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

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

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index 3f17f76490f9f79ed8a07c08aac7487e6f1e8d9b..c54ec1191508657b7eef8590fcd912fe3167bd9e 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -595,6 +595,11 @@ void interfMainPanel::onInterpolation(bool interpolate)
        wxContourMainFrame::getInstance()->onInterpolation(interpolate);
 }
 
+void interfMainPanel::onBeforAfterContour(bool before, bool after)
+{
+       wxContourMainFrame::getInstance()->onBeforeAfterContour(before,after);
+}
+
 
 void interfMainPanel::onConfigurationPressed()
 {
@@ -672,51 +677,36 @@ void interfMainPanel::onInformationPressed()
        // Statistics frame
        if(infoWin ==NULL)
        {
-printf("EED interfMainPanel::onInformationPressed 0.1\n");
                infoWin                 = new wxFrame (this, -1,_T("  Statistics  "), wxDefaultPosition, wxDefaultSize, wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT | wxRESIZE_BORDER  );
-printf("EED interfMainPanel::onInformationPressed 0.2\n");
                infoWin->SetSize( wxSize(825,650) );
 
                wxSize sizepanel(825,675);
-printf("EED interfMainPanel::onInformationPressed 0.3\n");
                informationPanel        = new interfInformationPanel(infoWin);//contourevent->getInformationPanel(infoWin);
-printf("EED interfMainPanel::onInformationPressed 0.3a\n");
 
-// Borrame             wxBoxSizer * sizerPanel = new wxBoxSizer(wxHORIZONTAL);
                wxFlexGridSizer * sizerPanel            = new wxFlexGridSizer(1);
 
                sizerPanel -> Add( informationPanel, 1, wxEXPAND ,0);
-printf("EED interfMainPanel::onInformationPressed 0.4\n");
 
                infoWin->SetSizer( sizerPanel );
                infoWin->SetAutoLayout( true );
                infoWin->Layout();
-printf("EED interfMainPanel::onInformationPressed 0.43\n");
                infoWin->Show();
        }else {
-printf("EED interfMainPanel::onInformationPressed 0.5\n");
-
                if (infoWin->IsShown()==true)
                {
-printf("EED interfMainPanel::onInformationPressed 0.6\n");
                        infoWin->Show(false);
                } else  {
                        //contourevent->FillGridWithContoursInformation();
-printf("EED interfMainPanel::onInformationPressed 0.7\n");
                        infoWin->Show(true);
                }
        }
 
-printf("EED interfMainPanel::onInformationPressed 1\n");
-
 //CMRU 29-08-09-----------------------------------------------------------------------------------------------
        if(panelAux == NULL)
        {
                panelAux = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T("")));
        }
 //------------------------------------------------------------------------------------------------------------
-printf("EED interfMainPanel::onInformationPressed 2\n");
-
        // mask view control panel
        if(infoPanelMask == NULL){
                infoPanelMask = new wxPanel(panelAux, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T("")));
@@ -727,15 +717,11 @@ printf("EED interfMainPanel::onInformationPressed 2\n");
                wxPanel *panel = wxContourMainFrame::getInstance()->getMaskImageViewPanel( infoPanelMask );
                wxStaticText* stattext = new wxStaticText(infoPanelMask, -1, wxString(_T("   Mask segmentation    ")), wxDefaultPosition,
                                                                                                  wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
-
                flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
-
                flexsizer->Add(panel, wxEXPAND);
                infoPanelMask->Layout();
-
        }
 
-printf("EED interfMainPanel::onInformationPressed 3\n");
 //CMRU 29-08-09-----------------------------------------------------------------------------------------------
        //Calibration panel
        if(infoPanelCalibration == NULL)
@@ -747,13 +733,10 @@ printf("EED interfMainPanel::onInformationPressed 3\n");
                wxPanel *panel = new interfCalibrationPanel(infoPanelCalibration);
                wxStaticText* stattext = new wxStaticText(infoPanelCalibration, -1, wxString(_T("              Calibration               ")), wxDefaultPosition,
                                                                                                  wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
-
                flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
-
                flexsizer->Add(panel, wxEXPAND);
                infoPanelCalibration->Layout();
        }
-printf("EED interfMainPanel::onInformationPressed 4\n");
 
 //EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
 #if wxMAJOR_VERSION <= 2
@@ -762,20 +745,13 @@ printf("EED interfMainPanel::onInformationPressed 4\n");
        wxFlexGridSizer* sizer = new wxFlexGridSizer(2);
 #endif
        sizer->Add(infoPanelMask);
-printf("EED interfMainPanel::onInformationPressed 4.1\n");
        sizer->Add(infoPanelCalibration);
-printf("EED interfMainPanel::onInformationPressed 4.2\n");
        panelAux->SetSizer(sizer, true);
-printf("EED interfMainPanel::onInformationPressed 4.3\n");
        panelAux->SetAutoLayout( true );
-printf("EED interfMainPanel::onInformationPressed 4.4\n");
        showPanel(panelAux);
-printf("EED interfMainPanel::onInformationPressed 4.5\n");
 
 //------------------------------------------------------------------
-printf("EED interfMainPanel::onInformationPressed OOJJOOOOOOOOOO......\n");
        wxContourMainFrame::getInstance()->changeInstant();
-printf("EED interfMainPanel::onInformationPressed End\n");
 }