X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=7b80e5b473257a415ab54df7c10e25f33d4e7cda;hb=e4a8d645b4aec3835d1b51a1f8d8f68a9da6a047;hp=b633d14adece6b565f7344e903d5cc319efdd3f7;hpb=6afda9ffe8fc5ee4fd7d6fa2ae006a0c78b5b1d8;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index b633d14..7b80e5b 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"
 
@@ -119,58 +122,38 @@
 //------------------------------------------------------------------------------------------------------------
 class interfMainPanel;
 class wxContourMainFrame : public wxPanel {
-
 	public:
-
 	//------------------------------------------------------------------------------------------------------------
 	// Constructors & Destructors
 	//------------------------------------------------------------------------------------------------------------
-
-
 	wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,long style  = wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER);
 	wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style  = wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,std::string datadir="C:/Creatis/creaContoursBin/RelWithDebInfo/");
-
 	~wxContourMainFrame();
-
 	//------------------------------------------------------------------------------------------------------------
 	// 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();
-
 	void createInstantChooserPanel(wxAuiNotebook * parent);
-
 	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);
-
 	void ShowToolsPanel(bool show);
-
-
 	////------------------------------------------------------------------------------------------------------------
 	//// Methods for capturing events
 	////------------------------------------------------------------------------------------------------------------
 
-
 	////------------------------------------------------------------------------------------------------------------
 	////  Model management methods
 	////------------------------------------------------------------------------------------------------------------
 
-
 	//------------------------------------------------------------------------------------------------------------
 	//  Attributes getters and setters
 	//------------------------------------------------------------------------------------------------------------
@@ -223,7 +206,7 @@ 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();
@@ -291,6 +274,7 @@ class wxContourMainFrame : public wxPanel {
 	void 	SetContourGroup(int contourGroup);
 	wxPanel *getThresholdImageViewPanel(wxWindow *parent);
 	wxPanel *getColorLayerImageViewPanel(wxWindow *parent);
+	void 	SetColorLayerImage(vtkImageData*);
 
 //CMRU 17-08-09-----------------------------------------------------------------------------------------------
 
@@ -344,10 +328,8 @@ class wxContourMainFrame : public wxPanel {
 	std::string GetStringTypeImage( vtkImageData* image);
 
 //------------------------------------------------------------------------------------------------------------
-
 	void SetXY(int x,int y);
 
-
 private:
 	//------------------------------------------------------------------------------------------------------------
 	//  Private methods
@@ -358,7 +340,7 @@ private:
 	// Attributtes
 	//------------------------------------------------------------------------------------------------------------
 
-	int _contourGroup;
+	int 						_contourGroup;
 	static wxContourMainFrame   *instance;
 	KernelManagerContour        *kernelManager;
 	interfMainPanel             *_pannew;
@@ -374,9 +356,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;
@@ -408,8 +390,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 );