X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuContourVOI.cxx;h=536d67833e6ab35e184e288bcecc4b682c668bef;hb=8eebd53dcbe07edf0569621003178ee37d69a39b;hp=dfdfb8d4953955ed507f295c55b399a2cb421d4c;hpb=3948b92b07a8992a6d04081c9649ba63e3e7d613;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuContourVOI.cxx b/bbtk/src/bbmaracasvisuContourVOI.cxx
index dfdfb8d..536d678 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,21 +57,18 @@ END_EVENT_TABLE( );
 		this->wxvtkbaseview = NULL;
 		mcontourvoiwidget=NULL;
 
-
 		if(wxvtkbaseview!=NULL&&imagedata!=NULL){
 
 			setBaseView(wxvtkbaseview);
 			setImageData(imagedata);
 			initializeVOIWidget();
-
-		}
-
-				
+		}			
   }
    void wxWidgetVOI::initializeVOIWidget(){
 	   wxSizer* sizer = this->GetSizer();
 
-		
+
+/// \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){
 			sizer->Remove(	mcontourvoiwidget );	
 			mcontourvoiwidget->Destroy();
@@ -52,7 +77,6 @@ END_EVENT_TABLE( );
 		mcontourvoiwidget = new ContourVOIWidget( this, wxvtkbaseview, imagedata );
 		mcontourvoiwidget->ConfigureVTK();
 
-		
 		sizer	-> Add( mcontourvoiwidget,1,wxGROW ); 
 //		wxwidget = new wxMPRWidget2( panel, marimagedata , 1 );	
 //		wxwidget->ConfigureVTK();	
@@ -134,7 +158,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 +173,6 @@ void ContourVOI::Process()
 		wxwidgetvoi->initializeVOIWidget();		
 	}
 
-	
 	if (wxwidgetvoi!=NULL && _img!=NULL && _base != NULL){
 		ContourVOIWidget* contourvoiwidget = wxwidgetvoi->GetContourVOIWidget();
 		
@@ -164,6 +186,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 +201,11 @@ void ContourVOI::Process()
 		_extract->Update();
 		bbSetOutputVOI(_extract->GetOutput());
 		//JCP
-                
-
-		
+  */
+	
 		bbSetOutputIndex( Index );
 		bbSetOutputSize( Size );
 	} 
-
 }
 
 //------------------------------------------------------
@@ -198,12 +221,11 @@ void ContourVOI::CreateWidget(wxWindow*  parent)
 }
 
 //------------------------------------------------------
-void ContourVOI::bbUserConstructor()
+void ContourVOI::bbUserSetDefaultValues()
 {
-
 	_img = NULL;
 	_base = NULL;
-	_extract =NULL;
+//EED 20Juin2011	_extract =NULL;
 	bbSetInputwxVtkBaseView(NULL);
 	bbSetInputIn(NULL);
 	bbSetOutputWidget(NULL);
@@ -214,22 +236,17 @@ void ContourVOI::bbUserConstructor()
 
 }
 
-//------------------------------------------------------
-void ContourVOI::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
+//-----------------------------------------------------------------	
+void ContourVOI::bbUserInitializeProcessing()
 {
-	_img = NULL;
-	_base = NULL;
-	_extract =NULL;
-
 }
-
-//------------------------------------------------------
-void ContourVOI::bbUserDestructor()
+	
+//-----------------------------------------------------------------	
+void ContourVOI::bbUserFinalizeProcessing()
 {
 }
-
-
+	
+//-----------------------------------------------------------------	
+	
 }
 // EO namespace bbcreaMaracasVisu
-
-