]> Creatis software - creaImageIO.git/blobdiff - src2/creaImageIOWxGimmickView.cpp
Added the PACS Connection Panel, a basic socket connection class and on .Gimmick...
[creaImageIO.git] / src2 / creaImageIOWxGimmickView.cpp
index 024bc8c19589838b05252260ae162b0cb466aa01..a77f9a7fe9de9bdc1726f0db2b1d01a3b22868ee 100644 (file)
@@ -1,6 +1,12 @@
 #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"
@@ -9,10 +15,18 @@ 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>
+#if defined(BUILD_BRUKER)
+       #include "bruker2dicom.h"
+#endif
 
 namespace creaImageIO
 {
@@ -21,27 +35,35 @@ 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;
   //================================================================
@@ -144,10 +166,15 @@ 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;
   }
@@ -161,6 +188,10 @@ namespace creaImageIO
        mViewer->StopPlayer();
     GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
                        <<std::endl);
+       if(mListener->IsAlive())
+       {
+        mListener->Delete();
+       }
   }
   //======================================================================
   
@@ -172,6 +203,11 @@ 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),
@@ -182,21 +218,36 @@ namespace creaImageIO
                                      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();
@@ -206,13 +257,13 @@ namespace creaImageIO
  
   //======================================================================
   /// Create the tree view for TreeHandler provided
-  void WxGimmickView::CreateTreeView( TreeHandler* h, TimestampDatabaseHandler* tdh)
+  void WxGimmickView::CreateTreeView( TreeHandler* h)
   {
     std::string name(h->GetTree().GetAttribute("Name"));
     GimmickMessage(2,"Creating the tree view for '"<<
                   name<<"'"<<std::endl);
     // Create the WxTreeView
-    WxTreeView* view = new WxTreeView(h,tdh,this,mNotebook,-1);
+    WxTreeView* view = new WxTreeView(h,this,mNotebook,-1);
 
     // TO DO : TEST THAT A VIEW WITH SAME NAME IS NOT
     // ALREADY IN THE MAP
@@ -227,7 +278,7 @@ namespace creaImageIO
   void WxGimmickView::GetSelectedImages(std::vector<vtkImageData*>& s, int dim)
   {
        std::vector<std::string> files;
-       GetTreeViewMap()["Local database"]->GetSelectedAsString(files);
+       GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files);
        ReadImagesNotThreaded(s,files,dim);
   }
   //======================================================================
@@ -235,7 +286,7 @@ namespace creaImageIO
   //======================================================================
   void WxGimmickView::GetSelectedFiles(std::vector<std::string>& s)
   {
-       GetTreeViewMap()["Local database"]->GetSelectedAsString(s);
+       GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(s);
   }
   //======================================================================
 
@@ -253,7 +304,7 @@ namespace creaImageIO
   void WxGimmickView::CreateIconList()
   {
     // Size of the icons;
-    int size = 24;
+    int size = 16;
 
     wxIcon icons[20];
     // should correspond to Icon_xxx enum
@@ -264,6 +315,10 @@ namespace creaImageIO
     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
@@ -415,7 +470,6 @@ namespace creaImageIO
        
        if(sel.size()==0)
        {
-               
                valid= ValidateSelected(NULL,
                                mSelectionMinDimension,
                                mSelectionMaxDimension );
@@ -448,8 +502,7 @@ namespace creaImageIO
                                mSelectionMaxDimension );
                }
        }
-       
-    mText->SetLabel(crea::std2wx(GetMessage()));
+       mText->SetLabel(crea::std2wx(GetMessage()));
     /*if(valid)
       {
        ReadImageThreaded(sel);
@@ -499,7 +552,7 @@ namespace creaImageIO
        //Going up
        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)
        {
@@ -517,7 +570,7 @@ namespace creaImageIO
        //Going down
        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)
        {
@@ -581,19 +634,313 @@ namespace creaImageIO
   {
        //TODO Select current tree handler       
     wxBusyCursor busy;
-    GetTreeViewMap()["Local database"]->RemoveSelected();
-
+    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::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)
+  {       
+    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).") } ;
+
+    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();
+  }
+  //=================================================
+
+  //=================================================
+  //AndresDonadio
+  void WxGimmickView::OnTools(wxCommandEvent& event)
+  {
+               mViewer->StopPlayer();
+               
+               wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(300,250));
+
+               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.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 :\n            %i handled - %i added",
           p.GetNumberScannedDirs(),
           p.GetNumberScannedFiles(),
@@ -621,7 +968,7 @@ namespace creaImageIO
     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,
@@ -664,25 +1011,72 @@ namespace creaImageIO
                std::stringstream st;
                for(int i = 0; i< files.size(); i++)
                {
-                       st<< "remote_" << i+1;
-                       //create TreeHandler
-                       mGimmick->addDB(st.str(), crea::wx2std(files[i]));
-                       //create TreeView
-                       CreateSingleTreeView(st.str());
+                       //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_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()
   //=================================================