+#include <creaImageIOPACSConnection.h>
+#include <creaImageIOWxPACSConnectionPanel.h>
#include <creaImageIOWxGimmickView.h>
#include <creaImageIOWxTreeView.h>
#include <creaImageIOSystem.h>
+#include <creaImageIOWxCustomizeConfigPanel.h>
+#include <creaImageIOWxListenerPanel.h>
+#include <creaImageIOWxEditFieldsPanel.h>
+#include <creaImageIOWxAttributeSelectionPanel.h>
+#include <creaImageIOWxDescriptorPanel.h>
+
using namespace crea;
// Icons
#include "icons/accept.xpm"
#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 <wx/imaglist.h>
-
+#include <wx/popupwin.h>
+#include<boost/filesystem/operations.hpp>
+#if defined(BUILD_BRUKER)
+ #include "bruker2dicom.h"
+#endif
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
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;
//================================================================
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),
- mProgressDialog(0)
+ GimmickView(gimmick, number_of_threads),
+ mProgressDialog(0),
+ mConstructed(false)
{
GimmickDebugMessage(1,"WxGimmickView::WxGimmickView"
<<std::endl);
mNotebook = new wxNotebook(mSplitter,
-1,wxDefaultPosition, wxDefaultSize, 0);
- //Gimmick
- mGimmick=gimmick;
-
- mSelectionMaxDimension=max_dim;
- mSelectionMinDimension=min_dim;
+ //Gimmick
+ mGimmick=gimmick;
+
+ mSelectionMaxDimension= max_dim;
+ mSelectionMinDimension= min_dim;
+
// Create the views
CreateTreeViews();
// Bottom panel
mBottomPanel = new wxPanel(mSplitter,-1);
- mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Status: Welcome to Gimmick!"));
-
+
+ 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(boost::shared_ptr<creaImageIO::ImagePointerHolder>(new ImagePointerHolder(GetDefaultImage())));
+
+ mViewer->SetImageVector(pointers);
+ mViewer->StartPlayer();
+
+
+ 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);
+
+
+
+ mBottomPanel->SetSizer(bottom_sizer);
+
// Splitting
int hsize = size.GetHeight();
- int bottom_minsize = 20;
+
+ int top_minsize = 450;
+ int bottom_minsize = 50;
mSplitter->SetMinimumPaneSize( bottom_minsize );
mSplitter->SplitHorizontally( mNotebook, mBottomPanel,
- hsize - bottom_minsize);
-
- sizer->Add( mSplitter,1,wxGROW ,0);
+ top_minsize);
+ 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;
}
//======================================================================
/// Destructor
WxGimmickView::~WxGimmickView()
{
+ // stop the viewer before application exit.
+ mViewer->StopPlayer();
GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
<<std::endl);
+ if(mListener->IsAlive())
+ {
+ mListener->Delete();
+ }
}
//======================================================================
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();
GimmickMessage(2,"Creating the tree view for '"<<
name<<"'"<<std::endl);
// Create the WxTreeView
- WxTreeView* view = new WxTreeView(h,mNotebook,-1);
-
- view->SetMaxDimension(mSelectionMaxDimension);
- view->SetMinDimension(mSelectionMinDimension);
+ WxTreeView* view = new WxTreeView(h,this,mNotebook,-1);
// TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT
// ALREADY IN THE MAP
// Add Notebook page
mNotebook->AddPage( view, crea::std2wx(name) );
+
+ }
+ //======================================================================
+ void WxGimmickView::GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
+ {
+ std::vector<std::string> files;
+ GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files);
+ ReadImagesNotThreaded(s,files,dim);
}
//======================================================================
- /// Returns the selected Images so that they comply with the given parameter(<4D)
- vtkImageData* WxGimmickView::GetSelectedImage(int dim)
+
+ //======================================================================
+ void WxGimmickView::GetSelectedFiles(std::vector<std::string>& s)
{
- return NULL;
+ GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(s);
}
+ //======================================================================
//======================================================================
- /// Returns the selected Images so that they comply with the given parameter(4D)
- void WxGimmickView::GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
+ void WxGimmickView::GetImages(int dim,
+ const std::vector<std::string>& files,
+ std::vector<vtkImageData*>& s)
{
-
- //GetTreeViewMap()["Local database"]->GetImageData()
- //return NULL ;
-
+ ReadImagesNotThreaded(s,files,dim);
}
+ //======================================================================
+
//=================================================
void WxGimmickView::CreateIconList()
{
// Size of the icons;
- int size = 24;
+ int size = 16;
wxIcon icons[20];
// should correspond to Icon_xxx enum
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
//=================================================
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(""),
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)
- {
+ {
+
- bool recurse = false;
- if (wxMessageBox(_T("Recurse into sub-directories ?"),
- _T("Scan directory"),
- wxYES_NO,this ) == wxYES)
+ 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)
+ title = _T("Adding directory (recursive)");
+ mProgressDialog =
+ new wxProgressDialog(_T("Adding directory"),
+ _T(""),
+ NumberFilesToAdd(dirname,recurse),
+ this,
+ 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 )
{
- recurse = true;
+ // If is directory & recurse : do recurse
+ if ( boost::filesystem::is_directory(itr->status()) )
+ {
+ if (recursive)
+ {
+ nb += NumberFilesToAdd(itr->string(), recursive);
+ }
+ }
+ else
+ {
+ nb++;
+ }
}
-
- 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 );
- std::string dirname = wx2std (FD->GetPath()) ;
- mCurrentDirectory = FD->GetPath();
-
- // TO DO : select the current tree handler
- mGimmick->AddDir("Local database",dirname,recurse);
-
- mProgressDialog->Pulse(_T("Updating view..."));
-
- UpdateTreeViewLevel("Local database",1);
- delete mProgressDialog;
- DisplayAddSummary();
- }
+ return nb;
+
+ }
+
+ //=================================================
+ // Test a directory to know if contains sub-directory to analyze
+ bool WxGimmickView::isNeedRecursive(std::string i_name)
+ {
+ boost::filesystem::directory_iterator iter(i_name), end_iter;
+ bool bfindir = false;
+ for(; iter != end_iter; ++iter)
+ {
+ if(boost::filesystem::is_directory(*iter))
+ {
+ return true;
+ }
+ }
+ return false;
}
//=================================================
//=================================================
- void WxGimmickView::SetMessage(const wxString& mess)
+ void WxGimmickView::OnSelectionChange(const std::vector<tree::Node*>& sel, bool isSelection, int selection, bool needProcess)
{
+ GimmickDebugMessage(5,
+ "WxGimmickView::OnSelectionChange"
+ <<std::endl);
wxBusyCursor busy;
+ bool valid=true;
+
+ if(sel.size()==0)
+ {
+ valid= ValidateSelected(NULL,
+ mSelectionMinDimension,
+ mSelectionMaxDimension );
+ }
+ else if(needProcess)
+ {
+ ResetExtent();
+ std::vector<tree::Node*>::const_iterator i;
+ for(i=sel.begin();i!=sel.end()&&valid;++i)
+ {
+ valid= ValidateSelected((*i),
+ mSelectionMinDimension,
+ mSelectionMaxDimension );
+ }
+ }
+ else if(isSelection)
+ {
+ valid= ValidateSelected(sel.front(),
+ mSelectionMinDimension,
+ mSelectionMaxDimension );
+ }
+ else
+ {
+ ResetExtent();
+ std::vector<tree::Node*>::const_iterator i;
+ for(i=sel.begin();i!=sel.end()&&valid;++i)
+ {
+ valid= ValidateSelected((*i),
+ mSelectionMinDimension,
+ mSelectionMaxDimension );
+ }
+ }
+ mText->SetLabel(crea::std2wx(GetMessage()));
+ /*if(valid)
+ {
+ ReadImageThreaded(sel);
+ }
+ else
+ {
+ ClearSelection();
+ }*/
+ ReadImageThreaded(sel);
+
- mText->SetLabel(_T("Status: ")+mess);
}
+
+ //==================================================
+
+ //==================================================
+ ///Reads Images (Threaded)
+ void WxGimmickView::ReadImageThreaded(const std::vector<tree::Node*>& sel)
+ {
+ GimmickDebugMessage(5,
+ "ReadImageThreaded"
+ <<std::endl);
+ int maxprio = GetMaximalPriority();
+ int prio = maxprio + 2000;
+
+ if(sel.size()>0)
+ {
+ //First load the selected images
+ mCurImageItemToShow = sel.front();
+ pointers.clear();
+ int index = 0;
+ std::vector<tree::Node*>::const_iterator selected;
+ for(selected=sel.begin();selected!=sel.end();++selected)
+ {
+ GimmickDebugMessage(5,
+ "Requesting image from selected "
+ <<(*selected)->GetAttribute("FullFileName")
+ <<std::endl);
+ //ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+ boost::shared_ptr<ImagePointerHolder> ph(new ImagePointerHolder(GetDefaultImage()));
+ pointers.push_back(ph);
+ RequestReading(*selected,prio,index,ph);
+ // AddEntryToMap(*selected);
+ prio--;
+ index++;
+ }
+ mViewer->SetImageVector(pointers);
+ //Going up
+ prio = maxprio + 20;
+ std::vector<tree::Node*> up;
+ GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetNodes(up,true);
+ std::vector<tree::Node*>::iterator iterUp;
+ for(iterUp=up.begin();iterUp!=up.end();++iterUp)
+ {
+ GimmickDebugMessage(5,
+ "Requesting image from neighbors up "
+ <<(*iterUp)->GetAttribute("FullFileName")
+ <<std::endl);
+// ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+ boost::shared_ptr<ImagePointerHolder> ph(new ImagePointerHolder(GetDefaultImage()));
+ RequestReading(*iterUp,prio,-1,ph);
+ // AddEntryToMap(*iterUp);
+ prio--;
+ if (prio == maxprio) break;
+ }
+
+ //Going down
+ prio = maxprio + 19;
+ std::vector<tree::Node*> down;
+ GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetNodes(down,false);
+ std::vector<tree::Node*>::iterator iterDown;
+ for(iterDown=down.begin();iterDown!=down.end();++iterDown)
+ {
+ GimmickDebugMessage(5,
+ "Requesting image from neighbors down "
+ <<(*iterDown)->GetAttribute("FullFileName")
+ <<std::endl);
+ //ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+ boost::shared_ptr<ImagePointerHolder> ph(new ImagePointerHolder(GetDefaultImage()));
+ RequestReading(*iterDown,prio,-1,ph);
+ // AddEntryToMap(*iterDown);
+ prio--;
+ if (prio == maxprio) break;
+ }
+ }
+ else
+ {
+ pointers.clear();
+ //ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+ boost::shared_ptr<ImagePointerHolder> ph(new ImagePointerHolder(GetDefaultImage()));
+ pointers.push_back(ph);
+ mViewer->SetImageVector(pointers);
+ }
+ }
+
+ //==================================================
+
+ //==================================================
+
+ //==================================================
+ void WxGimmickView::OnInternalIdle()
+ {
+ if (!mConstructed) return;
+ static bool first_time = true;
+ if (false)
+ {
+ first_time = false;
+ }
+ // GimmickMessage(1,"WxGimmickView : Refresh viewer"<<std::endl);
+ // mViewer->StartPlayer();
+ if(mViewer)
+ {
+ mViewer->RefreshIfNecessary();
+ }
+ }
+
+ //==================================================
+
+ //==================================================
+ void WxGimmickView::ClearSelection()
+ {
+ pointers.clear();
+ pointers.push_back(boost::shared_ptr<creaImageIO::ImagePointerHolder>(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();
+ }
+ //=================================================
+
+
//=================================================
+ 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<std::string>& 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::OnRemove(wxCommandEvent& event)
+ void WxGimmickView::AddDir(std::string dirName)
{
- //TODO Select current tree handler
+ 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(1);
+ 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("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<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 - %i handled - %i added",
+ sprintf(mess,"%i dirs : %i files :\n %i handled - %i added",
p.GetNumberScannedDirs(),
p.GetNumberScannedFiles(),
p.GetNumberHandledFiles(),
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()
//=================================================
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff