#3145 creaContours Bug New Normal - changeWx28to30

[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxContourViewPanel.cxx

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
index 4286054e785fb92ef3bb80c2deca61b883204759..b1d05679baff70d22551d1164534789e4890adea 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
@@ -52,65 +52,6 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
        //------------------------------------------------------------------------------------------------------------
        // Constructors & Destructors
        //------------------------------------------------------------------------------------------------------------
-       /*{
-
-               showingVID = theShowingImage;
-               int gapH = 20;
-               int gapV = 10;
-               createHorizontalBar(1,80);
-               createVerticalBar(1,200);
-               createViewPanel();
-
-               wxFlexGridSizer * panelSizer = new wxFlexGridSizer(3,1,0,0);
-               panelSizer->AddSpacer(gapV);
-               panelSizer -> AddGrowableCol(1);
-               panelSizer->Add(theViewPanel, 1, wxEXPAND);
-               panelSizer->AddSpacer(gapV);
-
-               wxFlexGridSizer * downSizer = new wxFlexGridSizer(1,3,gapV,gapH);
-               downSizer->Add(_verticalBar, 1, wxEXPAND);
-               //downSizer->AddSpacer(gapH);
-               downSizer -> AddGrowableCol(1);
-               downSizer->Add(panelSizer, 1, wxEXPAND|wxALL|wxCENTER);
-               //downSizer->AddSpacer(gapH);
-               outSizer = new wxFlexGridSizer(3,1,1,1);
-               outSizer->Add(_horizontalBar, 1, wxEXPAND);
-               outSizer -> AddGrowableRow(1);
-               outSizer -> AddGrowableCol(1);
-               outSizer->Add(downSizer, 1, wxEXPAND);
-
-               _horizontalBar->setDeviceBlitStart( _verticalBar->GetWidth() + gapH, gapV);
-               _horizontalBar->setDeviceEndMargin( gapH+10 );
-
-               //Connecting the events to the horizontal bar
-               Connect(_horizontalBar->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onBarrange_Horizontal );
-               Connect(_horizontalBar->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction)  &wxContourViewPanel::onActualChange_Bar_Horizontal );
-               Connect(_horizontalBar->GetId(),wxEVT_TSBAR_START,(wxObjectEventFunction) (wxCommandEventFunction)  &wxContourViewPanel::onStartChange_Bar_Horizontal );
-               Connect(_horizontalBar->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction)  &wxContourViewPanel::onEndChange_Bar_Horizontal );
-               Connect(_horizontalBar->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction)  &wxContourViewPanel::onSelectionEnd_Horizontal );
-               Connect(_horizontalBar->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction)  &wxContourViewPanel::onMovedBar_Horizontal );
-
-               //Connecting the events to the vertical bar
-               Connect(_verticalBar->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onBarrange_Vertical );
-               Connect(_verticalBar->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction)  &wxContourViewPanel::onActualChange_Bar_Vertical );
-               Connect(_verticalBar->GetId(),wxEVT_TSBAR_START,(wxObjectEventFunction) (wxCommandEventFunction)  &wxContourViewPanel::onStartChange_Bar_Vertical );
-               Connect(_verticalBar->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction)  &wxContourViewPanel::onEndChange_Bar_Vertical );
-               Connect(_verticalBar->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction)  &wxContourViewPanel::onSelectionEnd_Vertical );
-               Connect(_verticalBar->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction)  &wxContourViewPanel::onMovedBar_Vertical );
-
-
-               this->SetAutoLayout( true );
-               SetSizer( outSizer );
-               this->Layout();
-
-               SetSize(900,700);
-               theViewPanel->SetSize(800,600);
-               theViewPanel->GetWindow(1)->SetSize(800,600);
-
-               outSizer->Fit( this );
-               SetBackgroundColour(wxColour(255,0,0));
-
-       }*/
        //:wxScrolledWindow(parent, -1, pos, size, style)
        wxContourViewPanel::wxContourViewPanel ( vtkImageData * theShowingImage, wxWindow *parent, const wxPoint& pos, const wxSize& size,long style, int vertStart, int vertEnd, int horzStart, int horzEnd )
        :wxPanel(parent, -1, pos, size, style)
@@ -126,31 +67,31 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
                createViewPanel();
                _eventHandler                   = NULL;
 
+               wxFlexGridSizer * panelSizer = new wxFlexGridSizer(1,4,  gapV, gapH);
 //EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
 #if wxMAJOR_VERSION <= 2
-               wxFlexGridSizer * panelSizer = new wxFlexGridSizer(1,4,  gapV, gapH);
                panelSizer -> AddGrowableCol(2);
                panelSizer -> AddGrowableRow(2);
 #else
-               wxFlexGridSizer * panelSizer = new wxFlexGridSizer(4);
-               panelSizer -> AddGrowableCol(2);
+               panelSizer -> AddGrowableRow(0,1);
+               panelSizer -> AddGrowableCol(2,1);
 #endif
-               panelSizer->Add(_verticalBar, 1, wxGROW);
+               panelSizer->Add(_verticalBar, 0, wxEXPAND);
                panelSizer->AddSpacer(gapV);
-               panelSizer->Add(theViewPanel, 1, wxGROW);
+               panelSizer->Add(theViewPanel, 1, wxEXPAND);
                panelSizer->AddSpacer(gapV);
 
+               outSizer = new wxFlexGridSizer(3, 1, gapH, gapV);
 //EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
 #if wxMAJOR_VERSION <= 2
-               outSizer = new wxFlexGridSizer(3, 1, gapH, gapV);
                outSizer -> AddGrowableCol(1);
                outSizer -> AddGrowableRow(1);
 #else
-               outSizer = new wxFlexGridSizer(3);
-               outSizer -> AddGrowableCol(1);
+               outSizer -> AddGrowableRow(1,1);
+               outSizer -> AddGrowableCol(0,1);
 #endif
-               outSizer->Add( _horizontalBar, 1, wxGROW);
-               outSizer->Add( panelSizer, 1, wxGROW);
+               outSizer->Add( _horizontalBar, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP);
+               outSizer->Add( panelSizer, 1, wxEXPAND);
                outSizer->AddSpacer(gapH);
 
                _horizontalBar->setDeviceBlitStart( _verticalBar->GetWidth() + 2*gapH, gapV);
@@ -758,11 +699,13 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
                }
        }
 
-       void wxContourViewPanel::removeSceneContours(){
+       void wxContourViewPanel::removeSceneContours()
+       {
                _sceneManager->removeSceneContours();
        }
 
-       void wxContourViewPanel::addNameWrapperToScene(){
+       void wxContourViewPanel::addNameWrapperToScene()
+       {
                int size = wxContourMainFrame::getInstance()->getNamesWrappingSize();
                for(int i = 0; i < size;i++){
                        std::string name = wxContourMainFrame::getInstance()->getNameWrapping(i);