-#include <creaImageIOWxGimmickView.h>
+#include <creaImageIOWxGimmickView.h>
#include <creaImageIOWxTreeView.h>
#include <creaImageIOSystem.h>
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 <wx/imaglist.h>
+#include <wx/popupwin.h>
+#include<boost/filesystem/operations.hpp>
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_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
};
//======================================================================
//================================================================
//
- 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_database_add,
Icon_remove,
- Icon_database_add,
- Icon_help
+ Icon_synchronize,
+ Icon_help,
+ Icon_settings,
+ Icon_tools
}
icon_id;
//================================================================
mNotebook = new wxNotebook(mSplitter,
-1,wxDefaultPosition, wxDefaultSize, 0);
- //Gimmick
- mGimmick=gimmick;
- mViewer=new WxViewer(this, wxID_ANY, wxT("Gimmick! Viewer"),wxDefaultPosition, wxDefaultSize );
-
-
- 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()));
+ 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 = 15;
+
+ int top_minsize = 450;
+ int bottom_minsize = 50;
mSplitter->SetMinimumPaneSize( bottom_minsize );
mSplitter->SplitHorizontally( mNotebook, mBottomPanel,
- hsize - bottom_minsize);
-
+ top_minsize);
+
sizer->Add( mSplitter,1,wxGROW ,0);
/// Destructor
WxGimmickView::~WxGimmickView()
{
+ // stop the viewer before application exit.
+ mViewer->StopPlayer();
GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
<<std::endl);
}
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),
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,
+ 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")
+ );
//const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL)
mToolBar->Realize();
// Add Notebook page
mNotebook->AddPage( view, crea::std2wx(name) );
-
+
}
+
//======================================================================
- /// Returns the selected Image so that it complies with the given parameter(<4D)
- vtkImageData* WxGimmickView::GetSelectedImage(int dim)
+ void WxGimmickView::GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
{
- return NULL;
- //GetTreeViewMap()["Local database"]->GetSelectedImage(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)
- void WxGimmickView::GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
+ void WxGimmickView::GetSelectedFiles(std::vector<std::string>& s)
{
- int level=GetTreeViewMap()["Local database"]->GetNumberOfLevels();
- std::vector<tree::Node*> im=GetTreeViewMap()["Local database"]->GetSelected(level+1);
- ReadImagesNotThreaded(s,im,dim);
+ GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(s);
}
//======================================================================
- /// Returns the selected Images so that they comply with the given parameter(4D)
- void WxGimmickView::GetSelectedFiles(std::vector<std::string>& s)
+
+ //======================================================================
+ void WxGimmickView::GetImages(int dim,
+ const std::vector<std::string>& files,
+ std::vector<vtkImageData*>& s)
{
- GetTreeViewMap()["Local database"]->GetSelectedAsString(s);
+ 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)
{
+ mViewer->StopPlayer();
long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE;
std::string wc("*.*");
wxFileDialog* FD = new wxFileDialog( 0,
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,
if (FD->ShowModal()==wxID_OK)
{
+
- bool recurse = false;
- if (wxMessageBox(_T("Recurse into sub-directories ?"),
- _T("Scan directory"),
- wxYES_NO,this ) == wxYES)
- {
- recurse = true;
+ 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(""),
+ 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();
+
}
-
- 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();
- }
+ mViewer->StartPlayer();
+ }
+
+ //=================================================
+ // 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::OnSelectionChange(std::vector<tree::Node*>& sel)
+ 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 = ValidateSelected(sel,
- mSelectionMinDimension,
- mSelectionMaxDimension );
- mText->SetLabel(_T("Status: ")+crea::std2wx(GetMessage()));
- if(valid)
+ 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
{
- mViewer->Hide();
- }
+ ClearSelection();
+ }*/
+ ReadImageThreaded(sel);
}
//==================================================
///Reads Images (Threaded)
- void WxGimmickView::ReadImageThreaded(std::vector<tree::Node*> sel)
+ 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();
- std::vector<tree::Node*>::iterator selected;
+ 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);
- RequestReading(*selected,prio);
- AddEntryToMap(*selected);
- prio--;
- }
-
+ {
+ GimmickDebugMessage(5,
+ "Requesting image from selected "
+ <<(*selected)->GetAttribute("FullFileName")
+ <<std::endl);
+ 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 + 1000;
+ prio = maxprio + 20;
std::vector<tree::Node*> up;
- GetTreeViewMap()["Local database"]->GetNodes(up,true);
+ GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetNodes(up,true);
std::vector<tree::Node*>::iterator iterUp;
for(iterUp=up.begin();iterUp!=up.end();++iterUp)
{
"Requesting image from neighbors up "
<<(*iterUp)->GetAttribute("FullFileName")
<<std::endl);
- RequestReading(*iterUp,prio);
- AddEntryToMap(*iterUp);
+ ImagePointerHolder* ph=new ImagePointerHolder(GetDefaultImage());
+ RequestReading(*iterUp,prio,-1,ph);
+ // AddEntryToMap(*iterUp);
prio--;
+ if (prio == maxprio) break;
}
//Going down
- prio = maxprio + 999;
+ prio = maxprio + 19;
std::vector<tree::Node*> down;
- GetTreeViewMap()["Local database"]->GetNodes(down,false);
+ GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetNodes(down,false);
std::vector<tree::Node*>::iterator iterDown;
for(iterDown=down.begin();iterDown!=down.end();++iterDown)
{
"Requesting image from neighbors down "
<<(*iterDown)->GetAttribute("FullFileName")
<<std::endl);
- RequestReading(*iterDown,prio);
- AddEntryToMap(*iterDown);
+ 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());
+ pointers.push_back(ph);
+ mViewer->SetImageVector(pointers);
+ }
}
//==================================================
//==================================================
- /// Processes the queue of image events
- void WxGimmickView::ProcessImageEvents()
- {
- if (!mConstructed) return;
- int level=GetTreeViewMap()["Local database"]->GetNumberOfLevels();
- std::vector<tree::Node*> sel=GetTreeViewMap()["Local database"]->GetSelected(level+1);
- GimmickDebugMessage(5,
- "Processing Images. Lock Started"
- <<std::endl);
- MultiThreadImageReaderEventLock();
-
- mViewer->ClearImages();
- while (!IsQueueEmpty())
- {
- GimmickDebugMessage(5,
- "Queue not empty"
- <<std::endl);
-
- vtkImageData* image=GetNextImageQueued();
- if( image!=0 )
- {
- tree::Node* node=GetNextNodeQueued();
-
- bool found=false;
- std::vector<tree::Node*>::iterator i;
- for(i=sel.begin();i!=sel.end()&&!found;++i)
- {
- if((*i)==node)
- {
- mViewer->AddImage(image);
- found=true;
- }
- }
- }
- UnqueueNext();
- }
- if(!(mViewer->ImagesEmpty()))
- {
- GimmickDebugMessage(5,
- "Showing images"
- <<std::endl);
- mViewer->ShowImages();
- mViewer->Show();
- }
- ClearQueue();
-
-
- MultiThreadImageReaderEventUnlock();
- GimmickDebugMessage(5,
- "Processing Images. Lock Ended"
- <<std::endl);
- }
-
//==================================================
+ 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::OnInternalIdle()
+ void WxGimmickView::ClearSelection()
{
- ProcessImageEvents();
+ pointers.clear();
+ pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
+ mViewer->SetImageVector(pointers);
+ mViewer->RefreshIfNecessary();
+ ResetExtent();
}
//=================================================
//=================================================
void WxGimmickView::OnRemove(wxCommandEvent& event)
{
- //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<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::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,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();
+ }
+ //=================================================
+
+ //=================================================
+ //AndresDonadio
+ void WxGimmickView::OnTools(wxCommandEvent& event)
+ {
+ mViewer->StopPlayer();
+
+ wxDialog* dial= new wxDialog (this,-1,"Tools",wxDefaultPosition, wxSize(300,200));
+
+
+ WxGimmickTools * gimmickTools = new WxGimmickTools(dial, mCurrentDirectory);
+
+ wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
+
+
+ wxSizer* bsizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
+ topsizer->Add(gimmickTools,1,wxGROW,0);
+ topsizer->Add(bsizer,0,wxGROW);
+
+ dial->SetSizer(topsizer, true);
+ dial->Layout();
+ dial->ShowModal();
+
+ if (dial->GetReturnCode() == wxID_OK)
+ {
+ wxString inputDir = gimmickTools->getInputDir();
+ wxString outputDir = gimmickTools->getOutputDir();
+ bool addToDB = gimmickTools->getCheckBoxValue();
+/*
+ Bruker2Dicom b2d;
+ b2d.SetInputDirectory(crea::wx2std(inputDir));
+ b2d.SetOutputDirectory(crea::wx2std(outputDir));
+ b2d.SetConvertModeToDicom();
+ b2d.Execute();
+*/
+ if (addToDB)
+ {
+ mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+ mCurrentDirectory = outputDir;
+ mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),crea::wx2std(outputDir),true);
+ mProgressDialog->Pulse(_T("Updating view..."));
+
+ UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
+ delete mProgressDialog;
+ DisplayAddSummary();
+ }
+ }
+
+ mViewer->StartPlayer();
+
+ /*
+
+ 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)
+ {
+
+
+ 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(""),
+ 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();
+
+ }
+
+ */
}
//=================================================
+ void WxGimmickView::CreateSettingsDialog(wxNotebook* nb)
+ {
+ //First page: Customization of configurations
+ wxPanel* customConfig=new wxPanel(nb);
+ nb->AddPage( customConfig, crea::std2wx("Customize Configuration") );
+ //Second page: Creation of Databases
+ wxPanel* databaseCreation=new wxPanel(nb);
+ nb->AddPage( databaseCreation, crea::std2wx("Create Database") );
+ //Third page: CD/DVD Watch
+ wxPanel* cdWatch=new wxPanel(nb);
+ nb->AddPage( cdWatch, crea::std2wx("CD/DVD") );
+ //Fourth page: Selection of attributes to show (edit)
+ wxPanel* attSelection=new wxPanel(nb);
+ nb->AddPage( attSelection, crea::std2wx("Selection of Attributes") );
+
+ }
+
+
//=================================================
/// 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(),
wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this);
}
+ //////////////////////////////////////////////////
+ // 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);
+
+ 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)
+ {
+
+ //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)
+ {
+ 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);
+ }
+ }
+
//=================================================
//=================================================
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_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