From 41a140d8961e44ca197016805bd0f66035985ca3 Mon Sep 17 00:00:00 2001 From: Frederic Cervenansky Date: Thu, 9 Apr 2009 15:24:00 +0000 Subject: [PATCH] =?utf8?q?Correction=20d'un=20bug=20sur=20le=20decodetype.?= =?utf8?q?=20Modification=20sur=20l'insertion=20d'items=20et=20plus=20de?= =?utf8?q?=20remove=20si=20aucun=20objet=20s=E9lectionn=E9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src2/creaImageIOTreeAttributeDescriptor.cpp | 17 +- src2/creaImageIOWxTreeView.cpp | 224 +++++++++++--------- 2 files changed, 133 insertions(+), 108 deletions(-) diff --git a/src2/creaImageIOTreeAttributeDescriptor.cpp b/src2/creaImageIOTreeAttributeDescriptor.cpp index 3464797..54c56b8 100644 --- a/src2/creaImageIOTreeAttributeDescriptor.cpp +++ b/src2/creaImageIOTreeAttributeDescriptor.cpp @@ -126,6 +126,11 @@ namespace creaImageIO GDCM_NAME_SPACE::Global::GetDicts() ->GetDefaultPubDict()->GetEntry(GetGroup(),GetElement()); + if (entry==0) + { + typ = 2; + return; + } std::string type = entry->GetVR().str(); GimmickDebugMessage(3,"VR Value is "<GetTree().GetTree()); } - else - { - int n = GetCtrl(l-1)->GetItemCount(); - for (int i = 0; i < n; i++) - { - if ( GetCtrl(l-1)->GetItemState(i,wxLIST_STATE_SELECTED)) - { - long adr = GetCtrl(l-1)->GetItemData(i); - tree::Node* n = ((ItemData*)adr)->node; - if(mLastSelected==i) - { - std::vector::iterator it; - it = sel.begin(); - it = sel.insert ( it , n ); - } - else + else if (level < 5) + { + int n = GetCtrl(l-1)->GetItemCount(); + for (int i = 0; i < n; i++) + { + if ( GetCtrl(l-1)->GetItemState(i,wxLIST_STATE_SELECTED)) { - sel.push_back(n); + long adr = GetCtrl(l-1)->GetItemData(i); + tree::Node* n = ((ItemData*)adr)->node; + if(mLastSelected==i) + { + std::vector::iterator it; + it = sel.begin(); + it = sel.insert ( it , n ); + } + else + { + sel.push_back(n); + } } } - } - } + } + else + { + // NOTHING + } + + // return mLevelList[level-1].Selected; return sel; @@ -298,59 +304,69 @@ namespace creaImageIO // NOT SPECIFIC void WxTreeView::RemoveSelected() { + unsigned int tempLevel = mLastLevel; mLastLevel+=1; const std::vector& sel=GetSelected(mLastLevel+1); - bool erase=false; - std::stringstream out; - std::string levelName=GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName(); - out<<"Delete "; - out<1&&levelName.at(levelName.size()-1)!='s') - { - out<<" "<GetTree().GetLevelDescriptor(mLastLevel).GetName()<<"?"; - } - if (wxMessageBox(crea::std2wx(out.str()), - _T("Remove Files"), - wxYES_NO,this ) == wxYES) - { - erase = true; - } - if(erase) - { - bool needRefresh=false; - std::vector::const_iterator i; - for (i=sel.begin(); i!=sel.end(); ++i) - { - GimmickMessage(1, - "deleting '" - <<(*i)->GetLabel() - <<"'"<GetParent()->GetNumberOfChildren()<2) - { - needRefresh=true; - } - GetTreeHandler()->Remove(*i); - } - - if(needRefresh && mLastLevel>1) + // if no selection, no remove action. + if(sel.size() != 0) + { + bool erase=false; + std::stringstream out; + std::string levelName=GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName(); + out<<"Delete "; + out<1&&levelName.at(levelName.size()-1)!='s') { - UpdateLevel(mLastLevel-2); + out<<" "<1) + else { - UpdateLevel(mLastLevel-1); + out<<" "<GetTree().GetLevelDescriptor(mLastLevel).GetName()<<"?"; } - else + if (wxMessageBox(crea::std2wx(out.str()), + _T("Remove Files"), + wxYES_NO,this ) == wxYES) { - UpdateLevel(mLastLevel); + erase = true; } - } + if(erase) + { + bool needRefresh=false; + std::vector::const_iterator i; + for (i=sel.begin(); i!=sel.end(); ++i) + { + GimmickMessage(1, + "deleting '" + <<(*i)->GetLabel() + <<"'"<GetParent()->GetNumberOfChildren()<2) + { + needRefresh=true; + } + GetTreeHandler()->Remove(*i); + } + + if(needRefresh && mLastLevel>1) + { + UpdateLevel(mLastLevel-2); + } + else if(mLastLevel>1) + { + UpdateLevel(mLastLevel-1); + } + else + { + UpdateLevel(mLastLevel); + } + } + } + else + { + // no need to incremente level + mLastLevel = tempLevel; + } } @@ -406,62 +422,62 @@ namespace creaImageIO for (i=sel.begin(); i!=sel.end(); ++i) { - GimmickDebugMessage(2, + GimmickDebugMessage(1, "adding children of '" <<(*i)->GetLabel() <<"'" <InsertItem(0, _T("")); + GetTreeHandler()->LoadChildren(*i,1); tree::Node::ChildrenListType::reverse_iterator j; for (j = (*i)->GetChildrenList().rbegin(); j!= (*i)->GetChildrenList().rend(); ++j) { - wxListItem* item= new wxListItem; - item->SetMask(wxLIST_MASK_STATE | - wxLIST_MASK_TEXT | - // wxLIST_MASK_IMAGE | - wxLIST_MASK_DATA | - // wxLIST_MASK_WIDTH | - wxLIST_MASK_FORMAT - ); - - ItemData* data = new ItemData; - - data->node = *j; - item->SetId(_id); - - data->id = _id; - item->SetData(data); - - _id++; - GetCtrl(l)->InsertItem(*item); - - //Setting attributes - - for (int k=0; kGetColumnCount(); k++) - { - std::string val = (*j)->GetAttribute(mLevelList[l].key[k]); - if (val.size()==0) val = "?"; - item->SetText( crea::std2wx(val)); - item->SetColumn(k); - GetCtrl(l)->SetItem(*item); - } - - } - //GetCtrl(l)->DeleteItem(0); + GimmickDebugMessage(1, + "adding children " + <<(*j)->GetLabel() + <<"'" + <node = *j; + data->id = _id; + + item.SetId(_id); + item.SetData(data); + + _id++; + GetCtrl(l)->InsertItem(item); + + //Setting attributes + + for (int k=0; kGetColumnCount(); k++) + { + std::string val = (*j)->GetAttribute(mLevelList[l].key[k]); + if (val.size()==0) val = "?"; + item.SetText( crea::std2wx(val)); + item.SetColumn(k); + GetCtrl(l)->SetItem(item); + } + + } } - SortLevel(l); GetCtrl(l)->Show(); - - - } //===================================================================== -- 2.45.1