X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FHistogramDialogComboBox.cxx;h=4730763c14a87ca48b1c1c69414c7d7a683c04eb;hb=24937478048aca664712bb708240bff79879e0d9;hp=c47ec1b75233d2cb2e704c775b34de404857b496;hpb=8ac87d3ddc867c538bff2c80c9c84ad780094dad;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
index c47ec1b..4730763 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
@@ -23,6 +23,11 @@ HistogramDialogComboBox::HistogramDialogComboBox(wxWindow* parent)
 	_currentitem		= -1;
 	_maxgreyvalue		= 0;
 printf("EED HistogramDialogComboBox\n");	
+#ifdef LINUX
+	std::string currentpath = crea::System::GetExecutablePath();
+	currentpath.append("/data/");
+	crea::System::createDirectory(currentpath.c_str());
+#endif
 }
 
 HistogramDialogComboBox::~HistogramDialogComboBox()
@@ -59,7 +64,8 @@ wxSizer* HistogramDialogComboBox::getBitmapCombo()
 	return _bitmapsizer;
 }
 
-wxSizer* HistogramDialogComboBox::getSlidersWlCo(){
+wxSizer* HistogramDialogComboBox::getSlidersWlCo()
+{
 	wxBoxSizer* sizersliders = new wxBoxSizer(wxVERTICAL);
 
 	_slidercolor = new wxSlider(this, -1,1,0,1,wxDefaultPosition,wxDefaultSize,wxSL_LABELS);
@@ -76,39 +82,39 @@ wxSizer* HistogramDialogComboBox::getSlidersWlCo(){
 
 double HistogramDialogComboBox::GetWindowLevel()
 {
-	if(_sliderwindowlevel != NULL)
-	{
-		return _sliderwindowlevel->GetValue();
-	}
+   double val(0.0);
+   if(_sliderwindowlevel != NULL)
+      val= _sliderwindowlevel->GetValue();	
+   return val; // JPR
 }
 
 double HistogramDialogComboBox::GetColorLevel()
 {
-    if(_slidercolor != NULL)
-	{
-		return _slidercolor->GetValue();
-	}    
+   double val(0.0);
+   if(_slidercolor != NULL)
+      val = _slidercolor->GetValue();
+   return val; // JPR   
 }
 
 void HistogramDialogComboBox::OnColorLevelChanged(wxCommandEvent& event)
 {
-	_slidercolor->GetValue();
-	wxCommandEvent newevent(wxEVT_SCROLL_THUMBTRACK,this->GetId());
-	ProcessEvent(newevent);
+   _slidercolor->GetValue();
+   wxCommandEvent newevent(wxEVT_SCROLL_THUMBTRACK,this->GetId());
+   ProcessEvent(newevent);
 }
 
 void HistogramDialogComboBox::OnWindowLevelChanged(wxCommandEvent& event)
 {
-	_sliderwindowlevel->GetValue();
-	wxCommandEvent newevent(wxEVT_SCROLL_THUMBTRACK,this->GetId());
-    ProcessEvent(newevent);
+   _sliderwindowlevel->GetValue();
+   wxCommandEvent newevent(wxEVT_SCROLL_THUMBTRACK,this->GetId());
+   ProcessEvent(newevent);
 }
 
 void HistogramDialogComboBox::setImageData(vtkImageData* img)
 {
-	_maxgreyvalue = img->GetScalarRange()[1];
-	_img = img;
-	setSlidersValue();
+   _maxgreyvalue = img->GetScalarRange()[1];
+   _img = img;
+   setSlidersValue();
 }
 
 void HistogramDialogComboBox::setSlidersValue()
@@ -140,8 +146,16 @@ void HistogramDialogComboBox::OnEditBitmapCombo(wxCommandEvent& event)
 			_bitmapsitems = dialog->getComboBoxItems();
 			
 			//std::string currentpath = crea::System::GetDllAppPath("bbcreaMaracasVisu"); // JPR
-			std::string dllLastName("bbcreaMaracasVisu");
-			std::string currentpath = crea::System::GetDllAppPath(dllLastName);	
+			std::string dllLastName;
+			std::string currentpath;
+			#ifdef WIN32
+			dllLastName = "bbcreaMaracasVisu";
+			currentpath = crea::System::GetDllAppPath(dllLastName);
+			#endif
+			#ifdef LINUX
+			currentpath = crea::System::GetExecutablePath();
+			currentpath.append("/data/");
+			#endif
 			currentpath.append(FILENAME);
 
 			std::vector<double> redvect,greenvect,bluevect;
@@ -225,6 +239,10 @@ wxBitmapComboBox* HistogramDialogComboBox::getBitmapComboElements()
 	std::string currentpath = "";
 #ifdef WIN32
 	currentpath = crea::System::GetDllAppPath("bbcreaMaracasVisu");	
+#endif
+#ifdef LINUX
+	currentpath = crea::System::GetExecutablePath();
+	currentpath.append("/data/");
 #endif
 	currentpath.append(FILENAME);