BUG interaction ROI-creation line, rectangle, circle,

[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 dd6b80cf5d8c455295ab7de2ade80fae77ef488e..67f26f99e7f3c805d22d9f460656341a0944a3aa 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: 2009/03/24 10:49:21 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2009/04/24 15:26:02 $
+  Version:   $Revision: 1.9 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -54,8 +54,6 @@
                mwxvtkmpr3Dview                         = NULL; 
 
 
-               std::cout<<"mtype "<<mType<<std::endl;
-               std::cout<<"type "<<type<<std::endl;
                if (type==-1)
                {
                        mvtk2Dbaseview  = new wxVtk2DBaseView(panel);
@@ -66,20 +64,20 @@
 
                if (type==0)
                {
-                       mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,0);
+                       mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,2);
                        mvtkmpr2Dview_Z->SetVtkBaseData(mvtkmprbasedata);
                        wxwindow                = mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor();
                }
                if (type==1)
                {
-                       mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,1);
+                       mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,0);
                        mvtkmpr2Dview_X->SetVtkBaseData(mvtkmprbasedata);
                        wxwindow                =       mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor();
                }
 
                if (type==2)
                {
-                       mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,2);
+                       mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,1);
                        mvtkmpr2Dview_Y->SetVtkBaseData(mvtkmprbasedata);
                        wxwindow                = mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor();
                }
@@ -184,27 +182,19 @@
          
        wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget()
        {
+               if (mvtkmprbasedata)                    { delete mvtkmprbasedata;  }
+               if (mvtk2Dbaseview)                             { delete mvtk2Dbaseview; }
+               if (mvtkmpr2Dview_X)                    { delete mvtkmpr2Dview_X; }
+               if (mvtkmpr2Dview_Y)                    { delete mvtkmpr2Dview_Y; }
+               if (mvtkmpr2Dview_Z)                    { delete mvtkmpr2Dview_Z; }
+               if (mwidgetMesure)                              { delete mwidgetMesure; }
+               if (mvtkplane2Dview)                    { delete mvtkplane2Dview; }
+               if (mwxsphereview)                              { delete mwxsphereview; }
+               if (mwxvtkclipping3Dview)               { delete mwxvtkclipping3Dview; }
+               if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; }
+               if (mwxvtkmpr3Dview)                    { delete mwxvtkmpr3Dview; }
 
-               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;
-               }
        }
-           
        //------------------------------------------------------------------------------------------------------------
        // Methods
        //------------------------------------------------------------------------------------------------------------
@@ -239,7 +229,7 @@
                        mvtkmprbasedata->SetY( y );
                        mvtkmprbasedata->SetZ( z );
                }
-               RefreshView();
+//             RefreshView();
        }
 
        //-------------------------------------------------------------------------
@@ -252,6 +242,7 @@
        //-------------------------------------------------------------------------
        void wxMaracas_ViewerWidget::RefreshView()
        {
+               
                        if (mvtk2Dbaseview                              !=NULL ){ mvtk2Dbaseview                                -> Refresh();           }
                        if (mvtkmpr2Dview_X                             !=NULL ){ mvtkmpr2Dview_X                               -> Refresh();           }
                        if (mvtkmpr2Dview_Y                             !=NULL ){ mvtkmpr2Dview_Y                               -> Refresh();           }
@@ -262,6 +253,7 @@
                        if (mwxvtkmpr3Dview                             !=NULL ){ mwxvtkmpr3Dview                               -> RefreshView();       }
                        if (mwxvtkclipping3Dview                !=NULL ){ mwxvtkclipping3Dview                  -> Refresh();           }
                        if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D   -> Refresh();           }
+
        }
 
        //-------------------------------------------------------------------------
@@ -281,7 +273,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);