X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=fb46be65b1bfefc812697d47c05401272635b375;hb=595926ac27740a8822b6de9579e2e148c59f469c;hp=b445d82955383e73fc4855fe525c3401579f507a;hpb=4ac76c07b4bfbdf3c69da3faa347e1f14c7c217c;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index b445d82..fb46be6 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -1,6 +1,9 @@ #include #include #include +#include +#include + using namespace crea; // Icons #include "icons/accept.xpm" @@ -157,10 +160,14 @@ namespace creaImageIO sizer->Add( mSplitter,1,wxGROW ,0); - + mProgressDialog=0; SetSizer( sizer ); SetAutoLayout(true); Layout(); + mListener=new Listener(); + mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount , this, _1 ) ); + mListener->Create(); + mListener->Run(); mConstructed = true; } @@ -174,6 +181,10 @@ namespace creaImageIO mViewer->StopPlayer(); GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <IsAlive()) + { + mListener->Delete(); + } } //====================================================================== @@ -673,14 +684,13 @@ namespace creaImageIO //================================================= void WxGimmickView::OnSettings(wxCommandEvent& event) { - wxDialog* dial= new wxDialog (this,-1,_T("System Settings"),wxDefaultPosition, wxSize(450,600)); + wxDialog* dial= new wxDialog (this,-1,_T("System Settings"),wxDefaultPosition, wxSize(450,220)); wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL); // Notebook - wxNotebook* nb= new wxNotebook(dial, - -1,wxDefaultPosition, wxDefaultSize, 0); + wxNotebook* nb= new wxNotebook(dial, -1, wxDefaultPosition, wxDefaultSize, 0); siz->Add( nb,1,wxGROW ,0); - CreateSettingsDialog(nb); + CreateSettingsDialog(nb,dial); dial->SetSizer(siz); dial->ShowModal(); } @@ -692,109 +702,170 @@ namespace creaImageIO { mViewer->StopPlayer(); - wxDialog* dial= new wxDialog (this,-1,"Tools",wxDefaultPosition, wxSize(300,200)); + wxDialog* dial = new wxDialog (this,-1,"Tools",wxDefaultPosition, wxSize(300,250)); + wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL); + wxNotebook* nb= new wxNotebook(dial, -1, wxDefaultPosition, wxDefaultSize, 0); - WxGimmickTools * gimmickTools = new WxGimmickTools(dial, mCurrentDirectory); + wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL); + dialSizer->Add(nb,1,wxGROW,0); + dialSizer->Add(buttonsSizer,0,wxGROW); - wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL); - - - wxSizer* bsizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL); - topsizer->Add(gimmickTools,1,wxGROW,0); - topsizer->Add(bsizer,0,wxGROW); + //First page: Bruker Image Reader + WxGimmickTools * gimmickTools = new WxGimmickTools(nb, mCurrentDirectory); + nb->AddPage( gimmickTools, crea::std2wx("Bruker Image Reader") ); - dial->SetSizer(topsizer, true); + dial->SetSizer(dialSizer, true); dial->Layout(); dial->ShowModal(); - - if (dial->GetReturnCode() == wxID_OK) - { - wxString inputDir = gimmickTools->getInputDir(); - wxString outputDir = gimmickTools->getOutputDir(); - bool addToDB = gimmickTools->getCheckBoxValue(); -/* - Bruker2Dicom b2d; - b2d.SetInputDirectory(crea::wx2std(inputDir)); - b2d.SetOutputDirectory(crea::wx2std(outputDir)); - b2d.SetConvertModeToDicom(); - b2d.Execute(); -*/ - if (addToDB) - { - mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT ); - mCurrentDirectory = outputDir; - mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),crea::wx2std(outputDir),true); - mProgressDialog->Pulse(_T("Updating view...")); - - UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); - delete mProgressDialog; - DisplayAddSummary(); - } - } - - mViewer->StartPlayer(); - - /* - - std::string name = crea::wx2std(mNotebook->GetCurrentPage()->GetName()); - long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST; - wxDirDialog* FD = new wxDirDialog( 0, _T("Select directory"), mCurrentDirectory, style); - - if (FD->ShowModal()==wxID_OK) - { - - std::string dirname = wx2std (FD->GetPath()); - bool recurse = isNeedRecursive(dirname); - if (recurse) + if (dial->GetReturnCode() == wxID_OK) { - recurse = wxMessageBox(_T("Recurse into sub-directories ?"), _T("Scan directory"), wxYES_NO,this ) == wxYES ? true : false; + if (nb->GetSelection()==0)//Selection: Bruker Image Reader + { + std::string inputDir = crea::wx2std(gimmickTools->getInputDir()); + std::string outputDir = crea::wx2std(gimmickTools->getOutputDir()); + bool addToDB = gimmickTools->getCheckBoxValue(); + + if (inputDir.compare("")!=0 && outputDir.compare("")!=0) + { + /* + Bruker2Dicom b2d; + b2d.SetInputDirectory(crea::wx2std(inputDir)); + b2d.SetOutputDirectory(crea::wx2std(outputDir)); + b2d.SetConvertModeToDicom(); + b2d.Execute(); + */ + + if (addToDB) + { + mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT ); + mCurrentDirectory = outputDir; + mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),crea::wx2std(outputDir),true); + mProgressDialog->Pulse(_T("Updating view...")); + + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); + delete mProgressDialog; + DisplayAddSummary(); + } + } + + else + { + wxMessageBox(_T("One or both of the directory fields are empty"),_T("Empty Fields"),wxOK,this); + } + } } - - wxBusyCursor busy; - wxString title(_T("Adding directory")); - if (recurse) - title = _T("Adding directory (recursive)"); - mProgressDialog = - new wxProgressDialog(_T("Adding directory"), - _T(""), - 1000, - this, - wxPD_ELAPSED_TIME | - // wxPD_ESTIMATED_TIME | - // wxPD_REMAINING_TIME | - wxPD_CAN_ABORT ); - - mCurrentDirectory = FD->GetPath(); - mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),dirname,recurse); - mProgressDialog->Pulse(_T("Updating view...")); - - UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); - delete mProgressDialog; - DisplayAddSummary(); - } - - */ + mViewer->StartPlayer(); } //================================================= - void WxGimmickView::CreateSettingsDialog(wxNotebook* nb) + void WxGimmickView::CreateSettingsDialog(wxNotebook* nb, wxDialog* dial) { //First page: Customization of configurations - wxPanel* customConfig=new wxPanel(nb); + //Copy Path string + std::string cp; + mGimmick->GetSetting(SETTINGS_COPY_PATH,cp); + //Database Path String + std::string dp; + mGimmick->GetSetting(SETTINGS_DBPATH,dp); + //Syncronization Event String + std::string se; + mGimmick->GetSetting(SETTINGS_SYNC_EVENT,se); + //Syncronization Frequency String + std::string sf; + mGimmick->GetSetting(SETTINGS_SYNC_FREQ,sf); + + WxCustomizeConfigPanel * customConfig=new WxCustomizeConfigPanel(nb,dial,this,cp,dp,se,sf); + nb->AddPage( customConfig, crea::std2wx("Customize Configuration") ); + //Second page: Creation of Databases wxPanel* databaseCreation=new wxPanel(nb); nb->AddPage( databaseCreation, crea::std2wx("Create Database") ); + //Third page: CD/DVD Watch - wxPanel* cdWatch=new wxPanel(nb); + WxListenerPanel* cdWatch=new WxListenerPanel(nb,dial, this, mListener->IsPaused()); nb->AddPage( cdWatch, crea::std2wx("CD/DVD") ); + //Fourth page: Selection of attributes to show (edit) wxPanel* attSelection=new wxPanel(nb); nb->AddPage( attSelection, crea::std2wx("Selection of Attributes") ); + } + + //=================================================================== + void WxGimmickView::OnSaveSettingsCallback(const std::string& copyPath, + const std::string& dbPath, + const std::string& syncEvent, + const std::string& syncFreq) + { + mGimmick->UpdateSetting(SETTINGS_COPY_PATH,copyPath); + mGimmick->UpdateSetting(SETTINGS_DBPATH,dbPath); + mGimmick->UpdateSetting(SETTINGS_SYNC_EVENT,syncEvent); + mGimmick->UpdateSetting(SETTINGS_SYNC_FREQ,syncFreq); + } + + //=================================================================== + void WxGimmickView::OnListenerCallback(const std::string& drive, bool addFiles, bool removeFiles) + { + mListener->SetMonitoredDrive(drive); + mListener->SetAddFilesState(addFiles); + mListener->SetRemoveFilesState(removeFiles); + } + //======================================================================== + + void WxGimmickView::OnDriveMount(bool mount) + { + GimmickMessage(1, "Gimmick::OnDriveMount"<GetMonitoredDrive(drive); + + if(mount) + { + mViewer->StopPlayer(); + wxBusyCursor busy; + wxString title(_T("Adding drive")); + mProgressDialog = + new wxProgressDialog(_T("Adding drive"), + _T(""), + 1000, + this, + wxPD_ELAPSED_TIME | + // wxPD_ESTIMATED_TIME | + // wxPD_REMAINING_TIME | + wxPD_CAN_ABORT ); + mCurrentDirectory = crea::std2wx(drive); + mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),drive,true); + mProgressDialog->Pulse(_T("Updating view...")); + + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); + delete mProgressDialog; + DisplayAddSummary(); + mViewer->StartPlayer(); + + } + else + { + mGimmick->DeleteDrive(drive); + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); + } + + } + + //======================================================================== + + void WxGimmickView::StartListeningThread() + { + mListener->Resume(); + } + + //======================================================================== + + void WxGimmickView::StopListeningThread() + { + mListener->Pause(); }