X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=4b6ac62729b2880ad58c47c5bef8665d0710ed8a;hb=b13d5fc346334fa875520c47c219a7092e80d09d;hp=4c148e6770dc3c4457c39e30b62d78741cf5bcb5;hpb=52a1f20d5f8d78cc829b536860ac3ed0e9c50bcd;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 4c148e6..4b6ac62 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -38,6 +38,8 @@
 
 #include "ThresholdImageView.h"
 #include "ThresholdImageViewPanel.h"
+//EED #include "ColorLayerImageView.h"
+//EED #include "ColorLayerImageViewPanel.h"
 
 
 //#include "ContourThing.h"
@@ -189,6 +191,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
 	//------------------------------------------------------------------------------------------------------------
@@ -206,6 +209,8 @@ class wxContourMainFrame : public wxPanel {
 	void onCreateContourRectangle( );
 	void onCreateContourCircle( );
 	void onCreateContourLine( );
+	void onCreateContourPoints( );
+	void onCreateContourPolygon( );
 	void onCreateContourBullEye(wxPanel* pan);
 	/////////////////////////////////
 	void onDeleteContour();
@@ -240,8 +245,9 @@ class wxContourMainFrame : public wxPanel {
 ///////////////////////7
 	void onLoad();
 	void onSave();
-	
-	void openContours( FILE *pFile, int version, bool staticContour );
+	void onImport();
+	void onTest();
+	void openContours( FILE *pFile, FILE *pFileData, int version, bool staticContour );
 
 	void RefreshInterface();
 
@@ -264,12 +270,8 @@ class wxContourMainFrame : public wxPanel {
 
 	//AD
 	void onMirror();
-	void onThreshold();
-	void onThresholdChange();
-	void onThresholdInterpolation(bool interpolate);
-	void onThresholdChangeOpacity (int opacity);
-	void onThresholdRemove();
-
+	
+	
 //====================================================================================================	
 
 	void showAxis(bool show);
@@ -297,6 +299,10 @@ class wxContourMainFrame : public wxPanel {
 
 	std::vector<std::string> getOutlinesName(int slide);
 
+	//
+	//
+	// @param typeContourGroup - int The operation id (AND,OR,XOR,ALL=3)
+	//
 	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, 
@@ -314,10 +320,63 @@ class wxContourMainFrame : public wxPanel {
 	
 	void ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ );
 
+	wxPanel *getMaskImageViewPanel(wxWindow *parent);
+	void SetContourGroup(int contourGroup);
 	wxPanel *getThresholdImageViewPanel(wxWindow *parent);
+	wxPanel *getColorLayerImageViewPanel(wxWindow *parent);
 
-	void SetContourGroup(int contourGroup);
 
+//CMRU 17-08-09-----------------------------------------------------------------------------------------------
+
+	/**
+	* Associates the String parameter with the contour
+	* @param label Label entered by the user 
+	* @param manualBaseModel Currently selected contour 
+	*/
+	void onPrintLabel (wxString label, manualBaseModel* manualModel);
+
+	/**
+	* Calculates the size of the contour received as a parameter. Uses the measure of a pixel in millimeters. 
+	* @param manualBaseModel Currently selected contour 
+	*/
+	void onInsertCalculation(manualBaseModel* manualModel);
+
+	/**
+	* Assigns and returns the value of a pixel in millimeters 
+	@ param value Measure of the pixel in millimeters
+	*/
+	double onePixelSize(double value);
+
+	/**
+	* Returns the type of the currently selected contour
+	*/
+	int getType();
+	
+	/**
+	* Returns the size in pixels of the currently selected contour 
+	*/
+	double getContourSizeInPixels();
+	
+	/**
+	* Returns the currently selected contour. If no contour is selected returns NULL 
+	*/ 
+	manualBaseModel* getContour();
+	
+	/**
+	* Returns the Path of the data persistence file
+	*/
+	std::string GetFileLocation();
+	
+	/**
+	* Assign a new path to the data persistence file
+	@ param newFileLocation New path of the file 
+	*/
+	void SetFileLocation(std::string newFileLocation);
+//------------------------------------------------------------------------------------------------------------
+
+	void SetScalarRange(int grayRangeMin, int grayRangeMax);
+
+//------------------------------------------------------------------------------------------------------------
 	
 private:
 	//------------------------------------------------------------------------------------------------------------
@@ -359,17 +418,20 @@ private:
     long m_notebook_theme;
     int _numberOfVariablesStatistics;
 	
-	vtkImageReslice		* _imageReslicer;
-	vtkLookupTable		* _thresholdTable;
-	vtkImageMapToColors * _thresholdMapper;
-	vtkImageActor		* _thresholdActor;
 
+	// Contour Image Mask
+	ThresholdImageView			*_viewMaskImage;
+	ThresholdImageViewPanel		*_viewMaskImagePanel;
 	
-	ThresholdImageView		*_viewMaskImage;
-	ThresholdImageViewPanel *_viewMaskImagePanel;
-	
-	
+	// Threshold Image 
+	ThresholdImageView			*_viewThresholdImage;
+	ThresholdImageViewPanel		*_viewThresholdImagePanel;
 	
+	// Color Layer Image
+//EED	ColorLayerImageView			*_viewColorLayerImage;
+//EED	ColorLayerImageViewPanel	*_viewColorLayerImagePanel;
+	wxPanel						*_viewColorLayerImagePanel;
+
 	std::vector<vtkImageData*> _images;
 
 	bool _actorPresent;
@@ -377,31 +439,6 @@ private:
 	
 	
 	
-	//OutlineModelManager * _modelManager;
-
-	
-
-	//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;
-
-	//Instant * _actualInstant;
-
-	
 
 	/*DECLARE_CLASS(wxContourMainFrame)
 	// any class wishing to process wxWindows events must use this macro
@@ -412,17 +449,17 @@ private:
 
 	//manualContourModel * factoryManualContourModel(int typeContour);
 
-	manualContourModel * factoryManualContourModel(wxPanel* panel);
+	manualBaseModel * factoryManualContourModel(wxPanel* panel);
 	
 	ContourExtractData	*_contourextractdata;
 
-//EED	void GenerateContourExtractData();
 	
 	void saveState();
 	void loadState(std::string filename);
 	void loadContours( FILE *pFile, bool staticContour );
 
 	void saveFileWithContours( std::string filename );
+	void onLoadContours(std::string fileNameContourROI);
 
 	int inredo;
 	int inundo;
@@ -431,6 +468,15 @@ private:
 
 	static char COPY;
 
+//CMRU 17-08-09-----------------------------------------------------------------------------------------------
+	wxWindow *infoWin2;
+	wxPanel *calibrationPanel;
+	wxPanel *calibrationPanelError;
+	double _onePixelSize;
+	std::string _imageLocation;
+	std::string _fileLocation;
+//------------------------------------------------------------------------------------------------------------
+
 };
 
 #endif