X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuContourVOI.cxx;h=5ed739c404743cfc4bf63649f7641d0b08e93f42;hb=39ac649f6a07b1646505a9d8c418f72bd76fc64e;hp=dfb620215e184217e8afe8316abda565e10ecfb4;hpb=738e5bef4c52a1f25013e598a008a81f20fc6f63;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuContourVOI.cxx b/bbtk/src/bbmaracasvisuContourVOI.cxx
index dfb6202..5ed739c 100644
--- a/bbtk/src/bbmaracasvisuContourVOI.cxx
+++ b/bbtk/src/bbmaracasvisuContourVOI.cxx
@@ -1,8 +1,36 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 //HOLA!!!
 //HOLA!!!
 
 #include "bbmaracasvisuContourVOI.h"
 #include "bbcreaMaracasVisuPackage.h"
+
+
+
 namespace bbcreaMaracasVisu
 {
 
@@ -29,30 +57,34 @@ END_EVENT_TABLE( );
 		this->wxvtkbaseview = NULL;
 		mcontourvoiwidget=NULL;
 
-
 		if(wxvtkbaseview!=NULL&&imagedata!=NULL){
 
 			setBaseView(wxvtkbaseview);
 			setImageData(imagedata);
 			initializeVOIWidget();
-
-		}
-
-				
+		}			
   }
-   void wxWidgetVOI::initializeVOIWidget(){
+
+   void wxWidgetVOI::initializeVOIWidget()
+	{
 	   wxSizer* sizer = this->GetSizer();
 
-		
-		if(mcontourvoiwidget!=NULL){
-			sizer->Remove(	mcontourvoiwidget );	
+
+/// \TODO fix deprecated warning: virtual bool wxSizer::Remove(wxWindow*) is deprecated (declared at /usr/include/wx-2.8/wx/sizer.h:513)		
+		if(mcontourvoiwidget!=NULL)
+		{
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+			sizer->Remove( mcontourvoiwidget );	
+#else
+			sizer->Detach( mcontourvoiwidget );	
+#endif
 			mcontourvoiwidget->Destroy();
 		}
 
 		mcontourvoiwidget = new ContourVOIWidget( this, wxvtkbaseview, imagedata );
 		mcontourvoiwidget->ConfigureVTK();
 
-		
 		sizer	-> Add( mcontourvoiwidget,1,wxGROW ); 
 //		wxwidget = new wxMPRWidget2( panel, marimagedata , 1 );	
 //		wxwidget->ConfigureVTK();	
@@ -60,10 +92,13 @@ END_EVENT_TABLE( );
 		this->Refresh();
   }
 
-  void wxWidgetVOI::setBaseView(wxVtkBaseView * wxvtkbaseview){
+  void wxWidgetVOI::setBaseView(wxVtkBaseView * wxvtkbaseview)
+	{
 	  this->wxvtkbaseview = wxvtkbaseview;
   }
-  void wxWidgetVOI::setImageData(vtkImageData * imagedata){
+
+  void wxWidgetVOI::setImageData(vtkImageData * imagedata)
+	{
 	  this->imagedata = imagedata;
   }
 
@@ -134,7 +169,6 @@ void ContourVOI::Process()
       wxMessageDialog(NULL,  bbtk::std2wx("(ContourVOI) Input 'In' is not set"),  bbtk::std2wx(bbGetFullName()) ).ShowModal();
     }*/
 
-
 	vtkImageData* img = bbGetInputIn();
 	wxVtkBaseView* base = bbGetInputwxVtkBaseView();
 
@@ -150,7 +184,6 @@ void ContourVOI::Process()
 		wxwidgetvoi->initializeVOIWidget();		
 	}
 
-	
 	if (wxwidgetvoi!=NULL && _img!=NULL && _base != NULL){
 		ContourVOIWidget* contourvoiwidget = wxwidgetvoi->GetContourVOIWidget();
 		
@@ -164,6 +197,9 @@ void ContourVOI::Process()
 
 		std::cout<<"ContourVOI index "<<Index<<" size "<<Size<<std::endl;
 
+	/*EED 20 Juin 2011	
+	  This go out of the box ... see ExtractVtkImageFilter ...
+	 
 		//JCP
 		if(_extract!=NULL){		
 			_extract->Delete();
@@ -176,13 +212,11 @@ void ContourVOI::Process()
 		_extract->Update();
 		bbSetOutputVOI(_extract->GetOutput());
 		//JCP
-                
-
-		
+  */
+	
 		bbSetOutputIndex( Index );
 		bbSetOutputSize( Size );
 	} 
-
 }
 
 //------------------------------------------------------
@@ -200,10 +234,9 @@ void ContourVOI::CreateWidget(wxWindow*  parent)
 //------------------------------------------------------
 void ContourVOI::bbUserSetDefaultValues()
 {
-
 	_img = NULL;
 	_base = NULL;
-	_extract =NULL;
+//EED 20Juin2011	_extract =NULL;
 	bbSetInputwxVtkBaseView(NULL);
 	bbSetInputIn(NULL);
 	bbSetOutputWidget(NULL);
@@ -214,20 +247,17 @@ void ContourVOI::bbUserSetDefaultValues()
 
 }
 
-	//-----------------------------------------------------------------	
-	void ContourVOI::bbUserInitializeProcessing()
-	{
-	}
+//-----------------------------------------------------------------	
+void ContourVOI::bbUserInitializeProcessing()
+{
+}
 	
-	//-----------------------------------------------------------------	
-	void ContourVOI::bbUserFinalizeProcessing()
-	{
-	}
+//-----------------------------------------------------------------	
+void ContourVOI::bbUserFinalizeProcessing()
+{
+}
 	
-	//-----------------------------------------------------------------	
+//-----------------------------------------------------------------	
 	
-
 }
 // EO namespace bbcreaMaracasVisu
-
-