X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=a6c610564d3ee1e84120dee6e19bdf58ae17fc2a;hb=7bb4a2e269e8fc5d9344ddf5acdd6ef6a63409f5;hp=2434fb47b25b52f92654e70dbbcbb442dc3f3e6c;hpb=00bfeafb3fccce1256ae503a345ebfcaacc6a960;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 2434fb4..a6c6105 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -82,6 +82,9 @@
 
 //EED10JUIN2011  #include "itkImageFileWriter.h"
 
+//EED2020-03-18
+#undef Success
+
 #include "itkImageToVTKImageFilter.h"
 #include "itkVTKImageToImageFilter.h"
 
@@ -129,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();
@@ -137,6 +141,7 @@ class wxContourMainFrame : public wxPanel {
 	void createViewPanel(wxAuiNotebook * parent);
 	void createInstantChooserPanel(wxWindow * parent);
 	void createViewPanel(wxWindow * parent);
+	wxVtkBaseView* GetWxVtkBaseView();
 	void setInstantChooserPanel(  wxInstantChooserPanel * theInstantChooserPanel );
 	void getMaskValue(vtkImageData ** mask,vtkImageData ** value,int typeContourGroup, int selection, int minZ, int maxZ);
 	void SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value);
@@ -201,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();
@@ -269,6 +275,7 @@ class wxContourMainFrame : public wxPanel {
 	void 	SetContourGroup(int contourGroup);
 	wxPanel *getThresholdImageViewPanel(wxWindow *parent);
 	wxPanel *getColorLayerImageViewPanel(wxWindow *parent);
+	void 	SetColorLayerImage(vtkImageData*);
 
 //CMRU 17-08-09-----------------------------------------------------------------------------------------------
 
@@ -322,10 +329,8 @@ class wxContourMainFrame : public wxPanel {
 	std::string GetStringTypeImage( vtkImageData* image);
 
 //------------------------------------------------------------------------------------------------------------
-
 	void SetXY(int x,int y);
 
-
 private:
 	//------------------------------------------------------------------------------------------------------------
 	//  Private methods
@@ -336,7 +341,7 @@ private:
 	// Attributtes
 	//------------------------------------------------------------------------------------------------------------
 
-	int _contourGroup;
+	int 						_contourGroup;
 	static wxContourMainFrame   *instance;
 	KernelManagerContour        *kernelManager;
 	interfMainPanel             *_pannew;
@@ -352,9 +357,9 @@ private:
 
 	wxAuiManager                m_mgr;
 	wxAuiNotebook               *notebook;
-    	long                    m_notebook_style;
-    	long                    m_notebook_theme;
-    	int                      _numberOfVariablesStatistics;
+    long						m_notebook_style;
+    long    	                m_notebook_theme;
+    int     	                 _numberOfVariablesStatistics;
 
 	// Contour Image Mask
 	ThresholdImageView			*_viewMaskImage;
@@ -386,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 );