X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=bbtk%2Fsrc%2FbbCreaContournDimensions.cxx;h=c53e63787fbe754b63256fd65eda03cc327366d1;hb=696cdf7e15e3a90613c358774bab4525987571f9;hp=55eab4384847dea30748e6a4391b70619bd78afd;hpb=11655d90501504ddcb8df4e4091f5770f607cac1;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 55eab43..c53e637 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"
 
@@ -7,48 +32,37 @@ namespace bbcreaContours
 
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaContours,nDimensions)
 BBTK_BLACK_BOX_IMPLEMENTATION(nDimensions,bbtk::WxBlackBox);
+
 void nDimensions::Process()
 {
-printf("EED nDimensions::Process 01\n");	
 	double **vectx = 0, **vecty = 0, **vectz = 0;
-
 	std::vector< void * > vectortemp;
 	std::vector<int> size;
 	vtkImageData **mask = 0, **value = 0;
-
 	vtkImageData* img = bbGetInputIn();
-
 	std::vector<vtkImageData*> selectedimages;
-	if(img!=NULL && currentimg!=img){
-
-		printf("EED nDimensions::Process 02\n");	
-		wxContourMainFrame::getInstance()->ShowToolsPanel(true);
+	if(img!=NULL && currentimg!=img)
+	{
+        wxContourMainFrame::getInstance()->ShowToolsPanel(true);
 		currentimg=img;
 		selectedimages.push_back(img);
-		wxContourMainFrame::getInstance()->setVectImages(selectedimages);
-		printf("EED nDimensions::Process 03\n");	
-	}
+		wxContourMainFrame::getInstance()->configure(selectedimages);
+	} // if img
 
-	printf("EED nDimensions::Process 04\n");	
-	if(currentimg != NULL){
+	if(currentimg != NULL)
+   {
 		int contourtype = bbGetInputContourType();
 		//wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
 		//wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);
-	}
-
-	printf("EED nDimensions::Process 05\n");	
-	bbSetOutputX(vectx);
-	printf("EED nDimensions::Process 05.1\n");	
-	bbSetOutputY(vecty);
-	printf("EED nDimensions::Process 05.2\n");	
-	bbSetOutputZ(vectz);
-	printf("EED nDimensions::Process 05.3\n");	
-	bbSetOutputSizeContour(size);
-	printf("EED nDimensions::Process 05.4\n");	
-	bbSetOutputMask(*mask);
-	printf("EED nDimensions::Process 05.5\n");	
-	bbSetOutputValue(*value);
-	printf("EED nDimensions::Process 06\n");	
+	} // if currentimg
+    wxContourMainFrame::getInstance()->RefreshInterface();
+    bbSetOutputwxContourMainFrame( wxContourMainFrame::getInstance() );
+//	bbSetOutputX(vectx);
+//	bbSetOutputY(vecty);
+//	bbSetOutputZ(vectz);
+//	bbSetOutputSizeContour(size);
+//	bbSetOutputMask(*mask);
+//	bbSetOutputValue(*value);
 }
 
 //-----------------------------------------------------------------
@@ -66,7 +80,8 @@ void nDimensions::CreateWidget(wxWindow* parent)
 	//bbSetOutputWidget( frame1 );
 std::string datadir=".";
 #ifdef WIN32
-	datadir = crea::System::GetDllAppPath();
+printf("EED WARNING Verify that GetDllAppPath in  nDimensions::CreateWidget bbCreaContournDimensions is working.. \n");
+	datadir = crea::System::GetDllAppPath("bbCreaContours.dll");
 #else
 	datadir= crea::System::GetExecutablePath();
 #endif
@@ -81,17 +96,19 @@ std::string datadir=".";
 #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 );
 	wxContourMainFrame::getInstance()->ShowToolsPanel(false);
-//EED	bbSetOutputWidget( panel );
-		bbSetOutputWidget( new wxPanel(parent,-1) );
+
+		bbSetOutputWidget( wxcontourmainframe	 );
+
 }
 
 //-----------------------------------------------------------------
 void nDimensions::bbUserSetDefaultValues()
 {
+    currentimg=NULL;
 	bbSetInputContourType(0);
 	bbSetInputIn(NULL);
 }