{

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / pPlotter / HistogramDialogComboBox.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
index c47ec1b75233d2cb2e704c775b34de404857b496..19cbf847bdf706a946971beb4e213cb6293e7e88 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
@@ -59,7 +59,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 +77,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()