X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=c3e2b07c20807c32ca585a052bdc2bfeb4d5120c;hb=c272e3694727dd6fd52dd14538e21f798417c378;hp=b445d82955383e73fc4855fe525c3401579f507a;hpb=4ac76c07b4bfbdf3c69da3faa347e1f14c7c217c;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index b445d82..c3e2b07 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -1,6 +1,12 @@ -#include +#include #include #include +#include +#include +#include +#include +#include + using namespace crea; // Icons #include "icons/accept.xpm" @@ -14,10 +20,14 @@ using namespace crea; #include "icons/synchronize.xpm" #include "icons/settings.xpm" #include "icons/tools.xpm" +//#include "icons/import.xpm" #include #include #include +#if defined(BUILD_BRUKER) + #include "bruker2dicom.h" +#endif namespace creaImageIO { @@ -157,10 +167,15 @@ 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(); + mListener->Pause(); mConstructed = true; } @@ -174,6 +189,10 @@ namespace creaImageIO mViewer->StopPlayer(); GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <IsAlive()) + { + mListener->Delete(); + } } //====================================================================== @@ -328,7 +347,7 @@ namespace creaImageIO { mViewer->StopPlayer(); long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE; - std::string wc("*.*"); + std::string wc("*"); wxFileDialog* FD = new wxFileDialog( 0, _T("Select file"), _T(""), @@ -405,9 +424,10 @@ namespace creaImageIO mProgressDialog = new wxProgressDialog(_T("Adding directory"), _T(""), - 1000, + NumberFilesToAdd(dirname,recurse), this, - wxPD_ELAPSED_TIME | + wxPD_ELAPSED_TIME | + wxPD_SMOOTH | // wxPD_ESTIMATED_TIME | // wxPD_REMAINING_TIME | wxPD_CAN_ABORT ); @@ -424,6 +444,33 @@ namespace creaImageIO mViewer->StartPlayer(); } + + //================================================= + // Determines number of files potentially to add to database + int WxGimmickView::NumberFilesToAdd(const std::string &dirpath, bool recursive) + { + int nb = 0; + if ( !boost::filesystem::exists( dirpath ) ) return nb; + boost::filesystem::directory_iterator end_itr; // default construction yields past-the-end + for ( boost::filesystem::directory_iterator itr( dirpath ); itr != end_itr; ++itr ) + { + // If is directory & recurse : do recurse + if ( boost::filesystem::is_directory(itr->status()) ) + { + if (recursive) + { + nb += NumberFilesToAdd(itr->string(), recursive); + } + } + else + { + nb++; + } + } + return nb; + + } + //================================================= // Test a directory to know if contains sub-directory to analyze bool WxGimmickView::isNeedRecursive(std::string i_name) @@ -636,6 +683,19 @@ namespace creaImageIO wxMessageBox(std2wx("The selected files have been copied"),_T("Copy files"),wxOK,this); } + //================================================= + void WxGimmickView::AddDir(std::string dirName) + { + mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT ); + mCurrentDirectory = crea::std2wx(dirName); + mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),dirName,true); + mProgressDialog->Pulse(_T("Updating view...")); + + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); + delete mProgressDialog; + DisplayAddSummary(); + } + //================================================= void WxGimmickView::OnSynchronize(wxCommandEvent& event) { @@ -673,18 +733,49 @@ 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(); } //================================================= + void WxGimmickView::OnImportExport(wxCommandEvent &Event) + { + wxBusyCursor busy; + // Test if one image is selected => export + // if not =>import + if (GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]) + { + ExportImages(); + } + else + { + ImportImages(); + } + } + + void WxGimmickView::ExportImages() + { + //Archive selection: name, emplacement + //same process than copy local but to a zip + // if settings are yes "always ask for descriptor addition", ask + // if settings are yes, adding descriptor + } + + void WxGimmickView::ImportImages() + { + //Find the *.zip + //dezip + // Contain a descriptor.text + // create a new database, and add to database + // if not, add to current database + // + } //================================================= //AndresDonadio @@ -692,119 +783,225 @@ namespace creaImageIO { mViewer->StopPlayer(); - wxDialog* dial= new wxDialog (this,-1,"Tools",wxDefaultPosition, wxSize(300,200)); - + wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(300,250)); - WxGimmickTools * gimmickTools = new WxGimmickTools(dial, mCurrentDirectory); + wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL); + wxNotebook* nb= new wxNotebook(dial, -1, wxDefaultPosition, wxDefaultSize, 0); - wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL); - + wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL); + dialSizer->Add(nb,1,wxGROW,0); + dialSizer->Add(buttonsSizer,0,wxGROW); - wxSizer* bsizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL); - topsizer->Add(gimmickTools,1,wxGROW,0); - topsizer->Add(bsizer,0,wxGROW); +#if defined(BUILD_BRUKER) + //First page: Bruker Image Reader + WxGimmickTools * gimmickTools = new WxGimmickTools(nb, mCurrentDirectory); + nb->AddPage( gimmickTools, _T("Bruker Image Reader") ); +#endif - 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 defined(BUILD_BRUKER) + 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) + { + if ( wxMessageBox(_T("Depending on the amount of Data the process can take between 1 and 5 minutes. Do you want to continue?"), + _T("Please confirm"), wxICON_QUESTION | wxYES_NO) == wxYES ) + { + Bruker2Dicom b2d; + b2d.SetInputDirectory(inputDir); + b2d.SetOutputDirectory(outputDir); + b2d.SetConvertModeToDicom(); + b2d.Execute(); + + if (addToDB) + { + mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT ); + mCurrentDirectory = gimmickTools->getOutputDir(); + mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),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); + } + } + delete gimmickTools; +#endif } - - 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") ); + /*wxPanel* databaseCreation=new wxPanel(nb); + nb->AddPage( databaseCreation, crea::std2wx("Create Database") );*/ + + //Second page (temporary): Connection to PACS + WxPACSConnectionPanel* pacs=new WxPACSConnectionPanel(nb,dial, this); + nb->AddPage( pacs, crea::std2wx("Connect to PACS") ); + //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); + + //Fourth page: Selection of attributes to show + std::vector shown; + std::vector nShown; + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetAttributes(shown,nShown,1); + int nLev=GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetNumberOfLevels(); + WxAttributeSelectionPanel* attSelection=new WxAttributeSelectionPanel(nb,dial,this,shown,nShown,nLev); nb->AddPage( attSelection, crea::std2wx("Selection of Attributes") ); + } + //=================================================================== + void WxGimmickView::GetVisibleAttributes(std::vector& shown, + std::vector& nShown, int level) + { + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetAttributes(shown,nShown,level); + } + + //=================================================================== + void WxGimmickView::OnAttributesChanged(const std::vector& nShown, int level) + { + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->SetNonVisibleAttributes(nShown,level); + std::vector n=nShown; + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->CreateCtrl(n,level); + } + //=================================================================== + 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(); + } + + //======================================================================== + void WxGimmickView::CreateEditFieldsDialog(tree::Node* node, std::vector names, std::vector keys) + { + wxDialog* dial= new wxDialog (this,-1,crea::std2wx("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155)); + wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL); + WxEditFieldsPanel* ef = new WxEditFieldsPanel(dial, dial, this, node, names, keys); + + siz->Add( ef,1,wxGROW ,0); + dial->SetSizer(siz); + dial->ShowModal(); + } + + //======================================================================== + void WxGimmickView::OnFieldsEdited(tree::Node* node, const std::string& name, const std::string& key, const std::string& val) + { + mGimmick->EditField(node, crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())), name, key, val); + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); + } //================================================= /// AddProgress Gimmick callback void WxGimmickView::OnAddProgress( Gimmick::AddProgress& p) { - char mess[200]; - sprintf(mess,"%i dirs : %i files :\n %i handled - %i added", p.GetNumberScannedDirs(), p.GetNumberScannedFiles(), @@ -832,7 +1029,7 @@ namespace creaImageIO mess << "Files\tadded \t: " << p.GetNumberAddedFiles() << "\n\n"; /* char times[500]; - sprintf(times,"Time to parse dir \t\t: %ld ms \t%d°/o\nTime to read files info \t: %ld ms \t%d°/o\nTime to update structs \t: %ld ms \t%d°/o\nTime to update database \t: %ld ms \t%d°/o\nTotal time \t\t\t: %ld ms", + sprintf(times,"Time to parse dir \t\t: %ld ms \t%d°/o\nTime to read files info \t: %ld ms \t%d°/o\nTime to update structs \t: %ld ms \t%d°/o\nTime to update database \t: %ld ms \t%d°/o\nTotal time \t\t\t: %ld ms", summary.parse_time, (int)( summary.parse_time*100./summary.total_time), summary.file_scan_time,