BUG MACOS

[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 d81a4680e53e4807be703a387c9fcca005714678..63ebc509c655fedf56ee9b54446d1f97e278a492 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: 2008/12/03 11:42:54 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2009/03/30 15:31:15 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -53,6 +53,9 @@
                mwxvtk3Dbaseview_Clipping3D     = NULL;
                mwxvtkmpr3Dview                         = NULL; 
 
+
+               std::cout<<"mtype "<<mType<<std::endl;
+               std::cout<<"type "<<type<<std::endl;
                if (type==-1)
                {
                        mvtk2Dbaseview  = new wxVtk2DBaseView(panel);
@@ -73,6 +76,7 @@
                        mvtkmpr2Dview_X->SetVtkBaseData(mvtkmprbasedata);
                        wxwindow                =       mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor();
                }
+
                if (type==2)
                {
                        mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,2);
@@ -167,10 +171,12 @@
 
 
        wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-       sizer->Add( wxwindow , 1, wxEXPAND, 0);
+       sizer->Add( wxwindow , 1, wxGROW);      
        panel->SetSizer(sizer);
        panel->SetAutoLayout(true);
+       sizer->Layout();
        panel->Layout();
+       panel->Refresh();
 
        //   mbbtkViewerMaracas= NULL;
        }
@@ -179,6 +185,24 @@
        wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget()
        {
 
+               testDelete(mvtkmprbasedata);
+               testDelete(mvtk2Dbaseview);
+               testDelete(mvtkmpr2Dview_X); 
+               testDelete(mvtkmpr2Dview_Y); 
+               testDelete(mvtkmpr2Dview_Z); 
+               testDelete(mwidgetMesure);
+               testDelete(mvtkplane2Dview);
+               testDelete(mwxsphereview); 
+               testDelete(mwxvtkclipping3Dview);
+               testDelete(mwxvtk3Dbaseview_Clipping3D);
+               testDelete(mwxvtkmpr3Dview);
+
+       }
+
+       void wxMaracas_ViewerWidget::testDelete(void* point){
+               if(point!=NULL){
+                       delete point;
+               }
        }
            
        //------------------------------------------------------------------------------------------------------------
@@ -215,7 +239,7 @@
                        mvtkmprbasedata->SetY( y );
                        mvtkmprbasedata->SetZ( z );
                }
-               RefreshView();
+//             RefreshView();
        }
 
        //-------------------------------------------------------------------------
@@ -228,6 +252,7 @@
        //-------------------------------------------------------------------------
        void wxMaracas_ViewerWidget::RefreshView()
        {
+               
                        if (mvtk2Dbaseview                              !=NULL ){ mvtk2Dbaseview                                -> Refresh();           }
                        if (mvtkmpr2Dview_X                             !=NULL ){ mvtkmpr2Dview_X                               -> Refresh();           }
                        if (mvtkmpr2Dview_Y                             !=NULL ){ mvtkmpr2Dview_Y                               -> Refresh();           }
@@ -238,6 +263,7 @@
                        if (mwxvtkmpr3Dview                             !=NULL ){ mwxvtkmpr3Dview                               -> RefreshView();       }
                        if (mwxvtkclipping3Dview                !=NULL ){ mwxvtkclipping3Dview                  -> Refresh();           }
                        if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D   -> Refresh();           }
+
        }
 
        //-------------------------------------------------------------------------
@@ -257,7 +283,6 @@
 
        void wxMaracas_ViewerWidget::SetImage( vtkImageData *image      )
        {
-               //printf("EED wxMaracas_ViewerWidget::SetImage   IMPORTANT this methode is missing \n");
                marImageData* mar = mvtkmprbasedata->GetMarImageData();
                mar->removeImageData(0);
                mar->AddImageData(image);