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

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index cceebd8..aa7a947 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,37 @@
 //------------------------------------------------------------------------------------------------------------
 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);
-
 	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
 	//------------------------------------------------------------------------------------------------------------
@@ -264,7 +246,9 @@ class wxContourMainFrame : public wxPanel {
 	int getWindowLevel();
 	void onBrigthnessColorWindowLevel(int colorwindow,int windowlevel);
 	void onInterpolation(bool interpolate);
+	void onShowTextContour(bool show);
 	void onBeforeAfterContour(bool before, bool after);
+	void onJumpSlice(int step,int shift);
 	void onChangeInstant(std::string name,int actual);
 	void resetAppend();
 	void onSpreadAdd();
@@ -289,6 +273,7 @@ class wxContourMainFrame : public wxPanel {
 	void 	SetContourGroup(int contourGroup);
 	wxPanel *getThresholdImageViewPanel(wxWindow *parent);
 	wxPanel *getColorLayerImageViewPanel(wxWindow *parent);
+	void 	SetColorLayerImage(vtkImageData*);
 
 //CMRU 17-08-09-----------------------------------------------------------------------------------------------
 
@@ -339,7 +324,6 @@ class wxContourMainFrame : public wxPanel {
 //------------------------------------------------------------------------------------------------------------
 
 	void SetScalarRange(int grayRangeMin, int grayRangeMax);
-
 	std::string GetStringTypeImage( vtkImageData* image);
 
 //------------------------------------------------------------------------------------------------------------
@@ -357,7 +341,7 @@ private:
 	// Attributtes
 	//------------------------------------------------------------------------------------------------------------
 
-	int _contourGroup;
+	int 						_contourGroup;
 	static wxContourMainFrame   *instance;
 	KernelManagerContour        *kernelManager;
 	interfMainPanel             *_pannew;
@@ -373,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;