X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=a77f9a7fe9de9bdc1726f0db2b1d01a3b22868ee;hb=cf9b62742f0699be21da81b01cb9656be0f78c4f;hp=824386795051727db757a73268c3759da8414d97;hpb=be812877eb9dfa9b921df4f6d88df98af73328c3;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 8243867..a77f9a7 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -1,6 +1,12 @@ #include #include #include +#include +#include +#include +#include +#include + using namespace crea; // Icons #include "icons/accept.xpm" @@ -12,10 +18,15 @@ using namespace crea; #include "icons/create-database.xpm" #include "icons/help.xpm" #include "icons/synchronize.xpm" +#include "icons/settings.xpm" +#include "icons/tools.xpm" #include #include #include +#if defined(BUILD_BRUKER) + #include "bruker2dicom.h" +#endif namespace creaImageIO { @@ -30,25 +41,29 @@ namespace creaImageIO TOOL_ADDDATABASE_ID = 4, TOOL_REMOVE_ID = 5, TOOL_SYNCHRONIZE_ID = 6, - TOOL_HELP_ID = 7 + TOOL_HELP_ID = 7, + TOOL_SETTINGS_ID = 8, + TOOL_TOOLS_ID = 9 }; //====================================================================== //================================================================ // - const int icon_number = 8; + const int icon_number = 11; // Icon ids typedef enum { + Icon_create_database, Icon_accept, Icon_add, Icon_folder_down, Icon_page_down, + Icon_database_add, Icon_remove, - Icon_database_add, - Icon_help, Icon_synchronize, - Icon_create_database + Icon_help, + Icon_settings, + Icon_tools } icon_id; //================================================================ @@ -151,10 +166,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; } @@ -168,6 +188,10 @@ namespace creaImageIO mViewer->StopPlayer(); GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <IsAlive()) + { + mListener->Delete(); + } } //====================================================================== @@ -214,6 +238,16 @@ namespace creaImageIO mIcon->GetBitmap(Icon_help), _T("Open help window") ); + mToolSettings = mToolBar->AddTool( TOOL_SETTINGS_ID, + _T("System settings"), + mIcon->GetBitmap(Icon_settings), + _T("Allows the modification of various system settings") + ); + mToolTools = mToolBar->AddTool( TOOL_TOOLS_ID, + _T("Tools"), + mIcon->GetBitmap(Icon_tools), + _T("Applies tools to images") + ); //const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL) mToolBar->Realize(); @@ -283,6 +317,8 @@ namespace creaImageIO icons[Icon_help] = wxIcon(help_xpm); icons[Icon_synchronize] = wxIcon(synchronize_xpm); icons[Icon_create_database] = wxIcon(create_database_xpm); + icons[Icon_settings] = wxIcon(settings_xpm); + icons[Icon_tools] = wxIcon(tools_xpm); // unsigned int NbIcons = 8; // Make an image list containing small icons @@ -466,8 +502,7 @@ namespace creaImageIO mSelectionMaxDimension ); } } - - mText->SetLabel(crea::std2wx(GetMessage())); + mText->SetLabel(crea::std2wx(GetMessage())); /*if(valid) { ReadImageThreaded(sel); @@ -608,8 +643,28 @@ namespace creaImageIO //================================================= void WxGimmickView::AddIgnoreFile(tree::Node* toRemove) { - mGimmick->RemoveFile("Local database",toRemove); - GetTreeViewMap()["Local database"]->UpdateLevel(1); + mGimmick->RemoveFile(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),toRemove); + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1); + } + + //================================================= + void WxGimmickView::CopyFiles(const std::vector& filenames) + { + mGimmick->CopyFiles(filenames, crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))); + 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(); } //================================================= @@ -636,21 +691,256 @@ namespace creaImageIO bool checkAttributes=false; if(sel==2 || sel==3){repair=true;} if(sel==1 || sel==3){checkAttributes=true;} - std::string mess=mGimmick->Synchronize(repair, checkAttributes); + std::string mess=mGimmick->Synchronize(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),repair, checkAttributes); wxMessageBox(std2wx(mess),_T("Synchronization result"),wxOK,this); - GetTreeViewMap()["Local database"]->UpdateLevel(1); + if(sel==2 || sel==3){ + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1); + } } } //================================================= + //================================================= + void WxGimmickView::OnSettings(wxCommandEvent& event) + { + 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); + + siz->Add( nb,1,wxGROW ,0); + CreateSettingsDialog(nb,dial); + dial->SetSizer(siz); + dial->ShowModal(); + } + //================================================= + + //================================================= + //AndresDonadio + void WxGimmickView::OnTools(wxCommandEvent& event) + { + mViewer->StopPlayer(); + + wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(300,250)); + + wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL); + wxNotebook* nb= new wxNotebook(dial, -1, wxDefaultPosition, wxDefaultSize, 0); + + wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL); + dialSizer->Add(nb,1,wxGROW,0); + dialSizer->Add(buttonsSizer,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(dialSizer, true); + dial->Layout(); + dial->ShowModal(); + + if (dial->GetReturnCode() == wxID_OK) + { +#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 + } + + mViewer->StartPlayer(); + } + //================================================= + + void WxGimmickView::CreateSettingsDialog(wxNotebook* nb, wxDialog* dial) + { + //First page: Customization of configurations + //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") );*/ + + //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 + WxListenerPanel* cdWatch=new WxListenerPanel(nb,dial, this, mListener->IsPaused()); + nb->AddPage( cdWatch, crea::std2wx("CD/DVD") ); + + //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(), @@ -678,7 +968,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, @@ -780,12 +1070,13 @@ namespace creaImageIO //================================================= BEGIN_EVENT_TABLE(WxGimmickView, wxPanel) EVT_TOOL(TOOL_CREATEDB_ID, WxGimmickView::OnCreateDB) - EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnCreateDB) EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnAddFiles) EVT_TOOL(TOOL_ADDDIR_ID, WxGimmickView::OnAddDir) EVT_TOOL(TOOL_ADDDATABASE_ID, WxGimmickView::OnAddDB) EVT_TOOL(TOOL_REMOVE_ID, WxGimmickView::OnRemove) EVT_TOOL(TOOL_SYNCHRONIZE_ID, WxGimmickView::OnSynchronize) + EVT_TOOL(TOOL_SETTINGS_ID, WxGimmickView::OnSettings) + EVT_TOOL(TOOL_TOOLS_ID, WxGimmickView::OnTools) END_EVENT_TABLE() //=================================================