X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxDescriptorPanel.cpp;h=d192534b96c80c305b25d27a3b5d7f78a29c72d3;hb=8392c8e1b57464fe92e6280b88f69cabfbac58cf;hp=266eabe55dd6e2acea6e375620d590e54d7cdf11;hpb=76f7c62a930e60f9a569ede29b9546a179875d2c;p=creaImageIO.git diff --git a/src2/creaImageIOWxDescriptorPanel.cpp b/src2/creaImageIOWxDescriptorPanel.cpp index 266eabe..d192534 100644 --- a/src2/creaImageIOWxDescriptorPanel.cpp +++ b/src2/creaImageIOWxDescriptorPanel.cpp @@ -2,6 +2,9 @@ #include #include #include +#include + +#include namespace creaImageIO { @@ -145,7 +148,7 @@ namespace creaImageIO else { ResultCtrl->SetInsertionPoint(InsertPt); - for (int i = 1; i<=lv;i++) + for (int i = 1; i<=lv;i++) { ResultCtrl->WriteText(_T(" ")); } @@ -643,7 +646,7 @@ namespace creaImageIO std::map::iterator it_lv_nb = lvlist.begin(); std::map::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 +=""; outDscp += "\n"; @@ -655,6 +658,7 @@ namespace creaImageIO outDscp += it_lv_nb->second.c_str(); outDscp += "s"; outDscp += "\n"; + it_lv_nb++; } std::vector::iterator it_branch = DscpTree[it_lv->second.c_str()].begin(); for(;it_branch != DscpTree[it_lv->second.c_str()].end(); it_branch++) @@ -761,6 +765,10 @@ namespace creaImageIO onAddAttribute( entry->GetName(),compose, level); } } + else if(descriptors[0].find("#") != -1) + { + // commented line continue to next line + } else // "O" means if user's own tag. { boost::algorithm::replace_all(descriptors[2],"_"," ");