X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.cxx;h=ab420d82327ebe29d530dd04e9037fed5d344744;hb=03596c3a81a960624efaadc28a4cfc52d831ec98;hp=0ede4c607c2d1d8de97d3dfe576fbe0e1fbf8027;hpb=37b8224474313773d47c84ef4f5dacf274db254a;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx index 0ede4c6..ab420d8 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx @@ -3,6 +3,7 @@ // Class definition include //---------------------------------------------------------------------------------------------------------------- #include "wxVtkBaseView_SceneManager.h" +#include "wxVtk2DBaseView.h" //---------------------------------------------------------------------------------------------------------------- // Class implementation @@ -61,7 +62,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) _wxVtk_BaseView = theWxBaseViewToManage; if( _wxVtk_BaseView!=NULL ) { - vtkInteractorStyleBaseView* theInteractorStyleBaseView = _wxVtk_BaseView->GetInteractorStyleBaseView(); + vtkInteractorStyleBaseView* theInteractorStyleBaseView = (vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView(); theInteractorStyleBaseView->AddInteractorStyleMaracas( this ); SetVtkInteractorStyleBaseView( theInteractorStyleBaseView ); } @@ -123,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; @@ -141,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(); @@ -170,14 +172,13 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) manContourControl = new manualLineControler(); manViewerContour = new manualViewLine(); } + if (typeContour==7) + { + manContourControl = new manualContourControler(); + manViewerContour = new manualViewPoints(); + } -//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 ); _lastInteractionName = theKeyName; @@ -185,7 +186,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( 0.5 ); manViewerContour->SetZ( 1000 ); manViewerContour->SetSpacing(spc); @@ -223,7 +224,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) _viewerSelectionROI->SetSpacing( spc ); _controlerSelectionROI->SetModelView( _modelSelectionROI , _viewerSelectionROI ); - _wxVtk_BaseView->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _controlerSelectionROI ); + ((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _controlerSelectionROI ); _controlerSelectionROI->SetActive(false); } @@ -333,7 +334,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 ) { @@ -342,21 +343,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( ); @@ -386,13 +376,8 @@ 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); - _wxVtk_BaseView->GetInteractorStyleBaseView()->RemoveInteractorStyleMaracas( contourWRP->getControler() ); + ((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->RemoveInteractorStyleMaracas( contourWRP->getControler() ); contourWRP->getControler()->SetActive( control ); contourWRP->getControler()->SetEditable( false ); @@ -418,15 +403,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); + } } @@ -447,10 +425,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 ); @@ -517,7 +488,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) if( control ) { - _wxVtk_BaseView->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( contourWRP->getControler() ); + ((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( contourWRP->getControler() ); } if( ifActive ) { @@ -739,10 +710,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; @@ -813,11 +780,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(); @@ -865,12 +829,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(); @@ -1157,7 +1115,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;; + std::map ::iterator iter; for (iter=_contours_ViewControl->begin(); iter!=_contours_ViewControl->end(); iter++ ) { @@ -1245,8 +1203,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); @@ -1254,4 +1212,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) delete cViewer; delete cControler; } - \ No newline at end of file + + +