From 851d64446e8f3adadc217a644d222a184657fdef Mon Sep 17 00:00:00 2001 From: Frederic Cervenansky Date: Fri, 9 Oct 2009 07:40:33 +0000 Subject: [PATCH] dispaly all items information --- src2/creaImageIOWxTreeView.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index c196659..8e350cc 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -259,10 +259,14 @@ namespace creaImageIO //===================================================================== const std::vector& WxTreeView::GetSelected(int level) { + std::vector& sel = mLevelList[0].Selected; // if (GetSelectedUpToDate(level)) int l = level - 1; // the selection of upper level - std::vector& sel(mLevelList[l].Selected); + if(mLevelList.size() == level -1) + sel = mLevelList.back().Selected; + else + sel= mLevelList[l].Selected; if (sel.size() > 0) { sel.clear(); @@ -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); } } -- 2.45.1