BUG view MPR

[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 5d3233f3eae7d821ddc385da16ccf79f894f4870..e3215c49db8b086e9ac751f5277e6b61430a4052 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/05/04 07:35:42 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2009/06/05 06:07:39 $
+  Version:   $Revision: 1.13 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -30,7 +30,7 @@
        //------------------------------------------------------------------------------------------------------------
 
 
-       wxMaracas_ViewerWidget::wxMaracas_ViewerWidget(wxWindow *parent, vtkImageData* imagedata, int type)
+       wxMaracas_ViewerWidget::wxMaracas_ViewerWidget(wxWindow *parent, vtkImageData* imagedata, int type, vtkMPRBaseData *vtkmprbasedata)
                : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
        {
                wxPanel *panel = this;
@@ -38,9 +38,18 @@
 
                mType = type;
 
-               marImageData    *marimagedata   = new marImageData( imagedata );                        
-               mvtkmprbasedata                                 = new vtkMPRBaseData(); 
-               mvtkmprbasedata->SetMarImageData(marimagedata);
+               
+               if (vtkmprbasedata==NULL)
+               {
+                       minternalVtkmprbasedata                 = true;
+                       mvtkmprbasedata                                 = new vtkMPRBaseData(); 
+                       marImageData    *marimagedata   = new marImageData( imagedata );                        
+                       mvtkmprbasedata->SetMarImageData(marimagedata);
+               } else {
+                       minternalVtkmprbasedata                 = false;
+                       mvtkmprbasedata                                 = vtkmprbasedata; 
+               }
+               
 
                mvtk2Dbaseview                          = NULL;
                mvtkmpr2Dview_X                         = NULL;
@@ -191,7 +200,12 @@
          
        wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget()
        {
-               if (mvtkmprbasedata)                    { delete mvtkmprbasedata;  }
+               
+               if (minternalVtkmprbasedata==true)
+               {
+                       if (mvtkmprbasedata)                    { delete mvtkmprbasedata;  }
+               }       
+               
                if (mvtk2Dbaseview)                             { delete mvtk2Dbaseview; }
                if (mvtkmpr2Dview_X)                    { delete mvtkmpr2Dview_X; }
                if (mvtkmpr2Dview_Y)                    { delete mvtkmpr2Dview_Y; }