X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMPRBaseData.cxx;h=feb2f74282b21457dac7a573bb21e26fc7679fac;hb=255f774ce4100c0b84e6b5efa5c64d0db77f8a61;hp=e1b7c370dec6bffd60f649ef9622cb86dc43fd17;hpb=d653db1bd5d3650822d8c8f6febd9e1ab59cd701;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
index e1b7c37..feb2f74 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 
 #include <vtkPlanes.h>
@@ -13,7 +38,9 @@
 #include "pPlotter/HistogramDialog.h"
 
 
-
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
@@ -36,26 +63,35 @@ vtkMPRBaseData::vtkMPRBaseData()
   _transformOrientation = NULL;
   _marImageData = NULL;
 }
+
 //-------------------------------------------------------------------
 vtkMPRBaseData::~vtkMPRBaseData()
 {
 	if (_marImageData) 			delete _marImageData;
 	if (_transformOrientation) 	_transformOrientation ->Delete();
 }
+
 //-------------------------------------------------------------------
 void vtkMPRBaseData::Configure()
 {
+	//EED 03nov2012
+	vtkBaseData::Configure();
+	
 	vtkImageData* img = _marImageData->GetImageData();
-	if(img !=NULL){
+	if(img !=NULL)
+	{
 		img->GetExtent (_x1,_x2,_y1,_y2,_z1,_z2);
-	//std::cout<<"vtkMPRBaseData::Configure() _x1= "<<_x1<<" _x2= "<<_x2<<" _y1= "<<_y1<<" _y2= "<<_y2<<" _z1= "<<_z1<<" _z2= "<<_z2<<std::endl;
-		
+	//std::cout<<"vtkMPRBaseData::Configure() _x1= "<<_x1<<" _x2= "<<_x2<<" _y1= "<<_y1<<" _y2= "<<_y2<<" _z1= "<<_z1<<" _z2= "<<_z2<<std::endl;		
 	}
-	if(_transformOrientation==NULL){
+	
+	if(_transformOrientation==NULL)
+	{
 		_transformOrientation=vtkTransform::New();
 	}
+	
 	_transformOrientation->Identity();
 }
+
 //-------------------------------------------------------------------
 void vtkMPRBaseData::GetDimensionExtention(int *x1,int *x2,int *y1,int *y2,int *z1,int *z2)
 {
@@ -127,6 +163,7 @@ void vtkMPRBaseData::SetX(double x)
 		}
 		
 		_x=x;
+		_observable->InvokeEvent(1);	
 	}
 }
 //-------------------------------------------------------------------
@@ -161,6 +198,7 @@ void vtkMPRBaseData::SetY(double y)
 			y=ext[3] + origin[1];
 		}
 		_y=y;
+		_observable->InvokeEvent(2);	
 	}
 }
 //-------------------------------------------------------------------