X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FOpenImageDialog.cxx;h=3c0f1d58393fd219a5c7aace864e2722fd9bc7fe;hb=f9901e756bb82bd333310b47607875331616bb29;hp=354c473c91fe6c538d7ec661432193ab9d6f37ae;hpb=acfa60fa044ebc12067c4daba555d18c7d66b2d5;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
index 354c473..3c0f1d5 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 #include "OpenImageDialog.h"
 #include "creaWx.h"
@@ -14,13 +39,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,34 +68,36 @@ 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;		    
 			}else{
 				getImageDataDialog = (GETIMAGEDATADIALOG) dlsym (gimmickhandle, "getImageDataDialog");
-				if(!getImageDataDialog){
-				erreur = dlerror ();
-				std::cout<<erreur<<"getImageDataDialog "<<getImageDataDialog<<std::endl;			
+				if(!getImageDataDialog)
+				{
+					erreur = dlerror ();
+					std::cout<<erreur<<"getImageDataDialog "<<getImageDataDialog<<std::endl;			
 				}else{
 					img = (*getImageDataDialog)();
 					gimmickfound = true;
 					
-				}
+				} // if getImageDataDialog
 				/*dlclose returns 0 on success, non-zero on error*/
 				closingerror = dlclose(gimmickhandle);
 				if(closingerror!=0){
 					std::cout<<closingerror<<"error closing handle  "<<gimmickhandle<<std::endl;  
 				}else{
 					std::cout<<"handle released..."<<std::endl;  
-				}
-			}
+				} // if closingerror
+			} // if gimmickhandle
 
 		#endif
 		}
 		
 		if(!gimmickfound || !usegimmick){
-			//int i, j, k, *extint;
+			//int i, j, k, extint[6];
+			//double spacing[3];
 			//unsigned short* ptr1, *ptr2;
 			wxFileDialog* FD =
 			  new wxFileDialog( 0, _T("Read Image"),wxEmptyString,wxEmptyString, _T("*.mhd"));
@@ -81,15 +108,19 @@ 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();
 				reader->Delete();
-				/*img->SetSpacing(reader->GetOutput()->GetSpacing());
-				extint = reader->GetOutput()->GetExtent();
+				/*std::cout<<"image reference count "<<img->GetReferenceCount()<<std::endl;
+				reader->GetOutput()->GetSpacing(spacing);
+				img->SetSpacing(spacing);
+				reader->GetOutput()->GetExtent(extint);
 				img->SetExtent(extint);
-				img->SetScalarType(reader->GetOutput()->GetScalarType());
-				img->SetDimensions(reader->GetOutput()->GetDimensions());
+				img->SetScalarType(reader->GetOutput()->GetScalarType());				
 				img->AllocateScalars();
+				std::cout<<"image reference count "<<img->GetReferenceCount()<<std::endl;
 				for (i=extint[0];i <= extint[1];i++){
 					for (j=extint[2];j<=extint[3];j++){
 						for (k=extint[4];k<=extint[5];k++){
@@ -99,7 +130,9 @@ namespace creaMaracasVisuKernel{
 								*ptr2 = *ptr1;
 						}
 					}
-				}*/				
+				}*/
+				
+				/*std::cout<<"image reference count "<<img->GetReferenceCount()<<std::endl;*/
 			}
 			//delete FD;
 		}
@@ -108,10 +141,13 @@ namespace creaMaracasVisuKernel{
 	//-------------------------------------------------------------------
 	OpenImageDialog::~OpenImageDialog()
 	{
-		img = NULL;		
+		img = NULL;
 	}
 
 	vtkImageData* OpenImageDialog::getImageData(){		
 		return img;
 	}
+	std::string OpenImageDialog::getFilename(){
+		return _filename;
+	}
 }