X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxVtkSceneManager.cxx;h=ab0ef4e76d5a65f6e69cae0748be3c4bcef30c99;hb=806f5f22eb6e0e3d33e9f5e63efc13bd16d616a7;hp=b27c724c5da02616bba5127a61f1fb27a31cb2fe;hpb=a50e41251cd0693e7fed99110e1e6cf901bcec82;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx index b27c724..ab0ef4e 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx @@ -35,14 +35,11 @@ #include "wxVtkSceneManager.h" - #include #include - namespace bbtk { -cvs //========================================================================= wxVtkSceneManager::wxVtkSceneManager(wxGEditorTabPanel *parent, wxVtk3DBaseView *baseView, int idManager) { @@ -62,13 +59,11 @@ wxVtkSceneManager::wxVtkSceneManager(wxGEditorTabPanel *parent, if (_baseView != NULL) { //EED02JUIN2010 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__ - + "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__ _baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget((wxDropTarget*)parent); - - #endif +#endif configureBaseView(); _worldState = NOTHING_HAPPENS; @@ -535,17 +530,7 @@ int wxVtkSceneManager::createGConnector(GPortModel* startPort) { manContourView->SetColorNormalContour(0, 0, 1); manContourView->SetColorEditContour(0.5, 0.5, 0.5); manContourView->SetColorSelectContour(1, 0.8, 0); - - - /** - * JGRR AND CM - * Width increased from 2 to 5, it simplifies line handling and spline control :P - * @param WidthLine - */ - - manContourView->SetWidthLine( 5 ) ; - - + manContourView->SetWidthLine(1); manContourView->SetShowText(false); manContourControl->SetModelView(manContourModel, manContourView); @@ -663,41 +648,6 @@ void wxVtkSceneManager::update(int idController, int command) { _selectedObjects.erase(_selectedObjects.begin() + index); } } else if (command == INIT_CREATION_CONTOUR) { - - - // JGRR & CM WH - typedef std::map::iterator TIterator ; - TIterator iter ; - TIterator iter_end ; - // Find current item in the controller - iter = _controllers.find( idController ) ; - iter_end = _controllers.end( ) ; - // If item exist - if ( iter != iter_end ) { - GObjectController* gobjc = iter->second ; - - std::string bbtkType = gobjc->getModel( )->getBBTKType( ) ; - // And if the item is a port - if ( gobjc->getModel( )->getGObjectType( ) == GPORT ) { - TIterator c_it = _controllers.begin( ) ; - // Go through all componets - for ( c_it ; c_it != iter_end ; c_it++ ) { - GObjectController* obc = c_it->second ; - int obc_type = obc->getModel( )->getGObjectType( ) ; - std::string obc_bbtkType = obc->getModel( )->getBBTKType( ) ; - // if the component is a port and the type is the same of that selected - if ( ( obc_type == GPORT ) && ( obc_bbtkType == bbtkType ) ) { - // Highliht element - obc->getView( )->setState( POSSIBLE_CONNECTION ) ; - //obc->getView( )->setState( HIGHLIGHTED ) ; - } - } - } - } - - // EO JGRR & CM WH - - _worldState = INIT_CREATION_CONTOUR; GObjectController* cont = _controllers[idController]; GPortModel* startOutputPort = (GPortModel*) cont->getModel(); @@ -735,31 +685,6 @@ void wxVtkSceneManager::update(int idController, int command) { if (finPort->getGObjectType() == GPORT) { GPortModel* modelPort = (GPortModel*) finPort->getModel(); modelContour->setEndPort(modelPort); - - - // JGRR CM - typedef std::map::iterator TIterator ; - TIterator c_it = _controllers.begin( ) ; - TIterator iter_end = _controllers.end( ) ; - // Go through all componets - for ( c_it ; c_it != iter_end ; c_it++ ) { - GObjectController* obc = c_it->second ; - int obc_type = obc->getModel( )->getGObjectType( ) ; - int obc_state = obc->getView( )->getState( ) ; - // if the component is a port and the type is the same of that selected - if ( ( obc_type == GPORT ) && ( obc_state == POSSIBLE_CONNECTION )) { - // Return element to neutral state if not selected - obc->getView( )->setState( NOTHING_HAPPENS ) ; - } - if ( ( obc_type == GPORT ) && (obc_state == SELECTED_POSSIBLE_CONNECTION )) { - // Change element to connected state - obc->getView( )->setState( HIGHLIGHTED ) ; - - } - - } - // EO JGRR CM - _parent->saveTempDiagram(); } @@ -888,14 +813,6 @@ bool wxVtkSceneManager::OnLeftButtonDown() { && portView->getState() == HIGHLIGHTED) { isOverPort = true; } // if - - // JGRR & CM - if ( portmod->getPortType( ) == GINPUTPORT && portView->getState( ) == SELECTED_POSSIBLE_CONNECTION ) { - isOverPort = true ; - portView->setState( HIGHLIGHTED); - } - // EO JGRR & CM - } // if } // for @@ -2029,6 +1946,7 @@ void wxVtkSceneManager::loadDiagram(stringstream &inputStream) { std::string value(result); bbmod->setValueToInput(name, value); + getline(inputStream, line);//PORT o FIN_BOX port = line.substr(0, 4); } // while @@ -2638,7 +2556,6 @@ void wxVtkSceneManager::SetCbPackageName(std::string packagename) { } } - //========================================================================= std::string wxVtkSceneManager::GetCbPackageName() { return _cbPackageName; @@ -2678,67 +2595,15 @@ void wxVtkSceneManager::SetDescription(std::string description) { } } - //========================================================================= std::string wxVtkSceneManager::GetDescription() { return _Description; } //========================================================================= -// JGRR & CM -void wxVtkSceneManager::printAll(int com , int sta ){ - - int tmpState = sta ; - if ( tmpState == NOTHING_HAPPENS ) { - std::cout << "CONTROLER STATE---->NOTHING_HAPPENS\n" ; - } - if ( tmpState == HIGHLIGHTED ) { - std::cout << "CONTROLER STATE---->HIGHLIGHTED\n" ; - } - if ( tmpState == POSSIBLE_CONNECTION ) { - std::cout << "CONTROLER STATE---->POSSIBLE_CONNECTION\n" ; - } - if ( tmpState == SELECTED_POSSIBLE_CONNECTION ) { - std::cout << "CONTROLER STATE---->SELECTED_POSSIBLE_CONNECTION\n" ; - } - if ( tmpState == CLICKED ) { - std::cout << "CONTROLER STATE---->CLICKED\n" ; - } - if ( tmpState == DRAG ) { - std::cout << "CONTROLER STATE---->DRAG\n" ; - } - if ( tmpState == SELECTED ) { - std::cout << "CONTROLER STATE---->SELECTED\n" ; - } - if ( tmpState == CREATING_CONTOUR ) { - std::cout << "CONTROLER STATE---->CREATING_CONTOUR\n" ; - } - - // :P - - int command = com ; - if ( command == INIT_CREATION_CONTOUR ) { - std::cout << "COMMAND ----> INIT_CREATION_CONTOUR \n" ; - } - if ( command == FIN_CREATION_CONTOUR ) { - std::cout << "COMMAND ----> FIN_CREATION_CONTOUR \n" ; - } - if ( command == ADD_TO_SELECTED ) { - std::cout << "COMMAND ----> ADD_TO_SELECTED \n" ; - } - if ( command == DRAG_OBJECTS ) { - std::cout << "COMMAND ----> DRAG_OBJECTS \n" ; - } - if ( command == EDIT_BLACKBOX ) { - std::cout << "COMMAND ----> EDIT_BLACKBOX \n" ; - } - if ( command == REMOVE_FROM_SELECTED ) { - std::cout << "COMMAND ----> REMOVE_FROM_SELECTED \n" ; - } - - } } // EO namespace bbtk -// EOF +// EOF +