]> Creatis software - creaContours.git/blobdiff - lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
#3145 creaContours Bug New Normal - changeWx28to30
[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxVtkBaseView_SceneManager.cxx
index 54cbf69b831dffcee72fed5ffbca2f36f6ad9593..1d8f1e51659104368b0f3234d3f609dade2ee545 100644 (file)
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 //----------------------------------------------------------------------------------------------------------------
 // Class definition include
@@ -40,25 +65,21 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
        wxVtkBaseView_SceneManager :: wxVtkBaseView_SceneManager( wxVtkBaseView * theWxBaseViewToManage, wxEvtHandler * theEventHandler, double * spc )
        {
-               
                _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;
-               SetWidthContour(1.0);
-               
+               _drawingSelectionROI                    = false;
+               SetWidthContour(1.0);   
                _wxVtk_BaseView = theWxBaseViewToManage;
                if( _wxVtk_BaseView!=NULL )
                {
@@ -68,6 +89,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                }
                configureSelectionROI( spc );
        }
+
        //------------------------------------------------------------------------------------------------------------
        wxVtkBaseView_SceneManager :: ~wxVtkBaseView_SceneManager()
        {
@@ -77,7 +99,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                {
                        _contours_ViewControl->erase( iter );
                        i++;
-               }
+               } // for
                _contours_ViewControl->clear();         
                delete _contours_ViewControl;           
                _workingGroup->clear();
@@ -101,10 +123,9 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                        wxCommandEvent cevent( theEventType );
                        cevent.SetString( wxString( text.c_str(), wxConvUTF8) );
                        _eventHandler->ProcessEvent( cevent );
-               }
+               } // if
        }
 
-
        //------------------------------------------------------------------------------------------------------------
        //  Attributes getters and setters
        //------------------------------------------------------------------------------------------------------------
@@ -112,6 +133,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
        {
                _eventHandler = theEventHandler;
        }
+
        //------------------------------------------------------------------------------------------------------------
        void wxVtkBaseView_SceneManager :: setWxVtkViewBase( wxVtkBaseView * theBaseView )
        {
@@ -196,7 +218,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                manViewerContour->SetModel( manModelContour );
                manViewerContour->SetWxVtkBaseView( _wxVtk_BaseView );
                manViewerContour->SetRange( _widthOfControlPoint );
-               manViewerContour->SetZ( 1000 );
+               manViewerContour->SetZ( -900 ); 
 
                manViewerContour->SetSpacing(spc);
 
@@ -227,7 +249,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                _viewerSelectionROI->SetModel( _modelSelectionROI );
                _viewerSelectionROI->SetWxVtkBaseView( _wxVtk_BaseView );
                _viewerSelectionROI->SetRange( 2 );
-               _viewerSelectionROI->SetZ( 1000 );
+               _viewerSelectionROI->SetZ( -900 );
                _viewerSelectionROI->SetColorNormalContour(0.6, 0.8, 0);
 
                _viewerSelectionROI->SetSpacing( spc );
@@ -436,7 +458,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
        }
 
        //------------------------------------------------------------------------------------------------------------
-       void wxVtkBaseView_SceneManager :: removeSceneContours( )
+       void wxVtkBaseView_SceneManager::removeSceneContours()
        {
                std::map <std::string, ContourWrap_ViewControl *>::iterator iter = _sceneContours_ViewControl->begin(); 
                int size = _sceneContours_ViewControl->size();
@@ -446,8 +468,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                        iter++;
                }
                _sceneContours_ViewControl->clear();
-
-
                //Removing the selection rectangle to avoid showing when it's innecesary
                _controlerSelectionROI->SetActive( false );             
                _viewerSelectionROI->RemoveCompleteContourActor();      
@@ -726,7 +746,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
                bool condition = true;  
                int X,Y;
-               wxVTKRenderWindowInteractor *_wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
+               crea::wxVTKRenderWindowInteractor *_wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
                _wxVTKiren->GetEventPosition( X , Y );
 
                bool ctrlKey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey() == 1;
@@ -784,9 +804,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                                        size = selectionSize;
                                        iter = _workingGroup->begin();
                                }
-                       }                       
-                       else
-                       {
+                       } else {
                                
                                _toIncludeAtInteractionGroup = false;
                        }
@@ -1095,7 +1113,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                double sg = (double)(start) / CLOCKS_PER_SEC;
 #endif
                int tmpPx,tmpPy;
-               wxVTKRenderWindowInteractor *wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
+               crea::wxVTKRenderWindowInteractor *wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor();
                wxVTKiren->GetEventPosition( tmpPx , tmpPy );
                fprintf(ff,"::%s (x,y) = (%i, %i) t(sg): %f\n  \n",method.c_str(), tmpPx, tmpPy, sg);
                fclose(ff);
@@ -1198,7 +1216,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                        {
                                conwraviwcont           = iter->second;
                                cViewer                 = conwraviwcont->getViewer();
-                               cViewer->SetShowText( false );
+                               cViewer->SetShowText( false );                                  // EED 28Mars2011
                                cViewer->SetWidthLine( _widthOfContour );
                                cViewer->SetRange( _widthOfControlPoint );
                        } // for