#3145 creaContours Bug New Normal - changeWx28to30

[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 a1d38ca12cb2c264a1c5e1744e05a9092a39af4b..83da40fc269afdd5f346003d8d53ba907185ceaf 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -32,7 +32,6 @@ wxFrame* interfMainPanel::_newframe=NULL;
 interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtHandler * evtHandler, std::string datadir)
 : wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN)
 {
-
        PANEL                                   = "New Contour";
        PANEL1                                  = "I/O";
        PANEL2                                  = "Edit";
@@ -55,6 +54,7 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
        colorImageLayerPanel    = NULL;
        currentWindow                   = NULL;
        testPanel                               = NULL;
+       flipPanel                               = NULL;
 
 //CMRU 17-08-09 ------------------------------------------------------------------
        infoPanelCalibration = NULL;
@@ -67,7 +67,12 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
 
        wxPanel* toolpanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_DOUBLE, wxString(_T("")));
 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
        wxFlexGridSizer* flexsizer = new wxFlexGridSizer(6,2,1,1);
+#else
+       wxFlexGridSizer* flexsizer = new wxFlexGridSizer(6);
+#endif
        toolpanel->SetSizer(flexsizer, true);
        toolpanel->SetAutoLayout( true );
 
@@ -87,7 +92,6 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
        wxButton* b6 = getButton(toolpanel);
        b6->SetClientData(&PANEL6);
 
-
        wxPanel* mentex  = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
        wxPanel* mentex1 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
        wxPanel* mentex2 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
@@ -329,7 +333,13 @@ void interfMainPanel::showPanel(wxWindow* panel)
        if(currentWindow != NULL){
                currentWindow->Hide();
                /// \TODO fix warning: virtual bool wxSizer::Remove(wxWindow*) is deprecated 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
                sizer->Remove(currentWindow);
+#else
+               sizer->Detach(currentWindow);
+#endif
+
        }
        sizer->Add(panel);
        currentWindow = panel;
@@ -355,7 +365,13 @@ void interfMainPanel::hidePanel( )
        if(currentWindow != NULL){
                currentWindow->Hide();
                /// \TODO fix warning: virtual bool wxSizer::Remove(wxWindow*) is deprecated 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
                sizer->Remove(currentWindow);
+#else
+               sizer->Detach(currentWindow);
+#endif
+
        }
        wxPanel * emptyPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
        sizer->Add(emptyPanel);
@@ -472,11 +488,14 @@ void interfMainPanel::onSave()
        wxContourMainFrame::getInstance()->onSave();
 }
 
-void interfMainPanel::onImport(){
+void interfMainPanel::onImport()
+{
        wxContourMainFrame::getInstance()->onImport();
 }
 
-void interfMainPanel::onTest(){
+void interfMainPanel::onTest()
+{
+       printf("EED interfMainPanel::onTest \n");
        if(testPanel==NULL)
        {
                testPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition,
@@ -485,17 +504,15 @@ void interfMainPanel::onTest(){
                testPanel->SetSizer(flexsizer, true);
                testPanel->SetAutoLayout( true );
                panelTest = new interfTestPanel(testPanel);
-
-               wxStaticText* stattext = new wxStaticText(mirrorPanel,  -1,
+               wxStaticText* stattext = new wxStaticText(testPanel,  -1,
                        wxString(_T("   Test Panel   ")),
                        wxDefaultPosition, wxDefaultSize,
                        wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
-
                flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
                flexsizer->Add(panelTest, wxEXPAND);
                testPanel->Layout();
-               showPanel(testPanel);
        }
+       showPanel(testPanel);
 }
 
 void interfMainPanel::RefreshInterface()
@@ -964,6 +981,38 @@ void interfMainPanel::SetContourGroup(int contourGroup)
        wxContourMainFrame::getInstance()->SetContourGroup( contourGroup);
 }
 
+
+void interfMainPanel::onFlipContours()
+{
+       printf("EED interfMainPanel::onFlipContours() \n");
+       if(flipPanel==NULL)
+       {
+               flipPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition,
+                       wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
+               wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);
+               flipPanel->SetSizer(flexsizer, true);
+               flipPanel->SetAutoLayout( true );
+               panelFlip = new interfFlipPanel(flipPanel);
+               wxStaticText* stattext = new wxStaticText(flipPanel,  -1,
+                       wxString(_T("         Flip Contours   ")),
+                       wxDefaultPosition, wxDefaultSize,
+                       wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
+               flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
+               flexsizer->Add(panelFlip, wxEXPAND);
+               flipPanel->Layout();
+       }
+       showPanel(flipPanel);
+}
+
+
+void interfMainPanel::FlipContours(int typeContourFlip, int flipDirection)
+{
+       printf("EED interfMainPanel::FlipContours( %d , %d ) \n",typeContourFlip,  flipDirection );
+       wxContourMainFrame::getInstance()->FlipContours( typeContourFlip , flipDirection );
+}
+
+
+
 //CMRU 17-08-09 ---------------------------------------------
 void interfMainPanel::onPrintLabel ()
 {