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=5380f9e66daf440f27f33bb060e5ae1a646612cd;hp=f80bc74d6682c1b9af3630d478746123a8e43ff9;hpb=641bab7ee015a554fa99e678d713d66273756557;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
index f80bc74..4a1038a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
@@ -1,64 +1,127 @@
 
 #include "OpenImageDialog.h"
+#include "creaWx.h"
+
+#if defined(__GNUC__)
+// GCC compiler
+// dlopen, dlsym, etc.
+  #include <dlfcn.h>
+#endif
 
 typedef vtkImageData* (*GETIMAGEDATADIALOG)();
 
 namespace creaMaracasVisuKernel{
-	OpenImageDialog::OpenImageDialog()
+	OpenImageDialog::OpenImageDialog(bool usegimmick)
 	{
-
-
-		img = NULL;
-		bool gimmicknotfound = true;
-		
-	#ifdef WIN32
-		HINSTANCE gimmickhandle; 
-		gimmickhandle = LoadLibrary(TEXT("creaImageIO2.dll")); 	
-		std::cout<<"imagehandle "<<gimmickhandle<<std::endl;
-		if(gimmickhandle!=NULL){	
-
-			
+		img = NULL;		
+		_filename = "";
+		bool gimmickfound = false;
+
+		if(usegimmick){
+		#ifdef WIN32
+			HINSTANCE gimmickhandle;
+			gimmickhandle = LoadLibrary(TEXT("creaImageIO.dll"));
+			std::cout<<"imagehandle "<<gimmickhandle<<std::endl;
+			if(gimmickhandle!=NULL){
+
+				GETIMAGEDATADIALOG getImageDataDialog;
+
+				getImageDataDialog = (GETIMAGEDATADIALOG)GetProcAddress(gimmickhandle, "getImageDataDialog");
+
+				std::cout<<"imagedatadialog "<<getImageDataDialog<<std::endl;
+
+				if(getImageDataDialog!=NULL){
+					img = getImageDataDialog();
+					gimmickfound = true;
+				}
+				if(!FreeLibrary(gimmickhandle)){
+					std::cout<<"Error while releasing the handle creaImageIO2.dll"<<std::endl;
+				}
+			}
+		#else
+			void * gimmickhandle;	
 			GETIMAGEDATADIALOG getImageDataDialog;
-
-			getImageDataDialog = (GETIMAGEDATADIALOG)GetProcAddress(gimmickhandle, "getImageDataDialog");
-
-			
-			std::cout<<"imagedatadialog "<<getImageDataDialog<<std::endl;
-
-			if(getImageDataDialog!=NULL){
-				img = getImageDataDialog();
-				gimmicknotfound = false;
+			char * erreur;
+			int closingerror;
+			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;			
+				}else{
+					img = (*getImageDataDialog)();
+					gimmickfound = true;
+					
+				}
+				/*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;  
+				}
 			}
-		}	
-
-	#endif
 
-		if(gimmicknotfound){
-
-			wxFileDialog* FD = 
+		#endif
+		}
+		
+		if(!gimmickfound || !usegimmick){
+			//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"));
-			
+
 			if (FD->ShowModal()==wxID_OK)
 			{
-				std::string  path= FD->GetPath();
-
-				vtkMetaImageReader *reader =  vtkMetaImageReader::New();	
-				reader->SetFileName(path.c_str());		
-				img = reader->GetOutput();		
-			}		
-		}	
-
-
-		
+				std::string  path= crea::wx2std(FD->GetPath());
+				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();
+				/*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->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++){
+							
+								ptr1=(unsigned short*) reader->GetOutput()->GetScalarPointer(i,j,k); 
+								ptr2=(unsigned short*)img->GetScalarPointer(i,j,k);
+								*ptr2 = *ptr1;
+						}
+					}
+				}*/
+				
+				/*std::cout<<"image reference count "<<img->GetReferenceCount()<<std::endl;*/
+			}
+			//delete FD;
+		}
 	}
 
 	//-------------------------------------------------------------------
 	OpenImageDialog::~OpenImageDialog()
 	{
+		img = NULL;
 	}
 
-	vtkImageData* OpenImageDialog::getImageData(){
+	vtkImageData* OpenImageDialog::getImageData(){		
 		return img;
 	}
+	std::string OpenImageDialog::getFilename(){
+		return _filename;
+	}
 }
-