RaC Changes that includes a Polygon contour in creaMaracasVisu and creaContours

[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 fccc03657f72041a8d8d571ff8f6075cc9345c52..128f1bca280b567bb6e3659a5756a728f0205189 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -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,11 +142,11 @@ 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();
                        manViewerContour        = new manualViewContour();
-                       manModelContour->SetCloseContour(false);
                }
 
                if (typeContour==2)
@@ -173,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 );
@@ -335,7 +343,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 )
                {
@@ -344,21 +352,10 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                }
         std::map <std::string, ContourWrap_ViewControl *>::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;ii<size;ii++)
-//     {
-//             fprintf(ff,"   %d  %s\n ", ii ,iter->first.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(  );
 
@@ -388,11 +385,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() );
 
@@ -420,15 +412,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);
+               }       
        }
 
 
@@ -449,10 +434,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 <std::string, ContourWrap_ViewControl *>::iterator iter = _sceneContours_ViewControl->begin(); 
                int size = _sceneContours_ViewControl->size();
                for ( int i = 0; i<size; i++ )
@@ -462,9 +443,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                }
                _sceneContours_ViewControl->clear();
 
-//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 );             
@@ -741,10 +719,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;
@@ -815,11 +789,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; i<size ; i++ )
                                {
                                        control = iter->second->getControler();
@@ -867,12 +838,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();
@@ -1159,7 +1124,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<size; i++) 
@@ -1220,7 +1185,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                _widthOfContour = width;
                manualViewBaseContour           *cViewer;
                ContourWrap_ViewControl         *conwraviwcont;
-               std::map <std::string, ContourWrap_ViewControl *>::iterator iter;; 
+               std::map <std::string, ContourWrap_ViewControl *>::iterator iter; 
 
                for (iter=_contours_ViewControl->begin(); iter!=_contours_ViewControl->end(); iter++ )
                {
@@ -1247,8 +1212,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);
@@ -1256,4 +1221,6 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                delete cViewer;         
                delete cControler;
        }
-               
\ No newline at end of file
+       
+       
+