]> Creatis software - creaMaracasVisu.git/commitdiff
histogram BUG
authordavila <eduardo.davila@creatis.insa-lyon.fr>
Thu, 4 Jun 2015 07:32:24 +0000 (09:32 +0200)
committerdavila <eduardo.davila@creatis.insa-lyon.fr>
Thu, 4 Jun 2015 07:32:24 +0000 (09:32 +0200)
lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx

index 20a723cd68e948279419dddbffd77dd57f5b2860..50ee4ff5a8e7843a76e9e76c56c8bf2400b96639 100644 (file)
@@ -113,8 +113,11 @@ ColorLayerImageViewPanel::ColorLayerImageViewPanel(wxWindow* parent, int min, in
        _interpolationCheckBox->SetValue(true);
        _opacity = new wxSlider(this, wxID_ANY, 6, 1, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
 
-       _histogram                                      = new Histogram(  this , -1, wxPoint(0,0), wxSize(400,400), /*wxNO_BORDER*/ wxBORDER_DEFAULT ); 
-       _histogramMinMaxLevel   = new HistogramMinMaxLevel( (HistogramBase*)_histogram );
+       _histogram=NULL;
+       _histogramMinMaxLevel=NULL;
+
+//     _histogram                                      = new Histogram(  this , -1, wxPoint(0,0), wxSize(400,400), /*wxNO_BORDER*/ wxBORDER_DEFAULT ); 
+//     _histogramMinMaxLevel   = new HistogramMinMaxLevel( (HistogramBase*)_histogram );
 
        if (type==0)
        {
@@ -169,7 +172,7 @@ ColorLayerImageViewPanel::ColorLayerImageViewPanel(wxWindow* parent, int min, in
        sizer -> Add( _sl_SliceImageY                                                                                                           , 1, wxGROW );
        sizer -> Add( _sl_SliceImageZ                                                                                                           , 1, wxGROW );
        sizer -> Add( _cb_SliceFixDinamic                                                                                               , 1, wxGROW );
-       sizer -> Add( _histogramMinMaxLevel->GetWindow()                                                        , 1, wxGROW );
+//     sizer -> Add( _histogramMinMaxLevel->GetWindow()                                                        , 1, wxGROW );
 
        this->SetSizer( sizer );
        this->SetAutoLayout( true );
@@ -229,7 +232,10 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img)
 {
     if (img!=NULL)
     {
+               if (_histogramMinMaxLevel!=NULL) 
+               {
                        _histogramMinMaxLevel->Configure( img );
+               }
         _colorLayerImageViewManager->SetImage( img );
 
         double spc[3];