X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.cxx;h=daa8a32088f58c2ebfe9e2b0524d1097dd0b5f88;hb=refs%2Ftags%2FCreatools2-0-3.creaContour1-2-3.17Feb2011;hp=9e6a6056428936b7b26421363897f3c4cb87f712;hpb=5c51e157c5f506ceac760bdc90f4b73943395539;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx index 9e6a605..daa8a32 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx @@ -40,24 +40,24 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) wxVtkBaseView_SceneManager :: wxVtkBaseView_SceneManager( wxVtkBaseView * theWxBaseViewToManage, wxEvtHandler * theEventHandler, double * spc ) { - _widthOfContour = 1.0; + _lastInteraction = NULL; - _lastInteractionName = ""; + _lastInteractionName = ""; _eventHandler = theEventHandler; _leftClickCount = 0; _rigthClickCount = 0; - _contours_ViewControl = new std::map< std::string, ContourWrap_ViewControl * >(); - _sceneContours_ViewControl = new std::map< std::string, ContourWrap_ViewControl * >(); + _contours_ViewControl = new std::map< std::string, ContourWrap_ViewControl * >(); + _sceneContours_ViewControl = new std::map< std::string, ContourWrap_ViewControl * >(); _workingGroup = new std::map< std::string, ContourWrap_ViewControl * >(); _creatingMULT_ROI = false; - _editingROI = false; - _toIncludeAtInteractionGroup = false; - _waiting = false; + _editingROI = false; + _toIncludeAtInteractionGroup = false; + _waiting = false; _creatingROI = false; - _drawingSelectionROI = false; - + _drawingSelectionROI = false; + SetWidthContour(1.0); _wxVtk_BaseView = theWxBaseViewToManage; if( _wxVtk_BaseView!=NULL ) @@ -124,7 +124,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) return _wxVtk_BaseView; } //------------------------------------------------------------------------------------------------------------ - void wxVtkBaseView_SceneManager :: configureViewControlTo( std::string theKeyName, manualContourModel * manModelContour, double * spc,int typeContour) + void wxVtkBaseView_SceneManager :: configureViewControlTo( std::string theKeyName, manualBaseModel * manModelContour, double * spc,int typeContour) { //setControlActiveStateOfALL( false ); _creatingROI = true; @@ -142,6 +142,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) manualViewBaseContour *manViewerContour; // Creating the view manualViewContour and the manualContourControler + // NOTE: The model is created in the KernelManagerContour class, factoryManualContourModel method if (typeContour==1) { manContourControl = new manualContourControler(); @@ -172,12 +173,20 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) manViewerContour = new manualViewLine(); } + //Points + if (typeContour==7) + { + manContourControl = new manualContourControler(); + manViewerContour = new manualViewPoints(); + } + + //Polygon + if (typeContour==10) + { + manContourControl = new manualContourControler(); + manViewerContour = new manualViewContour(); + } -//EED Borrame -//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -//fprintf(ff,"EED wxVtkBaseView_SceneManager :: configureViewControlTo \n" ); -//fprintf(ff," %s %p \n",theKeyName.c_str() , manContourControl ); -//fclose(ff); _lastInteraction = insertWrap( theKeyName, manContourControl, manViewerContour ); @@ -186,7 +195,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) //Configuring the relations between the contour members representation manViewerContour->SetModel( manModelContour ); manViewerContour->SetWxVtkBaseView( _wxVtk_BaseView ); - manViewerContour->SetRange( 2 ); + manViewerContour->SetRange( _widthOfControlPoint ); manViewerContour->SetZ( 1000 ); manViewerContour->SetSpacing(spc); @@ -232,6 +241,10 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) ContourWrap_ViewControl * wxVtkBaseView_SceneManager :: insertWrap( std::string theKeyName, manualContourBaseControler * manContourControl, manualViewBaseContour * manViewerContour ) { ContourWrap_ViewControl * newContourWrap = new ContourWrap_ViewControl(manContourControl, manViewerContour); + if(_contours_ViewControl == NULL) + { + _contours_ViewControl = new std::map< std::string, ContourWrap_ViewControl * >(); + } _contours_ViewControl->insert(std::pair ( theKeyName, newContourWrap )); return newContourWrap; } @@ -334,7 +347,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) // Other functional methods //------------------------------------------------------------------------------------------------------------ - void wxVtkBaseView_SceneManager :: createCopyContourOf( std::string anExistingKName, std::string cloneName, manualContourModel * manualModel, bool append ) + void wxVtkBaseView_SceneManager :: createCopyContourOf( std::string anExistingKName, std::string cloneName, manualBaseModel * manualModel, bool append ) { if ( !append ) { @@ -343,21 +356,10 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) } std::map ::iterator iter; -//EED Borrame -// FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -// fprintf(ff,"EED wxVtkBaseView_SceneManager::createCopyContourOf() \n" ); -// int ii,size = _contours_ViewControl->size(); -// iter = _contours_ViewControl->begin(); -// for (ii=0;iifirst.c_str() ); -// iter++; -// } -//fclose(ff); iter = _contours_ViewControl->find( anExistingKName ); - manualContourModel *cModule = manualModel; + manualBaseModel *cModule = manualModel; manualViewBaseContour *cViewer = iter->second->getViewer()->Clone(); manualContourBaseControler *cControl = iter->second->getControler()->Clone( ); @@ -387,11 +389,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) _lastInteractionName = ""; } -//EED Borrame -//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -//fprintf(ff,"EED wxVtkBaseView_SceneManager :: removeFromScene \n" ); -//fprintf(ff," %p \n", contourWRP->getControler() ); -//fclose(ff); ((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->RemoveInteractorStyleMaracas( contourWRP->getControler() ); @@ -419,15 +416,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) { ContourWrap_ViewControl * contourWRP = iter->second; removeFromScene( contourWRP ); -//EED Borrame -//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -//fprintf(ff,"EED wxVtkBaseView_SceneManager :: removeFromScene Bbbbb \n" ); -//fprintf(ff," %d \n", _sceneContours_ViewControl->size() ); _sceneContours_ViewControl->erase(iter); - } -//EED Borrame -//fprintf(ff," %d \n", _sceneContours_ViewControl->size() ); -//fclose(ff); + } } @@ -448,10 +438,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) //------------------------------------------------------------------------------------------------------------ void wxVtkBaseView_SceneManager :: removeSceneContours( ) { -//EED Borrame -//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -//fprintf(ff,"EED wxVtkBaseView_SceneManager :: removeSceneContours \n" ); -//fprintf(ff," %d \n", _sceneContours_ViewControl->size() ); std::map ::iterator iter = _sceneContours_ViewControl->begin(); int size = _sceneContours_ViewControl->size(); for ( int i = 0; iclear(); -//EED Borrame -//fprintf(ff," %d \n", _sceneContours_ViewControl->size() ); -//fclose(ff); //Removing the selection rectangle to avoid showing when it's innecesary _controlerSelectionROI->SetActive( false ); @@ -740,10 +723,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) bool wxVtkBaseView_SceneManager :: OnMouseMove() { -//EED Borrame -// FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -// fprintf(ff,"EED wxVtkBaseView_SceneManager::OnMouseMove() \n" ); -// fclose(ff); bool condition = true; int X,Y; @@ -814,11 +793,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) if( ((_lastInteraction != NULL && !control->IsEditable() && !control->IsMoving() ) || _lastInteraction==NULL )) { -//EED Borrame -// FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); -// fprintf(ff,"EED wxVtkBaseView_SceneManager::OnMouseMove() 00222\n" ); -// fclose(ff); - _lastInteraction=NULL; + + _lastInteraction=NULL; for( i =0; isecond->getControler(); @@ -866,12 +842,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) bool wxVtkBaseView_SceneManager :: OnLeftButtonDown() { - /*FILE *ff; - ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); - long int endtime = clock(); -// double sg = (double)(endtime-startTimeAE) / (double)CLK_TCK; - fprintf(ff,"wxVtkBaseView_SceneManager :: OnLeftButtonDown() tLBDown = %i \n \n",endtime); - fclose(ff);*/ //EED??? char aa = _vtkInteractorStyleBaseView->GetInteractor()->GetKeyCode(); @@ -1158,7 +1128,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) if (currentSelection.size()>=1){ manualContourBaseControler *cControler = this->getControlerOf( currentSelection[0] ); - manualContourModel *cModel = cControler->GetManualContourModel(); + manualBaseModel *cModel = cControler->GetManualContourModel(); int i,size = cModel->GetNumberOfPointsSpline(); double x,y,z; for (i=0; i::iterator iter;; - - for (iter=_contours_ViewControl->begin(); iter!=_contours_ViewControl->end(); iter++ ) + std::map ::iterator iter; + + if (_contours_ViewControl!=NULL) { - conwraviwcont = iter->second; - cViewer = conwraviwcont->getViewer(); - cViewer->SetWidthLine(_widthOfContour); - } + for (iter=_contours_ViewControl->begin(); iter!=_contours_ViewControl->end(); iter++ ) + { + conwraviwcont = iter->second; + cViewer = conwraviwcont->getViewer(); + cViewer->SetWidthLine( _widthOfContour ); + cViewer->SetRange( _widthOfControlPoint ); + } // for + } // if } bool wxVtkBaseView_SceneManager::isEditableCControler(std::string theKeyName){ @@ -1246,8 +1221,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) ContourWrap_ViewControl* ccon = getContourWrap_ViewControlOf(theKeyName); - manualViewBaseContour * cViewer = ccon->getViewer(); - manualContourBaseControler * cControler = ccon->getControler(); + manualViewBaseContour * cViewer = ccon->getViewer(); + manualContourBaseControler * cControler = ccon->getControler(); removeFromScene(theKeyName); removeWrap(theKeyName); @@ -1255,4 +1230,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) delete cViewer; delete cControler; } - \ No newline at end of file + + +