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);
}
//=========================================================================
_baseView->GetRenderer()->SetBackground(0.9, 0.9, 0.9);
_baseView->GetRenderer()->GradientBackgroundOn();
- _baseView->Refresh();
// Actos Port_Text
_textActor = vtkTextActor3D::New();
* Width increased from 2 to 5, 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);
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;
}
}
// EO JGRR CM
- _parent->saveTempDiagram();
+ _parent->saveTempandUpdate("create connection");
}
manualConnectorContourController
manualConnectorContourView
* connView =
(manualConnectorContourView*) manCont->GetManualViewBaseContour();
- connView->Refresh();
-
+
std::map<int, GObjectController*>::iterator it2;
for (it2 = _controllers.begin(); it2 != _controllers.end(); ++it2) {
}
cont->SetActive(true);
}
+ connView->Refresh();
}
}
-
+
}
//=========================================================================
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) {
int id = _selectedObjects[i];
GObjectController* control = _controllers[id];
control->getView()->setState(NOTHING_HAPPENS);
+ control->getModel()->notifyObservers(_idManager);
}// for _selectedObjects
_selectedObjects.clear();
}
_controllers.erase(it);
}//if
}// for
- _parent->saveTempDiagram();
+ _parent->saveTempandUpdate("delete object");
}
//=========================================================================
}
_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();
-
}
//=========================================================================
} // start
- refresh();
}
//=========================================================================
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();
}