X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=86850e4192e795c7691f69567ea2f7dab904860e;hb=e79fb1c492e93cdd1a5a95ba0ab491b868cf5992;hp=a165230543b22c7da7afee0ecc9f16c8598f361a;hpb=c746c53074ffd15a6c275dba3524d6caff3f5af8;p=creaImageIO.git diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index a165230..86850e4 100644 --- a/src2/creaImageIOWxTreeView.cpp +++ b/src2/creaImageIOWxTreeView.cpp @@ -4,8 +4,10 @@ #include #include #include - - +#include +#ifdef _DEBUG +#define new DEBUG_NEW +#endif //===================================================================== namespace creaImageIO { @@ -107,7 +109,7 @@ namespace creaImageIO // mSplitter = new wxSplitterWindow( this , -1); // Global sizer - wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL); + msizer = new wxBoxSizer(wxHORIZONTAL); int ctrl_style = wxLC_REPORT | wxLC_VRULES; int col_style = wxLIST_FORMAT_LEFT; @@ -206,25 +208,35 @@ namespace creaImageIO Connect( mFilterID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnPopupFilter) ); + ////SubMenuItem EXPORT + subExportMenu = new wxMenu; + wxMenuItem *subExp1 = subExportMenu->Append(wxID_ANY, _T("&Export to Storage")); + Connect( subExp1->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnExportToStorage) ); //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")); - + wxMenuItem* m4Item=menuItem->Append(wxID_ANY, _T("&Display Dicom Tags")); + menuItem->AppendSubMenu(subExportMenu, wxT("&Export")); + mAnonymizingID=m1Item->GetId(); mLocalCopyID=m2Item->GetId(); mEditFieldID=m3Item->GetId(); + mDumpID=m4Item->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) ); + Connect( mDumpID, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(WxTreeView::OnDumpTags) ); + #endif // wxUSE_MENUS /// Initialize the first level splitter - sizer->Add( mLevelList[0].wxSplitter ,1, wxGROW ,0); + msizer->Add( mLevelList[0].wxSplitter ,1, wxGROW ,0); // mColumnSelected=1; mLastSelected=0; mLastLevel=0; @@ -235,7 +247,7 @@ namespace creaImageIO //CreateColorPalette(); UpdateLevel(1); - SetSizer( sizer ); + SetSizer( msizer ); SetAutoLayout(true); Layout(); @@ -866,6 +878,46 @@ namespace creaImageIO GetGimmickView()->CreateEditFieldsDialog(node,names,keys); } } + + //================================================================ + + //================================================================ + + void WxTreeView::OnExportToStorage(wxCommandEvent &event) + { + std::vector filesname; + std::vector nodes; + nodes.push_back(((ItemData*)GetCtrl(mLastRightLevel)->GetItemData(mLastRightSelected))->node); + GetFilenamesAsString(nodes,filesname); + GetGimmickView()->ExportToStorage(filesname); + } + + //================================================================ + + //================================================================ + + void WxTreeView::OnDumpTags(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->GetKey()=="FullFileName") + { + GetGimmickView()->DumpTags(node->GetAttribute("FullFileName")); + return; + } + } + } + } + + //================================================================ //================================================================