X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=9d3660a13a28fd120ebc1c42c909b162ef8454b4;hb=99c30d2b8b911d2b923ca173285041d2b077d770;hp=b48f08a17e482b05d5fc7a2876045df3d6ddf4e6;hpb=771693e697633fa631dbaa4823404eb2890136e5;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index b48f08a..9d3660a 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -28,8 +28,6 @@
 #include "wxInstantChooserPanel.h"
 #include "wxContourViewPanel.h"
 
-
-
 //#include "ContourWorkspace.h"
 #include "ContourExtractData.h"
 #include "PerformingOperation.h"
@@ -93,6 +91,13 @@
 #include "vtkMetaImageWriter.h"
 #include "vtkImageData.h"
 #include "vtkTransform.h"
+
+#include "vtkCamera.h"
+#include "vtkImageActor.h"
+#include <vtkImageMapToColors.h>
+#include <vtkLookupTable.h>
+#include <vtkCommand.h>
+
 //#include "vtkMetaImageReader.h"
 
 //------------------------------------------------------------------------------------------------------------
@@ -108,7 +113,7 @@
 //------------------------------------------------------------------------------------------------------------
 // Class definition
 //------------------------------------------------------------------------------------------------------------
-
+class interfMainPanel;
 class wxContourMainFrame : public wxPanel {
 
 	public:
@@ -119,16 +124,19 @@ class wxContourMainFrame : public wxPanel {
 	
 
 	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="<void>");
+	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
 	//------------------------------------------------------------------------------------------------------------
-	bool configurePanels(wxAuiNotebook * theNoteBook );
 
-	void setNotebook( wxAuiNotebook * theNoteBook );
+	void setVectImages( std::vector<vtkImageData*> images );
+
+	bool configurePanels( );
+
+	bool addNewPanel(wxPanel* panel);
 
 	wxAuiNotebook * createNotebook();
 
@@ -142,20 +150,19 @@ class wxContourMainFrame : public wxPanel {
 
 	void setInstantChooserPanel(  wxInstantChooserPanel * theInstantChooserPanel );
 
-//	void setButtonsBar(  wxContour_ButtonsBar * theButtonsBar );
 
-//	void setGrid(  wxContour_Grid * theGridPanel );
+	void getMaskValue(vtkImageData* mask,vtkImageData* value,int typeContourGroup);
 
-//	void setDrawToolsPanel(  wxContour_DrawToolsPanel * theDrawToolsPanel );
+	void SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value);
 
-//	void setOperationsToolsPanel(  wxContour_OperationsToolsPanel * theDrawToolsPanel );
 
+//	void setButtonsBar(  wxContour_ButtonsBar * theButtonsBar );
+//	void setGrid(  wxContour_Grid * theGridPanel );
+//	void setDrawToolsPanel(  wxContour_DrawToolsPanel * theDrawToolsPanel );
+//	void setOperationsToolsPanel(  wxContour_OperationsToolsPanel * theDrawToolsPanel );
 //	void setAutomaticFormsPanel(  wxContour_AutomaticFormsToolsPanel * theAutoFormsPanel );
-
 //	void setStandardToolsPanel(  wxContour_StandardToolsPanel * theStandardToolsPanel );
-
 //	void setEditionToolsPanel(  wxContour_EdtionToolsPanel * theEditionToolsPanel );
-
 //	void setListViewPanel(  wxContour_ListViewPanel * theListViewPanel );
 
 
@@ -172,8 +179,9 @@ class wxContourMainFrame : public wxPanel {
 	//------------------------------------------------------------------------------------------------------------
 	//  Attributes getters and setters
 	//------------------------------------------------------------------------------------------------------------
-	static wxContourMainFrame* getInstance(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="<void>");
+	static wxContourMainFrame* getInstance(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/");
 	static wxContourMainFrame* getInstance();
+	static void resetInstance();
 	//------------------------------------------------------------------------------------------------------------
 	//  Other functional methods
 	//------------------------------------------------------------------------------------------------------------
@@ -209,10 +217,10 @@ class wxContourMainFrame : public wxPanel {
 
 	std::string getNameWrapping(int i);
 
-
 	void updateInstantOutlines();
 	void updateInstantImageData();
 	void updateInstantAxes();
+	void updateActor();
 
 	void onChangeDeep(int val);
 
@@ -234,28 +242,29 @@ class wxContourMainFrame : public wxPanel {
 	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 );
-
 	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();
-
+	int  GetImageDataSizeZ();
 	void GetImageDataRange(double *range);
-
 	void onSegmentationAllSlice(int minZ,int maxZ,int isovalue,int sampling,int method);
 
 	//AD
 	void referenceLine();
 	void refLineHide();
 	void refLineShow();
+	void refLineChangeWidth(int width);
 
 	//AD
 	void onMirror();
+	void onThreshold(int minVal, int maxVal);
+	void onThresholdChange(int minVal, int maxVal);
+	void onThresholdInterpolation(bool interpolate);
+	void onThresholdChangeOpacity (int opacity);
+	void onThresholdRemove();
+
+//====================================================================================================	
 
 	void showAxis(bool show);
 
@@ -288,7 +297,7 @@ class wxContourMainFrame : public wxPanel {
 
 	void SaveValuesXYZ(std::string directory,std::string namefile, int typeContourGroup);
 
-	void SaveImageResult(std::string directory,std::string namefile, int typeContourGroup);
+	
 
 	void onChangeInstantInstantPanel(std::string name,int value, int minshow, int maxshow);
 
@@ -304,29 +313,38 @@ private:
 	//------------------------------------------------------------------------------------------------------------
 	// Attributtes
 	//------------------------------------------------------------------------------------------------------------
+	
 	static wxContourMainFrame* instance;
 
 	KernelManagerContour* kernelManager;
 
+	interfMainPanel* _pannew;
+
+	PerformingOperation* _performingOperation;
+
+	std::string _datadir;
+
 	wxContourViewPanel* _theViewPanel;
 
 	wxInstantChooserPanel * _instantPanel;
 
 	//AD: 03-09: This attributes represents the reference line that is going to be used for the mirroring
-	manualLineControler		* _refLineControl;
-	manualContourModelLine	* _refLineModel;
-	manualViewLine			* _refLineView;
+	manualLineControler     * _refLineControl;
+	manualContourModelLine  * _refLineModel;
+	manualViewLine          * _refLineView;
 
 
 
 	wxAuiManager m_mgr;
-    /*
-	wxArrayString m_perspectives;
-    wxMenu* m_perspectives_menu;
-	*/
+	wxAuiNotebook * notebook;
+
     long m_notebook_style;
     long m_notebook_theme;
-	int _numberOfVariablesStatistics;
+    int _numberOfVariablesStatistics;
+	
+	vtkImageActor * _thresholdActor;
+
+	bool _actorPresent;
 
 	//OutlineModelManager * _modelManager;
 
@@ -376,10 +394,6 @@ private:
 	int inundo;
 	std::string	stundoredo;
 
-	
-
-	//wxContourViewPanel* _viewPan;
-	PerformingOperation* _performingOperation;
 
 	static char COPY;