X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=00f9ec2b539bfda3b6ad96d0da6b1a4cdccddcf7;hb=74b501a27c4c1a94330cdc79677b850f0777209b;hp=981eb92192ef7661359d25317c420d66bb6c68cd;hpb=26f06d2da9f31bca99fe2266d5b7e5c38a00bdbb;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 981eb92..00f9ec2 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -27,14 +27,17 @@
 //#include "wxVtkBaseView_SceneManager.h"
 #include "wxInstantChooserPanel.h"
 #include "wxContourViewPanel.h"
-#include "wxThresholdPanel.h"
-
-
 
 //#include "ContourWorkspace.h"
 #include "ContourExtractData.h"
 #include "PerformingOperation.h"
 
+#include "manualLineControler.h"
+#include "manualContourModelLine.h"
+#include "manualViewLine.h"
+
+#include "ThresholdImageView.h"
+#include "ThresholdImageViewPanel.h"
 
 
 //#include "ContourThing.h"
@@ -135,10 +138,12 @@ class wxContourMainFrame : public wxPanel {
 	// Creational and initialization methods
 	//------------------------------------------------------------------------------------------------------------
 
-	void setVectImages( std::vector<vtkImageData*> images );
+	void setVectImages(std::vector<vtkImageData*> imgs);
 
 	bool configurePanels( );
 
+	bool addNewPanel(wxPanel* panel);
+
 	wxAuiNotebook * createNotebook();
 
 	void createInstantChooserPanel(wxAuiNotebook * parent);
@@ -151,11 +156,12 @@ class wxContourMainFrame : public wxPanel {
 
 	void setInstantChooserPanel(  wxInstantChooserPanel * theInstantChooserPanel );
 
-
-	void getMaskValue(vtkImageData* mask,vtkImageData* value,int typeContourGroup);
+	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);
+
 
 //	void setButtonsBar(  wxContour_ButtonsBar * theButtonsBar );
 //	void setGrid(  wxContour_Grid * theGridPanel );
@@ -235,7 +241,7 @@ class wxContourMainFrame : public wxPanel {
 	void onLoad();
 	void onSave();
 	
-	void openContours( FILE *pFile, bool staticContour );
+	void openContours( FILE *pFile, int version, bool staticContour );
 
 	void RefreshInterface();
 
@@ -258,11 +264,8 @@ class wxContourMainFrame : public wxPanel {
 
 	//AD
 	void onMirror();
-
-	void onThreshold(int minVal, int maxVal);
-
-	bool onThresholdPanel(wxPanel* panel);
-
+	
+	
 //====================================================================================================	
 
 	void showAxis(bool show);
@@ -290,9 +293,10 @@ class wxContourMainFrame : public wxPanel {
 
 	std::vector<std::string> getOutlinesName(int slide);
 
-	void onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ);
+	void onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ,int grayRangeMin, int grayRangeMax);
 
-	void onSaveResults(std::string directory,std::string namefile, std::string filename, int typeContourGroup);
+	void onSaveResults(std::string directory,std::string namefile, std::string filename, 
+		int typeContourGroup, int selection, int minZ, int maxZ, bool XYZValues, bool contourImage, bool statistics);
 
 	void SaveValuesXYZ(std::string directory,std::string namefile, int typeContourGroup);
 
@@ -303,6 +307,14 @@ class wxContourMainFrame : public wxPanel {
 	void onSnakePressed();
 
 	void saveFileWithContoursAutomatique();
+	
+	void ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ );
+
+	wxPanel *getMaskImageViewPanel(wxWindow *parent);
+	void SetContourGroup(int contourGroup);
+	wxPanel *getThresholdImageViewPanel(wxWindow *parent);
+
+	
 private:
 	//------------------------------------------------------------------------------------------------------------
 	//  Private methods
@@ -313,6 +325,8 @@ private:
 	// Attributtes
 	//------------------------------------------------------------------------------------------------------------
 	
+	int _contourGroup;
+	
 	static wxContourMainFrame* instance;
 
 	KernelManagerContour* kernelManager;
@@ -335,41 +349,29 @@ private:
 
 
 	wxAuiManager m_mgr;
-    /*
-	wxArrayString m_perspectives;
-        wxMenu* m_perspectives_menu;
-   */
-
-		wxAuiNotebook * notebook;
-        long m_notebook_style;
-        long m_notebook_theme;
-        int _numberOfVariablesStatistics;
-
-	//OutlineModelManager * _modelManager;
+	wxAuiNotebook * notebook;
 
+    long m_notebook_style;
+    long m_notebook_theme;
+    int _numberOfVariablesStatistics;
 	
 
-	//wxContour_ButtonsBar * _buttonsBar;
-
-	//wxContour_Grid *  _gridPanel;
-
-	//wxContour_DrawToolsPanel * _drawToolsPanel;
-
-	//wxContour_OperationsToolsPanel * _operationsToolsPanel;
-
-	//wxContour_AutomaticFormsToolsPanel * _autoFormsPanel; 
-
-	//wxContour_StandardToolsPanel *_standardToolsPanel;
-
-	//wxContour_EdtionToolsPanel * _editionToolsPanel;
-
-	//wxContour_ListViewPanel * _listViewPanel;
-
-	//wxVtkBaseView_SceneManager * _sceneManager;
+	// Contour Image Mask
+	ThresholdImageView		*_viewMaskImage;
+	ThresholdImageViewPanel *_viewMaskImagePanel;
+	
+	// Threshold Image 
+	ThresholdImageView		*_viewThresholdImage;
+	ThresholdImageViewPanel *_viewThresholdImagePanel;
+	
+	
+	std::vector<vtkImageData*> _images;
 
-	//Instant * _actualInstant;
+	bool _actorPresent;
 
 	
+	
+	
 
 	/*DECLARE_CLASS(wxContourMainFrame)
 	// any class wishing to process wxWindows events must use this macro
@@ -381,11 +383,13 @@ private:
 	//manualContourModel * factoryManualContourModel(int typeContour);
 
 	manualContourModel * factoryManualContourModel(wxPanel* panel);
+	
+	ContourExtractData	*_contourextractdata;
 
-
-
+	
 	void saveState();
 	void loadState(std::string filename);
+	void loadContours( FILE *pFile, bool staticContour );
 
 	void saveFileWithContours( std::string filename );