#3128 creaMaracasVisu Feature New Normal - branch changeWx28to30 compilation with...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxVtkMPR3DViewCntrlPanel.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
index 32624a50b213a59d12842f9a9c0cfa284aa79757..d717de5778248cd156f911af081ce55380a77781 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
@@ -280,7 +280,7 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 }
 
 //-------------------------------------------------------------------
-void wxVtkMPR3DViewCntrlPanel::UpdateControlPanel()
+void wxVtkMPR3DViewCntrlPanel::UpdateControlPanel(bool firsttime)
 {
        vtkMPRBaseData* basedata = _wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData();
        if(basedata != NULL){
@@ -288,15 +288,19 @@ void wxVtkMPR3DViewCntrlPanel::UpdateControlPanel()
                vtkImageData* img = basedata->GetImageData();
                int x0,x1,y0,y1,z0,z1;
 
-               if(img){
+               if(img)
+               {
                        img->GetExtent(x0,x1,y0,y1,z0,z1);
                        _positionX->SetRange(x0,x1);
                        _positionY->SetRange(y0,y1);
                        _positionZ->SetRange(z0,z1);
 
-                       _positionX->SetValue((x0+x1)/2);
-                       _positionY->SetValue((y0+y1)/2);
-                       _positionZ->SetValue((z0+z1)/2);
+                       if (firsttime==true)
+                       {
+                               _positionX->SetValue((x0+x1)/2);
+                               _positionY->SetValue((y0+y1)/2);
+                               _positionZ->SetValue((z0+z1)/2);
+                       } // if firsttime
 
 //EED 12April2012  This make a floting window in MacOs and Linux with for windows                      
 //                     _positionX->Update();
@@ -711,7 +715,13 @@ void wxVtkMPR3DViewCntrlPanel::OnInterpolate(wxCommandEvent& event)
        _wxvtkmpr3Dview->Refresh();
 
        wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
        _wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+       _wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
+
 
 }