#include <creaImageIOWxGimmickView.h>
#include <creaImageIOWxTreeView.h>
#include <creaImageIOSystem.h>
+#include <creaImageIOWxCustomizeConfigPanel.h>
+#include <creaImageIOWxListenerPanel.h>
+#include <creaImageIOWxEditFieldsPanel.h>
+#include <creaImageIOWxAttributeSelectionPanel.h>
+#include <creaImageIOWxPACSConnectionPanel.h>
+
using namespace crea;
// Icons
#include "icons/accept.xpm"
#include <wx/imaglist.h>
#include <wx/popupwin.h>
#include<boost/filesystem/operations.hpp>
+#if defined(BUILD_BRUKER)
+ #include "bruker2dicom.h"
+#endif
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;
}
mViewer->StopPlayer();
GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
<<std::endl);
+ if(mListener->IsAlive())
+ {
+ mListener->Delete();
+ }
}
//======================================================================
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)
{
//=================================================
void WxGimmickView::OnSettings(wxCommandEvent& event)
{
- wxDialog* dial= new wxDialog (this,-1,"System Settings",wxDefaultPosition, wxSize(450,600));
- wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL);
- // Notebook
- wxNotebook* nb= new wxNotebook(dial,
- -1,wxDefaultPosition, wxDefaultSize, 0);
-
- siz->Add( nb,1,wxGROW ,0);
- CreateSettingsDialog(nb);
- dial->SetSizer(siz);
- dial->ShowModal();
+ 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)
{
- wxDialog* dial= new wxDialog (this,-1,"Tools",wxDefaultPosition, wxDefaultSize);
- wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL);
+ mViewer->StopPlayer();
- wxButton *inBtn = new wxButton(dial,-1,_T("Input Directory"), wxDefaultPosition, wxSize(200,30) );
- wxButton *outBtn = new wxButton(dial,-1,_T("Output Directory"), wxDefaultPosition, wxSize(200,30) );
+ wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(300,250));
- dial->SetSizer(siz);
- dial->ShowModal();
+ wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
+ wxNotebook* nb= new wxNotebook(dial, -1, wxDefaultPosition, wxDefaultSize, 0);
- /*
- mViewer->StopPlayer();
- 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)
- {
+ wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL);
+ dialSizer->Add(nb,1,wxGROW,0);
+ dialSizer->Add(buttonsSizer,0,wxGROW);
-
- std::string dirname = wx2std (FD->GetPath());
- bool recurse = isNeedRecursive(dirname);
- if (recurse)
+#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)
{
- 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<std::string> shown;
+ std::vector<std::string> 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<std::string>& shown,
+ std::vector<std::string>& nShown, int level)
+ {
+ GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetAttributes(shown,nShown,level);
}
+ //===================================================================
+ void WxGimmickView::OnAttributesChanged(const std::vector<std::string>& nShown, int level)
+ {
+ GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->SetNonVisibleAttributes(nShown,level);
+ std::vector<std::string> 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"<<std::endl);
+ std::string drive;
+ mListener->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<std::string> names, std::vector<std::string> 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(),
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,
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff