X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=cb8f81df99ba4f7b76efd86347f771d6ec40e5d2;hb=8de9d3ee075fab84401989d770a73b8dc57442fd;hp=73d288311752f82e29e0491c72010938ed473690;hpb=5142cb6cbb8bec738b3f22920effc9a6ec40fc3b;p=creaImageIO.git diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index 73d2883..cb8f81d 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -3,8 +3,9 @@ #include #include #include +#include -const std::string void_string(""); +const std::string empty_string(""); //===================================================================== namespace creaImageIO @@ -13,7 +14,7 @@ namespace creaImageIO /// Data stored by the list items struct ItemData { - ItemData() : node(0), id(-1), attr(&void_string) {} + ItemData() : node(0), id(-1), attr(&empty_string) {} // The corresponding Node tree::Node* node; // The id ? @@ -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) { - GimmickDebugMessage(5,"Creating view for level "<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 +158,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 +189,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()); } } @@ -205,6 +208,7 @@ namespace creaImageIO #if wxUSE_MENUS + // Column Menu menu =new wxMenu; wxMenuItem* m1=menu->Append(wxID_ANY, _T("&Sort ascending")); wxMenuItem* m2=menu->Append(wxID_ANY, _T("&Sort descending")); @@ -215,10 +219,21 @@ namespace creaImageIO Connect( mAscendingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnPopupSort) ); Connect( mDescendingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnPopupSort) ); Connect( mFilterID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnPopupFilter) ); - -#endif // wxUSE_MENUS + + //ItemMenu + menuItem =new wxMenu; + wxMenuItem* m1Item=menuItem->Append(wxID_ANY, _T("&Anonymize")); + wxMenuItem* m2Item=menuItem->Append(wxID_ANY, _T("&Local Copy")); + + mAnonymizingID=m1Item->GetId(); + mLocalCopyID=m2Item->GetId(); + //Connect( mAnonymizingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnAnonymize) ); + Connect( mLocalCopyID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnLocalCopy) ); + + +#endif // wxUSE_MENUS /// Initialize the first level splitter sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW ,0); @@ -251,29 +266,31 @@ namespace creaImageIO //===================================================================== - const std::vector& WxTreeView::GetSelected(int level) + const std::vector& WxTreeView::GetSelected(int level) { // if (GetSelectedUpToDate(level)) - int l = level - 1; // the selection of upper level - std::vector& sel(mLevelList[level-1].Selected); + std::vector& sel(mLevelList[l].Selected); + std::cout<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) + else if (level < mLevelList.size()+2 ) + { + 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(); @@ -281,11 +298,37 @@ namespace creaImageIO } 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); + 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,66 +341,77 @@ 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) + { + GetGimmickView()->modifyValidationSignal(false); + 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; + } + tree::Node* n= (tree::Node*)(*i); + GetTreeHandler()->LoadChildren((*i),4); + GetGimmickView()->AddIgnoreFile(n); + 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; + } } - //===================================================================== - - //===================================================================== /// Updates a level of the view (adds or removes children, etc.) void WxTreeView::UpdateLevel( int level ) @@ -383,7 +437,7 @@ namespace creaImageIO } //===================================================================== - //===================================================================== + //===================================================================== /// Recursive method called upon by UpdateLevel to refresh all windows void WxTreeView::RecursiveUpdateLevel( int level ) { @@ -393,11 +447,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(); @@ -406,66 +460,100 @@ 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 | + GimmickDebugMessage(1, + "adding children " + <<(*j)->GetLabel() + <<"'" + <node = *j; - item->SetId(_id); - data->id = _id; - item->SetData(data); + + item.SetId(_id); + item.SetData(data); _id++; - GetCtrl(l)->InsertItem(*item); + GetCtrl(l)->InsertItem(item); //Setting attributes - - for (int k=0; kGetColumnCount(); k++) + for (int k=0; kGetColumnCount(); ++k) { - std::string val = (*j)->GetAttribute(mLevelList[l].key[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); + item.SetText( crea::std2wx(val)); + item.SetColumn(k); + GetCtrl(l)->SetItem(item); } } - //GetCtrl(l)->DeleteItem(0); } - SortLevel(l); GetCtrl(l)->Show(); - - - - } + } //===================================================================== - - + + //================================================================ void WxTreeView::OnItemDeSelected(wxListEvent& event) { @@ -480,12 +568,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"<GetScreenPosition().x; + clientpt.y = wxGetMousePosition().y - this->GetScreenPosition().y; + senderCtrl = event.GetEventObject(); + unsigned int level = 0; + for (level = 0; level& sel=GetSelected(mLastLevel+1); + + if(sel.size() != 0) + { + bool copy=false; + std::stringstream out; + std::string levelName=GetTreeHandler()->GetTree().GetLevelDescriptor(mLastLevel).GetName(); + out<<"Copy "; + out<1&&levelName.at(levelName.size()-1)!='s') + { + out<<" "<GetTree().GetLevelDescriptor(mLastLevel).GetName()<<" to .gimmick?"; + } + if (wxMessageBox(crea::std2wx(out.str()), + _T("Remove Files"), + wxYES_NO,this ) == wxYES) + { + copy = true; + } + if(copy) + { + std::vector s; + GetFilenamesAsString(sel,s); + GetGimmickView()->CopyFiles(s); + } + } + else + { + mLastLevel = tempLevel; + } + + + } + //================================================================ + //================================================================ void WxTreeView::SortLevel(int level) { @@ -839,12 +992,26 @@ namespace creaImageIO } if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 ) { + adr = GetCtrl(level)->GetItemData(item); nod = ((ItemData*)adr)->node; nodes.push_back(nod); } } + } + //================================================================ + //================================================= + void WxTreeView::OnKeyDown(wxListEvent &event) + { + if(event.GetKeyCode() == WXK_DELETE) + { + wxBusyCursor busy; + + RemoveSelected(); + GetGimmickView()->ClearSelection(); + } + } //================================================================ @@ -863,6 +1030,26 @@ namespace creaImageIO } } + //================================================================ + void WxTreeView::GetFilenamesAsString(const std::vector& nodes, std::vector&s) + { + std::vector::const_iterator i; + + for (i=nodes.begin(); i!=nodes.end(); ++i) + { + if((*i)->GetLevel()LoadChildren(*i,0); + GetFilenamesAsString((*i)->GetChildrenList(),s); + } + else + { + std::string filename=(*i)->GetAttribute("FullFileName"); + s.push_back(filename); + } + } + } + //================================================================ void WxTreeView::SetColor(int l, int item) { @@ -1025,8 +1212,9 @@ 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_RIGHT_CLICK(-1, WxTreeView::OnItemMenu) EVT_LIST_ITEM_DESELECTED(-1, WxTreeView::OnItemDeSelected) /* EVT_LIST_KEY_DOWN(LIST_CTRL, MyListCtrl::OnListKeyDown)