*** empty log message ***

diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp
index ebfd2c594412a353fbcd025292497e1fa1168b3f..3f9d4aa8d32cb2512852cefeef2161d20b80e6f5 100644 (file)
--- a/src2/creaImageIOTreeHandlerImageAdder.cpp
+++ b/src2/creaImageIOTreeHandlerImageAdder.cpp
@@ -47,24 +47,9 @@ namespace creaImageIO
          {
            mProgress.IncNumberHandledFiles();
            AddFile(*i);
-
-
-           /*
-           if (progress)
-             {
-               std::string mess("Adding ");
-               mess += *i;
-               if (!progress->Update( (int)(summary.added_images*999./nbf),
-                                      std2wx(mess)))
-                 {
-                   // Some file was added hence we must return true !
-                   summary.cancelled_by_user = true;
-                   break;
-                 }
-             }
-           */
          }
        mProgressSignal(mProgress);
+       if (mProgress.GetStop()) break;
       }
   }
   //=====================================================================
@@ -102,16 +87,8 @@ namespace creaImageIO
   void TreeHandlerImageAdder::AddDirectoryRecursor(const std::string &dirpath, 
                                                   bool recursive)
   {
-    //    std::cout << "dir : "<<dirpath << std::endl;
-   mProgress.IncNumberScannedDirs();
-    /*
-    if (progress) 
-      {
-       std::string mess("Parsing ");
-       mess += dirpath;
-       progress->Pulse(std2wx(mess));
-      }
-    */    
+    mProgress.IncNumberScannedDirs();
+
     std::string fileName;
     std::string dirName = dirpath;
 
@@ -134,31 +111,24 @@ namespace creaImageIO
 
        wxFileName wxffn(dir.GetName(),filename);
        std::string ffn = wx2std(wxffn.GetFullPath());
-       //      std::cout << "file : "<<ffn << std::endl;
        if (IsHandledFile(ffn)) 
          {
            mProgress.IncNumberHandledFiles();
-           //      std::cout << "handled : "<<ffn << std::endl;
            AddFile( ffn );
          }
-       //      std::cout << "signal " << std::endl;
        mProgressSignal(mProgress);
-       //      std::cout << "cont " << std::endl;
        cont = ( dir.GetNext(&filename) && (!mProgress.GetStop()) );
-       //      std::cout << "next" << std::endl;
       }
     
     // Recurse into subdirs
     if ( recursive )
       {
-       //      std::cout << "recurse " << std::endl;
        cont = dir.GetFirst(&filename, wxEmptyString, 
                            wxDIR_DIRS | wxDIR_HIDDEN );
        while ( cont )
          {
            wxFileName wxffn(dir.GetName(),filename);
            std::string ffn = wx2std(wxffn.GetFullPath());
-           //      std::cout << "goto "<<ffn << std::endl;
            AddDirectoryRecursor( ffn, recursive);
            cont = dir.GetNext(&filename);
          }

diff --git a/src2/creaImageIOTreeHandlerImageAdder.h b/src2/creaImageIOTreeHandlerImageAdder.h
index 4d753d77c74eb72d07e4570f738d77f0344b4b99..48158530e295d3ae626cc0b1ffc25d7fc43a65c2 100644 (file)
--- a/src2/creaImageIOTreeHandlerImageAdder.h
+++ b/src2/creaImageIOTreeHandlerImageAdder.h
@@ -49,10 +49,10 @@ namespace creaImageIO
        mNumberAddedFiles = 0;
       }
 
-      int GetNumberScannedFiles() { return mNumberScannedFiles; }
-      int GetNumberScannedDirs() { return mNumberScannedDirs; }
-      int GetNumberHandledFiles() { return mNumberHandledFiles; }
-      int GetNumberAddedFiles() { return mNumberAddedFiles; }
+      int GetNumberScannedFiles() const { return mNumberScannedFiles; }
+      int GetNumberScannedDirs() const { return mNumberScannedDirs; }
+      int GetNumberHandledFiles() const { return mNumberHandledFiles; }
+      int GetNumberAddedFiles() const { return mNumberAddedFiles; }
 
       void IncNumberScannedFiles() { mNumberScannedFiles++; }
       void IncNumberScannedDirs() { mNumberScannedDirs++; }
@@ -60,7 +60,7 @@ namespace creaImageIO
       void IncNumberAddedFiles() { mNumberAddedFiles++; }
 
       void SetStop() { mStop = true; }
-      bool GetStop() { return mStop; }
+      bool GetStop() const { return mStop; }
 
     private:
       bool mStop;
@@ -76,7 +76,6 @@ namespace creaImageIO
     //=============================================
 
     //=============================================
-    //    typedef boost::signals::trackable ProgressObserverType;
     typedef boost::signal<void (Progress&)>  ProgressSignalType;
     typedef ProgressSignalType::slot_function_type ProgressCallbackType;
     //=============================================

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 900101ad1a4cdc848fa05489766bb0d3382689ea..06b7372edd1c580abb3b564c80182fd5fb1b6f54 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -263,8 +263,8 @@ namespace creaImageIO
                               1000,
                               this,
                               wxPD_ELAPSED_TIME |
-                              wxPD_ESTIMATED_TIME | 
-                              wxPD_REMAINING_TIME |
+                              //                              wxPD_ESTIMATED_TIME | 
+                              //                              wxPD_REMAINING_TIME |
                               wxPD_CAN_ABORT );
 
        // TO DO : select the current tree handler
@@ -274,30 +274,7 @@ namespace creaImageIO
 
        UpdateTreeViewLevel("Local database",1);
        delete mProgressDialog;
-       
-    /*   
-       TreeItemData *data = 
-         (TreeItemData *)
-         mTreeListCtrl->GetItemData(mItemOfMenu);
-       DicomDatabase* db = data->GetDicomNode()->GetDicomDatabase();
-       DicomDatabase::UpdateSummary summary;
-       wxProgressDialog* progress = 
-         new wxProgressDialog(_T("Adding file(s)"),
-                              _T(""),
-                              1000,
-                              this,
-                              wxPD_ELAPSED_TIME |
-                              wxPD_ESTIMATED_TIME | 
-                              wxPD_REMAINING_TIME |
-                              wxPD_CAN_ABORT );
-       
-       db->AddFiles(filenames,progress,summary);
-       
-       progress->Pulse(_T("Updating view..."));
-       UpdateDicomDatabaseView(db);
-       delete progress;
-       DisplayUpdateSummary(summary,this);
-       */
+       DisplayAddSummary();    
       }
        
   }
@@ -334,8 +311,8 @@ namespace creaImageIO
                               1000,
                               this,
                               wxPD_ELAPSED_TIME |
-                              wxPD_ESTIMATED_TIME | 
-                              wxPD_REMAINING_TIME |
+                              //                              wxPD_ESTIMATED_TIME | 
+                              //                              wxPD_REMAINING_TIME |
                               wxPD_CAN_ABORT );
        std::string dirname = wx2std (FD->GetPath()) ;
        mCurrentDirectory = FD->GetPath();  
@@ -347,7 +324,7 @@ namespace creaImageIO
        
        UpdateTreeViewLevel("Local database",1);
        delete mProgressDialog;
-       
+       DisplayAddSummary();
       }
   }
   //=================================================
@@ -363,7 +340,7 @@ namespace creaImageIO
           p.GetNumberScannedFiles(),
           p.GetNumberHandledFiles(),
           p.GetNumberAddedFiles());
-    std::cout << "OnAddProgress "<<mess<<std::endl;
+    //    std::cout << "OnAddProgress "<<mess<<std::endl;
     wxString s(wxString::From8BitData(mess));
     //  std::cout << "Pulse"<<std::endl;
     if (!mProgressDialog->Pulse(s)) 
@@ -374,7 +351,35 @@ namespace creaImageIO
   }
   //=================================================
 
- //=================================================
+  //=================================================
+  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)

diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h
index 4d0db8a4d48d290015ffb588f1a29c4f35f76499..174468c5afb1372e8ff6602cdf8efd51a0e20706 100644 (file)
--- a/src2/creaImageIOWxGimmickView.h
+++ b/src2/creaImageIOWxGimmickView.h
@@ -65,6 +65,8 @@ namespace creaImageIO
       void OnAddFiles(wxCommandEvent& event);
       /// Callback for adding dir
       void OnAddDir(wxCommandEvent& event);
+      /// Display a message box with the last addition statistics
+      void DisplayAddSummary();
 
 
       /// AddProgress Gimmick callback

diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index a258ce88c0b082165b888018ebbf76189b8493ea..474e7f4dafd2a7b2da88ccf96d52d59e344659f5 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -56,7 +56,7 @@ namespace creaImageIO
                               crea::std2wx(a->GetName()),
                               col_style);
            level.key.push_back(a->GetKey());
-           // ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
+           //      ctrl->SetColumnWidth(col, wxLIST_AUTOSIZE );
            col++;
          }
        mLevelList.push_back(level);
@@ -154,10 +154,10 @@ namespace creaImageIO
 
            for (int k=0; k<GetCtrl(l)->GetColumnCount(); k++)
              {
-               GetCtrl(l)->SetItem
-                 (id,k,
-                  crea::std2wx
-                  ( (*j)->GetAttribute(mLevelList[l].key[k]) ));
+               std::string val = (*j)->GetAttribute(mLevelList[l].key[k]);
+               if (val.size()==0) val = "?";
+               GetCtrl(l)->SetItem(id,k, crea::std2wx(val));
+               GetCtrl(l)->SetColumnWidth(k, wxLIST_AUTOSIZE );
              }
            
          }

diff --git a/src2/doxygen/CMakeLists.txt b/src2/doxygen/CMakeLists.txt
index e21635286cae09b7a12baa5f53fd2ba0432d0963..7e991ce0ead0bcdfc39fc0cc2068f783cbd0d4f1 100644 (file)
--- a/src2/doxygen/CMakeLists.txt
+++ b/src2/doxygen/CMakeLists.txt
@@ -72,11 +72,16 @@ ENDMACRO(CREA_BUILD_DOXYGEN_DOC)
 
 
 
-#CONFIGURE_FILE(
-#  ${CMAKE_CURRENT_SOURCE_DIR}/CodingStyle.html
-#  ${CMAKE_CURRENT_BINARY_DIR}/CodingStyle.html
-#  IMMEDIATE
-#  )
+
+FILE(GLOB PAGES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.html")
+FOREACH(PAGE ${PAGES})
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PAGE}
+    ${PROJECT_BINARY_DIR}/doxygen/${PAGE}
+    IMMEDIATE
+  )
+ENDFOREACH(PAGE)
+
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/DoxyMainPage.txt.in
   ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt

diff --git a/src2/doxygen/DoxyMainPage.txt.in b/src2/doxygen/DoxyMainPage.txt.in
index 5a7c15eb79ae688f7e9732f901a174417f863d4f..f33fb5237f8612b85b3d3e2485fe5bd45be4264f 100644 (file)
--- a/src2/doxygen/DoxyMainPage.txt.in
+++ b/src2/doxygen/DoxyMainPage.txt.in
@@ -8,7 +8,6 @@
 <br>
 <a href="http://sites.google.com/site/gimmickdiagrams/Home/sequence-diagrams"> Sequence Diagrams </a>
 
-
 \endhtmlonly