X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FInterface_Icons_NDimensions%2FinterfMainPanel.h;h=460fbf26c5cb5c537c5ee5bbf1fb359571103c95;hb=dfdd7c80dbd20fea642090201b64eb7119a144bf;hp=8f5224cfbc47a8965f1abd0622dc8ae3e0afc5cb;hpb=ae4e82199b7c2de2c149f84be5a10edcce7596e0;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.h b/lib/Interface_Icons_NDimensions/interfMainPanel.h
index 8f5224c..460fbf2 100644
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.h
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.h
@@ -95,6 +95,11 @@ public:
 	void onCreateContourRectangle( );
 	void onCreateContourCircle( );
 	void onCreateContourLine( );
+	
+	// RaC 09-09 ---------------------
+	void onCreateContourPoints( );
+	// RaC 09-09 ---------------------
+	
 	void onCreateContoursBullEye(wxPanel* panBull);
 	/////////////////////////////////
 	void onDeleteContour();
@@ -111,105 +116,79 @@ public:
 	void onSave();
 /////////////////////////////7
 	void RefreshInterface();
-
 	vtkImageData* getImageData();
-
 	void getImageRange(double[2]);
-
 	void onSegmentationOneSlice(int isovalue,int sampling,int method);
-
 	void onSegmentationOneSliceITK(wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation);
-
 	int GetImageDataSizeZ();
-
-	void GetImageDataRange(double *range);
-
 	void onSegmentationAllSlice(int minZ,int maxZ,int isovalue,int sampling,int method);
-
 	void onMirrorPressed();
-
 	void onMirror();
-
 	void onMirrorAxisShow();
-
 	void onMirrorAxisHide();
-
 	void onMirrorChangeWidth(int width);
-
-	void onThreshold();
-
-	void onThresholdChange();
-
-	void onThresholdInstantChange(double range[]);
-
-	void onThresholdRemove();
-
 	void onThresholdPressed();
-
-	void onThresholdInterpolation(bool interpolate);
-
-	void onThresholdChangeOpacity (int opacity);
-
 	void setLabelSegmentationPanelVTK(wxString tmpString);
-
 	void onSegmentationPressed();
-
 	void onSegmentationPressedITK();
-
 	void onRigidPressed();
-
 	void onWidthOfContour(double width);
-
 	int getColorWindow();
 	int getWindowLevel();
-
 	void onBrigthnessColorWindowLevel(int colorwindow,int windowlevel);
-
 	void onInterpolation(bool interpolate);
-
 	void onSpreadPressed();
-
 	void onConfigurationPressed();
-
 	void resetAppend();
-
 	void onSpreadAdd();
-
 	void appendStringSpread(std::string val);
-
 	void onSpreadGo(int type);
-
 	void setStringSpread(std::string stringtemp);
-
 	void onInformationPressed();
-
-	
 	void getInstantVector(std::vector<int>& tempVector);
-
 	std::vector<std::string> getOutlinesName(int slide);
-
-	void onInformationContourLabels(int typeContourGroup,int selection,int minZ,int maxZ);
-
+	void onInformationContourLabels(int typeContourGroup,int selection,int minZ,int maxZ,int grayRangeMin,int grayRangeMax);
 	void setStringInfoPanel(wxString tmpString);	
-
 	void setRowLabelInfoPanel(int z, wxString tempString);
-
 	int getNumberColsInformationPanel();
-	
 	void appendColsInformationPanel(int _numberOfVariablesStatistics);
-
 	void setCellValueInfoPanel(int z,int tmpIntA,wxString tempString);
-
 	void setColLableInfoPanel(int tmpIntB ,wxString tmpTitleString);
-
 	void onSaveResults(std::string directory,std::string namefile, std::string filename,
-		int typeContourGroup, bool XYZValues, bool contourImage, bool statistics);
-
+		int typeContourGroup, int selection, int minZ, int maxZ, bool XYZValues, bool contourImage, bool statistics);
 	wxString getCellValue(int j,int i);
-
 	void onSnakePressed();
-
 	virtual bool Show(bool show);
+	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:
 	
@@ -229,6 +208,25 @@ private:
 	wxSplitterWindow* splitterwindow;
 
 	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;
@@ -256,8 +254,7 @@ private:
 	wxPanel* mirrorPanel;
 	interfMirrorPanel* panelMirror;	
 	wxPanel* thresholdPanel;
-	interfThresholdPanel* panelThreshold;
-
+	
 	bool axisshown;
 	bool refLineShown;