X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FOpenImageDialog.cxx;h=4a1038a684d43d68e2e8339f558e346dcda21f50;hb=d725af03e25b41e03b212c26068be2c04dacd270;hp=6b635e1388d06f958bc2485e69eead78f4ba6fc1;hpb=00a6c465c4e2fd1111dbb10cc0d70846fa03eeaa;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
index 6b635e1..4a1038a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
@@ -14,13 +14,13 @@ namespace creaMaracasVisuKernel{
 	OpenImageDialog::OpenImageDialog(bool usegimmick)
 	{
 		img = NULL;		
-		
+		_filename = "";
 		bool gimmickfound = false;
 
 		if(usegimmick){
 		#ifdef WIN32
 			HINSTANCE gimmickhandle;
-			gimmickhandle = LoadLibrary(TEXT("creaImageIO2.dll"));
+			gimmickhandle = LoadLibrary(TEXT("creaImageIO.dll"));
 			std::cout<<"imagehandle "<<gimmickhandle<<std::endl;
 			if(gimmickhandle!=NULL){
 
@@ -43,7 +43,7 @@ namespace creaMaracasVisuKernel{
 			GETIMAGEDATADIALOG getImageDataDialog;
 			char * erreur;
 			int closingerror;
-			gimmickhandle = dlopen ("libcreaImageIO2.so", RTLD_LAZY);			
+			gimmickhandle = dlopen ("libcreaImageIO.so", RTLD_LAZY);			
 			if (! gimmickhandle) {
 				erreur = dlerror ();
 				std::cout<<erreur<<"imagehandle "<<gimmickhandle<<std::endl;		    
@@ -82,6 +82,7 @@ namespace creaMaracasVisuKernel{
 				vtkMetaImageReader* reader =  vtkMetaImageReader::New();
 				reader->SetFileName(path.c_str());
 				reader->Update();
+				_filename = path;
 				img = vtkImageData::New();
 				img->DeepCopy(reader->GetOutput());
 				//reader->GetOutput()->Delete();
@@ -105,7 +106,7 @@ namespace creaMaracasVisuKernel{
 					}
 				}*/
 				
-				std::cout<<"image reference count "<<img->GetReferenceCount()<<std::endl;
+				/*std::cout<<"image reference count "<<img->GetReferenceCount()<<std::endl;*/
 			}
 			//delete FD;
 		}
@@ -120,4 +121,7 @@ namespace creaMaracasVisuKernel{
 	vtkImageData* OpenImageDialog::getImageData(){		
 		return img;
 	}
+	std::string OpenImageDialog::getFilename(){
+		return _filename;
+	}
 }