X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=bc12bf4694b22acd6110a7723746ee31b7ee5d90;hb=7ca5b25a73bb296c395c810af83332d8af1eed1c;hp=f5d50c9d351b1450801f2d9437579e3a7c7c0b38;hpb=e084e1d404c6353f9b6d552fe014e98fecdf4cac;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index f5d50c9..bc12bf4 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -1,6 +1,14 @@ +#include +#include #include #include #include +#include +#include +#include +#include +#include + using namespace crea; // Icons #include "icons/accept.xpm" @@ -9,11 +17,22 @@ using namespace crea; #include "icons/page-down.xpm" #include "icons/remove.xpm" #include "icons/database-add.xpm" +#include "icons/create-database.xpm" #include "icons/help.xpm" +#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 +#ifdef _DEBUG +#define new DEBUG_NEW +#endif namespace creaImageIO { @@ -21,27 +40,36 @@ namespace creaImageIO // The ids of the different tools enum { - TOOL_ADDFILES_ID = 1, - TOOL_ADDDIR_ID = 2, - TOOL_REMOVE_ID = 3, - TOOL_ADDDATABASE_ID = 4, - TOOL_HELP_ID = 5 + TOOL_ADDFILES_ID = 1, + TOOL_ADDDIR_ID = 2, + TOOL_ADDDATABASE_ID = 3, + TOOL_REMOVE_ID = 4, + TOOL_SYNCHRONIZE_ID = 5, + TOOL_HELP_ID = 6, + TOOL_SETTINGS_ID = 7, + TOOL_TOOLS_ID = 8, + TOOL_CREATEDB_ID = 9, + TOOL_PACS_ID = 10 }; //====================================================================== //================================================================ // - const int icon_number = 7; + const int icon_number = 11; // Icon ids typedef enum { + Icon_create_database, Icon_accept, Icon_add, Icon_folder_down, Icon_page_down, - Icon_remove, Icon_database_add, - Icon_help + Icon_remove, + Icon_synchronize, + Icon_help, + Icon_settings, + Icon_tools } icon_id; //================================================================ @@ -62,9 +90,10 @@ namespace creaImageIO WxGimmickView::WxGimmickView(Gimmick* gimmick, wxWindow *parent, const wxWindowID id, - const wxPoint& pos, const wxSize& size, + const wxPoint& pos, + const wxSize& size, int min_dim, - int max_dim, + int max_dim, int number_of_threads) : wxPanel(parent,id,pos,size), GimmickView(gimmick, number_of_threads), @@ -112,12 +141,14 @@ namespace creaImageIO // Bottom panel mBottomPanel = new wxPanel(mSplitter,-1); - wxBoxSizer *bottom_sizer = new wxBoxSizer(wxVERTICAL); //HORIZONTAL); + wxBoxSizer *bottom_sizer = new wxBoxSizer(wxVERTICAL); //HORIZONTAL); // Previewer mViewer = new WxViewer(mBottomPanel, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize ); - pointers.push_back(new ImagePointerHolder(GetDefaultImage())); + //pointers.push_back(new ImagePointerHolder(GetDefaultImage()) + pointers.push_back(boost::shared_ptr(new ImagePointerHolder(GetDefaultImage()))); + mViewer->SetImageVector(pointers); mViewer->StartPlayer(); @@ -125,8 +156,8 @@ namespace creaImageIO bottom_sizer->Add(mViewer,1,wxGROW,1); // mViewer->Show(); - mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Welcome to Gimmick!")); - bottom_sizer->Add(mText,0,wxGROW,0); + mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Welcome to Gimmick!")); + bottom_sizer->Add(mText,0,wxGROW,0); @@ -144,11 +175,16 @@ 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; } //====================================================================== @@ -158,9 +194,13 @@ namespace creaImageIO WxGimmickView::~WxGimmickView() { // stop the viewer before application exit. - mViewer->StopPlayer(); + mViewer->StopPlayer(); GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <IsAlive()) + { + mListener->Delete(); + } } //====================================================================== @@ -182,21 +222,48 @@ namespace creaImageIO mIcon->GetBitmap(Icon_folder_down), _T("Add the content of a folder to database") ); + mToolAddDatabase = mToolBar->AddTool( TOOL_ADDDATABASE_ID, + _T("Open database"), + mIcon->GetBitmap(Icon_database_add), + _T("Open a local or distant database") + ); mToolRemove = mToolBar->AddTool( TOOL_REMOVE_ID, _T("Remove"), mIcon->GetBitmap(Icon_remove), _T("Remove selected items") ); - mToolAddDatabase = mToolBar->AddTool( TOOL_ADDDATABASE_ID, - _T("Open database"), - mIcon->GetBitmap(Icon_database_add), - _T("Open a local or distant database") + mToolSynchronize = mToolBar->AddTool( TOOL_SYNCHRONIZE_ID, + _T("Synchronize"), + mIcon->GetBitmap(Icon_synchronize), + _T("Synchronizes the database with disk") ); mToolHelp = mToolBar->AddTool( TOOL_HELP_ID, _T("Help"), 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") + ); + mToolAddFile = mToolBar->AddTool( TOOL_CREATEDB_ID, + _T("Create database"), + mIcon->GetBitmap(Icon_create_database), + _T("Create DB from an Attributes Descriptor file") + ); +#if defined(BUILD_PACS) + mToolAddFile = mToolBar->AddTool( TOOL_PACS_ID, + _T("PACS Connection,"), + mIcon->GetBitmap(Icon_create_database), + _T("Echo, Find and Get to a PACS") + ); +#endif //const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL) mToolBar->Realize(); @@ -220,14 +287,14 @@ namespace creaImageIO // Add Notebook page mNotebook->AddPage( view, crea::std2wx(name) ); - + } //====================================================================== void WxGimmickView::GetSelectedImages(std::vector& s, int dim) { std::vector files; - GetTreeViewMap()["Local database"]->GetSelectedAsString(files); + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files); ReadImagesNotThreaded(s,files,dim); } //====================================================================== @@ -235,7 +302,7 @@ namespace creaImageIO //====================================================================== void WxGimmickView::GetSelectedFiles(std::vector& s) { - GetTreeViewMap()["Local database"]->GetSelectedAsString(s); + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(s); } //====================================================================== @@ -253,7 +320,7 @@ namespace creaImageIO void WxGimmickView::CreateIconList() { // Size of the icons; - int size = 24; + int size = 16; wxIcon icons[20]; // should correspond to Icon_xxx enum @@ -264,6 +331,10 @@ namespace creaImageIO icons[Icon_remove] = wxIcon(remove_xpm); icons[Icon_database_add] = wxIcon(database_add_xpm); 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 @@ -289,8 +360,9 @@ namespace creaImageIO //================================================= void WxGimmickView::OnAddFiles(wxCommandEvent& event) { - long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE; - std::string wc("*.*"); + mViewer->StopPlayer(); + long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE; + std::string wc("*"); wxFileDialog* FD = new wxFileDialog( 0, _T("Select file"), _T(""), @@ -324,37 +396,41 @@ namespace creaImageIO wxPD_CAN_ABORT ); // TO DO : select the current tree handler - mGimmick->AddFiles("Local database",filenames); + mGimmick->AddFiles(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),filenames); mProgressDialog->Pulse(_T("Updating view...")); - UpdateTreeViewLevel("Local database",1); + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); delete mProgressDialog; DisplayAddSummary(); + } - + mViewer->StartPlayer(); } //================================================= //================================================= void WxGimmickView::OnAddDir(wxCommandEvent& event) { + mViewer->StopPlayer(); + std::string name = crea::wx2std(mNotebook->GetCurrentPage()->GetName()); long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST; wxDirDialog* FD = - new wxDirDialog( 0, + 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) - { + std::string dirname = wx2std (FD->GetPath()); + bool recurse = isNeedRecursive(dirname); + if (recurse) + { recurse = wxMessageBox(_T("Recurse into sub-directories ?"), _T("Scan directory"), wxYES_NO,this ) == wxYES ? true : false; - } + } wxBusyCursor busy; wxString title(_T("Adding directory")); @@ -363,24 +439,51 @@ 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 ); mCurrentDirectory = FD->GetPath(); - - // TO DO : select the current tree handler - mGimmick->AddDir("Local database",dirname,recurse); - + mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),dirname,recurse); mProgressDialog->Pulse(_T("Updating view...")); - UpdateTreeViewLevel("Local database",1); + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); delete mProgressDialog; DisplayAddSummary(); + + } + 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; + } //================================================= @@ -411,7 +514,6 @@ namespace creaImageIO if(sel.size()==0) { - valid= ValidateSelected(NULL, mSelectionMinDimension, mSelectionMaxDimension ); @@ -444,8 +546,7 @@ namespace creaImageIO mSelectionMaxDimension ); } } - - mText->SetLabel(crea::std2wx(GetMessage())); + mText->SetLabel(crea::std2wx(GetMessage())); /*if(valid) { ReadImageThreaded(sel); @@ -484,7 +585,8 @@ namespace creaImageIO "Requesting image from selected " <<(*selected)->GetAttribute("FullFileName") < ph(new ImagePointerHolder(GetDefaultImage())); pointers.push_back(ph); RequestReading(*selected,prio,index,ph); // AddEntryToMap(*selected); @@ -495,7 +597,7 @@ namespace creaImageIO //Going up prio = maxprio + 20; std::vector up; - GetTreeViewMap()["Local database"]->GetNodes(up,true); + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetNodes(up,true); std::vector::iterator iterUp; for(iterUp=up.begin();iterUp!=up.end();++iterUp) { @@ -503,7 +605,8 @@ namespace creaImageIO "Requesting image from neighbors up " <<(*iterUp)->GetAttribute("FullFileName") < ph(new ImagePointerHolder(GetDefaultImage())); RequestReading(*iterUp,prio,-1,ph); // AddEntryToMap(*iterUp); prio--; @@ -513,7 +616,7 @@ namespace creaImageIO //Going down prio = maxprio + 19; std::vector down; - GetTreeViewMap()["Local database"]->GetNodes(down,false); + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetNodes(down,false); std::vector::iterator iterDown; for(iterDown=down.begin();iterDown!=down.end();++iterDown) { @@ -521,7 +624,8 @@ namespace creaImageIO "Requesting image from neighbors down " <<(*iterDown)->GetAttribute("FullFileName") < ph(new ImagePointerHolder(GetDefaultImage())); RequestReading(*iterDown,prio,-1,ph); // AddEntryToMap(*iterDown); prio--; @@ -531,7 +635,8 @@ namespace creaImageIO else { pointers.clear(); - ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage()); + //ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage()); + boost::shared_ptr ph(new ImagePointerHolder(GetDefaultImage())); pointers.push_back(ph); mViewer->SetImageVector(pointers); } @@ -543,28 +648,29 @@ namespace creaImageIO //================================================== void WxGimmickView::OnInternalIdle() - { - if (!mConstructed) return; - static bool first_time = true; - if (false) { - first_time = false; + if (!mConstructed) return; + static bool first_time = true; + if (false) + { + first_time = false; } // GimmickMessage(1,"WxGimmickView : Refresh viewer"<StartPlayer(); - if(mViewer) - { - mViewer->RefreshIfNecessary(); - } + if(mViewer) + { + mViewer->RefreshIfNecessary(); + } } //================================================== //================================================== void WxGimmickView::ClearSelection() - { + { pointers.clear(); - pointers.push_back(new ImagePointerHolder(GetDefaultImage())); + pointers.push_back(boost::shared_ptr(new ImagePointerHolder(GetDefaultImage()))); + //pointers.push_back(new ImagePointerHolder(GetDefaultImage())); mViewer->SetImageVector(pointers); mViewer->RefreshIfNecessary(); ResetExtent(); @@ -575,23 +681,347 @@ namespace creaImageIO //================================================= void WxGimmickView::OnRemove(wxCommandEvent& event) { - modifyValidationSignal(false); - //TODO Select current tree handler + //TODO Select current tree handler + wxBusyCursor busy; + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->RemoveSelected(); + ClearSelection(); + } + //================================================= + + + //================================================= + void WxGimmickView::AddIgnoreFile(tree::Node* toRemove) + { + 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(); + } + + //================================================= + void WxGimmickView::OnSynchronize(wxCommandEvent& event) + { wxBusyCursor busy; - GetTreeViewMap()["Local database"]->RemoveSelected(); + const wxString choices[] = { _T("Check database for files deletion and addition and give a report."), + _T("Check database for files deletion, addition and attributes change. Then give a report."), + _T("Repair database (remove deleted files and add new files)."), + _T("Repair database (remove deleted files, add new files and reset changed attributes).") } ; - ClearSelection(); + wxSingleChoiceDialog dialog(this, + _T("Select one of the following synchronization actions:\n") + _T("Please note that, due to the heavy amount of operations required, this action might take a while."), + _T("Synchronization Settings"), + WXSIZEOF(choices), choices); + + //dialog.SetSelection(0); + + if (dialog.ShowModal() == wxID_OK) + { + int sel=dialog.GetSelection(); + bool repair=false; + bool checkAttributes=false; + if(sel==2 || sel==3){repair=true;} + if(sel==1 || sel==3){checkAttributes=true;} + std::string mess=mGimmick->Synchronize(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),repair, checkAttributes); + wxMessageBox(std2wx(mess),_T("Synchronization result"),wxOK,this); + 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(); + } + //================================================= + 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 + void WxGimmickView::OnTools(wxCommandEvent& event) + { + mViewer->StopPlayer(); + + wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(550,350)); + + 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.verbose=false; + 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", + sprintf(mess,"%i dirs : %i files :\n %i handled - %i added", p.GetNumberScannedDirs(), p.GetNumberScannedFiles(), p.GetNumberHandledFiles(), @@ -616,31 +1046,92 @@ namespace creaImageIO mess << "Files\tscanned\t: " << p.GetNumberScannedFiles() << "\n"; mess << "Files\thandled\t: " << p.GetNumberHandledFiles() << "\n\n"; mess << "Files\tadded \t: " << p.GetNumberAddedFiles() << "\n\n"; + wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this); + } - /* 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", - summary.parse_time, - (int)( summary.parse_time*100./summary.total_time), - summary.file_scan_time, - (int)(summary.file_scan_time*100./summary.total_time), - summary.update_structs_time, - (int)(summary.update_structs_time*100./summary.total_time), - summary.update_database_time, - (int)(summary.update_database_time*100./summary.total_time), - summary.total_time ); + //////////////////////////////////////////////// + // Add a DB to application // + // @param event : WxEvent // + // @return : - // + //////////////////////////////////////////////// + void WxGimmickView::OnAddDB(wxCommandEvent& event) + { + //Select DB + long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST; + std::string wc("*.sqlite3*"); + wxFileDialog* FD = new wxFileDialog( 0, + _T("Select file"), + _T(""), + _T(""), + crea::std2wx(wc), + style, + wxDefaultPosition); - mess << times; - */ - wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this); + if (FD->ShowModal()==wxID_OK) + { + wxBusyCursor busy; + wxArrayString files; + FD->GetPaths(files); + std::stringstream st; + for(int i = 0; i< files.size(); i++) + { + //get name of DB (file name) + size_t pos = files[i].find_last_of(_T("\\")); + std::string name = crea::wx2std(files[i].substr(pos+1)); + pos = name.find_last_of("."); + name = name.substr(0,pos); + //create TreeHandler + mGimmick->addDB(name, crea::wx2std(files[i])); + //create TreeView + CreateSingleTreeView(name); + } + } + } + //////////////////////////////////////////////////// + // Create a DB from an Attributes Descriptor files // + // @param event : WxEvent // + // @return : - // + ////////////////////////////////////////////////// + void WxGimmickView::OnCreateDB(wxCommandEvent& event) + { + // PACSConnection(""); + WxDescriptorPanel * DescriptorPan = new WxDescriptorPanel(this, mGimmick->GetHomeDirectory()); + DescriptorPan->Layout(); + if ( DescriptorPan->ShowModal() == ID_DSCP_APPLY) + { + wxBusyCursor busy; + std::string file(DescriptorPan->GetDescriptor()); + if (!file.empty()) + { + size_t pos = file.find_last_of("\\"); + std::string name = file.substr(pos+1); + std::string directory = file.substr(0,pos); + pos = name.find_last_of("."); + name = name.substr(0,pos); + //get directory to store DB + directory += "\\" + name + ".sqlite3"; + //create createDB + mGimmick->createDB(name, file,directory); + //create TreeHandler + mGimmick->addDB(name, directory); + //create TreeView + CreateSingleTreeView(name); + } + } } //================================================= //================================================= BEGIN_EVENT_TABLE(WxGimmickView, wxPanel) + EVT_TOOL(TOOL_CREATEDB_ID, WxGimmickView::OnCreateDB) EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnAddFiles) EVT_TOOL(TOOL_ADDDIR_ID, WxGimmickView::OnAddDir) - EVT_TOOL(TOOL_REMOVE_ID, WxGimmickView::OnRemove) + 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() //=================================================