X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxTreeView.cpp;h=e644d5e1ba1420449c1d64564e440eb016b7216c;hb=9f8b288b5f8f56bc58fd01ddcb687833eb5ffa5b;hp=d81877f38ea60104dd1ff99cc669bf40db004325;hpb=41a140d8961e44ca197016805bd0f66035985ca3;p=creaImageIO.git diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index d81877f..e644d5e 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -3,6 +3,7 @@ #include #include #include +#include const std::string empty_string(""); @@ -109,7 +110,7 @@ namespace creaImageIO wxWindow* parent, const wxWindowID id) : wxPanel(parent,id), - TreeView(handler,gimmick) + TreeView(handler, gimmick) { GimmickDebugMessage(1,"WxTreeView::WxTreeView" < 0 (not for Root level) - for (int i = 1; - i < handler->GetTree().GetNumberOfLevels(); + for (int i = 0; + i < handler->GetTree().GetNumberOfLevels() -1; ++i) { @@ -141,10 +142,11 @@ namespace creaImageIO // If the first level : parent = this wxWindow* sparent = this; // else parent = last splitter - if (i>1) sparent = mLevelList[i-2].wxSplitter; + if (i>0) + sparent = mLevelList[i-1].wxSplitter; level.wxSplitter = new wxSplitterWindow( sparent , -1); - if(i!=1) + if(i!=0) { level.wxSplitter->Show(false); } @@ -157,16 +159,17 @@ namespace creaImageIO ctrl_style); level.wxCtrl = ctrl; level.wxSplitter->Initialize(ctrl); - - + // Create the columns : one for each attribute of the level int col = 0; std::string title; - tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a; - for (a = handler->GetTree().GetAttributeDescriptorList(i).begin(); - a != handler->GetTree().GetAttributeDescriptorList(i).end(); + + tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a; + for (a = handler->GetTree().GetAttributeDescriptorList(i+1).begin(); + a != handler->GetTree().GetAttributeDescriptorList(i+1).end(); ++a) - { + +{ GimmickDebugMessage(5,"Creating column "<GetName() @@ -187,15 +190,16 @@ namespace creaImageIO { title=a->GetName(); } + std::string temp = a->GetKey(); + if (temp.compare("ID") != 0) + { ctrl->InsertColumn(col, crea::std2wx(title), col_style); - level.key.push_back(a->GetKey()); - - // ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE ); - col++; + } + level.key.push_back(a->GetKey()); } } @@ -332,6 +336,7 @@ namespace creaImageIO } if(erase) { + GetGimmickView()->modifyValidationSignal(false); bool needRefresh=false; std::vector::const_iterator i; for (i=sel.begin(); i!=sel.end(); ++i) @@ -345,7 +350,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) @@ -371,9 +379,6 @@ namespace creaImageIO } - //===================================================================== - - //===================================================================== /// Updates a level of the view (adds or removes children, etc.) void WxTreeView::UpdateLevel( int level ) @@ -399,7 +404,7 @@ namespace creaImageIO } //===================================================================== - //===================================================================== + //===================================================================== /// Recursive method called upon by UpdateLevel to refresh all windows void WxTreeView::RecursiveUpdateLevel( int level ) { @@ -409,11 +414,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(); @@ -430,58 +435,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 = (*j)->GetAttribute(mLevelList[l].key[k]); - 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) { @@ -496,9 +532,12 @@ 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) { @@ -682,7 +721,7 @@ namespace creaImageIO { mLevelList[level].SortAscending = false; } - + SortLevel(level); } //================================================================ @@ -861,6 +900,19 @@ namespace creaImageIO } } + } + //================================================================ + //================================================= + void WxTreeView::OnKeyDown(wxListEvent &event) + { + if(event.GetKeyCode() == WXK_DELETE) + { + wxBusyCursor busy; + + RemoveSelected(); + GetGimmickView()->ClearSelection(); + } + } //================================================================ @@ -1041,6 +1093,7 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl) EVT_LIST_SET_INFO(LIST_CTRL, MyListCtrl::OnSetInfo) #endif */ + EVT_LIST_KEY_DOWN(-1, WxTreeView::OnKeyDown) EVT_LIST_ITEM_SELECTED(-1, WxTreeView::OnItemSelected) EVT_LIST_ITEM_DESELECTED(-1, WxTreeView::OnItemDeSelected)