X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=37c0f190560c8a42a5abe9c330079ad9b3855ae9;hb=b0843014c5482f70050fab8036c6780172e3b6c9;hp=9ada3c16b67eaf2f7738c1a6b0b10fff7739c66d;hpb=36cf4b6daf031e4d5e757b4f732b9bf39d69200c;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 9ada3c1..37c0f19 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -1,3 +1,5 @@ +#include +#include #include #include #include @@ -5,6 +7,7 @@ #include #include #include +#include using namespace crea; // Icons @@ -19,6 +22,7 @@ using namespace crea; #include "icons/synchronize.xpm" #include "icons/settings.xpm" #include "icons/tools.xpm" +//#include "icons/import.xpm" #include #include @@ -27,6 +31,8 @@ using namespace crea; #include "bruker2dicom.h" #endif + + namespace creaImageIO { @@ -34,15 +40,16 @@ namespace creaImageIO // The ids of the different tools enum { - TOOL_CREATEDB_ID = 1, - TOOL_ADDFILES_ID = 2, - TOOL_ADDDIR_ID = 3, - TOOL_ADDDATABASE_ID = 4, - TOOL_REMOVE_ID = 5, - TOOL_SYNCHRONIZE_ID = 6, - TOOL_HELP_ID = 7, - TOOL_SETTINGS_ID = 8, - TOOL_TOOLS_ID = 9 + 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 }; //====================================================================== @@ -52,16 +59,16 @@ namespace creaImageIO // Icon ids typedef enum { - Icon_create_database, + Icon_create_database, Icon_accept, Icon_add, Icon_folder_down, Icon_page_down, - Icon_database_add, + Icon_database_add, Icon_remove, - Icon_synchronize, + Icon_synchronize, Icon_help, - Icon_settings, + Icon_settings, Icon_tools } icon_id; @@ -80,12 +87,13 @@ namespace creaImageIO //====================================================================== // CTor - WxGimmickView::WxGimmickView(Gimmick* gimmick, + WxGimmickView::WxGimmickView(boost::shared_ptr 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), @@ -98,8 +106,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(); @@ -109,23 +117,21 @@ namespace creaImageIO // Create the tool bar CreateToolBar(); - sizer->Add( mToolBar ,0, wxGROW ,0); + sizer->Add( mToolBar, 0, wxGROW, 0); // Split part below toolbar into notebook for views and panel // for preview, messages... mSplitter = new wxSplitterWindow( this , -1); - - + // Notebook mNotebook = new wxNotebook(mSplitter, - -1,wxDefaultPosition, wxDefaultSize, 0); + -1, wxDefaultPosition, wxDefaultSize, 0); //Gimmick mGimmick=gimmick; - - mSelectionMaxDimension= max_dim; - mSelectionMinDimension= min_dim; + mSelectionMaxDimension = max_dim; + mSelectionMinDimension = min_dim; // Create the views CreateTreeViews(); @@ -133,12 +139,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(); @@ -146,8 +154,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); @@ -163,18 +171,18 @@ namespace creaImageIO mSplitter->SplitHorizontally( mNotebook, mBottomPanel, top_minsize); - sizer->Add( mSplitter,1,wxGROW ,0); + sizer->Add( mSplitter, 1, wxGROW, 0); - mProgressDialog=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(); - + //mListener=new Listener(); + //mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount, this, _1 ) ); + //mListener->Create(); + // mListener->Run(); + // mListener->Pause(); + mConstructed = true; } //====================================================================== @@ -184,13 +192,11 @@ namespace creaImageIO WxGimmickView::~WxGimmickView() { // stop the viewer before application exit. - mViewer->StopPlayer(); + mViewer->StopPlayer(); GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <IsAlive()) - { - mListener->Delete(); - } + delete mIcon; + //if(mListener->IsAlive()) { mListener->Delete(); } } //====================================================================== @@ -202,11 +208,6 @@ namespace creaImageIO mToolBar = new wxToolBar(this,-1,wxDefaultPosition,wxDefaultSize, style); - mToolAddFile = mToolBar->AddTool( TOOL_CREATEDB_ID, - _T("Create database"), - mIcon->GetBitmap(Icon_create_database), - _T("Create DB from an Attributes Descriptor file") - ); mToolAddFile = mToolBar->AddTool( TOOL_ADDFILES_ID, _T("Add file(s)"), mIcon->GetBitmap(Icon_page_down), @@ -217,7 +218,7 @@ namespace creaImageIO mIcon->GetBitmap(Icon_folder_down), _T("Add the content of a folder to database") ); - mToolAddDatabase = mToolBar->AddTool( TOOL_ADDDATABASE_ID, + mToolAddDatabase = mToolBar->AddTool( TOOL_ADDDATABASE_ID, _T("Open database"), mIcon->GetBitmap(Icon_database_add), _T("Open a local or distant database") @@ -232,21 +233,33 @@ namespace creaImageIO mIcon->GetBitmap(Icon_synchronize), _T("Synchronizes the database with disk") ); - mToolHelp = mToolBar->AddTool( TOOL_HELP_ID, + mToolHelp = mToolBar->AddTool( TOOL_HELP_ID, _T("Help"), mIcon->GetBitmap(Icon_help), _T("Open help window") ); - mToolSettings = mToolBar->AddTool( TOOL_SETTINGS_ID, + 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, + 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(); @@ -262,7 +275,7 @@ namespace creaImageIO GimmickMessage(2,"Creating the tree view for '"<< name<<"'"< files; GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files); - ReadImagesNotThreaded(s,files,dim); + ReadImagesNotThreaded(s, files, dim); + } + + //====================================================================== + void WxGimmickView::GetSelectedImagesInVector(std::vector& s, int dim) + { + std::vector files; + GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files); + ReadImagesNotThreadedInVector(s, files, dim); } //====================================================================== @@ -307,17 +328,17 @@ namespace creaImageIO wxIcon icons[20]; // should correspond to Icon_xxx enum - icons[Icon_accept] = wxIcon(accept_xpm); - icons[Icon_add] = wxIcon(add_xpm); - icons[Icon_folder_down] = wxIcon(folder_down_xpm); - icons[Icon_page_down] = wxIcon(page_down_xpm); - 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); + icons[Icon_accept] = wxIcon(accept_xpm); + icons[Icon_add] = wxIcon(add_xpm); + icons[Icon_folder_down] = wxIcon(folder_down_xpm); + icons[Icon_page_down] = wxIcon(page_down_xpm); + 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 @@ -344,8 +365,8 @@ namespace creaImageIO void WxGimmickView::OnAddFiles(wxCommandEvent& event) { mViewer->StopPlayer(); - long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE; - std::string wc("*.*"); + long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE; + std::string wc("*"); wxFileDialog* FD = new wxFileDialog( 0, _T("Select file"), _T(""), @@ -374,8 +395,8 @@ namespace creaImageIO 1000, this, wxPD_ELAPSED_TIME | - // wxPD_ESTIMATED_TIME | - // wxPD_REMAINING_TIME | + // wxPD_ESTIMATED_TIME | + // wxPD_REMAINING_TIME | wxPD_CAN_ABORT ); // TO DO : select the current tree handler @@ -399,22 +420,20 @@ namespace creaImageIO 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) + { + recurse = wxMessageBox(_T("Recurse into sub-directories ?"), _T("Scan directory"), wxYES_NO,this ) == wxYES ? true : false; + } - - 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")); if (recurse) @@ -422,26 +441,52 @@ namespace creaImageIO mProgressDialog = new wxProgressDialog(_T("Adding directory"), _T(""), - 1000, + NumberFilesToAdd(dirname,recurse), this, - wxPD_ELAPSED_TIME | - // wxPD_ESTIMATED_TIME | - // wxPD_REMAINING_TIME | + wxPD_ELAPSED_TIME | + wxPD_SMOOTH | + // 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(); } - //================================================= + + //================================================= + // 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) { @@ -511,8 +556,6 @@ namespace creaImageIO ClearSelection(); }*/ ReadImageThreaded(sel); - - } //================================================== @@ -540,7 +583,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); @@ -559,7 +603,8 @@ namespace creaImageIO "Requesting image from neighbors up " <<(*iterUp)->GetAttribute("FullFileName") < ph(new ImagePointerHolder(GetDefaultImage())); RequestReading(*iterUp,prio,-1,ph); // AddEntryToMap(*iterUp); prio--; @@ -577,7 +622,8 @@ namespace creaImageIO "Requesting image from neighbors down " <<(*iterDown)->GetAttribute("FullFileName") < ph(new ImagePointerHolder(GetDefaultImage())); RequestReading(*iterDown,prio,-1,ph); // AddEntryToMap(*iterDown); prio--; @@ -587,7 +633,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); } @@ -599,84 +646,88 @@ 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(); } - + //================================================= //================================================= void WxGimmickView::OnRemove(wxCommandEvent& event) { //TODO Select current tree handler - wxBusyCursor busy; - GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->RemoveSelected(); - ClearSelection(); + wxBusyCursor busy; + 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(); } //================================================= - + //================================================= void WxGimmickView::AddIgnoreFile(tree::Node* toRemove) { - mGimmick->RemoveFile(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),toRemove); - GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->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); + 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(); + 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; - 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).") } ; + 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).") } ; wxSingleChoiceDialog dialog(this, - _T("Select one of the following synchronization actions:\n") + _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); @@ -685,16 +736,17 @@ namespace creaImageIO if (dialog.ShowModal() == wxID_OK) { + wxBusyCursor busy; 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){ + 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); - } + } } } @@ -713,78 +765,111 @@ namespace creaImageIO 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(); + mViewer->StopPlayer(); - wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(300,250)); + 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); + 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") ); + //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(); + dial->SetSizer(dialSizer, true); + dial->Layout(); + dial->ShowModal(); - if (dial->GetReturnCode() == wxID_OK) - { + if (dial->GetReturnCode() == wxID_OK) + { #if defined(BUILD_BRUKER) - if (nb->GetSelection()==0)//Selection: Bruker Image Reader + 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->getAddToDBCheckBoxValue(); + + 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) { - 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); - } + 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(); + } } - delete gimmickTools; -#endif } - - mViewer->StartPlayer(); + 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) @@ -808,8 +893,12 @@ namespace creaImageIO 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 WxListenerPanel* cdWatch=new WxListenerPanel(nb,dial, this, mListener->IsPaused()); @@ -817,7 +906,7 @@ namespace creaImageIO //Fourth page: Selection of attributes to show std::vector shown; - std::vector nShown; + 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); @@ -887,15 +976,13 @@ namespace creaImageIO UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); delete mProgressDialog; DisplayAddSummary(); - mViewer->StartPlayer(); - + mViewer->StartPlayer(); } else { mGimmick->DeleteDrive(drive); UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); - } - + } } //======================================================================== @@ -915,7 +1002,7 @@ namespace creaImageIO //======================================================================== void WxGimmickView::CreateEditFieldsDialog(tree::Node* node, std::vector names, std::vector keys) { - wxDialog* dial= new wxDialog (this,-1,_T("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155)); + 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); @@ -927,8 +1014,8 @@ namespace creaImageIO //======================================================================== 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); + mGimmick->EditField(node, crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())), name, key, val); + UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1); } //================================================= @@ -936,7 +1023,7 @@ namespace creaImageIO 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(), @@ -961,32 +1048,16 @@ 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"; - - /* 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 ); - - mess << times; - */ wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this); } - ////////////////////////////////////////////////// - // Add a DB to application // - // @param event : WxEvent // - // @return : - // - ////////////////////////////////////////////////// + //////////////////////////////////////////////// + // 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*"); @@ -1020,43 +1091,34 @@ namespace creaImageIO } //////////////////////////////////////////////////// // Create a DB from an Attributes Descriptor files // - // @param event : WxEvent // - // @return : - // + // @param event : WxEvent // + // @return : - // ////////////////////////////////////////////////// void WxGimmickView::OnCreateDB(wxCommandEvent& event) { - - //Select DB - long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST; - std::string wc("*.txt"); - wxFileDialog* FD = new wxFileDialog( 0, - _T("Select file"), - _T(""), - _T(""), - crea::std2wx(wc), - style, - wxDefaultPosition); - - if (FD->ShowModal()==wxID_OK) + // PACSConnection(""); + WxDescriptorPanel * DescriptorPan = new WxDescriptorPanel(this, mGimmick->GetHomeDirectory()); + DescriptorPan->Layout(); + if ( DescriptorPan->ShowModal() == ID_DSCP_APPLY) { wxBusyCursor busy; - wxArrayString afile; - FD->GetPaths(afile); - //get name of DB (file name) - std::string file = crea::wx2std(afile[0]); - 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); + 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); + } } } @@ -1067,14 +1129,13 @@ namespace creaImageIO EVT_TOOL(TOOL_CREATEDB_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) + 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() //================================================= } // EO namespace creaImageIO -