X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbCreaContournDimensions.cxx;h=378f0d43accc88b99b877cf1f3d9810fe1f3483c;hb=4d5574beaa0d2f56951b00a9fcca5dd945506e13;hp=0589e98c9cac1cdaabe4296b9e1c06a21e8d13d5;hpb=7e39ed1fa75cd57dfea770353f5286bdcee23c24;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 0589e98..378f0d4 100644
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -1,9 +1,9 @@
 #include "bbCreaContournDimensions.h"
-#include "bbCreaContourPackage.h"
-namespace bbCreaContour
+#include "bbcreaContoursPackage.h"
+namespace bbcreaContours
 {
 
-BBTK_ADD_BLACK_BOX_TO_PACKAGE(CreaContour,nDimensions)
+BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaContours,nDimensions)
 BBTK_BLACK_BOX_IMPLEMENTATION(nDimensions,bbtk::WxBlackBox);
 void nDimensions::Process()
 {
@@ -14,9 +14,9 @@ void nDimensions::Process()
 
 	if(bbGetInputGet()==1){
 		bbSetInputGet(0);
-		eventHandler->checkInformationPanel();
-		eventHandler->getValuesXYZ(vectx, vecty, vectz, &size);	
-		eventHandler->getMaskValue(mask, value);
+		//eventHandler->checkInformationPanel();
+		//eventHandler->getValuesXYZ(vectx, vecty, vectz, &size);	
+		//eventHandler->getMaskValue(mask, value);
 	}
 
     bbSetOutputX(vectx);
@@ -26,71 +26,20 @@ void nDimensions::Process()
 	bbSetOutputMask(mask);
 	bbSetOutputValue(value);
 }
-void nDimensions::CreateWidget()
+void nDimensions::CreateWidget(wxWindow* parent)
 {
-	std::string s = "data";
- 	
-	std::string conceptsFN			=  s + "/holaConceptsFile.cf";
-	std::string imageSourcesFN		= s + "/holaImagesInstantsFile.of";
-	std::string imageSectionsFN		= "";
-	std::string axeThingsFN			= "";
-
-	std::map<std::string, ImageSourceThing *> * sourcesMap		= new std::map<std::string, ImageSourceThing *>();
-	std::map<std::string, ImageSectionThing *>* sectionsMap		= new std::map<std::string, ImageSectionThing *>();
-	std::map<std::string, AxeThing *>* axesMap					= new std::map<std::string, AxeThing *>();
-	std::map<std::string, ContourThing *>* outlinesMap			= new std::map<std::string, ContourThing *>();	
-
+	
 	vtkImageData* img = bbGetInputIn();
-	if(img==NULL){
-		vtkMetaImageReader *reader = vtkMetaImageReader::New();
-		reader->SetFileName( "data/hola.mhd" );
-		reader->Update();
-		img = reader->GetOutput();
-	}
 
-	ImageSourceThing * thing									= new ImageSourceThing(img);
-	sourcesMap->insert(std::pair<std::string, ImageSourceThing *>( "Source Image 1", thing));
+	std::vector<vtkImageData*> selectedimages;
+	selectedimages.push_back(img);
 
-	OutlineModelBuilder * _builder								= new OutlineModelBuilder( conceptsFN, s );
-	_builder->buildImageSource_Envornment( imageSourcesFN, sourcesMap );
-	_builder->buildImageSection_Envornment( imageSectionsFN, sectionsMap );		
-	_builder->buildAxe_Envornment(axeThingsFN, axesMap );
-	_builder->buildCountour_Envornment( imageSectionsFN, outlinesMap );
-	
-	wxFrame* frame1 = new wxFrame(bbGetWxParent(), wxID_ANY, wxT("ROI Application  -    Evaluation version, 23 Oct 2008 "), wxPoint(50,50), wxSize(800, 600) );
-	frame = new wxContourMainFrame( frame1, wxID_ANY, _T(""), wxPoint(50,50), wxSize(800, 600) ); 
+	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();
 
-
-	wxAuiNotebook * parent = frame->createNotebook();
-
-	OutlineModelManager * modelManager   = new OutlineModelManager( _builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(),  _builder->getContourEnv() );
-
-        std::string xxx1("Instant Chooser");
-	wxInstantChooserPanel * instantPanel = new wxInstantChooserPanel( parent, 
-	  xxx1, 
-	  true );
-	//ImageSourceThing * imageSource       = modelManager->getImageSourceThingByKeyName( wxT("Source Image 1") );
-	std::string xxx2("Source Image 1");
-	ImageSourceThing * imageSource       = modelManager->getImageSourceThingByKeyName( xxx2);
 	
-	wxContourViewPanel * theViewPanel    = new wxContourViewPanel( imageSource->getSourceImage(), parent );	
-	
-	eventHandler = new wxContourEventHandler();
-	eventHandler->setModelManager( modelManager );
-	eventHandler->setViewPanel( theViewPanel );
-	eventHandler->setInstantChooserPanel( instantPanel );
-
-	bool successConfiuration = eventHandler->configureEventsHandling();
-
-	frame->setViewPanel( theViewPanel );
-	frame->setInstantChooserPanel( instantPanel );
-
-	successConfiuration &= frame->configurePanels( parent );
-
-
-	//interfMainPanel* pannew = interfMainPanel::getInstance(frame1, eventHandler, s+"/Icons");
-
    bbSetOutputWidget( frame1 ); 
 
     
@@ -102,7 +51,7 @@ void nDimensions::bbUserConstructor()
 	bbSetInputGet(0);
 
 }
-void nDimensions::bbUserCopyConstructor()
+void nDimensions::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 
 }