]> Creatis software - creaImageIO.git/commitdiff
GetLabel vs GetValue
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 23 Sep 2009 15:09:37 +0000 (15:09 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 23 Sep 2009 15:09:37 +0000 (15:09 +0000)
re-indent

src2/creaImageIOWxGimmickTools.cpp
src2/creaImageIOWxGimmickTools.h
src2/creaImageIOWxGimmickView.cpp

index f2f082a74f7503795220f7dd6a5f79007cd897c1..d0392f50e3633a6c4315f2f89f27ffe5e7f8bd33 100644 (file)
@@ -30,10 +30,10 @@ namespace creaImageIO
                wxFlexGridSizer * sizer = new wxFlexGridSizer(2,5);
                sizer->Add( new wxStaticText(this, -1, _T(" ")), 1, wxGROW );
                sizer->Add( new wxStaticText(this, -1, _T(" ")), 1, wxGROW );
-               sizer->Add( _inputPath, 1, wxGROW );
-               sizer->Add( inputDir, 1, wxGROW );
-               sizer->Add( _outputPath, 1, wxGROW );
-               sizer->Add( outputDir, 1, wxGROW );
+               sizer->Add( _inputPath,   1, wxGROW );
+               sizer->Add( inputDir,     1, wxGROW );
+               sizer->Add( _outputPath,  1, wxGROW );
+               sizer->Add( outputDir,    1, wxGROW );
                sizer->Add( new wxStaticText(this, -1, _T(" ")), 1, wxGROW );
                sizer->Add( new wxStaticText(this, -1, _T(" ")), 1, wxGROW );
                sizer->Add( _addCheckBox, 1, wxGROW );
@@ -53,12 +53,12 @@ namespace creaImageIO
 
        wxString WxGimmickTools::getInputDir()
        {
-               return _inputPath->GetLabel();
+               return _inputPath->GetValue();
        }
 
        wxString WxGimmickTools::getOutputDir()
        {
-               return _outputPath->GetLabel();
+               return _outputPath->GetValue();
        }
 
        bool WxGimmickTools::getCheckBoxValue()
@@ -72,10 +72,8 @@ namespace creaImageIO
                wxDirDialog* FD = new wxDirDialog( 0, _T("Select the Input Directory"), _currentDir, style);
                              
                if (FD->ShowModal()==wxID_OK)
-               {
-                         
+               {  
                        _inputPath->SetValue(FD->GetPath());
-
                }
        }
 
index 31ba5e0b3aad2359c5c701fdcd6157a6a7b80bf3..d4ec04d46862fdecfe3c36a760a7d215976f2256 100644 (file)
@@ -17,32 +17,21 @@ namespace creaImageIO
   class WxGimmickTools : public wxPanel
   {
        public:
-               WxGimmickTools(wxWindow * parent, wxString mCurrentDirectory);          
+               WxGimmickTools(wxWindow *parent, wxString mCurrentDirectory);           
                ~WxGimmickTools();
                
                wxString getInputDir();
-               
                wxString getOutputDir();
-               
                bool getCheckBoxValue();
                
-
        private:
-
                wxCheckBox * _addCheckBox;      
-
                wxTextCtrl * _inputPath;
-
                wxTextCtrl * _outputPath;
-               
                wxString _currentDir;
-               
                bool _addFiles;
-
                void onInputDir(wxCommandEvent& event);
-
                void onOutputDir(wxCommandEvent& event);
-
                void onAddToDatabase(wxCommandEvent& event);
     
        };
index 297e6494995e7011f51e90f3c072b2b834fc2e0d..63e393af5a903cf56e9957139222386dbab610c7 100644 (file)
@@ -37,15 +37,15 @@ namespace creaImageIO
   // The ids of the different tools
   enum
     {
-         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_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,
     };
   //======================================================================
 
@@ -55,16 +55,16 @@ namespace creaImageIO
   // Icon ids
   typedef enum
     {
-         Icon_create_database,
+      Icon_create_database,
       Icon_accept,
       Icon_add,
       Icon_folder_down,
       Icon_page_down,
-         Icon_database_add,
+      Icon_database_add,
       Icon_remove,
-         Icon_synchronize,
+      Icon_synchronize,
       Icon_help,
-         Icon_settings,
+      Icon_settings,
       Icon_tools
     }
     icon_id;
@@ -86,9 +86,10 @@ namespace creaImageIO
   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, number_of_threads),
@@ -136,21 +137,21 @@ namespace creaImageIO
     // Bottom panel 
     mBottomPanel = new wxPanel(mSplitter,-1);
     
-         wxBoxSizer    *bottom_sizer = new wxBoxSizer(wxVERTICAL); //HORIZONTAL);
+    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();
+    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);
+    mText = new wxStaticText(mBottomPanel, wxID_ANY, wxT("Welcome to Gimmick!"));
+    bottom_sizer->Add(mText,0,wxGROW,0);
 
          
          
@@ -168,16 +169,16 @@ namespace creaImageIO
 
     sizer->Add( mSplitter,1,wxGROW  ,0);
 
-       mProgressDialog=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();
-    
+    mListener=new Listener();
+    mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount , this, _1 ) );
+    mListener->Create();
+    mListener->Run();
+    mListener->Pause();
+
     mConstructed = true;
   }
   //======================================================================
@@ -187,13 +188,13 @@ namespace creaImageIO
   WxGimmickView::~WxGimmickView()
   {
        // stop the viewer before application exit.
-       mViewer->StopPlayer();
+    mViewer->StopPlayer();
     GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
                        <<std::endl);
-       if(mListener->IsAlive())
-       {
-        mListener->Delete();
-       }
+    if(mListener->IsAlive())
+    {
+        mListener->Delete();
+    }
   }
   //======================================================================
   
@@ -205,7 +206,7 @@ namespace creaImageIO
     mToolBar = new wxToolBar(this,-1,wxDefaultPosition,wxDefaultSize,
                             style);
 
-       mToolAddFile = mToolBar->AddTool( TOOL_ADDFILES_ID, 
+    mToolAddFile = mToolBar->AddTool( TOOL_ADDFILES_ID, 
                                      _T("Add file(s)"),
                                      mIcon->GetBitmap(Icon_page_down),
                                      _T("Add one or more file to database")
@@ -215,7 +216,7 @@ namespace creaImageIO
                                      mIcon->GetBitmap(Icon_folder_down),
                                      _T("Add the content of a folder to database")
                                      );
-       mToolAddDatabase = mToolBar->AddTool( TOOL_ADDDATABASE_ID, 
+    mToolAddDatabase = mToolBar->AddTool( TOOL_ADDDATABASE_ID, 
                                      _T("Open database"),
                                      mIcon->GetBitmap(Icon_database_add),
                                      _T("Open a local or distant database")
@@ -230,22 +231,22 @@ namespace creaImageIO
                                      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, 
+    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, 
+    mToolTools = mToolBar->AddTool( TOOL_TOOLS_ID, 
                                      _T("Tools"),
                                      mIcon->GetBitmap(Icon_tools),
                                      _T("Applies tools to images")
                                      );
-       mToolAddFile = mToolBar->AddTool( TOOL_CREATEDB_ID, 
+    mToolAddFile = mToolBar->AddTool( TOOL_CREATEDB_ID, 
                                      _T("Create database"),
                                      mIcon->GetBitmap(Icon_create_database),
                                      _T("Create DB from an Attributes Descriptor file")
@@ -318,10 +319,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);
+    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
@@ -348,7 +349,7 @@ namespace creaImageIO
   void WxGimmickView::OnAddFiles(wxCommandEvent& event)
   {
     mViewer->StopPlayer();
-   long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE;
+    long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE;
     std::string wc("*");
     wxFileDialog* FD = new wxFileDialog( 0, 
                                         _T("Select file"),
@@ -403,21 +404,21 @@ namespace creaImageIO
        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)
-      {
+    {
 
        
-                 std::string dirname = wx2std (FD->GetPath());
-                 bool recurse =  isNeedRecursive(dirname);
-                 if (recurse)
-                {
+       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"));
@@ -631,26 +632,26 @@ namespace creaImageIO
 
   //==================================================
    void  WxGimmickView::OnInternalIdle()
-  {
-   if (!mConstructed) return;
-   static bool first_time = true;
-   if (false)
    {
-       first_time = false;
+     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();
-   }
+     if(mViewer)
+     {
+        mViewer->RefreshIfNecessary();
+     }
   }
 
    //==================================================
 
   //==================================================
    void  WxGimmickView::ClearSelection()
-  {
+   {
        pointers.clear();
        pointers.push_back(new ImagePointerHolder(GetDefaultImage()));
        mViewer->SetImageVector(pointers);
@@ -664,9 +665,9 @@ namespace creaImageIO
   void WxGimmickView::OnRemove(wxCommandEvent& event)
   {
        //TODO Select current tree handler       
-    wxBusyCursor busy;
-    GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->RemoveSelected();
-       ClearSelection();
+     wxBusyCursor busy;
+     GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->RemoveSelected();
+     ClearSelection();
   }
   //=================================================
 
@@ -674,41 +675,41 @@ namespace creaImageIO
   //=================================================
   void WxGimmickView::AddIgnoreFile(tree::Node* toRemove)
   {
-         mGimmick->RemoveFile(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),toRemove);
-         GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1);
+     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);
+     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();
+     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).") } ;
+    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("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);
@@ -718,15 +719,15 @@ namespace creaImageIO
     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){
+       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);
-               }
+       }
                
     }
   }
@@ -783,74 +784,72 @@ namespace creaImageIO
   //AndresDonadio
   void WxGimmickView::OnTools(wxCommandEvent& event)
   {
-               mViewer->StopPlayer();
+       mViewer->StopPlayer();
                
-       
-               wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(550,350));
+       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);
+       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") );
+       //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();
+       dial->SetSizer(dialSizer, true);
+       dial->Layout();
+       dial->ShowModal();
 
-               if (dial->GetReturnCode() == wxID_OK)
-                       {
+       if (dial->GetReturnCode() == wxID_OK)
+       {
 #if defined(BUILD_BRUKER)
-                                       if (nb->GetSelection()==0)//Selection: Bruker Image Reader
+               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)
                                        {
-                                               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);
-                                               }
+                                               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();
+                                       }       
                                }
-                                       delete gimmickTools;
-#endif
                        }
 
-               mViewer->StartPlayer();
+                       else
+                       {
+                               wxMessageBox(_T("One or both of the directory fields are empty"),_T("Empty Fields"),wxOK,this);
+                       }
+       }
+       delete gimmickTools;
+#endif
+       }
+
+       mViewer->StartPlayer();
   }
   //=================================================
 
@@ -888,7 +887,7 @@ namespace creaImageIO
 
          //Fourth page: Selection of attributes to show
          std::vector<std::string> shown;
-      std::vector<std::string> nShown;
+         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);
@@ -958,15 +957,13 @@ namespace creaImageIO
                UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
                delete mProgressDialog;
                DisplayAddSummary();
-               mViewer->StartPlayer();
-                 
+               mViewer->StartPlayer();  
          }
          else
          {  
                  mGimmick->DeleteDrive(drive);
                  UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-         }
-        
+         } 
   }
 
    //========================================================================
@@ -986,7 +983,7 @@ namespace creaImageIO
   //========================================================================
   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));
+    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);
 
@@ -998,8 +995,8 @@ namespace creaImageIO
   //========================================================================
   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);
+     mGimmick->EditField(node, crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())), name, key, val);
+     UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
   }
 
   //=================================================
@@ -1007,7 +1004,7 @@ namespace creaImageIO
   void WxGimmickView::OnAddProgress( Gimmick::AddProgress& p)
   {
     char mess[200];
-       sprintf(mess,"%i dirs : %i files :\n            %i handled - %i added",
+    sprintf(mess,"%i dirs : %i files :\n            %i handled - %i added",
           p.GetNumberScannedDirs(),
           p.GetNumberScannedFiles(),
           p.GetNumberHandledFiles(),
@@ -1035,14 +1032,13 @@ namespace creaImageIO
     wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this);
   }
 
-  //////////////////////////////////////////////////
-  // Add a DB to application                                     //
-  // @param event : WxEvent                                              //
-  // @return : -                                                                 //
-  //////////////////////////////////////////////////
+  ////////////////////////////////////////////////
+  // 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*");
@@ -1076,35 +1072,34 @@ namespace creaImageIO
   }
     ////////////////////////////////////////////////////
   // Create a DB from an Attributes Descriptor files  //
-  // @param event : WxEvent                                              //
-  // @return : -                                                                 //
+  // @param event : WxEvent                                    //
+  // @return : -                                               //
   //////////////////////////////////////////////////
   void WxGimmickView::OnCreateDB(wxCommandEvent& event)
   {
-    
-         WxDescriptorPanel * DescriptorPan = new WxDescriptorPanel(this, mGimmick->GetHomeDirectory());
-               DescriptorPan->Layout();
-               if ( DescriptorPan->ShowModal() == ID_DSCP_APPLY)
+       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())
                {
-                       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);
-                       }
+                       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);
                }
+       }
   }
 
    //=================================================
@@ -1114,11 +1109,11 @@ namespace creaImageIO
     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)
+    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()
   //=================================================