From: donadio <donadio>
Date: Wed, 3 Jun 2009 12:06:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~22
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8c7f886b29c0f0415cdce826804f9aec7dfbc6de;p=creaContours.git

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

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 0c84335..32b8083 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -99,13 +99,13 @@ char wxContourMainFrame::COPY = 'C';
 
 		if(images.size() > 0)
 		{
-			_images = images;
-			this->setVectImages();
+			_images = imgs;
+			this->setVectImages(imgs);
 		}
 
 }
 
-void wxContourMainFrame::setVectImages( )
+void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
 {
 
 	#if defined(__GNUC__)
@@ -121,7 +121,7 @@ void wxContourMainFrame::setVectImages( )
 	notebook = this->createNotebook();		
 
 
-	kernelManager = new KernelManagerContour( _images , _datadir+"/data/" , strCreaContourDataTmp );
+	kernelManager = new KernelManagerContour( imgs , _datadir+"/data/" , strCreaContourDataTmp );
 
 
 	_instantPanel				= new wxInstantChooserPanel( notebook, "Instant Chooser", true, false, "c" );
@@ -784,12 +784,14 @@ void wxContourMainFrame::onLoad(){
 		fscanf(pFile,"%s",tmp); // Version
 		fscanf(pFile,"%s",tmp); // 1.0.1 || 1.0.0
 		std::string version(tmp);
-
+		
+		//AD:02-06-09
 		if (version=="1.0.1")
 		{
 			openContours(pFile,false);
 		}
-
+		
+		//AD:02-06-09
 		else if (version=="1.0.0")
 		{
 			openContours(pFile,true);
diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index ebb1715..d70c1eb 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -134,7 +134,7 @@ class wxContourMainFrame : public wxPanel {
 	// Creational and initialization methods
 	//------------------------------------------------------------------------------------------------------------
 
-	void setVectImages( );
+	void setVectImages(std::vector<vtkImageData*> imgs);
 
 	bool configurePanels( );