From 11c1e921c0a4befcdb7fac9fe8e92fca297488f7 Mon Sep 17 00:00:00 2001
From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Fri, 12 Mar 2010 13:39:09 +0000
Subject: [PATCH] correctios to use gdcm2

---
 src2/CMakeLists.txt                         |  2 +-
 src2/creaImageIODicomImageReader2.cpp       |  2 +-
 src2/creaImageIOGimmick.cpp                 |  2 +-
 src2/creaImageIOTreeAttributeDescriptor.cpp | 11 ++++----
 src2/creaImageIOWxDescriptorPanel.cpp       | 29 ++++++++++++++++++---
 src2/creaImageIOWxGimmickReaderDialog.cpp   |  6 ++++-
 src2/creaImageIOWxGimmickReaderDialog.h     |  2 ++
 7 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 33cbbe1..b68fae5 100644
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -208,7 +208,7 @@ IF (WIN32)
 	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/bin/Shared/gimmick)
 ELSE (WIN32)
 	SET(INPUT_DATA_DIR ${PROJECT_SOURCE_DIR}/src2/data)
-	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/Shared/gimmick)
+	SET(OUTPUT_DATA_DIR ${PROJECT_BINARY_DIR}/share/gimmick)
 ENDIF (WIN32)
 CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
 
diff --git a/src2/creaImageIODicomImageReader2.cpp b/src2/creaImageIODicomImageReader2.cpp
index 75f5f40..8c141c6 100644
--- a/src2/creaImageIODicomImageReader2.cpp
+++ b/src2/creaImageIODicomImageReader2.cpp
@@ -130,7 +130,7 @@ namespace creaImageIO
 		if ( ( gr!=0 ) && ( el!=0 ) )
 		  {
 			   gdcm::DataElement de( gdcm::Tag(gr,el) );
-			   std::string val = GetStringValueFromTag(reader.GetFile().GetHeader().GetDataElement(gdcm::Tag(gr,el)));
+			   std::string val = GetStringValueFromTag(reader.GetFile().GetDataSet().GetDataElement(gdcm::Tag(gr,el)));
 		    i->second = irclean(val);
 		  }
 	      }
diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 44047ae..b72b477 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -276,7 +276,7 @@ namespace creaImageIO
 // The following stuff works on Linux, NOT CHECKED on Windows // JPR
 		
 #if defined(_WIN32)		
-		path+="/bin/share/gimmick/";
+		path+="/bin/Shared/gimmick/";
 #endif
 
 #if defined (LINUX)
diff --git a/src2/creaImageIOTreeAttributeDescriptor.cpp b/src2/creaImageIOTreeAttributeDescriptor.cpp
index 3d3ffb1..3e09a4f 100644
--- a/src2/creaImageIOTreeAttributeDescriptor.cpp
+++ b/src2/creaImageIOTreeAttributeDescriptor.cpp
@@ -102,8 +102,10 @@ namespace creaImageIO
 	  
 #if defined(USE_GDCM2)
       // Retrieve the name from gdcm dict
-	  gdcm::Dicts dicts;
-	  gdcm::DictEntry dictentry =  dicts.GetDictEntry(gdcm::Tag(mGroup, mElement));
+	const gdcm::Global& g = gdcm::Global::GetInstance(); 
+	 const gdcm::Dicts &dicts = g.GetDicts();
+  const gdcm::Dict &dict = dicts.GetPublicDict();
+	  gdcm::DictEntry dictentry =  dict.GetDictEntry(gdcm::Tag(mGroup, mElement));
 	  
       mName = dictentry.GetName();
 	  if(!mName.empty())
@@ -166,10 +168,9 @@ namespace creaImageIO
 		}
 #endif
 #if defined(USE_GDCM2)
-	 const gdcm::Global& g = gdcm::Global::GetInstance(); // sum of all knowledge !
+	 const gdcm::Global& g = gdcm::Global::GetInstance(); 
 	 const gdcm::Dicts &dicts = g.GetDicts();
-  const gdcm::Dict &dict = dicts.GetPublicDict(); // Part 6
-
+  const gdcm::Dict &dict = dicts.GetPublicDict();
 	  if(mGroup != 0 && mElement != 0)
 	  {
 		  gdcm::DictEntry dictentry =  dict.GetDictEntry(gdcm::Tag(GetGroup(), GetElement()));
diff --git a/src2/creaImageIOWxDescriptorPanel.cpp b/src2/creaImageIOWxDescriptorPanel.cpp
index 3b0f78e..d50de1f 100644
--- a/src2/creaImageIOWxDescriptorPanel.cpp
+++ b/src2/creaImageIOWxDescriptorPanel.cpp
@@ -4,8 +4,12 @@
 #include <gdcmGlobal.h>
 #include <gdcmDictSet.h>
 #endif
-#include <boost/algorithm/string.hpp>
 
+#if defined(USE_GDCM2)
+#include <gdcmGlobal.h>
+#include <gdcmDicts.h>
+#include <gdcmDict.h>
+#endif
 #include <boost/algorithm/string.hpp>
 
 namespace creaImageIO
@@ -700,9 +704,16 @@ namespace creaImageIO
    {
 	   std::ifstream i_file(i_name.c_str());
 	   std::stringstream buffer;
-		buffer << i_file.rdbuf();
-	   	std::string line;
-		std::string level;
+	   buffer << i_file.rdbuf();
+	   std::string line;
+	   std::string level;
+
+#if defined(USE_GDCM2)
+	   const gdcm::Global& g = gdcm::Global::GetInstance(); // sum of all knowledge !
+	   const gdcm::Dicts &dicts = g.GetDicts();
+	   const gdcm::Dict &dict = dicts.GetPublicDict(); // Part 6
+#endif
+	  
 
 		bool bname;
 		int ilevel = -1;
@@ -768,6 +779,16 @@ namespace creaImageIO
 					{
 						onAddAttribute( entry->GetName(),compose, level);
 					}
+#endif
+
+#if defined(USE_GDCM2)
+					gdcm::DictEntry dictentry =  dict.GetDictEntry(gdcm::Tag(group, element));
+					if(ilevel>0)
+					{
+						onAddAttribute( dictentry.GetName(),compose, level);
+					}
+	
+
 #endif
 				}
 				else if(descriptors[0].find("#") != -1)
diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index 4823d40..e2362d9 100644
--- a/src2/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src2/creaImageIOWxGimmickReaderDialog.cpp
@@ -90,9 +90,13 @@ namespace creaImageIO
       {
 		mGimmick->Finalize();
       }
-
+   deleteMessage();
   }
 
+void   	WxGimmickReaderDialog::deleteMessage()
+	{
+		deleteGimmickDebugMessage();
+	};
   ///Callback method on a selection
   void WxGimmickReaderDialog::OnValid(bool t)
   {
diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h
index 94b29b2..bac2c14 100644
--- a/src2/creaImageIOWxGimmickReaderDialog.h
+++ b/src2/creaImageIOWxGimmickReaderDialog.h
@@ -4,6 +4,7 @@
 #ifdef USE_WXWIDGETS
 
 #include <creaImageIOWxGimmickView.h>
+#include "creaImageIOSystem.h"
 #include <creaWx.h>
 #include "wx/wx.h"
 namespace creaImageIO
@@ -54,6 +55,7 @@ namespace creaImageIO
     void OnMenuTest(wxCommandEvent& event);
     void OnValid(bool valid);
     void OnExit(){ mView->StopPlayer(); }
+	void deleteMessage();
     // void OnButtonOk(wxCommandEvent& event);
     // void OnButtonCancel(wxCommandEvent& event);
 
-- 
2.45.1