Merge remote-tracking branch 'origin/vtk8itk5wx3-mingw64' into vtk8itk5wx3-macos

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

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
index 60d66f23de40d14d7a6a2087dc6822a639c149b0..1ea6f2679af5a1a94340fc6952cd9ba0aa97d610 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
@@ -279,23 +279,19 @@ class wxContourViewPanel : public wxPanel
        * Gets the vertical concept name
        * @return _verticalConcept The name of the concept for setting at the vertical bar
        */
-       std::string  getVerticalConceptName(  );
-
+       std::string     getVerticalConceptName(  );
        //------------------------------------------------------------------------------------------------------------
        //  Other functional methods
        //------------------------------------------------------------------------------------------------------------
-
-       void getSpacing( double * spacing );
-
-       wxVtkBaseView* getWxVtkBaseView();
-
-       double getCurrentDeep();
-       
-       void    SetVisibleAxis(bool ok);
-       int             GetX();
-       int             GetY();
-       int             GetZ();
-       void    Refresh();
+       void                    getSpacing( double * spacing );
+       wxVtkBaseView*  getWxVtkBaseView();
+       double                  getCurrentDeep();
+       void                    SetVisibleAxis(bool ok);
+       int                             GetX();
+       int                             GetY();
+       int                             GetZ();
+       void                    SetXY(int x, int y);
+       void                    Refresh();
 
 
 //this method should be deleted
@@ -312,41 +308,27 @@ class wxContourViewPanel : public wxPanel
        void onStopCreateROI (wxCommandEvent& event);
        void onChangedDeep (wxCommandEvent& event);
        void onActionButtonPressed(wxCommandEvent& event);
-
        void removeSceneContours();
        void addNameWrapperToScene();
-       
        std::vector<std::string> getSelectedObjects();
-
        void RefreshInterface();
-
        vtkImageData* getImageData();
-
        void configureViewControlTo(std::string theName,manualBaseModel* manModelContour,double* spc,int typeofcontour);
-
-       int GetImageDataSizeZ();
-
+       int  GetImageDataSizeZ();
        void GetImageDataRange(double *range);
-
        void SetWidthContour(double width );
-
-       int getColorWindow();
-
-       int getWindowLevel();
-
+       int  getColorWindow();
+       int  getWindowLevel();
        void onBrigthnessColorWindowLevel(int colorwindow,int windowlevel);
-
        void onInterpolation(bool interpolate);
-
+       void onShowTextContour(bool show);
+       void onBeforeAfterContour(bool before, bool after);
        void GetPointsOfActualContour( std::vector<double> *vecX, std::vector<double> *vecY, std::vector<double> *vecZ );
-
        void changeImage(vtkImageData* img);
-
        void changeDeep();
-
        void setImageSlice(int z);
-private:
-       
+
+private:       
        //------------------------------------------------------------------------------------------------------------
        // Attributtes
        //------------------------------------------------------------------------------------------------------------
@@ -377,6 +359,8 @@ private:
        bool                                                    _useHorizontalBar;
 
        wxEvtHandler                                    *_eventHandler;
+       bool                                                    _showBeforeContour;
+       bool                                                    _showAfterContour;
        
 //EED
 
@@ -386,7 +370,7 @@ private:
 
        
        
-       wxVtkMPR2DView * GetwxVtkMPR2DView();
+       wxVtkMPR2DView *GetwxVtkMPR2DView();
 
 
 //     DECLARE_CLASS(wxContourViewPanel)