X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FInterface_Icons_NDimensions%2FinterfMainPanel.h;h=a91c0865e0c6b1aa21e0dc68391269ff281d1776;hb=52a1f20d5f8d78cc829b536860ac3ed0e9c50bcd;hp=ddcb7038e966dab161e144dc22e23ac4c6975b68;hpb=9f3ce26fe4bcc20f4927bec7ec25de8787ca2a1d;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.h b/lib/Interface_Icons_NDimensions/interfMainPanel.h
index ddcb703..a91c086 100644
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.h
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.h
@@ -122,8 +122,6 @@ public:
 
 	int GetImageDataSizeZ();
 
-	void GetImageDataRange(double *range);
-
 	void onSegmentationAllSlice(int minZ,int maxZ,int isovalue,int sampling,int method);
 
 	void onMirrorPressed();
@@ -136,11 +134,11 @@ public:
 
 	void onMirrorChangeWidth(int width);
 
-	void onThreshold(int minVal, int maxVal);
+	void onThreshold();
 
-	void onThresholdChange(int minVal, int maxVal);
+	void onThresholdChange();
 
-	void onThresholdInstantChange(int range[]);
+	void onThresholdInstantChange(double range[]);
 
 	void onThresholdRemove();
 
@@ -188,7 +186,7 @@ public:
 
 	std::vector<std::string> getOutlinesName(int slide);
 
-	void onInformationContourLabels(int typeContourGroup,int selection,int minZ,int maxZ);
+	void onInformationContourLabels(int typeContourGroup,int selection,int minZ,int maxZ,int grayRangeMin,int grayRangeMax);
 
 	void setStringInfoPanel(wxString tmpString);	
 
@@ -202,18 +200,26 @@ public:
 
 	void setColLableInfoPanel(int tmpIntB ,wxString tmpTitleString);
 
-	void onSaveResults(std::string directory,std::string namefile, std::string filename,int typeContourGroup);
+	void onSaveResults(std::string directory,std::string namefile, std::string filename,
+		int typeContourGroup, int selection, int minZ, int maxZ, bool XYZValues, bool contourImage, bool statistics);
 
 	wxString getCellValue(int j,int i);
 
 	void onSnakePressed();
 
+	virtual bool Show(bool show);
+
+	void ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ);
+	
+	void SetContourGroup(int contourGroup);
+
 private:
 	
 
 	static interfMainPanel* interfmainpanel;
 
 
+	static wxFrame* _newframe;
 	wxPanel* menubar;
 	wxPanel* menubar1;
 	wxPanel* menubar2;
@@ -225,6 +231,7 @@ private:
 	wxSplitterWindow* splitterwindow;
 
 	wxPanel* infoPanel;
+	wxPanel* infoPanelMask;
 
 	wxStaticText* statictext;
 	wxStaticText* statictext1;
@@ -254,6 +261,7 @@ private:
 	wxPanel* thresholdPanel;
 	interfThresholdPanel* panelThreshold;
 
+	
 	bool axisshown;
 	bool refLineShown;