X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=2fced885b158ecc2844ab93c8bb70ebe10625778;hb=381f766db11094bd9b96f9e948527cbec24f680a;hp=65669c8b1176faf5e1ad89c80d6b2de767e1f2fd;hpb=158428b5c0a5afb1277c3629ff037ba4f1db1ab1;p=creaImageIO.git diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index 65669c8..2fced88 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" <GetTree().GetNumberOfLevels() -1; ++i) { - GimmickDebugMessage(5,"Creating view for level "<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 +192,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 ); - - } } @@ -216,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")); @@ -226,10 +219,24 @@ 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")); + wxMenuItem* m3Item=menuItem->Append(wxID_ANY, _T("&Edit Fields")); + + mAnonymizingID=m1Item->GetId(); + mLocalCopyID=m2Item->GetId(); + mEditFieldID=m3Item->GetId(); + //Connect( mAnonymizingID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnAnonymize) ); + Connect( mLocalCopyID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnLocalCopy) ); + Connect( mEditFieldID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnEditField) ); + + +#endif // wxUSE_MENUS /// Initialize the first level splitter sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW ,0); @@ -262,24 +269,46 @@ 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); sel.clear(); - - if (level == 1) + if (level == 1) { sel.push_back(GetTreeHandler()->GetTree().GetTree()); } - else if (level < 5) + else if (level < mLevelList.size()+2 ) { - 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 +321,16 @@ namespace creaImageIO } else { + sel.push_back(n); } } - } + }*/ } else { // NOTHING - } - - + } // return mLevelList[level-1].Selected; return sel; @@ -343,6 +371,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 +385,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 +414,6 @@ namespace creaImageIO } - //===================================================================== - - //===================================================================== /// Updates a level of the view (adds or removes children, etc.) void WxTreeView::UpdateLevel( int level ) @@ -410,7 +439,7 @@ namespace creaImageIO } //===================================================================== - //===================================================================== + //===================================================================== /// Recursive method called upon by UpdateLevel to refresh all windows void WxTreeView::RecursiveUpdateLevel( int level ) { @@ -420,11 +449,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,72 +470,92 @@ 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(((*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) { @@ -521,12 +570,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; levelHitTest(wxPoint(0,clientpt.y-8),flag,ptr); + PopupMenu(menuItem, clientpt); + } + //================================================================ //================================================================ @@ -635,7 +710,6 @@ namespace creaImageIO GimmickDebugMessage(7, "WxTreeView::OnEndLabelEdit" <& 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::OnEditField(wxCommandEvent& event) + { + if(mLastRightSelected!=-1) + { + tree::Node* node=((ItemData*)GetCtrl(mLastRightLevel)->GetItemData(mLastRightSelected))->node; + tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a; + std::vector names; + std::vector keys; + for (a = GetTreeHandler()->GetTree().GetAttributeDescriptorList(mLastRightLevel+1).begin(); + a != GetTreeHandler()->GetTree().GetAttributeDescriptorList(mLastRightLevel+1).end(); + ++a) + { + if(a->GetFlags()==creaImageIO::tree::AttributeDescriptor::EDITABLE) + { + names.push_back(a->GetName()); + keys.push_back(a->GetKey()); + } + } + GetGimmickView()->CreateEditFieldsDialog(node,names,keys); + } + } + //================================================================ + //================================================================ void WxTreeView::SortLevel(int level) { @@ -880,6 +1025,7 @@ namespace creaImageIO } if(GetCtrl(level)->GetItemState(item, wxLIST_STATE_SELECTED)==0 ) { + adr = GetCtrl(level)->GetItemData(item); nod = ((ItemData*)adr)->node; nodes.push_back(nod); @@ -893,8 +1039,10 @@ namespace creaImageIO { if(event.GetKeyCode() == WXK_DELETE) { - RemoveSelected(); - // ClearSelection(); + wxBusyCursor busy; + + RemoveSelected(); + GetGimmickView()->ClearSelection(); } } @@ -915,6 +1063,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) { @@ -1024,6 +1192,97 @@ namespace creaImageIO } + + //================================================================ + void WxTreeView::GetAttributes(std::vector& areShown, std::vector& notShown, int level) + { + areShown.clear(); + notShown.clear(); + tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a; + for (a = GetTreeHandler()->GetTree().GetAttributeDescriptorList(level).begin(); + a != GetTreeHandler()->GetTree().GetAttributeDescriptorList(level).end(); + ++a) + { + if(a->GetFlags()==creaImageIO::tree::AttributeDescriptor::EDITABLE && IsAttributeVisible(a->GetName(),level)) + { + areShown.push_back(a->GetName()); + } + } + notShown=mLevelList[level-1].notShownAtts; + } + + //================================================================ + void WxTreeView::SetNonVisibleAttributes(const std::vector& notShown, int nlevel) + { + mLevelList[nlevel].notShownAtts=notShown; + } + + //================================================================ + void WxTreeView::CreateCtrl(std::vector& notShown, int nlevel) + { + int ctrl_style = wxLC_REPORT | wxLC_VRULES; + int col_style = wxLIST_FORMAT_LEFT; + LevelType level; + mLevelList[nlevel].SelectedUpToDate = true; + mLevelList[nlevel].SortColumn = 0; + mLevelList[nlevel].key.clear(); + + mLevelList[nlevel].wxCtrl = new wxListCtrl(mLevelList[nlevel].wxSplitter, + nlevel, + wxDefaultPosition, + wxDefaultSize, + ctrl_style); + wxWindow* oldWin=mLevelList[nlevel].wxSplitter->GetWindow1(); + mLevelList[nlevel].wxSplitter->ReplaceWindow(oldWin,mLevelList[nlevel].wxCtrl); + mLevelList[nlevel].wxSplitter->Initialize(mLevelList[nlevel].wxCtrl); + + // Create the columns : one for each attribute of the level + int col = 0; + std::string title; + + tree::LevelDescriptor::AttributeDescriptorListType::const_iterator a; + for (a = GetTreeHandler()->GetTree().GetAttributeDescriptorList(nlevel+1).begin(); + a != GetTreeHandler()->GetTree().GetAttributeDescriptorList(nlevel+1).end(); + ++a) + + { + if(a->GetFlags()!=creaImageIO::tree::AttributeDescriptor::PRIVATE && IsAttributeVisible(a->GetName(),nlevel+1)) + { + title=a->GetName(); + std::string temp = a->GetKey(); + if (temp.compare("ID") != 0) + { + mLevelList[nlevel].wxCtrl->InsertColumn(col, + crea::std2wx(title), + col_style); + col++; + } + mLevelList[nlevel].key.push_back(a->GetKey()); + } + + } + oldWin->Destroy(); + UpdateLevel(1); + } + + //================================================================ + bool WxTreeView::IsAttributeVisible(const std::string& val, int level) + { + std::vector ns=mLevelList[level-1].notShownAtts; + std::vector::iterator it; + bool found=false; + for(it=ns.begin();it!=ns.end()&&!found;++it) + { + if(val.compare(*it)==0) + { + found=true; + } + } + + return !found; + } + + //================================================================ //================================================================ BEGIN_EVENT_TABLE(WxTreeView, wxPanel) /* @@ -1079,7 +1338,7 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl) */ 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)