X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbCreaContournDimensions.cxx;h=251d4ff5d12186ed4bcfe4e58ac9612358d96712;hb=9c3e9dac7175adc08659330ec8b10233b467bd2d;hp=d7ff4b80ccf330b15e1c3508000cdb2f5e37a504;hpb=89194c974f0b8692e440317daace5ec8064a0b21;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index d7ff4b8..251d4ff 100644
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -1,5 +1,32 @@
+/*# ---------------------------------------------------------------------
+#
+# 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"
+
+#include "creaSystem.h"
 namespace bbcreaContours
 {
 
@@ -7,42 +34,45 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaContours,nDimensions)
 BBTK_BLACK_BOX_IMPLEMENTATION(nDimensions,bbtk::WxBlackBox);
 void nDimensions::Process()
 {
-
-	double **vectx, **vecty, **vectz;
+	double **vectx = 0, **vecty = 0, **vectz = 0;
 
 	std::vector< void * > vectortemp;
 	std::vector<int> size;
-	vtkImageData **mask, **value;
+	vtkImageData **mask = 0, **value = 0;
 
 	vtkImageData* img = bbGetInputIn();
 
 	std::vector<vtkImageData*> selectedimages;
-	if(img!=NULL && currentimg!=img){
-
+	if(img!=NULL && currentimg!=img)
+	{
 		wxContourMainFrame::getInstance()->ShowToolsPanel(true);
 		currentimg=img;
 		selectedimages.push_back(img);
 		wxContourMainFrame::getInstance()->setVectImages(selectedimages);
-	}
-
-
+	} // if img
 
-	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);
+	} // if currentimg
+
+    wxContourMainFrame::getInstance()->RefreshInterface();
+
+
+    bbSetOutputwxContourMainFrame( wxContourMainFrame::getInstance() );
+//	bbSetOutputX(vectx);
+//	bbSetOutputY(vecty);
+//	bbSetOutputZ(vectz);
+//	bbSetOutputSizeContour(size);
+//	bbSetOutputMask(*mask);
+//	bbSetOutputValue(*value);
 }
+
+//-----------------------------------------------------------------
 void nDimensions::CreateWidget(wxWindow* parent)
 {
-
 	//vtkImageData* img = bbGetInputIn();
 
 	std::vector<vtkImageData*> selectedimages;
@@ -53,27 +83,33 @@ void nDimensions::CreateWidget(wxWindow* parent)
 	//new wxContourMainFrame( frame1, wxID_ANY, _T(""), wxPoint(50,50), wxSize(800, 600),selectedimages );
 	//frame1->CreateStatusBar();
 	//bbSetOutputWidget( frame1 );
-std::string path=".";
+std::string datadir=".";
 #ifdef WIN32
-	char currentPath[_MAX_PATH];
-	HMODULE hand = GetModuleHandle("bbcreaContours");
-	GetModuleFileName(hand, currentPath, _MAX_PATH);
-
-	path = currentPath;
-
-	path = path.substr(0,path.find_last_of("\\"));
+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
-
-	wxPanel* panel = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages,wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,path );
+	
+	
+#ifdef LINUX /* assume this is OSX */
+	datadir=datadir+"/../share/creaContours";
+#endif // MACOSX	
+	
+#ifdef MACOSX /* assume this is OSX */
+	datadir=datadir+"/../../../../share/creaContours";
+#endif // MACOSX	
+	
+	
+//printf("EED nDimensions::CreateWidget path=%s\n",datadir.c_str() );
+
+	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);
-	//std::cout<<"creaContours = "<<panel<<std::endl;
-	bbSetOutputWidget( panel );
-
-
-
-
 
+//		bbSetOutputWidget( new wxPanel(parent,-1) );
+		bbSetOutputWidget( wxcontourmainframe	 );
 }
+
 //-----------------------------------------------------------------
 void nDimensions::bbUserSetDefaultValues()
 {
@@ -90,7 +126,5 @@ void nDimensions::bbUserInitializeProcessing()
 void nDimensions::bbUserFinalizeProcessing()
 {
 }
-}
-// EO namespace bbCreaContour
-
 
+}  // EO namespace bbCreaContour