X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.cxx;h=2c37a7f5ec068f3181376cc97f5c5a4da3cbcab7;hb=393af49c04fb77e019068f0f184b3b65e894f2a3;hp=96049d3b7e13c9ab38fd81a58e69d32632d02525;hpb=31aee9621a75c61c4455a261a8080dd5a162f802;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 96049d3..2c37a7f 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -60,6 +60,7 @@ char wxContourMainFrame::COPY = 'C';
 		//: wxWindow(parent, id, pos, size, style)
 		: wxPanel(parent, id, pos, size, style)
 	{
+printf("EED wxContourMainFrame :: wxContourMainFrame Start 1\n");
 		m_mgr.SetManagedWindow(this);
 		_contourGroup				= 1;
 		_creatingContoursActive		= false;
@@ -70,13 +71,13 @@ char wxContourMainFrame::COPY = 'C';
 //		_gridPanel					= NULL;
 //		_drawToolsPanel				= NULL;
 //		_operationsToolsPanel		= NULL;
-		//_autoFormsPanel				= NULL;
+		//_autoFormsPanel			= NULL;
 //		_standardToolsPanel			= NULL;
 //		_editionToolsPanel			= NULL;
 //		_listViewPanel				= NULL;
 //		_sceneManager				= NULL;
-		//_actualInstant				= NULL;
-		_numberOfVariablesStatistics = 6+1;
+		//_actualInstant			= NULL;
+		_numberOfVariablesStatistics= 6+1;
 
 		_refLineControl				= NULL;
 		_refLineModel				= NULL;
@@ -92,13 +93,15 @@ char wxContourMainFrame::COPY = 'C';
 		_viewMaskImage				= NULL;
 		_viewMaskImagePanel			= NULL;
 		_viewThresholdImage			= NULL;
-		_viewThresholdImagePanel		= NULL;
-		_viewColorLayerImagePanel		= NULL;
+		_viewThresholdImagePanel	= NULL;
+		_viewColorLayerImagePanel	= NULL;
+printf("EED wxContourMainFrame :: wxContourMainFrame End 1\n");
 	}
 
 	wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir)
 		: wxPanel(parent, id, pos, size, style)
 	{
+printf("EED wxContourMainFrame :: wxContourMainFrame Start 2\n");
 		m_mgr.SetManagedWindow(this);
 		_contourGroup				= 1;
 		_creatingContoursActive		= false;
@@ -112,70 +115,66 @@ char wxContourMainFrame::COPY = 'C';
 		_viewMaskImage				= NULL;
 		_viewMaskImagePanel			= NULL;
 		_viewThresholdImage			= NULL;
-		_viewThresholdImagePanel		= NULL;
-		_viewColorLayerImagePanel		= NULL;
-
+		_viewThresholdImagePanel	= NULL;
+		_viewColorLayerImagePanel	= NULL;
+printf("EED wxContourMainFrame :: wxContourMainFrame A\n");
 		// set up default notebook style
-		m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
-		m_notebook_theme = 0;
+		m_notebook_style 			= wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
+		m_notebook_theme 			= 0;
 		//wxContour_ActionCommandsID a;
-		_numberOfVariablesStatistics = 7;
-
-		_datadir = datadir;
-
-
-		inredo = 0;
-		inundo = 0;
-
+		_numberOfVariablesStatistics= 7;
+		_datadir 					= datadir;
+		inredo 						= 0;
+		inundo 						= 0;
+printf("EED wxContourMainFrame :: wxContourMainFrame B\n");
 		_pannew = interfMainPanel::getInstance(this,datadir+"/data/Icons");//, eventHandler);
-		_performingOperation = new PerformingOperation();
-
+printf("EED wxContourMainFrame :: wxContourMainFrame C\n");
+		_performingOperation 		= new PerformingOperation();
+printf("EED wxContourMainFrame :: wxContourMainFrame C.1\n");
 		if(images.size() > 0)
 		{
+printf("EED wxContourMainFrame :: wxContourMainFrame C.2\n");
 			this->setVectImages(images);
+printf("EED wxContourMainFrame :: wxContourMainFrame C.3\n");
 		}
-
 		_contourextractdata			= NULL;
+printf("EED wxContourMainFrame :: wxContourMainFrame End 2\n");
 }
 
 void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
 {
-
+printf("EED wxContourMainFrame::setVectImages Start\n");
 	_images = imgs;
-
 	#if defined(__GNUC__)
 		std::string str_home(getenv("HOME"));
 	#elif defined(_WIN32)
-			std::string str_home(getenv("USERPROFILE"));
+		std::string str_home(getenv("USERPROFILE"));
 	#endif
-		std::string strCreaContourDataTmp = str_home + "/.creaContourDataTemp/";
-
+	std::string strCreaContourDataTmp = str_home + "/.creaContourDataTemp/";
 	std::vector<std::string> conceptNameVect;
 	std::vector<int> conceptSizeVect;
-
+printf("EED wxContourMainFrame::setVectImages Start  01\n");
 	notebook = this->createNotebook();
-
-
-	kernelManager = new KernelManagerContour( imgs , _datadir+"/data/" , strCreaContourDataTmp );
-
-
-	_instantPanel				= new wxInstantChooserPanel( notebook, "Instant Chooser", true, false, "c" );
-	_theViewPanel				= new wxContourViewPanel( kernelManager->getSourceImage(), notebook );
-
+printf("EED wxContourMainFrame::setVectImages Start  02\n");
+	kernelManager 	= new KernelManagerContour( imgs , _datadir+"/data/" , strCreaContourDataTmp );
+printf("EED wxContourMainFrame::setVectImages Start  03\n");
+	_instantPanel	= new wxInstantChooserPanel( notebook, "Instant Chooser", true, false, "c" );
+printf("EED wxContourMainFrame::setVectImages Start  04\n");
+	_theViewPanel	= new wxContourViewPanel( kernelManager->getSourceImage(), notebook );
+printf("EED wxContourMainFrame::setVectImages Start   05\n");
 //-------------------------------------------------------------
 	kernelManager->getConceptsInformation(conceptNameVect, conceptSizeVect);
+printf("EED wxContourMainFrame::setVectImages 1\n");
 	_instantPanel->addConcepts(conceptNameVect, conceptSizeVect);
-
-
+printf("EED wxContourMainFrame::setVectImages 2\n");
 	double val = _theViewPanel->getCurrentDeep();
 	_instantPanel->setConceptValue( "Axe Depth", (int)val );
 	//JCP _instantPanel->setConceptValue("time", num de imagenes);
 	ConceptDataWrap * data = _instantPanel->getConceptDataOf( "Axe Depth" );
 	//*******************changeInstant();
 	_theViewPanel->setVerticalConcept( "Axe Depth", data->getMinValue(), data->getMaxValue(), data->getMinShowedValue(),  data->getMaxShowedValue(), data->getActualValue() );
-
 	this->configurePanels( );
-
+printf("EED wxContourMainFrame::setVectImages End\n");
 }