X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=80ca4e22caa7914be03f8bf2ceaf041824b4edbf;hb=a609787b177c3ba7652e6e4f91cf348f9d7b036c;hp=6259baff6ae56dbe6f5fbcd6f9dddf2cda2742c0;hpb=fce8424fdb8d78a343ccc1dd9551bbded44ab5fe;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 6259baf..80ca4e2 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -93,6 +93,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 +115,7 @@
 //------------------------------------------------------------------------------------------------------------
 // Class definition
 //------------------------------------------------------------------------------------------------------------
-
+class interfMainPanel;
 class wxContourMainFrame : public wxPanel {
 
 	public:
@@ -145,20 +152,15 @@ class wxContourMainFrame : public wxPanel {
 
 	void setInstantChooserPanel(  wxInstantChooserPanel * theInstantChooserPanel );
 
-//	void setButtonsBar(  wxContour_ButtonsBar * theButtonsBar );
 
-//	void setGrid(  wxContour_Grid * theGridPanel );
 
+//	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 );
 
 
@@ -177,6 +179,7 @@ class wxContourMainFrame : public wxPanel {
 	//------------------------------------------------------------------------------------------------------------
 	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
 	//------------------------------------------------------------------------------------------------------------
@@ -212,7 +215,6 @@ class wxContourMainFrame : public wxPanel {
 
 	std::string getNameWrapping(int i);
 
-
 	void updateInstantOutlines();
 	void updateInstantImageData();
 	void updateInstantAxes();
@@ -237,29 +239,25 @@ 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 showAxis(bool show);
 
 	void onRigidPressed();
@@ -307,10 +305,15 @@ private:
 	//------------------------------------------------------------------------------------------------------------
 	// Attributtes
 	//------------------------------------------------------------------------------------------------------------
+	
 	static wxContourMainFrame* instance;
 
 	KernelManagerContour* kernelManager;
 
+	interfMainPanel* _pannew;
+
+	PerformingOperation* _performingOperation;
+
 	std::string _datadir;
 
 	wxContourViewPanel* _theViewPanel;
@@ -318,20 +321,20 @@ private:
 	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;
-	*/
-    long m_notebook_style;
-    long m_notebook_theme;
-	int _numberOfVariablesStatistics;
+        wxMenu* m_perspectives_menu;
+   */
+        long m_notebook_style;
+        long m_notebook_theme;
+        int _numberOfVariablesStatistics;
 
 	//OutlineModelManager * _modelManager;
 
@@ -381,10 +384,6 @@ private:
 	int inundo;
 	std::string	stundoredo;
 
-	
-
-	//wxContourViewPanel* _viewPan;
-	PerformingOperation* _performingOperation;
 
 	static char COPY;