no newline at end of file

[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxVtkBaseView_SceneManager.cxx

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index 3d65b286f89258637ee757a8aeb585d2f602dc1a..0ede4c607c2d1d8de97d3dfe576fbe0e1fbf8027 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -77,12 +77,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;
        }
 
        //------------------------------------------------------------------------------------------------------------
@@ -165,6 +165,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+");
@@ -408,7 +414,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
                std::map<std::string, ContourWrap_ViewControl *> :: 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
@@ -576,7 +583,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                int size = _workingGroup->size();
                for ( int i = 0; i<size; i++ )
                {
-                       manualViewBaseContour * viewer = iter->second->getViewer();
+//EED???                       manualViewBaseContour * viewer = iter->second->getViewer();
                        selectedObjects.push_back( iter->first);        
 
                        iter++;
@@ -587,8 +594,8 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
        void wxVtkBaseView_SceneManager :: selectObjects( std::vector< std::string > theExistingObjectsToSelect )
        {
                std::map <std::string, ContourWrap_ViewControl *>::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; i<size; i++ )
                {
                        selected = false;
@@ -743,7 +750,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                _wxVTKiren->GetEventPosition( 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 +787,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                        {
                                //Multiple moving
                                
-                               bool ckecking = false;
+//EED???                               bool ckecking = false;
                                for( i =0; i<size ; i++ ) 
                                {
                                        control = iter->second->getControler();
@@ -866,12 +873,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 +965,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 +996,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 +1018,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 +1126,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);
        }