Changes with manualBaseModel. It improves the functionality with the new

[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 845adcf6a6942c9ba888512cd2b7fa68e2968154..a6ceb2031d5c4e066156fdea94fceed86d685b58 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)
@@ -172,6 +172,11 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                        manContourControl       = new manualLineControler();
                        manViewerContour        = new manualViewLine();
                }
+               if (typeContour==7)
+               {
+                       manContourControl       = new manualContourControler();
+                       manViewerContour        = new manualViewPoints();
+               }
 
 
 
@@ -329,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 )
                {
@@ -341,7 +346,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
                iter = _contours_ViewControl->find( anExistingKName );
 
-               manualContourModel                      *cModule        = manualModel;
+               manualBaseModel                 *cModule        = manualModel;
                manualViewBaseContour           *cViewer        = iter->second->getViewer()->Clone();
                manualContourBaseControler      *cControl       = iter->second->getControler()->Clone(  );
 
@@ -1110,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<size; i++)