X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOWxGimmickView.cpp;h=625cb94afc1b8c0d8af85221641e1bafe3cf7c4c;hb=37692ca5ea7fb8414cb70bcae0ce16e51da57568;hp=ddf43617e16dad7484f5f54dfbba364caf1d3cbb;hpb=6af4831637e7dbc737fc8a42ae1395ee94658103;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index ddf4361..625cb94 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -30,9 +30,11 @@ using namespace crea; #if defined(BUILD_BRUKER) #include "bruker2dicom.h" #endif + #ifdef _DEBUG #define new DEBUG_NEW #endif + namespace creaImageIO { @@ -106,8 +108,8 @@ namespace creaImageIO mCurrentDirectory = std2wx(gimmick->GetHomeDirectory()); // Connect the AddProgress callback - gimmick->ConnectAddProgressObserver - ( boost::bind( &WxGimmickView::OnAddProgress , this, _1 ) ); + gimmick->ConnectAddProgressObserver + ( boost::bind( &WxGimmickView::OnAddProgress , this, _1 ) ); // Create the list of icons (mIcon) CreateIconList(); @@ -177,11 +179,11 @@ namespace creaImageIO SetSizer( sizer ); SetAutoLayout(true); Layout(); - mListener=new Listener(); - mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount, this, _1 ) ); - mListener->Create(); - mListener->Run(); - mListener->Pause(); + //mListener=new Listener(); + //mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount, this, _1 ) ); + //mListener->Create(); + // mListener->Run(); + // mListener->Pause(); mConstructed = true; } @@ -196,10 +198,7 @@ namespace creaImageIO GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <IsAlive()) - { - mListener->Delete(); - } + //if(mListener->IsAlive()) { mListener->Delete(); } } //====================================================================== @@ -684,7 +683,10 @@ namespace creaImageIO { //TODO Select current tree handler wxBusyCursor busy; - GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->RemoveSelected(); + std::string remove; + mGimmick->GetSetting(SETTINGS_REMOVE_PATIENT_DISPLAY,remove); + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->RemoveSelected(remove); + mGimmick->UpdateSetting(SETTINGS_REMOVE_PATIENT_DISPLAY,remove); ClearSelection(); } //================================================= @@ -694,7 +696,7 @@ namespace creaImageIO void WxGimmickView::AddIgnoreFile(tree::Node* toRemove) { mGimmick->RemoveFile(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),toRemove); - GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1); + // GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1); } //================================================= @@ -736,6 +738,7 @@ namespace creaImageIO if (dialog.ShowModal() == wxID_OK) { + wxBusyCursor busy; int sel=dialog.GetSelection(); bool repair=false; bool checkAttributes=false;