#3322 creaContours Feature New Normal - Show reference contour Befor After actual...

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

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
index de7b90660a8eb27c230f8b4a4736f2bcbef7fbeb..059d7cecd1edce39c9fecbaa7da8c5cfab3d6125 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
@@ -58,8 +58,8 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
        {
                theShowingImage->GetSpacing(last_spacing);
                showingVID                              = theShowingImage;
-               _before                                 = false;
-               _after                                  = false;
+               _showBeforeContour              = false;
+               _showAfterContour               = false;
                int gapH                                = 20;
                int gapV                                = 10;
                _verticalConceptName    = "";
@@ -719,11 +719,14 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
                        _sceneManager->addToScene(name, true, true, true, false, false );
                } // for i
 
+               _sceneManager->SetLabelNumberOfContours( "contours:"+std::to_string(size) );
+
                std::vector<int> tempVector;
                wxContourMainFrame::getInstance()->getInstantVector( tempVector );
 
-               if (_before==true)
+               if (_showBeforeContour==true)
                {
+                       size=0;
                        std::vector<std::string> lstNameBefor;
                        // Contours Befor
                        for (i=tempVector[1]-1; i>=0; i--)
@@ -742,8 +745,10 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
                        } // for i
                } // if _before Contour
        
-               if (_after==true)
+printf("EED wxContourViewPanel::addNameWrapperToScene A\n");
+               if (_showAfterContour==true)
                {
+                       size=0;
                        std::vector<std::string> lstNameAfter;
                        // Contours After
                        int ext[6];
@@ -764,17 +769,22 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
                                _sceneManager->addToScene(lstNameAfter[i], true, true, false, false, false );
                        } // for i
                } // if _after Contour
+printf("EED wxContourViewPanel::addNameWrapperToScene B\n");
+
        }
 
-       std::vector<std::string> wxContourViewPanel::getSelectedObjects(){
+       std::vector<std::string> wxContourViewPanel::getSelectedObjects()
+       {
                return _sceneManager->getSelectedObjects();
        }
 
-       void wxContourViewPanel::RefreshInterface(){
+       void wxContourViewPanel::RefreshInterface()
+       {
                getWxVtkBaseView()->Refresh();
        }
 
-       vtkImageData* wxContourViewPanel::getImageData(){
+       vtkImageData* wxContourViewPanel::getImageData()
+       {
                return _sceneManager->GetImageData();
        }
 
@@ -829,8 +839,13 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 
        void wxContourViewPanel::onBeforeAfterContour(bool before, bool after)
        {
-               _before = before;
-               _after  = after;
+               _showBeforeContour      = before;
+               _showAfterContour       = after;
+       }
+
+       void wxContourViewPanel::onShowTextContour(bool show)
+       {
+               _sceneManager->SetShowTextContour( show );
        }
 
        void wxContourViewPanel::GetPointsOfActualContour( std::vector<double> *vecX, std::vector<double> *vecY, std::vector<double> *vecZ )
@@ -838,7 +853,8 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
                _sceneManager->GetPointsOfActualContour(vecX, vecY, vecZ);
        }
 
-       void wxContourViewPanel::setImageSlice(int z){
+       void wxContourViewPanel::setImageSlice(int z)
+       {
                vtkInteractorStyleBaseView* stylebaseview = (vtkInteractorStyleBaseView*) _sceneManager->getWxVtkViewBase()->GetInteractorStyleBaseView();
                wxVtk2DBaseView* baseview = (wxVtk2DBaseView*)stylebaseview->GetWxVtk2DBaseView();
                baseview->SetActualSlice(z);