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

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

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index d9445631743d9c1169aaa4358c4dd39bfb127a08..aa7a947df3139d0dbebe42c5eaaf3de4ceef4731 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -82,6 +82,9 @@
 
 //EED10JUIN2011  #include "itkImageFileWriter.h"
 
+//EED2020-03-18
+#undef Success
+
 #include "itkImageToVTKImageFilter.h"
 #include "itkVTKImageToImageFilter.h"
 
@@ -119,58 +122,37 @@
 //------------------------------------------------------------------------------------------------------------
 class interfMainPanel;
 class wxContourMainFrame : public wxPanel {
-
        public:
-
        //------------------------------------------------------------------------------------------------------------
        // Constructors & Destructors
        //------------------------------------------------------------------------------------------------------------
-
-
        wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,long style  = wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER);
        wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style  = wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,std::string datadir="C:/Creatis/creaContoursBin/RelWithDebInfo/");
-
        ~wxContourMainFrame();
-
        //------------------------------------------------------------------------------------------------------------
        // Creational and initialization methods
        //------------------------------------------------------------------------------------------------------------
-
        void setVectImages(std::vector<vtkImageData*> imgs);
-
        bool configurePanels( );
-
        bool addNewPanel(wxPanel* panel);
-
        wxAuiNotebook * createNotebook();
-
        void createInstantChooserPanel(wxAuiNotebook * parent);
-
        void createViewPanel(wxAuiNotebook * parent);
-
        void createInstantChooserPanel(wxWindow * parent);
-
        void createViewPanel(wxWindow * parent);
-
+       wxVtkBaseView* GetWxVtkBaseView();
        void setInstantChooserPanel(  wxInstantChooserPanel * theInstantChooserPanel );
-
        void getMaskValue(vtkImageData ** mask,vtkImageData ** value,int typeContourGroup, int selection, int minZ, int maxZ);
-
        void SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value);
-
        void ShowToolsPanel(bool show);
-
-
        ////------------------------------------------------------------------------------------------------------------
        //// Methods for capturing events
        ////------------------------------------------------------------------------------------------------------------
 
-
        ////------------------------------------------------------------------------------------------------------------
        ////  Model management methods
        ////------------------------------------------------------------------------------------------------------------
 
-
        //------------------------------------------------------------------------------------------------------------
        //  Attributes getters and setters
        //------------------------------------------------------------------------------------------------------------
@@ -264,6 +246,9 @@ class wxContourMainFrame : public wxPanel {
        int getWindowLevel();
        void onBrigthnessColorWindowLevel(int colorwindow,int windowlevel);
        void onInterpolation(bool interpolate);
+       void onShowTextContour(bool show);
+       void onBeforeAfterContour(bool before, bool after);
+       void onJumpSlice(int step,int shift);
        void onChangeInstant(std::string name,int actual);
        void resetAppend();
        void onSpreadAdd();
@@ -288,6 +273,7 @@ class wxContourMainFrame : public wxPanel {
        void    SetContourGroup(int contourGroup);
        wxPanel *getThresholdImageViewPanel(wxWindow *parent);
        wxPanel *getColorLayerImageViewPanel(wxWindow *parent);
+       void    SetColorLayerImage(vtkImageData*);
 
 //CMRU 17-08-09-----------------------------------------------------------------------------------------------
 
@@ -338,11 +324,13 @@ class wxContourMainFrame : public wxPanel {
 //------------------------------------------------------------------------------------------------------------
 
        void SetScalarRange(int grayRangeMin, int grayRangeMax);
-
        std::string GetStringTypeImage( vtkImageData* image);
 
 //------------------------------------------------------------------------------------------------------------
 
+       void SetXY(int x,int y);
+
+
 private:
        //------------------------------------------------------------------------------------------------------------
        //  Private methods
@@ -353,7 +341,7 @@ private:
        // Attributtes
        //------------------------------------------------------------------------------------------------------------
 
-       int _contourGroup;
+       int                                             _contourGroup;
        static wxContourMainFrame   *instance;
        KernelManagerContour        *kernelManager;
        interfMainPanel             *_pannew;
@@ -369,9 +357,9 @@ private:
 
        wxAuiManager                m_mgr;
        wxAuiNotebook               *notebook;
-       long                    m_notebook_style;
-       long                    m_notebook_theme;
-       int                      _numberOfVariablesStatistics;
+    long                                               m_notebook_style;
+    long                       m_notebook_theme;
+    int                         _numberOfVariablesStatistics;
 
        // Contour Image Mask
        ThresholdImageView                      *_viewMaskImage;