X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbCreaContournDimensions.cxx;h=d0a4504dc68bcdef88777ba708a2e3712a68bd18;hb=87eb16df886e4afe2d53ddf115de54cf8fe25665;hp=89164e52d06c37c73940e50c3fe0dbd3826e579b;hpb=e86fe14fab3ca41f54b110ef3a19b6ce0bfd6bd3;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 89164e5..d0a4504 100644
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.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 "bbCreaContournDimensions.h"
 #include "bbcreaContoursPackage.h"
 
@@ -9,6 +34,7 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaContours,nDimensions)
 BBTK_BLACK_BOX_IMPLEMENTATION(nDimensions,bbtk::WxBlackBox);
 void nDimensions::Process()
 {
+printf("EED nDimensions::Process Start \n" );
 	double **vectx = 0, **vecty = 0, **vectz = 0;
 
 	std::vector< void * > vectortemp;
@@ -18,28 +44,39 @@ void nDimensions::Process()
 	vtkImageData* img = bbGetInputIn();
 
 	std::vector<vtkImageData*> selectedimages;
-	if(img!=NULL && currentimg!=img){
-
-		printf("EED nDimensions::Process 02\n");	
+	if(img!=NULL && currentimg!=img)
+	{
 		wxContourMainFrame::getInstance()->ShowToolsPanel(true);
 		currentimg=img;
 		selectedimages.push_back(img);
+printf("EED nDimensions::Process 1 \n" );
 		wxContourMainFrame::getInstance()->setVectImages(selectedimages);
-		printf("EED nDimensions::Process 03\n");	
+printf("EED nDimensions::Process 2 \n" );
 	}
 
-	if(currentimg != NULL){
+	if(currentimg != NULL)
+   {
 		int contourtype = bbGetInputContourType();
 		//wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
 		//wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);
 	}
 
-	bbSetOutputX(vectx);
-	bbSetOutputY(vecty);
-	bbSetOutputZ(vectz);
-	bbSetOutputSizeContour(size);
-	bbSetOutputMask(*mask);
-	bbSetOutputValue(*value);
+    wxContourMainFrame::getInstance()->RefreshInterface();
+
+
+printf("EED nDimensions::Process 3.1 \n" );
+//	bbSetOutputX(vectx);
+printf("EED nDimensions::Process 3.2 \n" );
+//	bbSetOutputY(vecty);
+printf("EED nDimensions::Process 3.3 \n" );
+//	bbSetOutputZ(vectz);
+printf("EED nDimensions::Process 3.4 \n" );
+//	bbSetOutputSizeContour(size);
+printf("EED nDimensions::Process 3.5 \n" );
+//	bbSetOutputMask(*mask);
+printf("EED nDimensions::Process 3.6 \n" );
+//	bbSetOutputValue(*value);
+printf("EED nDimensions::Process End \n" );
 }
 
 //-----------------------------------------------------------------
@@ -73,12 +110,17 @@ printf("EED WARNING Verify that GetDllAppPath in  nDimensions::CreateWidget bbCr
 #endif // MACOSX	
 	
 	
-	printf("EED nDimensions::CreateWidget path=%s\n",datadir.c_str() );
+printf("EED nDimensions::CreateWidget path=%s\n",datadir.c_str() );
 
-	wxPanel* panel = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages,wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,datadir );
+	wxContourMainFrame* wxcontourmainframe = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages,wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,datadir );
+printf("EED nDimensions::CreateWidget 1 \n" );
 	wxContourMainFrame::getInstance()->ShowToolsPanel(false);
-//EED	bbSetOutputWidget( panel );
-		bbSetOutputWidget( new wxPanel(parent,-1) );
+printf("EED nDimensions::CreateWidget 2 \n" );
+
+//		bbSetOutputWidget( new wxPanel(parent,-1) );
+		bbSetOutputWidget( wxcontourmainframe	 );
+
+printf("EED nDimensions::CreateWidget 3 \n" );
 }
 
 //-----------------------------------------------------------------