#3358 creaMaracasVisu Feature New Normal - Box::ColorLayerImageView Change informat...

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index 8578922356f4f7c86ec9a4ea9f3f7d706d3d17bd..b8aac4632ca32d93ad410ede07033416673dbe5e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -66,7 +66,7 @@
                //RaC 03-2010 Adding a tab
                wxPanel                         *controlPanelClippingVol3D      = NULL;
 
-               wxBoxSizer *sizer                       = 0;
+               wxBoxSizer *sizer                                                               = 0;
 
                mType = type;
 
@@ -187,14 +187,14 @@
                        wxwindow=panelClipping3D;
 
                } else if (type==6)             {
-                       panelClipping3D                                 = new wxSplitterWindow( panel , -1);
-                       mwxvtk3Dbaseview_Clipping3D             = new wxVtk3DBaseView( panelClipping3D , vtkmprbasedata);
-                       mwxvtkmpr3Dview                                 = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D );
-                       vtkmpr3Ddataviewer                              = new vtkMPR3DDataViewer();
-                       wxWindow *window3D                              = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
-                       wxPanel *panelControl                   = new wxPanel(panelClipping3D,-1);
-                       wxPanel *controlPanelMPR3D              = mwxvtkmpr3Dview->CreateControlPanel(panelControl, true);
-                       wxFlexGridSizer  *sizerCtrol    = new wxFlexGridSizer(1);
+                       panelClipping3D                                         = new wxSplitterWindow( panel , -1);
+                       mwxvtk3Dbaseview_Clipping3D                     = new wxVtk3DBaseView( panelClipping3D , vtkmprbasedata);
+                       mwxvtkmpr3Dview                                         = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D );
+                       vtkmpr3Ddataviewer                                      = new vtkMPR3DDataViewer();
+                       wxWindow                *window3D                       = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor();
+                       wxPanel                 *panelControl           = new wxPanel(panelClipping3D,-1);
+                       wxPanel                 *controlPanelMPR3D      = mwxvtkmpr3Dview->CreateControlPanel(panelControl, true);
+                       wxFlexGridSizer *sizerCtrol             = new wxFlexGridSizer(1);
                        sizerCtrol->Add(controlPanelMPR3D, 1, wxALL|wxEXPAND, 2);
 
                        panelControl->SetAutoLayout(true);
@@ -317,7 +317,6 @@
                if ( mwidgetMesure       !=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview); }
                if ( mwidgetMesure       !=NULL ) { mwidgetMesure->ConfigureA(mvtkplane2Dview); }
                if ( mwidgetMesure       !=NULL ) { mwidgetMesure->SetActiveLink(true);         }
-               if ( mwidgetMesure       !=NULL ) { mwidgetMesure->SetMesureScale( 1 );         }
                if ( mwxsphereview       !=NULL ) { mwxsphereview->Configure();                 }
 
                
@@ -361,15 +360,16 @@ void wxMaracas_ViewerWidget::Refresh(bool eraseBackground ,const wxRect* rect  )
        //-------------------------------------------------------------------------
        void wxMaracas_ViewerWidget::RefreshView()
        {
-               if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D->Refresh();        }
-               if (mwxvtkclipping3Dview                !=NULL ){ mwxvtkclipping3Dview->Refresh();                       }
-               if (mwxvtkmpr3Dview                             !=NULL ){ mwxvtkmpr3Dview->RefreshView();                        }
-               if (mvtk2Dbaseview                              !=NULL ){ mvtk2Dbaseview->Refresh();                             }
-               if (mvtkmpr2Dview_X                             !=NULL ){ mvtkmpr2Dview_X->Refresh();                            }
-               if (mvtkmpr2Dview_Y                             !=NULL ){ mvtkmpr2Dview_Y->Refresh();                            }
-               if (mvtkmpr2Dview_Z                             !=NULL ){ mvtkmpr2Dview_Z->Refresh();                            }
-               if (mvtkplane2Dview                             !=NULL ){ mvtkplane2Dview->Refresh();                            }
-               if (mwxsphereview                               !=NULL ){ mwxsphereview ->RefreshView();                         }
+//printf("EED wxMaracas_ViewerWidget::RefreshView %p\n", this);
+               if (mwxvtkmpr3Dview                             !=NULL ){ mwxvtkmpr3Dview                               ->RefreshView();        }
+               if (mwxvtkclipping3Dview                !=NULL ){ mwxvtkclipping3Dview                  ->Refresh();            }
+               if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D   ->Refresh();            }
+               if (mvtk2Dbaseview                              !=NULL ){ mvtk2Dbaseview                                ->Refresh();            }
+               if (mvtkmpr2Dview_X                             !=NULL ){ mvtkmpr2Dview_X                               ->Refresh();            }
+               if (mvtkmpr2Dview_Y                             !=NULL ){ mvtkmpr2Dview_Y                               ->Refresh();            }
+               if (mvtkmpr2Dview_Z                             !=NULL ){ mvtkmpr2Dview_Z                               ->Refresh();            }
+               if (mvtkplane2Dview                             !=NULL ){ mvtkplane2Dview                               ->Refresh();            }
+               if (mwxsphereview                               !=NULL ){ mwxsphereview                                 ->RefreshView();        }
        }
 
        //-------------------------------------------------------------------------
@@ -377,25 +377,32 @@ void wxMaracas_ViewerWidget::Refresh(bool eraseBackground ,const wxRect* rect  )
        wxVtkBaseView *wxMaracas_ViewerWidget::GetwxVtkBaseView()
        {
                wxVtkBaseView *wxvtkbaseview=NULL;
-               if (mvtk2Dbaseview!=NULL){
+               if (mvtk2Dbaseview!=NULL)
+               {
                        wxvtkbaseview = mvtk2Dbaseview;
                }
-               if (mvtkmpr2Dview_X!=NULL){
+               if (mvtkmpr2Dview_X!=NULL)
+               {
                        wxvtkbaseview = mvtkmpr2Dview_X;
                }
-               if (mvtkmpr2Dview_Y!=NULL){
+               if (mvtkmpr2Dview_Y!=NULL)
+               {
                        wxvtkbaseview = mvtkmpr2Dview_Y;
                }
-               if (mvtkmpr2Dview_Z!=NULL){
+               if (mvtkmpr2Dview_Z!=NULL)
+               {
                        wxvtkbaseview = mvtkmpr2Dview_Z;
                }
-               if (mvtkplane2Dview!=NULL){
+               if (mvtkplane2Dview!=NULL)
+               {
                        wxvtkbaseview = mvtkplane2Dview;
                }
-               if (mwxsphereview!=NULL){
+               if (mwxsphereview!=NULL)
+               {
                        wxvtkbaseview = mwxsphereview;
                }
-               if (mwxvtk3Dbaseview_Clipping3D!=NULL){
+               if (mwxvtk3Dbaseview_Clipping3D!=NULL)
+               {
                        wxvtkbaseview = mwxvtk3Dbaseview_Clipping3D;
                }
                return wxvtkbaseview   ;
@@ -404,56 +411,54 @@ void wxMaracas_ViewerWidget::Refresh(bool eraseBackground ,const wxRect* rect  )
 
 
 //-------------------------------------------------------------------------
-       void wxMaracas_ViewerWidget::SetImage( vtkImageData *image )
+void wxMaracas_ViewerWidget::SetImage( vtkImageData *image )
+{
+       if(mvtkmprbasedata !=NULL)
+       {
+               marImageData* mar = mvtkmprbasedata->GetMarImageData();
+               mar->removeImageData(0);
+               mar->AddImageData(image);
+       }       
+       if (mvtk2Dbaseview!=NULL)
        {
-               if(mvtkmprbasedata !=NULL)
-               {
-                       marImageData* mar = mvtkmprbasedata->GetMarImageData();
-                       mar->removeImageData(0);
-                       mar->AddImageData(image);
-               }
-               
-               if (mvtk2Dbaseview!=NULL)
-               {
                        mvtk2Dbaseview->SetImageToVtkViewer(image);
-               }
-               
-               if (mvtkmpr2Dview_X!=NULL)
-               {
-                       mvtkmpr2Dview_X->SetImageToVtkViewer(image);
-               }
-               if (mvtkmpr2Dview_Y!=NULL)
-               {
-                       mvtkmpr2Dview_Y->SetImageToVtkViewer(image);
-               }
-               if (mvtkmpr2Dview_Z!=NULL)
-               {
-                       mvtkmpr2Dview_Z->SetImageToVtkViewer(image);
-               }
-               
-               if (mvtkplane2Dview!=NULL)
-               {
-                       // ???  EED 10 oct 2012
-               }
-               if (mwxsphereview!=NULL)
-               {
-                       mwxsphereview->SetImage();
-               }
-               if (mwxvtkclipping3Dview!=NULL)
-               {
-                       mwxvtkclipping3Dview->GetVtkClipping3DDataViewer()->SetImage();
-               }
-               
-               if (mwxvtkmpr3Dview!=NULL)
-               {
-                       mwxvtkmpr3Dview->SetImage();
-               }
+       }       
+       if (mvtkmpr2Dview_X!=NULL)
+       {
+               mvtkmpr2Dview_X->SetImageToVtkViewer(image);
+               mvtkmpr2Dview_X->ResetBackXYZ();
+       }
+       if (mvtkmpr2Dview_Y!=NULL)
+       {
+               mvtkmpr2Dview_Y->SetImageToVtkViewer(image);
+               mvtkmpr2Dview_Y->ResetBackXYZ();
+       }
+       if (mvtkmpr2Dview_Z!=NULL)
+       {
+               mvtkmpr2Dview_Z->SetImageToVtkViewer(image);
+               mvtkmpr2Dview_Z->ResetBackXYZ();
+       }       
+       if (mvtkplane2Dview!=NULL)
+       {
+               // ???  EED 10 oct 2012
+       }
+       if (mwxsphereview!=NULL)
+       {
+               mwxsphereview->SetImage();
+       }
+       if (mwxvtkmpr3Dview!=NULL)
+       {
+               mwxvtkmpr3Dview->SetImage();
+       }
+       if (mwxvtkclipping3Dview!=NULL)
+       {
+               mwxvtkclipping3Dview->GetVtkClipping3DDataViewer()->SetImage();
+       }               
                
 //EED 26/11/2009
 //             ConfigureVTK();
 //             RefreshView();
-
-       }
+}
 
        //-------------------------------------------------------------------------
 
@@ -521,34 +526,6 @@ void wxMaracas_ViewerWidget::SetColorWindowLevel(double colorWindow, double colo
 {
        mvtkmprbasedata->SetColorWindow(colorWindow);
        mvtkmprbasedata->SetColorLevel(colorLevel);
-//EED Borrame  
-/*     
- RefreshView();
-       if(mvtk2Dbaseview!=NULL)
-       {
-               mvtk2Dbaseview->SetColorWindow(level);
-       }
-       
-       if(mvtkmpr2Dview_X!=NULL)
-       {
-               mvtkmpr2Dview_X->SetColorWindow(level);
-       }
-       
-       if(mvtkmpr2Dview_Y!=NULL)
-       {
-               mvtkmpr2Dview_Y->SetColorWindow(level);
-       }
-       
-       if(mvtkmpr2Dview_Z!=NULL)
-       {
-               mvtkmpr2Dview_Z->SetColorWindow(level);
-       }
-       
-       if(mwxvtkmpr3Dview!=NULL)
-       {
-               mwxvtkmpr3Dview->SetColorWindow(level);
-       }
- */
 }