X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.cxx;h=fccc03657f72041a8d8d571ff8f6075cc9345c52;hb=a6507d91019d9f428af751e5b0b3a7d19d6f0bf6;hp=3d65b286f89258637ee757a8aeb585d2f602dc1a;hpb=a654abbc209ed3104e98553cb381ef1c2845937a;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx index 3d65b28..fccc036 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 ); } @@ -77,12 +78,12 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) _contours_ViewControl->erase( iter ); i++; } - delete _contours_ViewControl; _contours_ViewControl->clear(); + delete _contours_ViewControl; _workingGroup->clear(); delete _lastInteraction; delete _workingGroup; - delete _contours_ViewControl; + //delete _contours_ViewControl; } //------------------------------------------------------------------------------------------------------------ @@ -145,6 +146,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) { manContourControl = new manualContourControler(); manViewerContour = new manualViewContour(); + manModelContour->SetCloseContour(false); } if (typeContour==2) @@ -165,6 +167,12 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) manViewerContour = new manualViewBullEye(); } + if (typeContour==6) + { + manContourControl = new manualLineControler(); + manViewerContour = new manualViewLine(); + } + //EED Borrame //FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+"); @@ -179,7 +187,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); @@ -217,7 +225,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); } @@ -386,7 +394,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) //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 ); @@ -408,7 +416,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) std::map :: iterator iter; iter = _sceneContours_ViewControl->find( theKeyName ); - if (iter != _sceneContours_ViewControl->end()){ + if (iter != _sceneContours_ViewControl->end()) + { ContourWrap_ViewControl * contourWRP = iter->second; removeFromScene( contourWRP ); //EED Borrame @@ -510,7 +519,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) if( control ) { - _wxVtk_BaseView->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( contourWRP->getControler() ); + ((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( contourWRP->getControler() ); } if( ifActive ) { @@ -576,7 +585,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) int size = _workingGroup->size(); for ( int i = 0; isecond->getViewer(); +//EED??? manualViewBaseContour * viewer = iter->second->getViewer(); selectedObjects.push_back( iter->first); iter++; @@ -587,8 +596,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) void wxVtkBaseView_SceneManager :: selectObjects( std::vector< std::string > theExistingObjectsToSelect ) { std::map ::iterator iter = _contours_ViewControl->begin(); - int size = _contours_ViewControl->size(); - bool selected; +//EED??? int size = _contours_ViewControl->size(); +//EED??? bool selected; /*for ( int i = 0; iGetEventPosition( X , Y ); bool ctrlKey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey() == 1; - bool shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey() == 1; +//??? bool shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey() == 1; if( _waiting && !ctrlKey ) { @@ -780,7 +789,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) { //Multiple moving - bool ckecking = false; +//EED??? bool ckecking = false; for( i =0; isecond->getControler(); @@ -866,12 +875,12 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) fclose(ff);*/ - char aa = _vtkInteractorStyleBaseView->GetInteractor()->GetKeyCode(); +//EED??? char aa = _vtkInteractorStyleBaseView->GetInteractor()->GetKeyCode(); bool condition = false; //vtkCommand * theComand = _wxVtk_BaseView ->GetInteractorStyleBaseView()->GetCommand( - vtkRenderWindowInteractor * vtkRWInteractor1 = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor(); - wxVTKRenderWindowInteractor * vtkRWInteractor2 = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor(); - wxVTKRenderWindowInteractorPlus * vtkRWInteractor3 = (wxVTKRenderWindowInteractorPlus*)_wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor(); +//EED??? vtkRenderWindowInteractor * vtkRWInteractor1 = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor(); +//EED??? wxVTKRenderWindowInteractor * vtkRWInteractor2 = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor(); +//EED?? wxVTKRenderWindowInteractorPlus * vtkRWInteractor3 = (wxVTKRenderWindowInteractorPlus*)_wxVtk_BaseView ->GetWxVTKRenderWindowInteractor();//GetInteractorStyleBaseView()->GetInteractor(); vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor(); bool ctrlKey = vtkRWInteractor->GetControlKey() == 1; @@ -958,8 +967,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) bool wxVtkBaseView_SceneManager :: OnRightButtonDown() { bool condition = false; - vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor(); - bool ctrlKey = vtkRWInteractor->GetControlKey() == 1; +//EED??? vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor(); +//EED??? bool ctrlKey = vtkRWInteractor->GetControlKey() == 1; _waiting = true; condition = true; @@ -989,7 +998,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) //_lastInteraction->getControler()->SetPosibleToMove( false ); control->SetActive( false ); control->SetEditable( false ); - _wxVtk_BaseView->GetInteractorStyleBaseView()->RemoveInteractorStyleMaracas( control ); + control->SetPosibleToMove( false ); +// _wxVtk_BaseView->GetInteractorStyleBaseView()->RemoveInteractorStyleMaracas( control ); _lastInteraction->getViewer()->Refresh(); this->_vtkInteractorStyleBaseView->SetRefresh_waiting(); } @@ -1010,9 +1020,9 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) bool wxVtkBaseView_SceneManager :: OnRightDClick() { bool condition = false; condition = true; - vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor(); +//EED??? vtkRenderWindowInteractor * vtkRWInteractor = _vtkInteractorStyleBaseView->GetInteractor(); /*vtkRenderWindowInteractor * vtkRWInteractor1 =*/ _vtkInteractorStyleBaseView->OnChar(); - wxVTKRenderWindowInteractor * wxVtkRWInterator = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor(); +//EED??? wxVTKRenderWindowInteractor * wxVtkRWInterator = _wxVtk_BaseView ->GetWxVTKRenderWindowInteractor(); /*if( _waiting ) { @@ -1118,7 +1128,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP ) int tmpPx,tmpPy; wxVTKRenderWindowInteractor *wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition( tmpPx , tmpPy ); - fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): \n \n",method.c_str(), tmpPx, tmpPy, sg); + fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): %f\n \n",method.c_str(), tmpPx, tmpPy, sg); fclose(ff); }