BUG contour interaction click right

[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 1a2a54234102d9e0aa9b372e401b44b7026df7b4..9d3660a13a28fd120ebc1c42c909b162ef8454b4 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -28,8 +28,6 @@
 #include "wxInstantChooserPanel.h"
 #include "wxContourViewPanel.h"
 
-
-
 //#include "ContourWorkspace.h"
 #include "ContourExtractData.h"
 #include "PerformingOperation.h"
@@ -93,6 +91,13 @@
 #include "vtkMetaImageWriter.h"
 #include "vtkImageData.h"
 #include "vtkTransform.h"
+
+#include "vtkCamera.h"
+#include "vtkImageActor.h"
+#include <vtkImageMapToColors.h>
+#include <vtkLookupTable.h>
+#include <vtkCommand.h>
+
 //#include "vtkMetaImageReader.h"
 
 //------------------------------------------------------------------------------------------------------------
@@ -108,7 +113,7 @@
 //------------------------------------------------------------------------------------------------------------
 // Class definition
 //------------------------------------------------------------------------------------------------------------
-
+class interfMainPanel;
 class wxContourMainFrame : public wxPanel {
 
        public:
@@ -129,9 +134,9 @@ class wxContourMainFrame : public wxPanel {
 
        void setVectImages( std::vector<vtkImageData*> images );
 
-       bool configurePanels(wxAuiNotebook * theNoteBook );
+       bool configurePanels( );
 
-       void setNotebook( wxAuiNotebook * theNoteBook );
+       bool addNewPanel(wxPanel* panel);
 
        wxAuiNotebook * createNotebook();
 
@@ -145,6 +150,12 @@ class wxContourMainFrame : public wxPanel {
 
        void setInstantChooserPanel(  wxInstantChooserPanel * theInstantChooserPanel );
 
+
+       void getMaskValue(vtkImageData* mask,vtkImageData* value,int typeContourGroup);
+
+       void SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value);
+
+
 //     void setButtonsBar(  wxContour_ButtonsBar * theButtonsBar );
 //     void setGrid(  wxContour_Grid * theGridPanel );
 //     void setDrawToolsPanel(  wxContour_DrawToolsPanel * theDrawToolsPanel );
@@ -170,6 +181,7 @@ class wxContourMainFrame : public wxPanel {
        //------------------------------------------------------------------------------------------------------------
        static wxContourMainFrame* getInstance(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/");
        static wxContourMainFrame* getInstance();
+       static void resetInstance();
        //------------------------------------------------------------------------------------------------------------
        //  Other functional methods
        //------------------------------------------------------------------------------------------------------------
@@ -208,6 +220,7 @@ class wxContourMainFrame : public wxPanel {
        void updateInstantOutlines();
        void updateInstantImageData();
        void updateInstantAxes();
+       void updateActor();
 
        void onChangeDeep(int val);
 
@@ -241,9 +254,17 @@ class wxContourMainFrame : public wxPanel {
        void referenceLine();
        void refLineHide();
        void refLineShow();
+       void refLineChangeWidth(int width);
 
        //AD
        void onMirror();
+       void onThreshold(int minVal, int maxVal);
+       void onThresholdChange(int minVal, int maxVal);
+       void onThresholdInterpolation(bool interpolate);
+       void onThresholdChangeOpacity (int opacity);
+       void onThresholdRemove();
+
+//==================================================================================================== 
 
        void showAxis(bool show);
 
@@ -276,7 +297,7 @@ class wxContourMainFrame : public wxPanel {
 
        void SaveValuesXYZ(std::string directory,std::string namefile, int typeContourGroup);
 
-       void SaveImageResult(std::string directory,std::string namefile, int typeContourGroup);
+       
 
        void onChangeInstantInstantPanel(std::string name,int value, int minshow, int maxshow);
 
@@ -292,10 +313,15 @@ private:
        //------------------------------------------------------------------------------------------------------------
        // Attributtes
        //------------------------------------------------------------------------------------------------------------
+       
        static wxContourMainFrame* instance;
 
        KernelManagerContour* kernelManager;
 
+       interfMainPanel* _pannew;
+
+       PerformingOperation* _performingOperation;
+
        std::string _datadir;
 
        wxContourViewPanel* _theViewPanel;
@@ -310,13 +336,15 @@ private:
 
 
        wxAuiManager m_mgr;
-    /*
-       wxArrayString m_perspectives;
-        wxMenu* m_perspectives_menu;
-   */
-        long m_notebook_style;
-        long m_notebook_theme;
-        int _numberOfVariablesStatistics;
+       wxAuiNotebook * notebook;
+
+    long m_notebook_style;
+    long m_notebook_theme;
+    int _numberOfVariablesStatistics;
+       
+       vtkImageActor * _thresholdActor;
+
+       bool _actorPresent;
 
        //OutlineModelManager * _modelManager;
 
@@ -366,10 +394,6 @@ private:
        int inundo;
        std::string     stundoredo;
 
-       
-
-       //wxContourViewPanel* _viewPan;
-       PerformingOperation* _performingOperation;
 
        static char COPY;