X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbCreaContournDimensions.cxx;h=dde333b68011e0c931ca2f1a2a810574761fb5d2;hb=60b52441cfaace2c530f9d46ce959b84162e674e;hp=af72d5c6468b30490ca10177c36d40ac9dabbb5f;hpb=28ef036731a2758d1c2efcf4de582d063b4129ec;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index af72d5c..dde333b 100644
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -1,22 +1,36 @@
 #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()
 {
  
 	double **vectx, **vecty, **vectz;
+
+	std::vector< void * > vectortemp;
 	std::vector<int> size;
 	vtkImageData *mask, *value;
 
-	if(bbGetInputGet()==1){
-		bbSetInputGet(0);
-		eventHandler->checkInformationPanel();
-		eventHandler->getValuesXYZ(vectx, vecty, vectz, &size);	
-		eventHandler->getMaskValue(mask, value);
+	vtkImageData* img = bbGetInputIn();
+
+	std::vector<vtkImageData*> selectedimages;
+	if(img!=NULL && currentimg!=img){
+
+		wxContourMainFrame::getInstance()->ShowToolsPanel(true);
+		currentimg=img;
+		selectedimages.push_back(img);
+		wxContourMainFrame::getInstance()->setVectImages(selectedimages);
+	}
+
+
+
+	if(currentimg != NULL){
+		int contourtype = bbGetInputContourType();		
+		//wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
+		wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);		
 	}
 
     bbSetOutputX(vectx);
@@ -26,89 +40,55 @@ 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));
-
-	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) ); 
-	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 );	
+	//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();
+	//bbSetOutputWidget( frame1 ); 
+std::string path="";
+#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("\\"));
+#endif
+
+	wxPanel* panel = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages,wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,path );
+	wxContourMainFrame::getInstance()->ShowToolsPanel(false);
+	//std::cout<<"creaContours = "<<panel<<std::endl;
+	bbSetOutputWidget( panel ); 
 	
-	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( frame ); 
+   
 
     
   
 }
-void nDimensions::bbUserConstructor()
+//-----------------------------------------------------------------	
+void nDimensions::bbUserSetDefaultValues()
 {
-
-	bbSetInputGet(0);
-
+	bbSetInputContourType(0);
+	bbSetInputIn(NULL);   
 }
-void nDimensions::bbUserCopyConstructor()
-{
 
-}
-void nDimensions::bbUserDestructor()
+//-----------------------------------------------------------------	
+void nDimensions::bbUserInitializeProcessing()
 {
+}
 
+//-----------------------------------------------------------------	
+void nDimensions::bbUserFinalizeProcessing()
+{
 }
 }
 // EO namespace bbCreaContour