no message

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ThresholdImageViewPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ThresholdImageViewPanel.cxx
index 4ad0d443b5905cf79e675603ef5782e573186fec..7d2dd8cab8a9c96db9dc1490c8c257d45087689f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ThresholdImageViewPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ThresholdImageViewPanel.cxx
@@ -13,47 +13,62 @@
 /**
  ** Begin of the threshold panel
  **/
-ThresholdImageViewPanel::ThresholdImageViewPanel(wxWindow* parent)
+ThresholdImageViewPanel::ThresholdImageViewPanel(wxWindow* parent, int min, int max, int type)
 : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
 {
        _thresholdImageView = new ThresholdImageView();
 
-       wxButton *thresholdGoBtn = new wxButton(this,wxID_ANY,_T("Show/Hide Color"), wxDefaultPosition, wxSize(200,30) );
+//     wxButton *thresholdGoBtn = new wxButton(this,wxID_ANY,_T("Show/Hide Color"), wxDefaultPosition, wxSize(200,30) );
+       
+       _thresholdGo = true;
+       _cb_ShowHide = new wxCheckBox(this, wxID_ANY, _T("Show/Hide layer") );
+       _cb_ShowHide->SetValue(_thresholdGo);
+       
        _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);
-       _thresholdGo = false;
        
-       double range[2];
+//     double range[2];
 //     interfMainPanel::getInstance()->getImageRange(range);
        
-       int min = (int)floor (range[0]);
-       int max = (int)ceil (range[1]);
+//     int min = (int)floor (range[0]);
+//     int max = (int)ceil (range[1]);
+
+       if (type==0)
+       {
+       }
+       
+       if (type==1)
+       {
+               _mBarThreshold  =  new mBarRange(this,70,65);
+               _mBarThreshold->SetMin(0);
+               _mBarThreshold->SetStart(0);
+               _mBarThreshold-> SetOrientation( true );
+               _mBarThreshold-> setActiveStateTo(true);
+               _mBarThreshold-> setVisibleLabels( true );
+               _mBarThreshold-> setDeviceEndMargin(10);
+               _mBarThreshold-> setRepresentedValues( min , max );
+               _mBarThreshold-> setDeviceBlitStart(10,10); 
+               _mBarThreshold-> setIfWithActualDrawed( false );
+               _mBarThreshold-> SetStart( min );
+               _mBarThreshold-> SetEnd( max );  
+       }
        
-       _mBarThreshold  =  new mBarRange(this,70,65);
-       _mBarThreshold->SetMin(0);
-       _mBarThreshold->SetStart(0);
-       _mBarThreshold-> SetOrientation( true );
-       _mBarThreshold-> setActiveStateTo(true);
-       _mBarThreshold-> setVisibleLabels( true );
-       _mBarThreshold-> setDeviceEndMargin(10);
-       _mBarThreshold-> setRepresentedValues( min , max );
-       _mBarThreshold-> setDeviceBlitStart(10,10); 
-       _mBarThreshold-> setIfWithActualDrawed( false );
-       _mBarThreshold-> SetStart( min );
-       _mBarThreshold-> SetEnd( max );  
        
-       Connect( thresholdGoBtn->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &ThresholdImageViewPanel::onThresholdGo ); 
+       Connect( _cb_ShowHide->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &ThresholdImageViewPanel::onThresholdShow ); 
        Connect( _interpolationCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &ThresholdImageViewPanel::onThresholdInterpolation );
        
        wxFlexGridSizer * sizer         = new wxFlexGridSizer(1);
-       sizer -> Add( new wxStaticText(this,-1,_T("Image Threshold"))  , 1, wxGROW );
-       sizer -> Add( _mBarThreshold, 1, wxGROW );
-       sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
+       if (type==1)
+       {
+               sizer -> Add( new wxStaticText(this,-1,_T("Image Threshold"))  , 1, wxGROW );
+               sizer -> Add( _mBarThreshold, 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( thresholdGoBtn, 1, wxGROW );
+       sizer -> Add( _cb_ShowHide, 1, wxGROW );
        sizer -> Add( new wxStaticText(this,-1,_T(" "))  , 1, wxGROW );
        sizer -> Add( _interpolationCheckBox, 1, wxGROW );
        
@@ -63,7 +78,8 @@ ThresholdImageViewPanel::ThresholdImageViewPanel(wxWindow* parent)
 }
 
 //----------------------------------------------------------------------------
-ThresholdImageViewPanel::~ThresholdImageViewPanel(){
+ThresholdImageViewPanel::~ThresholdImageViewPanel()
+{
 }
 
 
@@ -79,25 +95,26 @@ void ThresholdImageViewPanel::onThresholdChange(wxCommandEvent& event)
 {
        if (_thresholdGo)
        {
+               _thresholdImageView->SetminMaxValue( _mBarThreshold->GetStart(), _mBarThreshold->GetEnd() );
                _thresholdImageView->onThresholdChange();
-               
+               _thresholdImageView->GetwxVtkBaseView()->Refresh();
                //std::cout<< "Valor Min: " << minVal << " & Valor Max: " << maxVal  << std::endl;
        }
 }
 
 //----------------------------------------------------------------------------
-void ThresholdImageViewPanel::onThresholdGo(wxCommandEvent& event)
+void ThresholdImageViewPanel::onThresholdShow(wxCommandEvent& event)
 {
-       if (!_thresholdGo)
+       _thresholdGo = _cb_ShowHide->GetValue();
+       if (_thresholdGo)
        {
                _thresholdImageView->onThreshold();
-               _thresholdGo=true;
        }
        else
        {       
                _thresholdImageView->onThresholdRemove( );
-               _thresholdGo=false;             
        }
+       _thresholdImageView->GetwxVtkBaseView()->Refresh();
 }
 
 //----------------------------------------------------------------------------
@@ -110,17 +127,12 @@ void ThresholdImageViewPanel::onThresholdStop()
        }
 }
 
-//----------------------------------------------------------------------------
-void ThresholdImageViewPanel::onThresholdInstantChange(double range[])
-{
-       range[0] = _mBarThreshold->GetStart();
-       range[1] = _mBarThreshold->GetEnd();
-}
-
 //----------------------------------------------------------------------------
 void ThresholdImageViewPanel::onThresholdInterpolation(wxCommandEvent& event)
 {
        _thresholdImageView->onThresholdInterpolation(_interpolationCheckBox->GetValue());
+       _thresholdImageView->GetwxVtkBaseView()->Refresh();
+
 }
 
 //----------------------------------------------------------------------------
@@ -128,9 +140,16 @@ void ThresholdImageViewPanel::onChangeOpacity(wxScrollEvent& event)
 {
        int opacity = _opacity->GetValue();
        _thresholdImageView->onThresholdChangeOpacity(opacity);
+       _thresholdImageView->GetwxVtkBaseView()->Refresh();
 }
 
 
+//----------------------------------------------------------------------------
+bool ThresholdImageViewPanel::IsVisible()
+{
+       return _thresholdGo;
+}
+
 
 BEGIN_EVENT_TABLE(ThresholdImageViewPanel, wxPanel)
   EVT_COMMAND(wxID_ANY, wxEVT_TSBAR_START, ThresholdImageViewPanel::onThresholdChange)