no message

[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 af6723b670ba85d6a16bdcbbf47068bb2a20405d..1ae47ff4e6fd3f7e8ac6636efd90d2c5f90f372e 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/04/20 14:42:41 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2010/08/25 17:51:12 $
+  Version:   $Revision: 1.30 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -47,13 +47,13 @@
 
                if (vtkmprbasedata==NULL)
                {
-                       minternalVtkmprbasedata         = true;
-                       mvtkmprbasedata                 = new vtkMPRBaseData(); 
+                       minternalVtkmprbasedata = true;
+                       mvtkmprbasedata         = new vtkMPRBaseData();
                        marImageData    *marimagedata   = new marImageData( imagedata );                        
                        mvtkmprbasedata->SetMarImageData(marimagedata);
                } else {
                        minternalVtkmprbasedata         = false;
-                       mvtkmprbasedata                 = vtkmprbasedata; 
+                       mvtkmprbasedata                 = vtkmprbasedata;
                }
 
                mvtk2Dbaseview                  = NULL;
@@ -65,8 +65,8 @@
                mwxsphereview                   = NULL;
                mwxvtkclipping3Dview            = NULL;
                mwxvtk3Dbaseview_Clipping3D     = NULL;
-               mwxvtkmpr3Dview                 = NULL;
-               vtkmpr3Ddataviewer              = NULL;
+               mwxvtkmpr3Dview                     = NULL;
+               vtkmpr3Ddataviewer                  = NULL;
 
                if (type==-1)
                {
@@ -296,24 +296,36 @@
                if ( mwidgetMesure       !=NULL ) { mwidgetMesure->SetActiveLink(true);         }
                if ( mwidgetMesure       !=NULL ) { mwidgetMesure->SetMesureScale( 1 );         }
                if ( mwxsphereview       !=NULL ) { mwxsphereview->Configure();                 }
+               
 
-               if (mwxvtk3Dbaseview_Clipping3D !=NULL) {
-                       mwxvtk3Dbaseview_Clipping3D->Configure();       
-                       
+               if (mwxvtk3Dbaseview_Clipping3D !=NULL) 
+               {
+                       mwxvtk3Dbaseview_Clipping3D->Configure();                               
                }
 
-               if (vtkmpr3Ddataviewer                  !=NULL) {                       
-                       vtkmpr3Ddataviewer->Configure();
-                       
+               if (vtkmpr3Ddataviewer                  !=NULL)
+               {                       
+                       vtkmpr3Ddataviewer->Configure();                        
+
                }
-               if (mwxvtkmpr3Dview                     !=NULL) { 
-                       
+               
+
+
+               if (mwxvtkmpr3Dview                     !=NULL)
+               {                       
+
                        mwxvtkmpr3Dview->Configure();
                        mwxvtkmpr3Dview->ResetCamera(ext,org,spc);
+               }
 
+               if (mwxvtkclipping3Dview                !=NULL) 
+               { 
+                       mwxvtkclipping3Dview->Configure();      
                }
 
+               
                if (mwxvtkclipping3Dview                !=NULL) { mwxvtkclipping3Dview->Configure();    }
+
                
                //if(vtkmpr3Ddataviewer!=NULL){vtkmpr3Ddataviewer->Configure();}
 //             RefreshView();
@@ -333,7 +345,6 @@
        //-------------------------------------------------------------------------
        void wxMaracas_ViewerWidget::RefreshView()
        {
-               
                        if (mvtk2Dbaseview              !=NULL ){ mvtk2Dbaseview->Refresh();            }
                        if (mvtkmpr2Dview_X             !=NULL ){ mvtkmpr2Dview_X->Refresh();           }
                        if (mvtkmpr2Dview_Y             !=NULL ){ mvtkmpr2Dview_Y->Refresh();           }