X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxTreeView.cpp;h=867a192275db6d2f713088267e1e911ba9e02686;hb=2a9cd3d33877f2490550c2de08452eac220a131c;hp=505bf80b21c02e22ac17d35c3315fa97b7856f8c;hpb=eb6dbb22921be6bf7061773b25205446619966c6;p=creaImageIO.git diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index 505bf80..867a192 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -5,10 +5,6 @@ #include #include - - - - const std::string empty_string(""); //===================================================================== @@ -114,7 +110,7 @@ namespace creaImageIO wxWindow* parent, const wxWindowID id) : wxPanel(parent,id), - TreeView(handler,gimmick) + TreeView(handler, gimmick) { GimmickDebugMessage(1,"WxTreeView::WxTreeView" <Initialize(ctrl); - - + // Create the columns : one for each attribute of the level int col = 0; std::string title; - tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a; + + tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a; for (a = handler->GetTree().GetAttributeDescriptorList(i+1).begin(); a != handler->GetTree().GetAttributeDescriptorList(i+1).end(); ++a) @@ -197,16 +193,13 @@ namespace creaImageIO std::string temp = a->GetKey(); if (temp.compare("ID") != 0) { + ctrl->InsertColumn(col, crea::std2wx(title), col_style); col++; } level.key.push_back(a->GetKey()); - - // ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE ); - - } } @@ -270,16 +263,39 @@ namespace creaImageIO // the selection of upper level std::vector& sel(mLevelList[level-1].Selected); sel.clear(); - - if (level == 1) + if (level == 1) { sel.push_back(GetTreeHandler()->GetTree().GetTree()); } else if (level < 5) { - int n = GetCtrl(l-1)->GetItemCount(); - for (int i = 0; i < n; i++) + long item = -1; + for ( ;; ) { + item = GetCtrl(l-1)->GetNextItem(item, + wxLIST_NEXT_ALL, + wxLIST_STATE_SELECTED); + if ( item == -1 ) + break; + long adr = GetCtrl(l-1)->GetItemData(item); + tree::Node* n = ((ItemData*)adr)->node; + if(mLastSelected==item) + { + std::vector::iterator it; + it = sel.begin(); + it = sel.insert ( it , n ); + } + else + { + + sel.push_back(n); + } + + } + /*int n = GetCtrl(l-1)->GetItemCount(); + for (int i = 0; iGetItemState(i,wxLIST_STATE_SELECTED)<GetItemState(i,wxLIST_STATE_SELECTED)) { long adr = GetCtrl(l-1)->GetItemData(i); @@ -292,17 +308,16 @@ namespace creaImageIO } else { + sel.push_back(n); } } - } + }*/ } else { // NOTHING - } - - + } // return mLevelList[level-1].Selected; return sel; @@ -343,6 +358,7 @@ namespace creaImageIO } if(erase) { + GetGimmickView()->modifyValidationSignal(false); bool needRefresh=false; std::vector::const_iterator i; for (i=sel.begin(); i!=sel.end(); ++i) @@ -356,7 +372,10 @@ namespace creaImageIO { needRefresh=true; } - GetTreeHandler()->Remove(*i); + tree::Node* n= (tree::Node*)(*i); + GetTreeHandler()->LoadChildren((*i),4); + GetGimmickView()->AddIgnoreFile(n); + GetTreeHandler()->Remove(*i); } if(needRefresh && mLastLevel>1) @@ -382,9 +401,6 @@ namespace creaImageIO } - //===================================================================== - - //===================================================================== /// Updates a level of the view (adds or removes children, etc.) void WxTreeView::UpdateLevel( int level ) @@ -410,7 +426,7 @@ namespace creaImageIO } //===================================================================== - //===================================================================== + //===================================================================== /// Recursive method called upon by UpdateLevel to refresh all windows void WxTreeView::RecursiveUpdateLevel( int level ) { @@ -420,11 +436,11 @@ namespace creaImageIO <& sel(GetSelected(level)); - + int l = level - 1; - + // to speed up inserting we hide the control temporarily GetCtrl(l)->Hide(); GetCtrl(l)->DeleteAllItems(); @@ -441,76 +457,89 @@ namespace creaImageIO int _id=0; //Adds items and sets their attributes - + GetTreeHandler()->LoadChildren(*i,1); tree::Node::ChildrenListType::reverse_iterator j; for (j = (*i)->GetChildrenList().rbegin(); j!= (*i)->GetChildrenList().rend(); ++j) { - 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; - // Temporary correction : it works but no explanation about the problem FCY - if(k==0 && level <3) - val = (*j)->GetAttribute("NumberOfChildren"); - else - val = (*j)->GetAttribute(mLevelList[l].key[k]); - if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isDateEntry()) // Date - { - boost::gregorian::date d1(boost::gregorian::from_undelimited_string(val)); - val = to_iso_extended_string(d1); - } - else if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isTimeEntry()) // Time - { - if (val != "" || val != " ") - val = val.substr(0,2) + " : " + val.substr(2,2) + " : " + val.substr(4,2); - } - else - { - - } - if (val.size()==0) val = "?"; - item.SetText( crea::std2wx(val)); - item.SetColumn(k); - GetCtrl(l)->SetItem(item); - } - - } + 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; + // Temporary correction : it works but no explanation about the problem FCY + if(k==0 && level <3) + val = (*j)->GetAttribute("NumberOfChildren"); + else + val = (*j)->GetAttribute(mLevelList[l].key[k]); + if(((*j)->GetAttributeDescriptor(mLevelList[l].key[k])).isDateEntry()) // Date + { + // std::cout << "["<GetAttributeDescriptor(mLevelList[l].key[k])).isTimeEntry()) // Time + { + if ((val.size()>6) && + (val != "" || val != " ")) + val = val.substr(0,2) + " : " + + val.substr(2,2) + " : " + + val.substr(4,2); + } + else + { + + } + if (val.size()==0) val = "?"; + item.SetText( crea::std2wx(val)); + item.SetColumn(k); + GetCtrl(l)->SetItem(item); + } + + } } - + SortLevel(l); GetCtrl(l)->Show(); - } + } //===================================================================== - - + + //================================================================ void WxTreeView::OnItemDeSelected(wxListEvent& event) { @@ -525,12 +554,16 @@ namespace creaImageIO if ( GetCtrl(level) == obj ) break; } SetSelectedUpToDate(level,false); + // to allow a first selection in images TreeView + if (level==mLevelList.size()-1) + OnItemSelected(event); } //================================================================ - + //================================================================ void WxTreeView::OnItemSelected(wxListEvent& event) { + GimmickDebugMessage(1, GetTreeHandler()->GetTree().GetLabel() <<" WxTreeView::OnItemSelected"<ClearSelection(); } }