#3382 Change Init parameters

[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 671047dda4d1abd67e819701e4e58df8bb692e59..8f57f3442a7d4043dee833fa43a501bbe1e21af1 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
+++ b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
@@ -30,7 +30,7 @@ interfConfigurationPanel::interfConfigurationPanel(wxWindow * parent)
 : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
 {
 //     wxPanel *panel                                                  = new wxPanel(parent,-1,wxDefaultPosition, wxDefaultSize,wxNO_BORDER, wxString(_T("")));
-       _withOfContourLine                                              = new wxSlider(this, -1, 1 , 1, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
+       _withOfContourLine                                              = new wxSlider(this, -1, 3 , 1, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
 
        double range[2];
        interfMainPanel::getInstance()->getImageRange(range);
@@ -55,7 +55,7 @@ interfConfigurationPanel::interfConfigurationPanel(wxWindow * parent)
        _interpolationCheckBox->SetValue(true);
 
        _showTextContourCheckBox                                = new wxCheckBox(this, -1, _T("Labels") );
-       _showTextContourCheckBox->SetValue(true);
+       _showTextContourCheckBox->SetValue(false);
 
        _beforContourCheckBox                                   = new wxCheckBox(this, -1, _T("Befor Contour") );
        _beforContourCheckBox->SetValue(false);
@@ -280,7 +280,6 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent)
 //: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
 : wxPanel(parent, -1)
 {
-printf("EED interfInformationPanel::interfInformationPanel Start\n");
        //wxPanel *panel                                                                        = new wxPanel(parent,-1,wxDefaultPosition, wxDefaultSize,wxTAB_TRAVERSAL);
        wxString lstOptions[4];
        lstOptions[0]=_T("Current Slice");
@@ -297,9 +296,6 @@ printf("EED interfInformationPanel::interfInformationPanel Start\n");
        _radiolstboxContourGroup->SetSelection(1);
        Connect( _radiolstboxContourGroup->GetId(), wxEVT_COMMAND_RADIOBOX_SELECTED , (wxObjectEventFunction) &interfInformationPanel::onContourGroup );
 
-printf("EED interfInformationPanel::interfInformationPanel 1\n");
-
-
        _XYZValues      = new wxCheckBox(this, -1, _T("Save Contour Values") );
        _XYZValues->SetValue(true);
        _contourImage   = new wxCheckBox(this, -1, _T("Extract Contours as Images") );
@@ -313,7 +309,6 @@ printf("EED interfInformationPanel::interfInformationPanel 1\n");
        informationContourLabelsBtn->SetEventHandler( this );
 #else
        //      informationContourLabelsBtn->SetEventHandler( this );
-       printf("EED interfInformationPanel::interfInformationPanel OOOjjjooooooo informationContourLabelsBtn->SetEventHandler \n");
 #endif
        Connect( informationContourLabelsBtn->GetId(),          wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onInformationContourLabels );
 
@@ -322,7 +317,6 @@ printf("EED interfInformationPanel::interfInformationPanel 1\n");
        statisticsContourBtn->SetEventHandler( this );
 #else
        //statisticsContourBtn->SetEventHandler( this );
-       printf("EED interfInformationPanel::interfInformationPanel OOOjjjooooooo statisticsContourBtn->SetEventHandler \n");
 #endif
        Connect( statisticsContourBtn->GetId(),         wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onExtractInformation );
 
@@ -331,7 +325,6 @@ printf("EED interfInformationPanel::interfInformationPanel 1\n");
        showResultImagesBtn->SetEventHandler( this );
 #else
        //showResultImagesBtn->SetEventHandler( this );
-       printf("EED interfInformationPanel::interfInformationPanel OOOjjjooooooo showResultImagesBtn->SetEventHandler \n");
 #endif
        Connect( showResultImagesBtn->GetId(),          wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onShowResultImages );
 
@@ -340,13 +333,10 @@ printf("EED interfInformationPanel::interfInformationPanel 1\n");
        saveResultsBtn->SetEventHandler( this );
 #else
 //EED  saveResultsBtn->SetEventHandler( this );
-printf("EED interfInformationPanel::interfInformationPanel OOOjjjooooooo saveResultsBtn->SetEventHandler \n");
 #endif
 
        Connect( saveResultsBtn->GetId(),               wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfInformationPanel::onSaveResults );
-
        int sizeZ = interfMainPanel::getInstance()->GetImageDataSizeZ();
-
        //_theViewPanel->getSceneManager()->GetImageDataSizeZ();
        _mbarrangeSliceInformation                      =  new mBarRange(this,65,65);
        _mbarrangeSliceInformation->SetMin(0);
@@ -360,14 +350,10 @@ printf("EED interfInformationPanel::interfInformationPanel OOOjjjooooooo saveRes
        _mbarrangeSliceInformation->setIfWithActualDrawed( false );
        _mbarrangeSliceInformation->SetStart( 0 );
        _mbarrangeSliceInformation->SetEnd( sizeZ-1 );
-
        double range[2];
        interfMainPanel::getInstance()->getImageRange(range);
-printf("EED interfInformationPanel::interfInformationPanel 2\n");
-
        int min = (int)floor (range[0]);
        int max = (int)ceil (range[1]);
-
        _mbarrangeRangeInformation      =  new mBarRange(this,65,65);
        _mbarrangeRangeInformation->SetMin(0);
        _mbarrangeRangeInformation->SetStart(0);
@@ -380,7 +366,6 @@ printf("EED interfInformationPanel::interfInformationPanel 2\n");
        _mbarrangeRangeInformation->setIfWithActualDrawed( false );
        _mbarrangeRangeInformation->SetStart( min );
        _mbarrangeRangeInformation->SetEnd( max );
-
 //     _mbarrangeSliceInformation->PushEventHandler(this);
 //     Connect(_mbarrangeRangeInformation->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &interfInformationPanel::onRangeSliceInformation );
 //     Connect(_mbarrangeRangeInformation->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction)  &interfInformationPanel::onRangeSliceInformation );
@@ -388,9 +373,6 @@ printf("EED interfInformationPanel::interfInformationPanel 2\n");
        Connect(_mbarrangeRangeInformation->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction)  &interfInformationPanel::onRangeSliceInformation );
 //     Connect(_mbarrangeRangeInformation->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction)  &interfInformationPanel::onRangeSliceInformation );
        Connect(_mbarrangeRangeInformation->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction)  &interfInformationPanel::onRangeSliceInformation );
-
-
-printf("EED interfInformationPanel::interfInformationPanel 3\n");
        _staticTextInformation  = new wxStaticText(this,-1,_T("    "));
        _grid = new wxGrid( this,
                 wxID_ANY,
@@ -407,7 +389,6 @@ printf("EED interfInformationPanel::interfInformationPanel 3\n");
 //                     _grid->SetColLabelSize(0);
        FillGridWithContoursInformation();
 
-
 //EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
 #if wxMAJOR_VERSION <= 2
        wxFlexGridSizer * sizerSave             = new wxFlexGridSizer(2,2);
@@ -419,8 +400,6 @@ printf("EED interfInformationPanel::interfInformationPanel 3\n");
        sizerSave->Add( _statistics,   1, wxALL, 2 );
        sizerSave->Add( _contourImage, 1, wxALL, 2 );
 
-
-printf("EED interfInformationPanel::interfInformationPanel 4\n");
 //EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
 #if wxMAJOR_VERSION <= 2
        wxFlexGridSizer * sizerA                = new wxFlexGridSizer(10);
@@ -449,30 +428,20 @@ printf("EED interfInformationPanel::interfInformationPanel 4\n");
 #else
        wxFlexGridSizer * sizer         = new wxFlexGridSizer(20,1,0,0);
 #endif
-printf("EED interfInformationPanel::interfInformationPanel 5\n");
        sizer->Add( sizerA                     , 1, wxALL               , 0 );
-printf("EED interfInformationPanel::interfInformationPanel 5.1\n");
        sizer->Add( new wxStaticText(this      ,1,_T("Slice Range"))    , 1, wxALL , 0 );
-printf("EED interfInformationPanel::interfInformationPanel 5.2\n");
        sizer->Add( _mbarrangeSliceInformation , 1, wxALL|wxGROW        , 2 );
-printf("EED interfInformationPanel::interfInformationPanel 5.3\n");
        sizer->Add( new wxStaticText(this      ,1,_T("Gray Range"))     , 1, wxALL , 0 );
-printf("EED interfInformationPanel::interfInformationPanel 5.4\n");
        sizer->Add( _mbarrangeRangeInformation , 1, wxALL|wxGROW        , 2 );
-       
-       
-       sizer->Add( sizerB                     , 1, wxEXPAND            , 0 );
+
+    sizer->Add( sizerB                     , 1, wxEXPAND               , 0 );
        sizer->Add( _staticTextInformation     , 1, wxEXPAND            , 0 );
        sizer->Add( _grid                      , 1, wxEXPAND            , 0 );
        this->SetSizer( sizer );
        this->SetSize( wxSize(1500,1500) );
        this->SetAutoLayout( true );
-printf("EED interfInformationPanel::interfInformationPanel 5.10\n");
        this->Layout();
        //return panel;
-
-printf("EED interfInformationPanel::interfInformationPanel End\n");
-
 }
 
 interfInformationPanel::~interfInformationPanel()