X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=a6c610564d3ee1e84120dee6e19bdf58ae17fc2a;hb=7bb4a2e269e8fc5d9344ddf5acdd6ef6a63409f5;hp=aa7a947df3139d0dbebe42c5eaaf3de4ceef4731;hpb=987fba348941c0c59d783d0a803d97d3fb740e5e;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index aa7a947..a6c6105 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -132,7 +132,8 @@ class wxContourMainFrame : public wxPanel {
 	//------------------------------------------------------------------------------------------------------------
 	// Creational and initialization methods
 	//------------------------------------------------------------------------------------------------------------
-	void setVectImages(std::vector<vtkImageData*> imgs);
+    void changeImage(int id, vtkImageData *img);
+    void configure(std::vector<vtkImageData*> imgs);
 	bool configurePanels( );
 	bool addNewPanel(wxPanel* panel);
 	wxAuiNotebook * createNotebook();
@@ -205,21 +206,22 @@ class wxContourMainFrame : public wxPanel {
 	void createCopyContourOf ( std::string anExistingKName, std::vector<int> &instantNoTouchData, bool append );
 	void createMirrorContourOf ( std::string anExistingKName, std::vector<int> &instantNoTouchData, bool append );
 ///////////////////////7
-	void onLoad();
+	void onLoad(bool interactiveInterface=true);
 	void onSave();
 	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 onSegmentationOneSlice(double 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 );
+	void SegmentationOneSlice( int x, int y, int z, double isovalue, int sampling, int method , vtkImageData *imagedata);
 	void SegmentationOneSliceITK(int x, int y, int z, wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation);
 	void Mirror( int x, int y, int z, int isovalue, int sampling, int method );
 	int  GetImageDataSizeZ();
 	void GetImageDataRange(double *range);
-	void onSegmentationAllSlice(int minZ,int maxZ,int isovalue,int sampling,int method);
+	void onSegmentationAllSlices(int minZ,int maxZ,double isovalue,int sampling,int method);
+    void onSegmentationAllSlices2(int step ,double isovalue,int samplsing,int method,int minZ, int maxZ,vtkImageData* imagedata);
 
 	//AD
 	void referenceLine();
@@ -327,10 +329,8 @@ class wxContourMainFrame : public wxPanel {
 	std::string GetStringTypeImage( vtkImageData* image);
 
 //------------------------------------------------------------------------------------------------------------
-
 	void SetXY(int x,int y);
 
-
 private:
 	//------------------------------------------------------------------------------------------------------------
 	//  Private methods
@@ -391,8 +391,8 @@ private:
 	manualBaseModel * factoryManualContourModel(wxPanel* panel);
 	ContourExtractData	        *_contourextractdata;
 
-	void saveState();
-	void loadState(std::string filename);
+    void saveState();
+    void loadState(std::string filename);
 
 //	void loadContours( FILE *pFile, bool staticContour );