*** empty log message ***

[creaImageIO.git] / src2 / creaImageIOWxTreeView.cpp

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index c196659863950190bbb9ac0d2a1123333ca3d8be..b583a7c0775f48d08515030467e4b3efb97ea8ce 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -259,10 +259,14 @@ namespace creaImageIO
   //=====================================================================
   const std::vector<tree::Node*>& WxTreeView::GetSelected(int level)
   {
+         std::vector<tree::Node*>& sel = mLevelList[0].Selected;
     //  if (GetSelectedUpToDate(level)) 
     int l = level - 1;
     // the selection of upper level
-       std::vector<tree::Node*>& sel(mLevelList[l].Selected);
+       if(mLevelList.size() == level -1)
+                sel = mLevelList.back().Selected;
+       else
+                 sel=  mLevelList[l].Selected;
        if (sel.size() > 0)
        {
                sel.clear();
@@ -376,9 +380,9 @@ namespace creaImageIO
                          {
                            needRefresh=true;
                          }
-                         tree::Node* n= (tree::Node*)(*i);
+                         //tree::Node* n = new (tree::Node*)(*i);
                          GetTreeHandler()->LoadChildren((*i),4);
-                         GetGimmickView()->AddIgnoreFile(n);
+                         GetGimmickView()->AddIgnoreFile(*i);
                          GetTreeHandler()->Remove(*i);
                      }
                    
@@ -530,14 +534,15 @@ namespace creaImageIO
                  }
                else
                  {
-                   
+                   if (val.size()==0) val = "?";
                  }
-               if (val.size()==0) val = "?";
+               if (val.size()==0) val = "X";
                item.SetText( crea::std2wx(val));
                item.SetColumn(k);
-               GetCtrl(l)->SetItem(item);
+                 
+                 GetCtrl(l)->SetItem(item);
+                 }
                item.Clear();
-             } 
            
          }
       }
@@ -610,7 +615,8 @@ namespace creaImageIO
        GetGimmickView()->ClearSelection();
       }
     // Select all images if the selection is at series level
-    if (level==mLevelList.size()-2) SelectAll(level+1);
+    if (level==mLevelList.size()-2) 
+               SelectAll(level+1);
     // Validate selected images if the selection is at image level
     if (level==(mLevelList.size()-1)) //&&mProcess) 
       {
@@ -648,7 +654,7 @@ namespace creaImageIO
            mIgnoreSelectedChanged = true;//    mProcess=false;
          }
        GetCtrl(level)->SetItemState(item,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE 
-                                    | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT);
+                                    | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT);
       }
   }