X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=9d3660a13a28fd120ebc1c42c909b162ef8454b4;hb=99c30d2b8b911d2b923ca173285041d2b077d770;hp=80ca4e22caa7914be03f8bf2ceaf041824b4edbf;hpb=a609787b177c3ba7652e6e4f91cf348f9d7b036c;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 80ca4e2..9d3660a 100644
--- 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"
@@ -136,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();
 
@@ -153,6 +151,10 @@ 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 );
@@ -218,6 +220,7 @@ class wxContourMainFrame : public wxPanel {
 	void updateInstantOutlines();
 	void updateInstantImageData();
 	void updateInstantAxes();
+	void updateActor();
 
 	void onChangeDeep(int val);
 
@@ -255,8 +258,13 @@ class wxContourMainFrame : public wxPanel {
 
 	//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);
 
@@ -289,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);
 
@@ -328,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;