]> Creatis software - creaImageIO.git/commitdiff
fix DescriptorPanel
authorFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Mon, 16 Nov 2009 10:24:12 +0000 (10:24 +0000)
committerFrederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Mon, 16 Nov 2009 10:24:12 +0000 (10:24 +0000)
src2/creaImageIOWxDescriptorPanel.cpp

index 35cb2f830520d92203a7ca26e0d8ea7ec10d4304..d192534b96c80c305b25d27a3b5d7f78a29c72d3 100644 (file)
@@ -148,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("   "));
                                }
@@ -646,7 +646,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 +658,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++)
@@ -764,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],"_"," ");