printf(
"RaC-EED 21-06-2010 %p wxVtkSceneManager::wxVtkSceneManager If you comment this line, the drag and drop functionnality is not initialized.\n",
this);
-#ifdef __APPLE__
+//#ifdef __APPLE__
_baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget((wxDropTarget*)parent);
-#endif
+//#endif
configureBaseView();
_worldState = NOTHING_HAPPENS;
wxVtkSceneManager::~wxVtkSceneManager() {
//FCY memory leaks
- printf("EED %p ~wxVtkSceneManager()\n", this);
+ printf("EED %p ~wxVtkSceneManager() START\n", this);
disconnectDrop();
delete _baseView;
+ printf("EED %p ~wxVtkSceneManager() END\n", this);
}
//=========================================================================
interactorstylebaseview->SetwxVtkBaseView(_baseView);
_baseView->GetRenderer()->GetActiveCamera()->ParallelProjectionOn();
- _baseView->GetRenderer()->ResetCamera(-100, 100, -100, 100, 800, 1100);
+ _baseView->GetRenderer()->ResetCamera(-100, 100, -100, 100, -1000, 1000);
+ _baseView->GetRenderer()->GetActiveCamera()->Zoom(10);
+
_baseView->GetRenderer()->SetBackground(0.9, 0.9, 0.9);
_baseView->GetRenderer()->GradientBackgroundOn();
- _baseView->Refresh();
// Actos Port_Text
_textActor = vtkTextActor3D::New();
- _textActor->SetPosition(-9999, -9999, 900);
+ _textActor->SetPosition(-9999, -9999, GPOSITION_Z);
_textActor->SetInput("<void>");
_textActor->GetTextProperty()->SetFontSize(60);
_textActor->GetTextProperty()->BoldOn();
//------------
double xInic = 0;
double yInic = 0;
- double zInic = 900;
+ double zInic = GPOSITION_Z;
vtkPolygon *aPolygon = vtkPolygon::New();
_fillObjectActor = vtkActor::New();
BlackBoxDescriptor::Pointer descriptor =
GObjectsMVCFactory::getInstance()->getBlackBoxDescriptor(
packageName, boxType);
-
+ if (descriptor == NULL){
+ printf("SCP: ERROR in wxVtkSceneManager::createGBlackBox, box %s probably does not exist.\n", boxType.c_str());
+ }
//Prepares the initial model
//The coordinates obtained are the following. Top-Left:x=0,y=0 Bottom-Right:x=width,y=height
double yy = windowHeight - y;
//z value is not important yet, because it is only used a parallel projection
- double zz = 900;
+ double zz = GPOSITION_Z;
_baseView->TransCoordScreenToWorld(xx, yy, zz);
model->setInicPoint(xx, yy, zz);
double yy = windowHeight - 5;
//z value is not important yet, because it is only used a parallel projection
- double zz = 900;
- printf("EED wxVtkSceneManager::createGComplexBoxInputPort 900-450\n");
+ double zz = GPOSITION_Z;
_baseView->TransCoordScreenToWorld(xx, yy, zz);
model->setInicPoint(xx, yy, zz);
double yy = windowHeight - 5;
//z value is not important yet, because it is only used a parallel projection
- double zz = 900;
-
- printf("EED wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
+ double zz = GPOSITION_Z;
_baseView->TransCoordScreenToWorld(xx, yy, zz);
model->setInicPoint(xx, yy, zz);
int wxVtkSceneManager::createGConnector(GPortModel* startPort) {
int type = GCONNECTOR;
- manualConnectorContourController* manContourControl =
- new manualConnectorContourController();
- manualConnectorContourView* manContourView =
- new manualConnectorContourView();
- manualContourModel* manContourModel = new manualContourModel();
-
- GConnectorController* connectorcontroller = new GConnectorController();
- GConnectorModel* connectorModel = new GConnectorModel();
- vtkGConnectorView* connectorView = new vtkGConnectorView();
+ manualConnectorContourController *manContourControl = new manualConnectorContourController();
+ manualConnectorContourView *manContourView = new manualConnectorContourView();
+ manualContourModel *manContourModel = new manualContourModel();
+ GConnectorController *connectorcontroller = new GConnectorController();
+ GConnectorModel *connectorModel = new GConnectorModel();
+ vtkGConnectorView *connectorView = new vtkGConnectorView();
connectorModel->setGObjectType(type);
manContourModel->SetCloseContour(false);
manContourView->SetModel(manContourModel);
manContourView->SetWxVtkBaseView(_baseView);
manContourView->SetRange(0.5);
- manContourView->SetZ(900);
+ manContourView->SetZ(GPOSITION_Z);
manContourView->SetColorNormalContour(0, 0, 1);
manContourView->SetColorEditContour(0.5, 0.5, 0.5);
/**
* JGRR AND CM
- * Width increased from 2 to 5, it simplifies line handling and spline control :P
+ * Width increased from 2 to 3, it simplifies line handling and spline control :P
* @param WidthLine
*/
- manContourView->SetWidthLine( 5 ) ;
+ manContourView->SetWidthLine( 3 ) ;
manContourView->SetShowText(false);
manContourControl->SetModelView(manContourModel, manContourView);
manContourControl->CreateNewManualContour();
- manContourView->RefreshContour();
double x, y, z;
connectorModel->getInicPoint(x, y, z);
-
+
+
manContourControl->SetState(1);
manContourModel->SetCloseContour(false);
int bak = manContourControl->GetNumberOfPointsManualContour() - 1;
manContourControl->_bakIdPoint = bak;
- manContourView->Refresh();
-
+
manContourControl->SetMoving(false);
connectorcontroller->setModelAndView(connectorModel, connectorView);
connectorModel->addObserver(connectorView);
connectorModel->addObserver(this);
+// manContourView->Refresh();
+
return newId;
}
if (command != NO_COMMAND) {
if (command == ADD_TO_SELECTED) {
- //EEDBorrame GObjectController* cont = _controllers[idController];
-
if (GetIndexInSelected(idController) == -1) {
_selectedObjects.push_back(idController);
}
-
- //EEDBorrame
- // bool foundID=false;
- // for (int i=0; i<(int)_selectedObjects.size() && foundID==false; i++)
- // {
- // if(_selectedObjects[i]==idController)
- // {
- // foundID = true;
- // }
- // }
- // if(!foundID)
- // {
- // _selectedObjects.push_back(idController);
- // }
-
} else if (command == REMOVE_FROM_SELECTED) {
int index = GetIndexInSelected(idController);
if (index >= 0) {
// EO JGRR & CM WH
- _worldState = INIT_CREATION_CONTOUR;
- GObjectController* cont = _controllers[idController];
+ _worldState = INIT_CREATION_CONTOUR;
+ GObjectController* cont = _controllers[idController];
GPortModel* startOutputPort = (GPortModel*) cont->getModel();
// The last one is the controller of the connector
}
_selectedObjects.clear();
_idConnectionInCreation = createGConnector(startOutputPort);
- } else if (command == FIN_CREATION_CONTOUR && _worldState
- == INIT_CREATION_CONTOUR) {
+ } else if (command == FIN_CREATION_CONTOUR && _worldState == INIT_CREATION_CONTOUR) {
_worldState = NOTHING_HAPPENS;
//int id = _controllers.size()-1;
- GObjectController *cont = _controllers[_idConnectionInCreation];
- GConnectorModel *modelContour = (GConnectorModel*) cont->getModel();
- GObjectController *finPort = _controllers[idController];
+ GObjectController *cont = _controllers[_idConnectionInCreation];
+ GConnectorModel *modelContour = (GConnectorModel*) cont->getModel();
+ GObjectController *finPort = _controllers[idController];
if (finPort->getGObjectType() == GPORT) {
GPortModel* modelPort = (GPortModel*) finPort->getModel();
}
// EO JGRR CM
- _parent->saveTempDiagram();
+ _parent->saveTempandUpdate("create connection");
}
- manualConnectorContourController
- * manCont =
- ((GConnectorController*) cont)->getManualContourController();
- manualConnectorContourView
- * connView =
- (manualConnectorContourView*) manCont->GetManualViewBaseContour();
- connView->Refresh();
-
+ manualConnectorContourController *manCont = ((GConnectorController*) cont)->getManualContourController();
+ manualConnectorContourView *connView = (manualConnectorContourView*) manCont->GetManualViewBaseContour();
+
std::map<int, GObjectController*>::iterator it2;
for (it2 = _controllers.begin(); it2 != _controllers.end(); ++it2) {
}
cont->SetActive(true);
}
+ connView->Refresh();
}
}
-
+
}
//=========================================================================
bool wxVtkSceneManager::OnMouseMove() {
int X, Y;
- bool okStatusMessage = false;
- bool okPortMessage = false;
+ bool okStatusMessage = false;
+ bool okPortMessage = false;
wxVTKRenderWindowInteractor *wxVTKiren;
- wxVTKiren
- = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
+ wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
wxVTKiren->GetEventPosition(X, Y);
if (_worldState == DRAG_OBJECTS) {
_startDragging = false;
- } else if (_worldState == NOTHING_HAPPENS || _worldState
- == INIT_CREATION_CONTOUR) {
+ } else if (_worldState == NOTHING_HAPPENS || _worldState == INIT_CREATION_CONTOUR) {
std::map<int, GObjectController*>::iterator it;
double px, py, pz;
for (it = _controllers.begin(); it != _controllers.end(); ++it) {
GObjectController *desc = it->second;
- int type = desc->getGObjectType();
- int state = desc->getView()->getState();
+ int type = desc->getGObjectType();
+ int state = desc->getView()->getState();
desc->getModel()->getCenter(px, py, pz);
- if (state == HIGHLIGHTED) {
+ // JGRR & CM
+ if ((state == HIGHLIGHTED) || (state == SELECTED_POSSIBLE_CONNECTION )) {
+ // EO JGRR & CM
okStatusMessage = true;
updateStatusBar(desc->getStatusText());
if (type == GBLACKBOX) {
} else { //_worldState
- _worldState = DRAG_OBJECTS;
- _startDragging = true;
+ _worldState = DRAG_OBJECTS;
+ _startDragging = true;
- int shiftkey =
- _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
- int ctrlkey =
- _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
- ctrlkey = ctrlkey + shiftkey;
+ int shiftkey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
+ int ctrlkey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
+ ctrlkey = ctrlkey + shiftkey;
GObjectController *cont = GetGBlackBoxControlerPointedByMouse();
int id = _selectedObjects[i];
GObjectController* control = _controllers[id];
control->getView()->setState(NOTHING_HAPPENS);
+ control->getModel()->notifyObservers(_idManager);
}// for _selectedObjects
_selectedObjects.clear();
}
//=========================================================================
-bool wxVtkSceneManager::OnChar() {
- char keyCode = _vtkInteractorStyleBaseView->GetInteractor()-> GetKeyCode();
- int ctrlkey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
+bool wxVtkSceneManager::OnChar()
+{
+ bool ok=false;
+ char keyCode = _vtkInteractorStyleBaseView->GetInteractor()-> GetKeyCode();
+ int ctrlkey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
// KeyCode 127 : Delete Key
// KeyCode 8 : Backspace Key
- if (keyCode == 8 || keyCode == 127) {
- if (_selectedObjects.size() > 0) {
- for (int i = 0; i < (int) _selectedObjects.size(); i++) {
+ if (keyCode == 8 || keyCode == 127)
+ {
+ for (int i = 0; i < (int) _selectedObjects.size(); i++)
+ {
int id = _selectedObjects[i];
+ printf("EED wxVtkSceneManager::OnChar %d %d\n", i, id);
std::map<int, GObjectController*>::iterator it;
it = _controllers.find(id);
if (it != _controllers.end()) {
- deleteObject(id);
- }
+ ok=ok||deleteObject(id);
+ } // if
+ }// for selected objects
+ if (ok) _selectedObjects.clear();
+ _parent->saveTempandUpdate("delete object");
+ }// if keyCode
+
+ /// Duplicate
+#ifdef MACOSX
+ if((keyCode==0) && (ctrlkey==1)) {
+#else
+ ctrlkey+=keyCode;
+ if(ctrlkey==5){
+#endif
+ if(_selectedObjects.size()){
+ std::cout<<"objects to copy :";
+ for(int i=0;i<_selectedObjects.size();i++){
+ std::cout<<_selectedObjects.at(i)<<" ";
}
- _selectedObjects.clear();
- }
- }
-
- /// Duplicate
- if(ctrlkey==5){
- if(_selectedObjects.size()){
- std::cout<<"objects to copy :";
- for(int i=0;i<_selectedObjects.size();i++){
- std::cout<<_selectedObjects.at(i)<<" ";
- }
- DuplicateObjects(getSelectedObjects());
- }else{
- std::cout<<"No objects to copy\n";
- }
- }
+ DuplicateObjects(getSelectedObjects());
+ }else{
+ std::cout<<"No objects to copy\n";
+ } // _selectedObjects.size
+ } // ctrlkey 5
return true;
}
//=========================================================================
-void wxVtkSceneManager::deleteObject(int id) {
+bool wxVtkSceneManager::deleteObject(int id)
+{
+ bool result=true;
GObjectController *control = _controllers[id];
std::vector<int> controllersToRemove;
// Add box input controllers to be removed
for (int i = 0; i < (int) inputs.size(); i++) {
- AddControlerToBeRemove(&controllersToRemove,
- inputs[i]->getObjectId());
+ AddControlerToBeRemove(&controllersToRemove, inputs[i]->getObjectId());
if (inputs[i]->isConnected()) {
boxConnected = true;
}
// Add box output controllers to be removed
for (int i = 0; i < (int) outputs.size(); i++) {
- AddControlerToBeRemove(&controllersToRemove,
- outputs[i]->getObjectId());
+ AddControlerToBeRemove(&controllersToRemove, outputs[i]->getObjectId());
if (outputs[i]->isConnected()) {
boxConnected = true;
}
int type = cont->getGObjectType();
if (type == GCONNECTOR) {
GConnectorModel *conMod = (GConnectorModel*) cont->getModel();
- if (conMod->getStartPort() != NULL
- && conMod->getStartPort()->getParentBox()->getObjectId()
- == bbmod->getObjectId()) {
- AddControlerToBeRemove(&controllersToRemove,
- conMod->getObjectId());
+ if (conMod->getStartPort() != NULL && conMod->getStartPort()->getParentBox()->getObjectId() == bbmod->getObjectId())
+ {
+ AddControlerToBeRemove(&controllersToRemove,conMod->getObjectId());
}
- if (conMod->getEndPort() != NULL
- && conMod->getEndPort()->getParentBox()->getObjectId()
- == bbmod->getObjectId()) {
- AddControlerToBeRemove(&controllersToRemove,
- conMod->getObjectId());
+ if (conMod->getEndPort() != NULL && conMod->getEndPort()->getParentBox()->getObjectId() == bbmod->getObjectId())
+ {
+ AddControlerToBeRemove(&controllersToRemove,conMod->getObjectId());
}
}
}
// Add box controller to be removed
AddControlerToBeRemove(&controllersToRemove, bbmod->getObjectId());
} else if (control->getGObjectType() == GCONNECTOR) {
- GConnectorModel *conMod = (GConnectorModel*) control->getModel();
- AddControlerToBeRemove(&controllersToRemove, conMod->getObjectId());
+ GConnectorController *gconnectorcontroler = (GConnectorController*)control;
+ if (gconnectorcontroler->getManualContourController()->IsEditable()==false)
+ {
+ GConnectorModel *conMod = (GConnectorModel*) control->getModel();
+ AddControlerToBeRemove(&controllersToRemove, conMod->getObjectId());
+ } else{
+ gconnectorcontroler->getManualContourController()->OnChar();
+ result = false;
+ }
}
std::map<int, GObjectController*>::iterator it;
_controllers.erase(it);
}//if
}// for
- _parent->saveTempDiagram();
+
+
+ return result;
}
//=========================================================================
}
_selectedObjects.clear();
_controllers.clear();
- refreshScene();
}
//=========================================================================
_baseView->GetRenderer()->GetActiveCamera()->SetFocalPoint(0, 0, temp[2]);
_baseView->GetRenderer()->GetActiveCamera()->GetPosition(temp);
_baseView->GetRenderer()->GetActiveCamera()->SetPosition(0, 0, temp[2]);
- _baseView->RefreshView();
-
}
//=========================================================================
if (line == "# - BBTKGEditor v 1.2 BBG BlackBox Diagram file") {
version = line.substr(18, 3);
}
+ if (line == "# - BBTKGEditor v 1.3 BBG BlackBox Diagram file") {
+ version = line.substr(18, 3);
+ }
} else if (line == "APP_START") {
start = true;
break;
std::istringstream zSt(zInic);
zSt >> zIn;
+ if (version<="1.2")
+ {
+ if (zIn==900) zIn=GPOSITION_Z;
+ }
+
getline(inputStream, line);//FIN_COMPLEX_PORT
configGComBoxInputOutputPort(true, inputPortName, xIn, yIn, zIn);
std::istringstream zSt(zInic);
zSt >> zIn;
+ if (version<="1.2")
+ {
+ if (zIn==900) zIn=GPOSITION_Z;
+ }
+
getline(inputStream, line);//FIN_COMPLEX_PORT
- configGComBoxInputOutputPort(false, outputPortName, xIn, yIn,
- zIn);
+ configGComBoxInputOutputPort(false, outputPortName, xIn, yIn, zIn);
} // for output complex box
std::istringstream zSt(zInic);
zSt >> zIn;
+
+ if (version<="1.2")
+ {
+ if (zIn==900) zIn=GPOSITION_Z;
+ }
+
+
//----------
getline(inputStream, line);//xEnd:yEnd:zEnd
strcpy(coord, line.c_str());
std::istringstream zEt(zEnd);
zEt >> zEn;
+ if (version<="1.2")
+ {
+ if (zEn==900) zEn=GPOSITION_Z;
+ }
+
+
bool boxExecutable = false;
if (isExec == "TRUE") {
boxExecutable = true;
}
int idBox = createGBlackBox(xIn, yIn, package, type);
- configGBlackBox(idBox, xIn, yIn, zIn, name, boxExecutable, xEn,
- yEn, zEn);
+ configGBlackBox(idBox, xIn, yIn, zIn, name, boxExecutable, xEn, yEn, zEn);
GObjectController *cont = _controllers[idBox];
GBlackBoxModel *bbmod = (GBlackBoxModel*) cont->getModel();
result = strtok(NULL, delims);
std::string nameEndPort(result);
- int idCon = configGConnetion(nameStartBox, nameStartPort,
- nameEndBox, nameEndPort);
+ int idCon = configGConnetion(nameStartBox, nameStartPort,nameEndBox, nameEndPort);
if (version != "1.0") {
//Readding control points of the manualContour
- //ups1
- GConnectorController *tempp =
- (GConnectorController*) _controllers[idCon];
- GConnectorModel *conMod = (GConnectorModel*) tempp->getModel();
- vtkGConnectorView *conView =
- (vtkGConnectorView*) tempp->getView();
+ GConnectorController *tempp = (GConnectorController*) _controllers[idCon];
+ GConnectorModel *conMod = (GConnectorModel*) tempp->getModel();
+ vtkGConnectorView *conView = (vtkGConnectorView*) tempp->getView();
getline(inputStream, line); //NumberOfControlPoints:##
strcpy(conns, line.c_str());
result = strtok(conns, delims);
result = strtok(NULL, delims);
std::istringstream isPointZ(result);
isPointZ >> pz;
-
- conMod->getManualContourModel()->InsertPoint_id(ii + 1, px,
- py, pz);
+
+ if (version<="1.2")
+ {
+ if (pz==900) pz=GPOSITION_Z;
+ }
+
+ conMod->getManualContourModel()->InsertPoint_id(ii + 1, px, py, pz);
conView->getManualContourView()->AddPoint();
}
}// version !=1.0
} // start
- refresh();
}
//=========================================================================
boxModel = findGBox(nameStartBox);
if (boxModel != NULL) {
startP = boxModel->getOutputPort(nameStartPort);
+ if(startP == NULL){
+ printf("SCP: ERROR in wxVtkSceneManager::configGConnetion start port %s is null. Port name is probably wrong.\n", nameStartPort.c_str());
+ }
}
boxModel = findGBox(nameEndBox);
if (boxModel != NULL) {
endP = boxModel->getInputPort(nameEndPort);
+ if(endP == NULL){
+ printf("SCP: ERROR in wxVtkSceneManager::configGConnetion end port %s is null. Port name is probably wrong\n", nameStartPort.c_str(), nameEndPort.c_str());
+ }
}
//ups2
int newId = _contLastId;//_controllers.size();
objController->setId(newId);
_controllers[newId] = objController;
- std::cout
- << "DFCH: int wxVtkSceneManager::addObjectController(GObjectController* objController) ---- _contLastId = "
- << _contLastId << std::endl;
+ //std::cout << "DFCH: int wxVtkSceneManager::addObjectController(GObjectController* objController) ---- _contLastId = " << _contLastId << std::endl;
_contLastId++;
return newId;
}
cont->getModel()->notifyObservers(_idManager);
}
- refreshScene();
}
git://git.creatis.insa-lyon.fr / bbtkGEditor.git / blobdiff