]> Creatis software - creaMaracasVisu.git/commitdiff
#3473 Stuck Render macOS
authorEduardo DAVILA <davila@creatis.insa-lyon.fr>
Wed, 3 Nov 2021 10:14:06 +0000 (11:14 +0100)
committerEduardo DAVILA <davila@creatis.insa-lyon.fr>
Wed, 3 Nov 2021 10:14:06 +0000 (11:14 +0100)
lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx

index 7b8c144d3bbf197f37c84db88bf6556e7b48c392..c8cedd05ebcee7bf2e5c624a14cb1967dbc89481 100644 (file)
@@ -147,6 +147,7 @@ void vtkInteractorStyleBaseView::InsertInteractorStyleMaracas(int pos, Interacto
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
 {
+printf("EED vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas Start \n ");
        InteractorStyleMaracas *intStyMar;
 
        int i,size=_lstInteractorStyleMaracas.size();
@@ -269,6 +270,8 @@ void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
        } // for
 
        EvaluateToRefresh();
+printf("EED vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas End \n ");
+
 }
 //---------------------------------------------------------------------------
 void  vtkInteractorStyleBaseView::OnChar()  // virtual 
@@ -362,12 +365,15 @@ bool vtkInteractorStyleBaseView::GetParent_refresh_waiting()
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::EvaluateToRefresh()
 {
+printf("EED vtkInteractorStyleBaseView::EvaluateToRefresh Start \n ");
        if  ( _blockRefresh==false )
        {
                if ( (_refresh_waiting==true) && (_parent_refresh_waiting==false))
                {
                        _refresh_waiting                = false;
+            printf("EED vtkInteractorStyleBaseView::EvaluateToRefresh 1.0 \n ");
                        this->_wxvtkbaseview->Refresh();
+            printf("EED vtkInteractorStyleBaseView::EvaluateToRefresh 1.1 \n ");
                }
                if (_parent_refresh_waiting==true)
                {
@@ -378,17 +384,22 @@ void vtkInteractorStyleBaseView::EvaluateToRefresh()
 #if wxMAJOR_VERSION <= 2
                        this->_wxvtkbaseview->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
 #else
+            printf("EED vtkInteractorStyleBaseView::EvaluateToRefresh 2.0 \n ");
                        this->_wxvtkbaseview->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+            printf("EED vtkInteractorStyleBaseView::EvaluateToRefresh 2.1 \n ");
 #endif
 
                        int i;
                        int size = _lstParentToReport.size();
                        for(i = 0; i<size; i++)
                        {       
+                printf("EED vtkInteractorStyleBaseView::EvaluateToRefresh 3.0 \n ");
                                _lstParentToReport[i]->ProcessEvent(newevent1);
+                printf("EED vtkInteractorStyleBaseView::EvaluateToRefresh 3.1 \n ");
                        }//for
                }//if
        }//if _blockRefresh
+printf("EED vtkInteractorStyleBaseView::EvaluateToRefresh End\n");
 }
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::BlockRefresh()
index 2942530922006dc77d2baf1782440b45a69887f7..618488f93713d78c071fbc30f56c31c3806c83cb 100644 (file)
@@ -97,7 +97,7 @@ void wxVtk2DBaseView::TransformCoordinate_spacing_ModelToView(double &X,double &
 //-------------------------------------------------------------------
 void wxVtk2DBaseView::ResetView()
 {
-       printf("EED wxVtk2DBaseView::ResetView");
+       printf("EED wxVtk2DBaseView::ResetView Start\n");
        double spx = 0,spy = 0,spz = 0;
        int x1 = 1,x2 = 1,y1 = 1,y2 = 1,z1 = 1,z2 = 1;
        wxVtkBaseView::Configure();
@@ -150,6 +150,7 @@ printf("//EED wxVtk2DBaseView::ResetView %d %d    %d %d     %d %d \n",x1,x2,y1,y
 
        // RaC
        //////////////
+    printf("EED wxVtk2DBaseView::ResetView End\n");
 
 }
 
@@ -334,6 +335,7 @@ void wxVtk2DBaseView::UpdateCameraParallelScale()
 //-------------------------------------------------------------------
 void wxVtk2DBaseView::Refresh()
 {
+printf("EED wxVtk2DBaseView::Refresh Start\n");
        int z = (int)(GetVtkBaseData()->GetZ());
        _imageViewer2XYZ->SetZSlice( z );
 //EED 2016/02/19
@@ -343,6 +345,7 @@ void wxVtk2DBaseView::Refresh()
        UpdateColorWindowLevel();       
        UpdateCameraParallelScale();    
        wxVtkBaseView::Refresh();
+printf("EED wxVtk2DBaseView::Refresh End\n");
 }
 
 //-------------------------------------------------------------------
index 4bf3d9b73a7520f050ab99e131f2f6eaa642663b..b27f41d1727125b0dc2de7b9cddc49d1a66709d2 100644 (file)
@@ -71,9 +71,11 @@ vtkRenderWindow* wxVtk3DBaseView::GetRenWin()  // virtual
 //-------------------------------------------------------------------
 void wxVtk3DBaseView::Refresh()
 {
+printf("EED wxVtk3DBaseView::Refresh Start\n");
 //     _renWin->Render();
        vtkRenderWindowInteractor *vri = GetWxVTKRenderWindowInteractor();
        vri->vtkRenderWindowInteractor::Render();
+printf("EED wxVtk3DBaseView::Refresh End\n");
 }
 
 //-------------------------------------------------------------------
index 9875b72cec473d94a948410a2926eb28f68f06cd..88a5cff541a4d943623f64107833dd0a4947d8b6 100644 (file)
@@ -80,6 +80,8 @@ void wxVtkBaseView::Configure()  // virtual
 //-------------------------------------------------------------------
 void wxVtkBaseView::Refresh()  // virtual 
 {
+printf("EED wxVtkBaseView::Refresh Start \n ");
+
 // EED 10 Oct 2007
        #if defined(WIN32)
                _iren->Refresh(true);
@@ -93,16 +95,19 @@ void wxVtkBaseView::Refresh()  // virtual
        vri->vtkRenderWindowInteractor::Render();
                //_iren->Refresh();
        #endif
+printf("EED wxVtkBaseView::Refresh End\n");
 }
 //-------------------------------------------------------------------
 void wxVtkBaseView::RefreshView()  // virtual 
 {
+printf("EED wxVtkBaseView::RefreshView Start\n");
 // EED 10 Oct 2007
        #if defined(WIN32)
                GetRenWin()->Render();
        #else
                //GetRenWin()->Render();
        #endif
+printf("EED wxVtkBaseView::RefreshView End\n");
 }
 //---------------------------------------------------------------------------
 vtkRenderer* wxVtkBaseView::GetRenderer()      // virtual