Bug #1679

[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 53b7f5ff317a9218d6f41adf87aba5b9a5c6c742..a0ca639899ac8173d90700ba1658e3bd88ce469d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_ViewerWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/10/23 12:01:32 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2012/10/11 10:45:16 $
+  Version:   $Revision: 1.36 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -23,7 +23,6 @@
 //------------------------------------------------------------------------------------------------------------
 // Other includes
 //------------------------------------------------------------------------------------------------------------
-
        //------------------------------------------------------------------------------------------------------------
        // Constructors & Destructors
        //------------------------------------------------------------------------------------------------------------
@@ -107,7 +106,7 @@
 
                        mwxvtkclipping3Dview                    = new wxVtkClipping3DView(mwxvtk3Dbaseview_Clipping3D);
                        vtkClipping3DDataViewer *vtkclipping3Ddataviewer = new vtkClipping3DDataViewer();
-                       vtkclipping3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
+                       vtkclipping3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);                    
                        vtkclipping3Ddataviewer->Configure();
                        mwxvtkclipping3Dview->SetVtkClipping3DDataViewer(vtkclipping3Ddataviewer);
 
@@ -179,9 +178,10 @@
                        panelControl->SetSize(400,350);
                        panelControl->Layout();
                        //panelClipping3D->SetMinimumPaneSize( 5 );
-                       panelClipping3D->SetMinimumPaneSize( 100 );  // JPR
-
-                       panelClipping3D->SplitHorizontally( panelControl , window3D , 10  );
+                       panelClipping3D->SetMinimumPaneSize( 130 );  // FCY
+                       panelClipping3D->SplitHorizontally( panelControl , window3D , 0  );
+                       //panelClipping3D->SetSashSize(10);
+                       panelClipping3D->UpdateSize(); //FCY
                        wxwindow=panelClipping3D;
 
                        vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata);
@@ -213,7 +213,7 @@
                {
                   if (mvtkmprbasedata)         { delete mvtkmprbasedata;}
                }
-
+               
                if (mvtk2Dbaseview)             { delete mvtk2Dbaseview; }
                if (mvtkmpr2Dview_X)            { delete mvtkmpr2Dview_X;}
                if (mvtkmpr2Dview_Y)            { delete mvtkmpr2Dview_Y;}
@@ -224,6 +224,7 @@
                if (mwxvtkmpr3Dview)            { delete mwxvtkmpr3Dview;}
                if (mwxvtkclipping3Dview)       { delete mwxvtkclipping3Dview;}
                if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; mwxvtk3Dbaseview_Clipping3D=NULL;}
+               if (vtkmpr3Ddataviewer)                 { delete vtkmpr3Ddataviewer;}
        }
        //------------------------------------------------------------------------------------------------------------
        // Methods
@@ -297,6 +298,7 @@
                if ( mwidgetMesure       !=NULL ) { mwidgetMesure->SetMesureScale( 1 );         }
                if ( mwxsphereview       !=NULL ) { mwxsphereview->Configure();                 }
 
+               
                if (mwxvtk3Dbaseview_Clipping3D !=NULL)
                {
                        mwxvtk3Dbaseview_Clipping3D->Configure();
@@ -311,7 +313,7 @@
                if (mwxvtkmpr3Dview                     !=NULL)
                {
                        mwxvtkmpr3Dview->Configure();
-                       mwxvtkmpr3Dview->ResetCamera(ext,org,spc);
+//EED???                       mwxvtkmpr3Dview->ResetCamera(ext,org,spc);
                }
 
                if (mwxvtkclipping3Dview                !=NULL)
@@ -319,7 +321,6 @@
                        mwxvtkclipping3Dview->Configure();
                }
 
-
                //if(vtkmpr3Ddataviewer!=NULL){vtkmpr3Ddataviewer->Configure();}
 //             RefreshView();
 
@@ -339,16 +340,15 @@
        //-------------------------------------------------------------------------
        void wxMaracas_ViewerWidget::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 ->Refresh();            }
-
-                       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 ->Refresh();                            }
+               if (mwxvtkmpr3Dview                             !=NULL ){ mwxvtkmpr3Dview->RefreshView();                       }
+               if (mwxvtkclipping3Dview                !=NULL ){ mwxvtkclipping3Dview->Refresh();                      }
+               if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D->Refresh();       }
        }
 
        //-------------------------------------------------------------------------
@@ -389,6 +389,34 @@
                        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){
+                       // ???  EED 10 oct 2012
+               }
+               if (mwxvtk3Dbaseview_Clipping3D!=NULL){
+                       // ???  EED 10 oct 2012
+               }
+               
+               
+               
 //EED 26/11/2009
 //             ConfigureVTK();
 //             RefreshView();