X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=00f9ec2b539bfda3b6ad96d0da6b1a4cdccddcf7;hb=9ce42ddc2e10cca4239f5b15840065cb9a5f84e3;hp=4c148e6770dc3c4457c39e30b62d78741cf5bcb5;hpb=52a1f20d5f8d78cc829b536860ac3ed0e9c50bcd;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 4c148e6..00f9ec2 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -264,12 +264,8 @@ class wxContourMainFrame : public wxPanel {
 
 	//AD
 	void onMirror();
-	void onThreshold();
-	void onThresholdChange();
-	void onThresholdInterpolation(bool interpolate);
-	void onThresholdChangeOpacity (int opacity);
-	void onThresholdRemove();
-
+	
+	
 //====================================================================================================	
 
 	void showAxis(bool show);
@@ -314,9 +310,9 @@ class wxContourMainFrame : public wxPanel {
 	
 	void ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ );
 
-	wxPanel *getThresholdImageViewPanel(wxWindow *parent);
-
+	wxPanel *getMaskImageViewPanel(wxWindow *parent);
 	void SetContourGroup(int contourGroup);
+	wxPanel *getThresholdImageViewPanel(wxWindow *parent);
 
 	
 private:
@@ -359,15 +355,14 @@ private:
     long m_notebook_theme;
     int _numberOfVariablesStatistics;
 	
-	vtkImageReslice		* _imageReslicer;
-	vtkLookupTable		* _thresholdTable;
-	vtkImageMapToColors * _thresholdMapper;
-	vtkImageActor		* _thresholdActor;
 
-	
+	// Contour Image Mask
 	ThresholdImageView		*_viewMaskImage;
 	ThresholdImageViewPanel *_viewMaskImagePanel;
 	
+	// Threshold Image 
+	ThresholdImageView		*_viewThresholdImage;
+	ThresholdImageViewPanel *_viewThresholdImagePanel;
 	
 	
 	std::vector<vtkImageData*> _images;
@@ -377,31 +372,6 @@ private:
 	
 	
 	
-	//OutlineModelManager * _modelManager;
-
-	
-
-	//wxContour_ButtonsBar * _buttonsBar;
-
-	//wxContour_Grid *  _gridPanel;
-
-	//wxContour_DrawToolsPanel * _drawToolsPanel;
-
-	//wxContour_OperationsToolsPanel * _operationsToolsPanel;
-
-	//wxContour_AutomaticFormsToolsPanel * _autoFormsPanel; 
-
-	//wxContour_StandardToolsPanel *_standardToolsPanel;
-
-	//wxContour_EdtionToolsPanel * _editionToolsPanel;
-
-	//wxContour_ListViewPanel * _listViewPanel;
-
-	//wxVtkBaseView_SceneManager * _sceneManager;
-
-	//Instant * _actualInstant;
-
-	
 
 	/*DECLARE_CLASS(wxContourMainFrame)
 	// any class wishing to process wxWindows events must use this macro
@@ -416,7 +386,6 @@ private:
 	
 	ContourExtractData	*_contourextractdata;
 
-//EED	void GenerateContourExtractData();
 	
 	void saveState();
 	void loadState(std::string filename);