X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbCreaContournDimensions.cxx;h=89164e52d06c37c73940e50c3fe0dbd3826e579b;hb=refs%2Ftags%2FCreatools2-0-3.creaContour1-2-3.17Feb2011;hp=378f0d43accc88b99b877cf1f3d9810fe1f3483c;hpb=e785187cf74e53b8bb771614da6bc763448ceb80;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 378f0d4..89164e5 100644
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -1,5 +1,7 @@
 #include "bbCreaContournDimensions.h"
 #include "bbcreaContoursPackage.h"
+
+#include "creaSystem.h"
 namespace bbcreaContours
 {
 
@@ -7,59 +9,93 @@ 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();
 
-	if(bbGetInputGet()==1){
-		bbSetInputGet(0);
-		//eventHandler->checkInformationPanel();
-		//eventHandler->getValuesXYZ(vectx, vecty, vectz, &size);	
-		//eventHandler->getMaskValue(mask, value);
+	std::vector<vtkImageData*> selectedimages;
+	if(img!=NULL && currentimg!=img){
+
+		printf("EED nDimensions::Process 02\n");	
+		wxContourMainFrame::getInstance()->ShowToolsPanel(true);
+		currentimg=img;
+		selectedimages.push_back(img);
+		wxContourMainFrame::getInstance()->setVectImages(selectedimages);
+		printf("EED nDimensions::Process 03\n");	
 	}
 
-    bbSetOutputX(vectx);
+	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);
+	bbSetOutputMask(*mask);
+	bbSetOutputValue(*value);
 }
+
+//-----------------------------------------------------------------
 void nDimensions::CreateWidget(wxWindow* parent)
 {
-	
-	vtkImageData* img = bbGetInputIn();
+	//vtkImageData* img = bbGetInputIn();
 
 	std::vector<vtkImageData*> selectedimages;
-	selectedimages.push_back(img);
-
-	wxFrame* frame1 = new wxFrame(parent, wxID_ANY, wxT("ROI Application  -    Evaluation version, 23 Oct 2008 "), wxPoint(400,50), wxSize(800, 600) );
-	frame = wxContourMainFrame::getInstance(frame1, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages );
-	//new wxContourMainFrame( frame1, wxID_ANY, _T(""), wxPoint(50,50), wxSize(800, 600),selectedimages ); 
-	frame1->CreateStatusBar();
+	//selectedimages.push_back(img);
 
+	//wxFrame* frame1 = new wxFrame(parent, wxID_ANY, wxT("ROI Application  -    Evaluation version, 23 Oct 2008 "), wxPoint(400,50), wxSize(800, 600) );
+	//frame = wxContourMainFrame::getInstance(frame1, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages );
+	//new wxContourMainFrame( frame1, wxID_ANY, _T(""), wxPoint(50,50), wxSize(800, 600),selectedimages );
+	//frame1->CreateStatusBar();
+	//bbSetOutputWidget( frame1 );
+std::string datadir=".";
+#ifdef WIN32
+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
+	
 	
-   bbSetOutputWidget( frame1 ); 
+#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() );
 
-    
-  
+	wxPanel* panel = 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) );
 }
-void nDimensions::bbUserConstructor()
-{
-
-	bbSetInputGet(0);
 
-}
-void nDimensions::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
+//-----------------------------------------------------------------
+void nDimensions::bbUserSetDefaultValues()
 {
-
+	bbSetInputContourType(0);
+	bbSetInputIn(NULL);
 }
-void nDimensions::bbUserDestructor()
-{
 
+//-----------------------------------------------------------------
+void nDimensions::bbUserInitializeProcessing()
+{
 }
-}
-// EO namespace bbCreaContour
 
+//-----------------------------------------------------------------
+void nDimensions::bbUserFinalizeProcessing()
+{
+}
 
+}  // EO namespace bbCreaContour