X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxTreeView.cpp;h=86850e4192e795c7691f69567ea2f7dab904860e;hb=e79fb1c492e93cdd1a5a95ba0ab491b868cf5992;hp=c196659863950190bbb9ac0d2a1123333ca3d8be;hpb=a67d921cdc10d438852b48c2985f14d91320e016;p=creaImageIO.git diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp index c196659..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(); @@ -259,10 +271,14 @@ namespace creaImageIO //===================================================================== const std::vector& WxTreeView::GetSelected(int level) { + std::vector& sel = mLevelList[0].Selected; // if (GetSelectedUpToDate(level)) int l = level - 1; // the selection of upper level - std::vector& sel(mLevelList[l].Selected); + if(mLevelList.size() == level -1) + sel = mLevelList.back().Selected; + else + sel= mLevelList[l].Selected; if (sel.size() > 0) { sel.clear(); @@ -332,15 +348,17 @@ namespace creaImageIO //===================================================================== ///Removes selected nodes on last selected level // NOT SPECIFIC - void WxTreeView::RemoveSelected() + void WxTreeView::RemoveSelected(std::string &i_save) { - unsigned int tempLevel = mLastLevel; + bool erase=false; + + unsigned int tempLevel = mLastLevel; mLastLevel+=1; const std::vector& sel=GetSelected(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 "; @@ -376,9 +394,9 @@ namespace creaImageIO { needRefresh=true; } - tree::Node* n= (tree::Node*)(*i); + //tree::Node* n = new (tree::Node*)(*i); GetTreeHandler()->LoadChildren((*i),4); - GetGimmickView()->AddIgnoreFile(n); + GetGimmickView()->AddIgnoreFile(*i); GetTreeHandler()->Remove(*i); } @@ -402,6 +420,17 @@ namespace creaImageIO mLastLevel = tempLevel; } + if (erase && mLastLevel == 1 && i_save == "0") + { + + RemoveAlertDlg *dial = new RemoveAlertDlg(this, crea::std2wx("Remove files"), wxSize(370,100)); + //dial->ShowModal(); + if (dial->ShowModal() == wxID_OK) + { + i_save = dial->isChecked() == false? "0" : "1"; + } + + } } @@ -530,14 +559,15 @@ namespace creaImageIO } else { - + if (val.size()==0) val = "?"; } - if (val.size()==0) val = "?"; + if (val.size()==0) val = "X"; item.SetText( crea::std2wx(val)); item.SetColumn(k); - GetCtrl(l)->SetItem(item); + + GetCtrl(l)->SetItem(item); + } item.Clear(); - } } } @@ -610,7 +640,8 @@ namespace creaImageIO GetGimmickView()->ClearSelection(); } // Select all images if the selection is at series level - if (level==mLevelList.size()-2) SelectAll(level+1); + if (level==mLevelList.size()-2) + SelectAll(level+1); // Validate selected images if the selection is at image level if (level==(mLevelList.size()-1)) //&&mProcess) { @@ -648,7 +679,7 @@ namespace creaImageIO mIgnoreSelectedChanged = true;// mProcess=false; } GetCtrl(level)->SetItemState(item,wxLIST_STATE_SELECTED, wxLIST_MASK_STATE - | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT); + | wxLIST_MASK_TEXT |wxLIST_MASK_IMAGE | wxLIST_MASK_DATA | wxLIST_MASK_WIDTH | wxLIST_MASK_FORMAT); } } @@ -847,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; + } + } + } + } + + //================================================================ //================================================================ @@ -1032,8 +1103,8 @@ namespace creaImageIO if(event.GetKeyCode() == WXK_DELETE) { wxBusyCursor busy; - - RemoveSelected(); + std::string temp = "0"; + RemoveSelected(temp); GetGimmickView()->ClearSelection(); } @@ -1165,6 +1236,47 @@ namespace creaImageIO return !found; } + //================================================================ + //================================================================ + + RemoveAlertDlg::RemoveAlertDlg(wxWindow *parent, + wxString title, + const wxSize& size) + : wxDialog( parent, + wxID_ANY, + title, + wxDefaultPosition, + size, + wxDEFAULT_DIALOG_STYLE) + { + wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL); + + //std::string out("To reload deleted patient, you should synchronize your database before."); // JPR + //wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY,crea::std2wx(out),wxDefaultPosition, wxSize(500,20)); + wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, + _T("To reload deleted patient, you should synchronize your database before."), + wxDefaultPosition, wxSize(500,20)); + mcheck = new wxCheckBox(this, 5478, _T("Do not display this warning again!")); + Connect( mcheck->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &RemoveAlertDlg::onCheck ); + wxSizer* buttonsSizer = this->CreateSeparatedButtonSizer(wxOK|wxCANCEL); + + topsizer->Add(text); + topsizer->Add(mcheck,0,wxGROW); + topsizer->Add(buttonsSizer,0,wxGROW); + SetSizer(topsizer, true); + mSave = false; + Layout(); + } + RemoveAlertDlg::~RemoveAlertDlg(){}; + bool RemoveAlertDlg::isChecked() + { + return mSave; + } + void RemoveAlertDlg::onCheck(wxCommandEvent &Event) + { + mSave = mcheck->IsChecked(); + } + //================================================================ //================================================================