X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourCrownWidget.cxx;h=3ab512b57199daf2bb825554452667a0bbcdfce9;hb=HEAD;hp=4ed87a8046dbdb7f7f0c15f610cbefac8592e301;hpb=cea19159becbb13fffac6d87a914480c385f8026;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx
index 4ed87a8..3ab512b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx
@@ -1,3 +1,27 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 "ContourCrownWidget.h"
 
@@ -8,42 +32,12 @@
 #include "vtkLookupTable.h"
 
 //----------------------------------------------------------------------
-  wxMaracasCoutourTool::wxMaracasCoutourTool(wxWindow *parent, wxVtkBaseView *wxvtkbaseview, vtkImageData* imagedata)
+  wxMaracasCoutourTool::wxMaracasCoutourTool(wxWindow *parent)
     : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
   {
-//EED    this->mbbtkContourCrown	= contourcrown;
-    this->imagedata			= imagedata;
-	this->wxvtkbaseview		= wxvtkbaseview;
 	wxPanel	*panel			= this;
     wxSizer *sizer			= NULL;
 	
-	InitVtkImagesResult();
-
-	 vtkLookupTable *table = vtkLookupTable::New();
-//	 table->SetAlphaRange(128,255);
-     table->SetRange(0, 255); // image intensity range
-//   table->SetValueRange(0.0, 1.0); // from black to white
-     table->SetValueRange(0.0, 255.0); // from black to white
-
-	 table->SetTableValue (0, 1.0 , 1.0 , 1.0 , 0.1 );
-	 table->SetTableValue (255, 1.0 , 1.0 , 0.0 , 0.1);
-
-//	 table->SetTableValue (0, 0.0 , 0.0 , 1.0 , 0.35 );
-//	 table->SetTableValue (255, 1.0 , 0.0 , 0.0 , 0.10);
-
-     table->SetSaturationRange(0.0, 0.0); // no color saturation
-     table->SetRampToLinear();
-     table->Build();
-
-	vtkImageMapToColors  *mapperImage = vtkImageMapToColors::New();
-	mapperImage->SetLookupTable(table);
-	mapperImage->SetInput( imagedataMaskResult );
-	vtkImageActor *actorImage	= vtkImageActor::New();
-	actorImage->SetInput( mapperImage->GetOutput() );
-	actorImage->SetOpacity(1);
-
-	wxvtkbaseview->GetRenderer()->AddActor(actorImage);
-
 	// Widget interface
 	wxButton *btnContourA   = new wxButton( panel, -1, _T("Crown Extern"));
 	wxButton *btnContourB   = new wxButton( panel, -1, _T("Crown Intern"));
@@ -104,8 +98,42 @@
 	}
 
 
-  // ------------------------------------------------------------------------
+	// ------------------------------------------------------------------------
+void wxMaracasCoutourTool::Init(wxVtkBaseView *wxvtkbaseview, vtkImageData* imagedata)
+{
+    this->imagedata			= imagedata;
+	this->wxvtkbaseview		= wxvtkbaseview;
+	
+	InitVtkImagesResult();
+	
+	vtkLookupTable *table = vtkLookupTable::New();
+	//	 table->SetAlphaRange(128,255);
+	table->SetRange(0, 255); // image intensity range
+	//   table->SetValueRange(0.0, 1.0); // from black to white
+	table->SetValueRange(0.0, 255.0); // from black to white
+	
+	table->SetTableValue (0, 1.0 , 1.0 , 1.0 , 0.1 );
+	table->SetTableValue (255, 1.0 , 1.0 , 0.0 , 0.1);
+	
+	//	 table->SetTableValue (0, 0.0 , 0.0 , 1.0 , 0.35 );
+	//	 table->SetTableValue (255, 1.0 , 0.0 , 0.0 , 0.10);
+	
+	table->SetSaturationRange(0.0, 0.0); // no color saturation
+	table->SetRampToLinear();
+	table->Build();
+	
+	vtkImageMapToColors  *mapperImage = vtkImageMapToColors::New();
+	mapperImage->SetLookupTable(table);
+	mapperImage->SetInput( imagedataMaskResult );
+	vtkImageActor *actorImage	= vtkImageActor::New();
+	actorImage->SetInput( mapperImage->GetOutput() );
+	actorImage->SetOpacity(1);
+	
+	wxvtkbaseview->GetRenderer()->AddActor(actorImage);	
+}
 
+
+  // ------------------------------------------------------------------------
   void wxMaracasCoutourTool::ConfigureVTK()
   {
 	  double spc[3];