From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Mon, 9 Feb 2009 16:28:54 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~70
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3a73ff10fa8904d7aad5df49b1481f58abf829e3;p=creaContours.git

*** empty log message ***
---

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 9543a5c..45815f4 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -253,7 +253,8 @@ JCP 17-10-2008*/
 	}   
 
 
-	wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application  -    Evaluation version, 28 Jan 2009 "), wxPoint(400,50), wxSize(800, 600) );
+	wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application  -    Evaluation version, 09 Feb 2009 "), wxPoint(400,50), wxSize(800, 600) );
+
 	//frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(_T("")), wxPoint(50,50), wxSize(800, 600), images ); 
 	frame = wxContourMainFrame::getInstance(frame1, wxID_ANY, wxString(_T("")), wxPoint(200,50), wxSize(800, 600), images );
 	frame1->CreateStatusBar();
diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
index b40caf4..cd697ef 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
@@ -211,8 +211,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 						aConcept->clearCheckAt( groupID );
 					}					
 				}
-			}		
-			
+			}			
 		}
 	}
 
diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
index 93e21d5..d741dc6 100644
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
@@ -13,7 +13,13 @@ KernelManagerContour::KernelManagerContour(){
 **/
 	inredo = 0;
 	inundo = 0;	
-	stundoredo = "data/temp";
+
+	time_t seconds;
+	seconds = time (NULL);
+	int time = seconds;
+
+
+	stundoredo = "data/temp"+intToString(time);
 	_currentIndex = 0;
 
 	_contourPropagation = NULL;
@@ -36,9 +42,15 @@ KernelManagerContour::KernelManagerContour(std::vector<vtkImageData*> images){
 **/
 	inredo = 0;
 	inundo = 0;	
-	stundoredo = "data/temp";
-	_currentIndex = 0;
 
+	time_t seconds;
+	seconds = time (NULL);
+	int time = seconds;
+
+
+	stundoredo = "data/temp"+intToString(time);
+	_currentIndex = 0;
+	
 	_contourPropagation = NULL;
 #if(WIN32)
 		mkdir(stundoredo.c_str());
diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
index 3987149..7e4d4dc 100644
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.h
@@ -12,6 +12,7 @@
 //#include "ContourThing.h"
 #include "OutlineModelManager.h"
 #include "OutlineModelBuilder.h"
+#include "time.h"
 
 #include "ContourPropagation.h"
 
diff --git a/lib/kernel_ManagerContour_NDimensions/OutlineModelBuilder.cxx b/lib/kernel_ManagerContour_NDimensions/OutlineModelBuilder.cxx
index 5c0c33c..a8c4366 100644
--- a/lib/kernel_ManagerContour_NDimensions/OutlineModelBuilder.cxx
+++ b/lib/kernel_ManagerContour_NDimensions/OutlineModelBuilder.cxx
@@ -90,6 +90,7 @@ OutlineModelBuilder ::  OutlineModelBuilder(std::string  theConceptsFile, std::s
 	{
 		if( !conceptsFile.empty() )
 			imageSourceEnv_Reader = new ReaderEnvironment<ImageSourceThing *> (conceptsFile, sourcesFile, sources);
+			//imageSourceEnv_Reader = new ReaderEnvironment<ImageSourceThing *> ("data/holaConceptsFile.cf", sourcesFile, sources);
 	}
 
 	/**