#include <creaImageIOWxGimmickView.h>
#include <creaImageIOWxTreeView.h>
#include <creaImageIOSystem.h>
-
+using namespace crea;
// Icons
#include "icons/accept.xpm"
#include "icons/add.xpm"
#include "icons/folder-down.xpm"
#include "icons/page-down.xpm"
#include "icons/remove.xpm"
+#include "icons/database-add.xpm"
#include "icons/help.xpm"
#include <wx/imaglist.h>
// The ids of the different tools
enum
{
- TOOL_ADDFILE_ID = 1,
+ TOOL_ADDFILES_ID = 1,
TOOL_ADDDIR_ID = 2,
TOOL_REMOVE_ID = 3,
- TOOL_HELP_ID = 4
+ TOOL_ADDDATABASE_ID = 4,
+ TOOL_HELP_ID = 5
};
//======================================================================
//================================================================
//
- const int icon_number = 6;
+ const int icon_number = 7;
// Icon ids
typedef enum
{
Icon_folder_down,
Icon_page_down,
Icon_remove,
+ Icon_database_add,
Icon_help
}
icon_id;
int image_type,
int number_of_threads)
: wxPanel(parent,id,pos,size),
- GimmickView(gimmick)
+ GimmickView(gimmick),
+ mProgressDialog(0)
{
GimmickDebugMessage(1,"WxGimmickView::WxGimmickView"
<<std::endl);
+ // Sets the current directory to the home dir
+ mCurrentDirectory = std2wx(gimmick->GetHomeDirectory());
+
+ // Connect the AddProgress callback
+ gimmick->ConnectAddProgressObserver
+ ( boost::bind( &WxGimmickView::OnAddProgress , this, _1 ) );
+
// Create the list of icons (mIcon)
CreateIconList();
mNotebook = new wxNotebook(mSplitter,
-1,wxDefaultPosition, wxDefaultSize, 0);
+ //Gimmick
+ mGimmick=gimmick;
+
// Create the views
CreateTreeViews();
/// Creates the tool bar
void WxGimmickView::CreateToolBar()
{
- long style = wxTB_HORIZONTAL | wxNO_BORDER;
+ long style = wxTB_HORIZONTAL | wxNO_BORDER | wxTB_TEXT;
mToolBar = new wxToolBar(this,-1,wxDefaultPosition,wxDefaultSize,
style);
- mToolAddFile = mToolBar->AddTool( TOOL_ADDFILE_ID,
- _T("Add file"),
+ mToolAddFile = mToolBar->AddTool( TOOL_ADDFILES_ID,
+ _T("Add file(s)"),
mIcon->GetBitmap(Icon_page_down),
- _T("Add file")
+ _T("Add one or more file to database")
);
mToolAddDir = mToolBar->AddTool( TOOL_ADDDIR_ID,
_T("Add folder"),
mIcon->GetBitmap(Icon_folder_down),
- _T("Add folder")
+ _T("Add the content of a folder to database")
);
mToolRemove = mToolBar->AddTool( TOOL_REMOVE_ID,
- _T("Remove selected"),
+ _T("Remove"),
mIcon->GetBitmap(Icon_remove),
- _T("Remove selected")
+ _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")
);
mToolHelp = mToolBar->AddTool( TOOL_HELP_ID,
_T("Help"),
mIcon->GetBitmap(Icon_help),
- _T("Help")
+ _T("Open help window")
);
//const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL)
void WxGimmickView::CreateIconList()
{
// Size of the icons;
- int size = 48;
+ int size = 24;
wxIcon icons[20];
// should correspond to Icon_xxx enum
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);
// unsigned int NbIcons = 8;
//=================================================
+ //=================================================
+ void WxGimmickView::OnAddFiles(wxCommandEvent& event)
+ {
+ long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE;
+ std::string wc("*.*");
+ 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);
+ unsigned int i;
+ std::vector<std::string> filenames;
+ for (i=0;i<files.GetCount();++i)
+ {
+ filenames.push_back(wx2std(files[i]));
+ GimmickMessage(2,"Adding File "<<files[i]<<"."<<std::endl);
+ }
+
+ mProgressDialog =
+ new wxProgressDialog(_T("Adding file(s)"),
+ _T(""),
+ 1000,
+ this,
+ wxPD_ELAPSED_TIME |
+ // wxPD_ESTIMATED_TIME |
+ // wxPD_REMAINING_TIME |
+ wxPD_CAN_ABORT );
+
+ // TO DO : select the current tree handler
+ mGimmick->AddFiles("Local database",filenames);
+
+ mProgressDialog->Pulse(_T("Updating view..."));
+
+ UpdateTreeViewLevel("Local database",1);
+ delete mProgressDialog;
+ DisplayAddSummary();
+ }
+
+ }
+ //=================================================
+
+ //=================================================
+ void WxGimmickView::OnAddDir(wxCommandEvent& event)
+ {
+ long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
+ wxDirDialog* FD =
+ 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)
+ {
+ recurse = true;
+ }
+
+ 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();
+ }
+ }
+ //=================================================
+
+ //=================================================
+ void WxGimmickView::OnRemove(wxCommandEvent& event)
+ {
+ //TODO Select current tree handler
+ wxBusyCursor busy;
+ GetTreeViewMap()["Local database"]->RemoveSelected(1);
+ }
+ //=================================================
+
+ //=================================================
+ /// AddProgress Gimmick callback
+ void WxGimmickView::OnAddProgress( Gimmick::AddProgress& p)
+ {
+
+ char mess[200];
+ sprintf(mess,"%i dirs - %i files - %i handled - %i added",
+ p.GetNumberScannedDirs(),
+ p.GetNumberScannedFiles(),
+ p.GetNumberHandledFiles(),
+ p.GetNumberAddedFiles());
+ // std::cout << "OnAddProgress "<<mess<<std::endl;
+ wxString s(wxString::From8BitData(mess));
+ // std::cout << "Pulse"<<std::endl;
+ if (!mProgressDialog->Pulse(s))
+ {
+ p.SetStop();
+ }
+ // std::cout << "OnAddProgress ok"<<std::endl;
+ }
+ //=================================================
+
+ //=================================================
+ void WxGimmickView::DisplayAddSummary()
+ {
+ const Gimmick::AddProgress& p = mGimmick->GetAddProgress();
+ std::stringstream mess;
+ mess << "Dirs \tscanned\t: " << p.GetNumberScannedDirs() << "\n";
+ 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);
+ }
+ //=================================================
+
+ //=================================================
+ BEGIN_EVENT_TABLE(WxGimmickView, wxPanel)
+ EVT_TOOL(TOOL_ADDFILES_ID, WxGimmickView::OnAddFiles)
+ EVT_TOOL(TOOL_ADDDIR_ID, WxGimmickView::OnAddDir)
+ EVT_TOOL(TOOL_REMOVE_ID, WxGimmickView::OnRemove)
+ END_EVENT_TABLE()
+ //=================================================
} // EO namespace creaImageIO
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff