X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxDescriptorPanel.cpp;h=d50de1fecfaae7803d68b00bec5fd8540b633312;hb=11c1e921c0a4befcdb7fac9fe8e92fca297488f7;hp=35cb2f830520d92203a7ca26e0d8ea7ec10d4304;hpb=3e44acb4a0963c9fb97d135820048fda3cf9ebd9;p=creaImageIO.git

diff --git a/src2/creaImageIOWxDescriptorPanel.cpp b/src2/creaImageIOWxDescriptorPanel.cpp
index 35cb2f8..d50de1f 100644
--- a/src2/creaImageIOWxDescriptorPanel.cpp
+++ b/src2/creaImageIOWxDescriptorPanel.cpp
@@ -1,9 +1,15 @@
 #include "creaImageIOWxDescriptorPanel.h"
 #include <creaImageIOSystem.h>
+#if defined(USE_GDCM)
 #include <gdcmGlobal.h>
 #include <gdcmDictSet.h>
-#include <boost/algorithm/string.hpp>
+#endif
 
+#if defined(USE_GDCM2)
+#include <gdcmGlobal.h>
+#include <gdcmDicts.h>
+#include <gdcmDict.h>
+#endif
 #include <boost/algorithm/string.hpp>
 
 namespace creaImageIO
@@ -148,7 +154,7 @@ namespace creaImageIO
 			else
 			{
 				ResultCtrl->SetInsertionPoint(InsertPt);
-                                for (int i = 1; i<=lv;i++)
+                for (int i = 1; i<=lv;i++)
 				{ 
 				   ResultCtrl->WriteText(_T("   "));
 				}
@@ -243,7 +249,7 @@ namespace creaImageIO
 		  val.clear();
 		  val <<   std::dec << el ;
 		  val >> std::hex >> element;
-			
+#if defined(USE_GDCM)	
 		 // Retrieve the name from gdcm dict
 		  GDCM_NAME_SPACE::DictEntry* entry = GDCM_NAME_SPACE::Global::GetDicts()->GetDefaultPubDict()->GetEntry(group, element);
 		 // AttributeCombo->Clear();
@@ -257,6 +263,7 @@ namespace creaImageIO
 			  AttributeCombo->Delete(0);
 			  AttributeCombo->Insert(_T("Unknown Attribute"),0);
 		  }
+#endif
 			  AttributeCombo->SetSelection(0);
 		
 	  }
@@ -646,7 +653,7 @@ namespace creaImageIO
 		   std::map<int, std::string >::iterator it_lv_nb = lvlist.begin();
 		   std::map<int, std::string >::iterator it_lv = lvlist.begin();
 		   it_lv_nb++;
-		   for (;it_lv != lvlist.end(); it_lv++, it_lv_nb++)
+		   for (;it_lv != lvlist.end(); it_lv++)
 	       {
 			   outDscp +="<level>";
 	  	       outDscp += "\n";
@@ -658,6 +665,7 @@ namespace creaImageIO
 				   outDscp += it_lv_nb->second.c_str();
 				   outDscp += "s";
 				   outDscp += "\n";
+				   it_lv_nb++;
 			   }
 			   std::vector<std::string>::iterator it_branch = DscpTree[it_lv->second.c_str()].begin();	
 		      for(;it_branch != DscpTree[it_lv->second.c_str()].end(); it_branch++)
@@ -696,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;
@@ -758,11 +773,27 @@ namespace creaImageIO
 					compose +=  descriptors[1];
 					compose += "_";
 					compose +=  descriptors[2];
+#if defined(USE_GDCM)
 					GDCM_NAME_SPACE::DictEntry* entry = GDCM_NAME_SPACE::Global::GetDicts()->GetDefaultPubDict()->GetEntry(group, element);
 					if(ilevel>0)
 					{
 						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)
+				{
+					// commented line continue to next line
 				}
 				else // "O" means if user's own tag.
 				{