X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FInterface_Icons_NDimensions%2FinterfMainPanel.h;h=cea3b745dc810773fd831809b637304505654aa4;hb=6383d69864c69a97539b59d3e39406c79408577b;hp=9c3868d46186cde815975b6cb0955a127b985323;hpb=11f6d82d938648eb1b5ee5321c8a0c797b20606e;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.h b/lib/Interface_Icons_NDimensions/interfMainPanel.h
index 9c3868d..cea3b74 100644
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.h
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.h
@@ -14,8 +14,9 @@
 #include "interfToolsSpreadPanel.h"
 #include "interfSegmentationMenu.h"
 #include "interfMenuBar.h"
-#include "interfSegmentationPanels.h"
 #include "interfToolsPanels.h"
+#include "interfSegmentationPanels.h"
+#include "interfImageToolsMenu.h"
 
 #include <wx/treebook.h>
 #include <wx/sizer.h>
@@ -94,7 +95,15 @@ public:
 	void onCreateContourSpline( );
 	void onCreateContourRectangle( );
 	void onCreateContourCircle( );
-	void onCreateContourLine( );
+	void onCreateContourLine( );	
+	// RaC 09-09 ---------------------
+	void onCreateContourPoints( );
+	// RaC 09-09 ---------------------
+
+	// RaC 10-09 ---------------------
+	void onCreateContourPolygon( );
+	// RaC 10-09 ---------------------
+	
 	void onCreateContoursBullEye(wxPanel* panBull);
 	/////////////////////////////////
 	void onDeleteContour();
@@ -109,6 +118,8 @@ public:
 	//////////////////////////
 	void onLoad();
 	void onSave();
+	void onImport();
+	void onTest();
 /////////////////////////////7
 	void RefreshInterface();
 	vtkImageData* getImageData();
@@ -123,6 +134,7 @@ public:
 	void onMirrorAxisHide();
 	void onMirrorChangeWidth(int width);
 	void onThresholdPressed();
+	void onColorLayerImagePressed();
 	void setLabelSegmentationPanelVTK(wxString tmpString);
 	void onSegmentationPressed();
 	void onSegmentationPressedITK();
@@ -149,6 +161,7 @@ public:
 	void appendColsInformationPanel(int _numberOfVariablesStatistics);
 	void setCellValueInfoPanel(int z,int tmpIntA,wxString tempString);
 	void setColLableInfoPanel(int tmpIntB ,wxString tmpTitleString);
+	void SetScalarRange(int grayRangeMin,int grayRangeMax);
 	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);
 	wxString getCellValue(int j,int i);
@@ -157,6 +170,34 @@ public:
 	void ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ);
 	void SetContourGroup(int contourGroup);
 
+//CMRU 29-08-09-----------------------------------------------------------------------------------------------
+	
+	/**
+	* Associates the current selected contour with a label
+	*/
+	void onPrintLabel();
+	
+	
+	/**
+	* Calculates the pixel value in milimeters according to the current contour if the selected contour is a Line Contour
+	* @param size Size in milimeters of the selected contour
+	* @param unit Measurement unit
+	*/
+	void onCalibration(wxString size, int unit);
+	
+	/**
+	* Calculate the pixel value in milimeters
+	* @param realSize Size of the contour in milimeters
+	* @param sizePixel Size of the contour in pixels
+	*/
+	double onePixelSize (double realSize,double sizePixel);
+	
+	/**
+	* Returns the value of a pixel in milimeters
+	*/
+	double GetPixelValue();
+//------------------------------------------------------------------------------------------------------------
+
 private:
 	
 
@@ -170,6 +211,7 @@ private:
 	wxPanel* menubar3;
 	wxPanel* menubar4;
 	wxPanel* menubar5;
+	wxPanel* menubar6;
 
 	wxWindow* currentWindow;
 	wxSplitterWindow* splitterwindow;
@@ -177,12 +219,31 @@ private:
 	wxPanel* infoPanel;
 	wxPanel* infoPanelMask;
 
+//CMRU 17-08-09 ------------------------------------------------------------------
+	
+	/**
+	* Panel with the calibration options
+	*/
+	wxPanel* infoPanelCalibration;
+	
+	/**
+	* Panel who contains the calibration panel and the information panel mask
+	*/
+	wxPanel* panelAux;
+
+	/**
+	* Value of a pixel in milimeters
+	*/
+	double _pixelValue; 
+//--------------------------------------------------------------------------------
+
 	wxStaticText* statictext;
 	wxStaticText* statictext1;
 	wxStaticText* statictext2;
 	wxStaticText* statictext3;
 	wxStaticText* statictext4;
 	wxStaticText* statictext5;
+	wxStaticText* statictext6;
 
 	std::string PANEL;
 	std::string PANEL1;
@@ -190,19 +251,25 @@ private:
 	std::string PANEL3;
 	std::string PANEL4;
 	std::string PANEL5;
+	std::string PANEL6;
 
-	wxPanel* segmentPanel;
-	wxPanel* segmentationPanel;
-	wxPanel* segmentPanelITK;
-	wxPanel* configPanel;
-	wxPanel* spreadPanel;
-	interfSpreadPanel* panelSpread;
-	wxWindow* infoWin;
-	wxPanel* informationPanel;
+	wxPanel				*segmentPanel;
+	wxPanel				*segmentationPanel;
+	wxPanel				*segmentPanelITK;
+	wxPanel				*configPanel;
+	wxPanel				*spreadPanel;
+	interfSpreadPanel	*panelSpread;
+	wxWindow			*infoWin;
+	wxPanel				*informationPanel;
 	
-	wxPanel* mirrorPanel;
-	interfMirrorPanel* panelMirror;	
-	wxPanel* thresholdPanel;
+	wxPanel				*testPanel;
+	interfTestPanel		*panelTest;
+
+	wxPanel				*mirrorPanel;
+	interfMirrorPanel	*panelMirror;	
+
+	wxPanel				*thresholdPanel;
+	wxPanel				*colorImageLayerPanel;
 	
 	bool axisshown;
 	bool refLineShown;