#2490 creaMaracasVisu Feature New High - Histogram Interaction

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / ThresholdImageView / ColorLayerImageViewPanel.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx
index 963a51c222ec7ab2c888be502b3a19bc616cfc33..ffabba162bf8ae6dbba8fbfd61921eb36bb1d96b 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx
@@ -48,7 +48,7 @@ wxDlgTransformByDimensionBySpacingByPixel::~wxDlgTransformByDimensionBySpacingBy
 
 void wxDlgTransformByDimensionBySpacingByPixel::GetTransformType(wxWindow *parent , wxString message,int &typeOfTransformation,bool &dlgWxOK)
 {
-       wxDialog* dial          = new wxDialog (parent,-1,_T("Tools"),wxDefaultPosition, wxSize(590,190));
+       wxDialog* dial                          = new wxDialog (parent,-1,_T("Tools"),wxDefaultPosition, wxSize(590,190));
        wxSizer* buttonsSizer   = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
        wxBoxSizer *dialSizer   = new wxBoxSizer(wxVERTICAL);
 
@@ -88,7 +88,7 @@ void wxDlgTransformByDimensionBySpacingByPixel::GetTransformType(wxWindow *paren
  ** Begin of the threshold panel
  **/
 ColorLayerImageViewPanel::ColorLayerImageViewPanel(wxWindow* parent, int min, int max, int type)
-: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
+: wxPanel(parent, -1, wxDefaultPosition, wxSize(600,100), wxBORDER_SUNKEN)
 {
        printf("EED ColorLayerImageViewPanel::ColorLayerImageViewPanel start \n");
 
@@ -112,11 +112,13 @@ ColorLayerImageViewPanel::ColorLayerImageViewPanel(wxWindow* parent, int min, in
        _sl_SliceImageX->Enable(false);
        _sl_SliceImageY->Enable(false);
        _sl_SliceImageZ->Enable(false);
-
        _interpolationCheckBox = new wxCheckBox(this, -1, _T("Image Interpolation") );
        _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 );
+
        if (type==0)
        {
        }
@@ -127,7 +129,7 @@ ColorLayerImageViewPanel::ColorLayerImageViewPanel(wxWindow* parent, int min, in
 
 
        Connect( _btn_ReadImage->GetId(), wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &ColorLayerImageViewPanel::onReadImage );
-       Connect( _cb_ShowHide->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &ColorLayerImageViewPanel::onThresholdShow );
+       Connect( _cb_ShowHide->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED  , (wxObjectEventFunction) &ColorLayerImageViewPanel::onThresholdShow );
        Connect( _interpolationCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &ColorLayerImageViewPanel::onThresholdInterpolation );
        Connect( _opacity->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction) &ColorLayerImageViewPanel::onChangeOpacity );
        Connect( _cb_SliceFixDinamic->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceFixDinamic );
@@ -150,28 +152,27 @@ ColorLayerImageViewPanel::ColorLayerImageViewPanel(wxWindow* parent, int min, in
        Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_PAGEUP          , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage );
        Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_PAGEDOWN                , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage );
 
-
-
        wxFlexGridSizer * sizer         = new wxFlexGridSizer(1);
        if (type==1)
        {
-               sizer -> Add( new wxStaticText(this,-1,_T("Color Image Layer"))  , 1, wxGROW );
-               sizer -> Add( _btn_ReadImage, 1, wxGROW );
-               sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
+               sizer -> Add( new wxStaticText(this,-1,_T("Color Image Layer"))         , 1, wxGROW );
+               sizer -> Add( _btn_ReadImage                                                                                                    , 1, wxGROW );
+               sizer -> Add( new wxStaticText(this,-1,_T(" "))                                                 , 1, wxGROW );
        }
-       sizer -> Add( new wxStaticText(this,-1,_T("Opacity Level"))  , 1, wxGROW );
-       sizer -> Add( _opacity, 1, wxGROW );
-       sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
-       sizer -> Add( _cb_ShowHide, 1, wxGROW );
-       sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
-       sizer -> Add( _interpolationCheckBox, 1, wxGROW );
-
-       sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
-       sizer -> Add( new wxStaticText(this,-1,_T("Slice "))  , 1, wxGROW );
-       sizer -> Add( _sl_SliceImageX, 1, wxGROW );
-       sizer -> Add( _sl_SliceImageY, 1, wxGROW );
-       sizer -> Add( _sl_SliceImageZ, 1, wxGROW );
-       sizer -> Add( _cb_SliceFixDinamic, 1, wxGROW );
+       sizer -> Add( new wxStaticText(this,-1,_T("Opacity Level"))                     , 1, wxGROW );
+       sizer -> Add( _opacity                                                                                                                          , 1, wxGROW );
+       sizer -> Add( new wxStaticText(this,-1,_T(" "))                                                         , 1, wxGROW );
+       sizer -> Add( _cb_ShowHide                                                                                                                      , 1, wxGROW );
+       sizer -> Add( new wxStaticText(this,-1,_T(" "))                                                         , 1, wxGROW );
+       sizer -> Add( _interpolationCheckBox                                                                                    , 1, wxGROW );
+
+       sizer -> Add( new wxStaticText(this,-1,_T(" "))                                                         , 1, wxGROW );
+       sizer -> Add( new wxStaticText(this,-1,_T("Slice "))                                    , 1, wxGROW );
+       sizer -> Add( _sl_SliceImageX                                                                                                           , 1, wxGROW );
+       sizer -> Add( _sl_SliceImageY                                                                                                           , 1, wxGROW );
+       sizer -> Add( _sl_SliceImageZ                                                                                                           , 1, wxGROW );
+       sizer -> Add( _cb_SliceFixDinamic                                                                                               , 1, wxGROW );
+       sizer -> Add( _histogramMinMaxLevel->GetWindow()                                                        , 1, wxGROW );
 
        this->SetSizer( sizer );
        this->SetAutoLayout( true );
@@ -241,6 +242,7 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img)
 {
     if (img!=NULL)
     {
+                       _histogramMinMaxLevel->Configure( img );
         _colorLayerImageViewManager->SetImage( img );
 
         double spc[3];
@@ -307,8 +309,11 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img)
 //EED01        if (_colorLayerImageView!=NULL)
 //EED01        {
 //EED01            _colorLayerImageView->onThreshold();
-               _colorLayerImageViewManager->onThreshold();
-               RefreshView();
+               if (_active==true)
+               {
+                   _colorLayerImageViewManager->onThreshold();
+                RefreshView();
+               }
 //EED01        }
 
 
@@ -407,7 +412,7 @@ void ColorLayerImageViewPanel::onThresholdInterpolation(wxCommandEvent& event)
 //EED01        if (_colorLayerImageView!=NULL)
 //EED01        {
 //EED01                _colorLayerImageView->onThresholdInterpolation(_interpolationCheckBox->GetValue());
-               _colorLayerImageViewManager->onThresholdInterpolation(_interpolationCheckBox->GetValue());
+          _colorLayerImageViewManager->onThresholdInterpolation(_interpolationCheckBox->GetValue());
                RefreshView();
 //EED01        }//_colorLayerImageView
 }
@@ -471,6 +476,12 @@ bool ColorLayerImageViewPanel::IsVisible()
        return _thresholdGo;
 }
 
+//----------------------------------------------------------------------------
+void ColorLayerImageViewPanel::SetActive(bool active)
+{
+      _active=active;
+      _cb_ShowHide->SetValue( _active );
+}
 
 
 // EOF