X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfMainPanel.h;h=9c3868d46186cde815975b6cb0955a127b985323;hb=11f6d82d938648eb1b5ee5321c8a0c797b20606e;hp=6e9f6f30d8ac6afb27ed85ca64e3b83813dac4fa;hpb=a6507d91019d9f428af751e5b0b3a7d19d6f0bf6;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.h b/lib/Interface_Icons_NDimensions/interfMainPanel.h
index 6e9f6f3..9c3868d 100644
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.h
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.h
@@ -111,106 +111,52 @@ public:
 	void onSave();
 /////////////////////////////7
 	void RefreshInterface();
-
 	vtkImageData* getImageData();
-
 	void getImageRange(double[2]);
-
 	void onSegmentationOneSlice(int isovalue,int sampling,int method);
-
 	void onSegmentationOneSliceITK(wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation);
-
 	int GetImageDataSizeZ();
-
 	void onSegmentationAllSlice(int minZ,int maxZ,int isovalue,int sampling,int method);
-
 	void onMirrorPressed();
-
 	void onMirror();
-
 	void onMirrorAxisShow();
-
 	void onMirrorAxisHide();
-
 	void onMirrorChangeWidth(int width);
-
-	void onThreshold();
-
-	void onThresholdChange();
-
-	void onThresholdInstantChange(double range[]);
-
-	void onThresholdRemove();
-
 	void onThresholdPressed();
-
-	void onThresholdInterpolation(bool interpolate);
-
-	void onThresholdChangeOpacity (int opacity);
-
 	void setLabelSegmentationPanelVTK(wxString tmpString);
-
 	void onSegmentationPressed();
-
 	void onSegmentationPressedITK();
-
 	void onRigidPressed();
-
 	void onWidthOfContour(double width);
-
 	int getColorWindow();
 	int getWindowLevel();
-
 	void onBrigthnessColorWindowLevel(int colorwindow,int windowlevel);
-
 	void onInterpolation(bool interpolate);
-
 	void onSpreadPressed();
-
 	void onConfigurationPressed();
-
 	void resetAppend();
-
 	void onSpreadAdd();
-
 	void appendStringSpread(std::string val);
-
 	void onSpreadGo(int type);
-
 	void setStringSpread(std::string stringtemp);
-
 	void onInformationPressed();
-
-	
 	void getInstantVector(std::vector<int>& tempVector);
-
 	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);	
-
 	void setRowLabelInfoPanel(int z, wxString tempString);
-
 	int getNumberColsInformationPanel();
-	
 	void appendColsInformationPanel(int _numberOfVariablesStatistics);
-
 	void setCellValueInfoPanel(int z,int tmpIntA,wxString tempString);
-
 	void setColLableInfoPanel(int tmpIntB ,wxString tmpTitleString);
-
 	void onSaveResults(std::string directory,std::string namefile, std::string filename,
-		int typeContourGroup, bool XYZValues, bool contourImage, bool statistics);
-
+		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);
 
-	void ShowResultImages(int typeContourGroup);
-	
 private:
 	
 
@@ -229,6 +175,7 @@ private:
 	wxSplitterWindow* splitterwindow;
 
 	wxPanel* infoPanel;
+	wxPanel* infoPanelMask;
 
 	wxStaticText* statictext;
 	wxStaticText* statictext1;
@@ -256,8 +203,7 @@ private:
 	wxPanel* mirrorPanel;
 	interfMirrorPanel* panelMirror;	
 	wxPanel* thresholdPanel;
-	interfThresholdPanel* panelThreshold;
-
+	
 	bool axisshown;
 	bool refLineShown;