X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FHistogramDialogComboBox.h;h=0eb2cb343f23bb24a76c5e5f779acd1564b68eda;hb=4dcdcabb81ce9f9e9b7ccdb86a64995d7b18ea23;hp=ee5b947e8a7a5b1b9804dd6784dcd95c0dc8db64;hpb=acfa60fa044ebc12067c4daba555d18c7d66b2d5;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.h
index ee5b947..0eb2cb3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.h
@@ -1,4 +1,29 @@
 
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #ifndef __HistogramDialogComboBox__
 #define __HistogramDialogComboBox__
 
@@ -17,15 +42,12 @@
 
 #include "HistogramDialogComboBoxItem.h"
 #include <fstream>
+
 #include <wx/bmpcbox.h>
+#include <wx/checkbox.h>
 #include "vtkImageData.h"
 
-#ifdef WIN32
-#define FILENAME "/data/colorsfunction.txt"
-#else
-#define FILENAME "~/.creaMaracasVisu/data/colorsfunction.txt"
-#endif
-
+#define COLORSFUNCTIONFILENAME "colorsfunction.txt"
 
 class HistogramDialogComboBox : public wxPanel
 {
@@ -47,9 +69,11 @@ public:
 
 	void OnEditBitmapCombo(wxCommandEvent& event);
 	void OnBitmapComboItemSelected(wxCommandEvent& event);
+   	void BitmapComboItemSelect(int value);
 
 	void OnColorLevelChanged(wxCommandEvent& event);	
 	void OnWindowLevelChanged(wxCommandEvent& event);	
+	void OnChkBoxActive(wxCommandEvent& event);
 
 	void setImageData(vtkImageData* img);
 
@@ -67,8 +91,11 @@ public:
 									std::vector<double>& green,
 									std::vector<double>& blue);
 
-	double GetWindowLevel();
-	double GetColorLevel();
+	double 	GetWindowLevel();
+	double 	GetColorLevel();
+	bool 	GetActive();
+	void 	InitCurrentPathColorsFuntion();
+	std::string GetFileNameOfColorsFunction();
 
 private:
 
@@ -82,16 +109,19 @@ private:
 	double _maxgreyvalue;
 	int _currentitem;	
 
+	std::string _currentpathColorsFuntion;
+
 	/*
 	* Represents the color of the backGround. Default color is the parent color. 
 	*/		
 
-	wxBitmapComboBox*	_bitmapcombo;
-	wxSlider*	_slidercolor;
-	wxSlider*	_sliderwindowlevel;
-	std::vector<HistogramDialogComboBoxItem*> _bitmapsitems;
-	wxBitmap* colorBar_Bitmap;
-	wxSizer* _bitmapsizer;
+	wxBitmapComboBox							*_bitmapcombo;
+	wxCheckBox									*_ckboxActive;
+	wxSlider									*_slidercolor;
+	wxSlider									*_sliderwindowlevel;
+	std::vector<HistogramDialogComboBoxItem*> 	_bitmapsitems;
+	wxBitmap									*colorBar_Bitmap;
+	wxSizer										*_bitmapsizer;
 
 	wxSizer* getBitmapCombo();
 	wxSizer* getSlidersWlCo();