X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=cceebd807b59ba75a1b6c77df7d56832b4181a2a;hb=d8ae77db08ab2e951c0e984c20fc47b615744abb;hp=546484a18f94314b3a5c94b529cd5ba7faea1efd;hpb=28671ae02163f2b674da599a98a128f58dfead88;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 546484a..cceebd8 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -208,19 +208,13 @@ class wxContourMainFrame : public wxPanel {
 	void setConceptValue( std::string name, int value );
 	ConceptDataWrap* getLastConceptData();
 	bool getIfConceptCheckedAt( std::string name, int pos );
-
 	void changeInstant();
-
 	int getNamesWrappingSize();
-
 	std::string getNameWrapping(int i);
-
 	void updateInstantOutlines();
 	void updateInstantImageData();
 	void updateInstantAxes();
-
 	void onChangeDeep(int val);
-
 ///////////////////////////
 	void onCopy();
 	void onPaste();
@@ -234,11 +228,8 @@ class wxContourMainFrame : public wxPanel {
 	void onImport();
 	void onTest();
 	void openContours( FILE *pFile, FILE *pFileData, bool staticContour );
-
 	void RefreshInterface();
-
 	vtkImageData* getImageData();
-
 	void onSegmentationOneSlice(int isovalue,int sampling,int method);
 	void onSegmentationOneSliceITK(wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation);
 	void SegmentationOneSlice( int x, int y, int z, int isovalue, int sampling, int method );
@@ -264,7 +255,6 @@ class wxContourMainFrame : public wxPanel {
 	void FlipAllContours(int flipDirection);
 	void FlipLstOfContours(std::vector<std::string> lstNameThings, int flipDirection);
 
-		
 //====================================================================================================
 
 	void showAxis(bool show);
@@ -274,6 +264,7 @@ class wxContourMainFrame : public wxPanel {
 	int getWindowLevel();
 	void onBrigthnessColorWindowLevel(int colorwindow,int windowlevel);
 	void onInterpolation(bool interpolate);
+	void onBeforeAfterContour(bool before, bool after);
 	void onChangeInstant(std::string name,int actual);
 	void resetAppend();
 	void onSpreadAdd();
@@ -286,20 +277,19 @@ class wxContourMainFrame : public wxPanel {
 	//
 	// @param typeContourGroup - int The operation id (AND,OR,XOR,ALL=3)
 	//
-	void onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ,int grayRangeMin, int grayRangeMax);
-	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);
-	void SaveValuesXYZ(std::string directory,std::string namefile, int typeContourGroup);
-	void onChangeInstantInstantPanel(std::string name,int value, int minshow, int maxshow);
-	void onSnakePressed();
-	void saveFileWithContoursAutomatique();
-	void ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ );
+	void 	onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ,int grayRangeMin, int grayRangeMax);
+	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);
+	void 	SaveValuesXYZ(std::string directory,std::string namefile, int typeContourGroup);
+	void 	onChangeInstantInstantPanel(std::string name,int value, int minshow, int maxshow);
+	void 	onSnakePressed();
+	void 	saveFileWithContoursAutomatique();
+	void 	ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ );
 	wxPanel *getMaskImageViewPanel(wxWindow *parent);
-	void SetContourGroup(int contourGroup);
+	void 	SetContourGroup(int contourGroup);
 	wxPanel *getThresholdImageViewPanel(wxWindow *parent);
 	wxPanel *getColorLayerImageViewPanel(wxWindow *parent);
 
-
 //CMRU 17-08-09-----------------------------------------------------------------------------------------------
 
 	/**
@@ -350,8 +340,13 @@ class wxContourMainFrame : public wxPanel {
 
 	void SetScalarRange(int grayRangeMin, int grayRangeMax);
 
+	std::string GetStringTypeImage( vtkImageData* image);
+
 //------------------------------------------------------------------------------------------------------------
 
+	void SetXY(int x,int y);
+
+
 private:
 	//------------------------------------------------------------------------------------------------------------
 	//  Private methods
@@ -435,6 +430,8 @@ private:
 	std::string                 _fileLocation;
 //------------------------------------------------------------------------------------------------------------
 
+	wxFrame						*_frameShowResultImages;
+
 };
 
 #endif