#3322 creaContours Feature New Normal - Show reference contour Befor After actual...

[creaContours.git] / lib / Interface_Icons_NDimensions / interfToolsPanels.cxx

diff --git a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
index b26ed89371a5082d90fdeefa08c73995f5f21e93..ea290acd2a6812d31c141fbbb5a1acd943c4c76f 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
+++ b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
@@ -51,13 +51,17 @@ interfConfigurationPanel::interfConfigurationPanel(wxWindow * parent)
        _brithtnessWindowLevel                                  = new wxSlider(this, -1, windowlevel , min, max, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
        _brithtnessColorLevel                                   = new wxSlider(this, -1, colorwindow , min, max, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
 
-       _interpolationCheckBox = new wxCheckBox(this, -1, _T("Image Interpolation") );
+       _interpolationCheckBox                                  = new wxCheckBox(this, -1, _T("Image Interpolation") );
        _interpolationCheckBox->SetValue(true);
 
-       _beforContourCheckBox = new wxCheckBox(this, -1, _T("Befor Contour") );
+       _showTextContourCheckBox                                = new wxCheckBox(this, -1, _T("Labels Contours") );
+       _showTextContourCheckBox->SetValue(true);
+
+
+       _beforContourCheckBox                                   = new wxCheckBox(this, -1, _T("Befor Contour") );
        _beforContourCheckBox->SetValue(false);
 
-       _afterContourCheckBox = new wxCheckBox(this, -1, _T("After Contour") );
+       _afterContourCheckBox                                   = new wxCheckBox(this, -1, _T("After Contour") );
        _afterContourCheckBox->SetValue(false);
 
 
@@ -69,21 +73,31 @@ interfConfigurationPanel::interfConfigurationPanel(wxWindow * parent)
        Connect( _brithtnessColorLevel->GetId() , wxEVT_SCROLL_CHANGED,           (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel);
        Connect( _brithtnessColorLevel->GetId() , wxEVT_SCROLL_THUMBTRACK,        (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel);
        Connect( _interpolationCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &interfConfigurationPanel::OnInterpolation);
+       Connect( _showTextContourCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &interfConfigurationPanel::OnShowTextContour);
        Connect( _beforContourCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &interfConfigurationPanel::OnBeforAfterContour);
        Connect( _afterContourCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &interfConfigurationPanel::OnBeforAfterContour);
 
-       wxFlexGridSizer * sizer                                 = new wxFlexGridSizer(1);
-       sizer -> Add( new wxStaticText(this,-1, _T("Contour width"))  , 1, wxGROW );
-       sizer -> Add( _withOfContourLine                , 1, wxGROW );
-       sizer -> Add( new wxStaticText(this,-1, _T(" "))  , 1, wxGROW );
-       sizer -> Add( new wxStaticText(this,-1, _T("Window level"))  , 1, wxGROW );
-       sizer -> Add( _brithtnessWindowLevel            , 1, wxGROW );
-       sizer -> Add( new wxStaticText(this,-1, _T("Color level"))  , 1, wxGROW );
-       sizer -> Add( _brithtnessColorLevel, 1, wxGROW );
-       sizer -> Add( new wxStaticText(this,-1, _T(" "))  , 1, wxGROW );
-       sizer -> Add( _interpolationCheckBox            , 1, wxGROW );
-       sizer -> Add( _beforContourCheckBox             , 1, wxGROW );
-       sizer -> Add( _afterContourCheckBox             , 1, wxGROW );
+       wxFlexGridSizer * sizerA                                        = new wxFlexGridSizer(1);
+       sizerA -> Add( new wxStaticText(this,-1, _T("Contour width"))  , 1, wxGROW );
+       sizerA -> Add( _withOfContourLine               , 1, wxGROW );
+       sizerA -> Add( new wxStaticText(this,-1, _T(" "))  , 1, wxGROW );
+       sizerA -> Add( new wxStaticText(this,-1, _T("Window level"))  , 1, wxGROW );
+       sizerA -> Add( _brithtnessWindowLevel           , 1, wxGROW );
+       sizerA -> Add( new wxStaticText(this,-1, _T("Color level"))  , 1, wxGROW );
+       sizerA -> Add( _brithtnessColorLevel, 1, wxGROW );
+       sizerA -> Add( new wxStaticText(this,-1, _T(" "))  , 1, wxGROW );
+
+       wxFlexGridSizer * sizerB                                        = new wxFlexGridSizer(1);
+       sizerB -> Add( _interpolationCheckBox           , 1, wxGROW );
+       sizerB -> Add( new wxStaticText(this,-1, _T(" "))  , 1, wxGROW );
+       sizerB -> Add( _showTextContourCheckBox         , 1, wxGROW );
+       sizerB -> Add( new wxStaticText(this,-1, _T(" "))  , 1, wxGROW );
+       sizerB -> Add( _beforContourCheckBox            , 1, wxGROW );
+       sizerB -> Add( _afterContourCheckBox            , 1, wxGROW );
+
+       wxFlexGridSizer * sizer                                         = new wxFlexGridSizer(2);
+       sizer -> Add( sizerA            , 1, wxGROW );
+       sizer -> Add( sizerB            , 1, wxGROW );
 
        this->SetSizer( sizer );
        //JCP 13-10-08
@@ -121,6 +135,11 @@ void interfConfigurationPanel::OnBeforAfterContour(wxCommandEvent& event)
        interfMainPanel::getInstance()->onBeforAfterContour(_beforContourCheckBox->GetValue() , _afterContourCheckBox->GetValue() );
 }
 
+void interfConfigurationPanel::OnShowTextContour(wxCommandEvent& event)
+{
+       interfMainPanel::getInstance()->onShowTextContour(_showTextContourCheckBox->GetValue() );
+}
+
 
 /**
 ** Begin of the spread panel