From: guigues Date: Wed, 18 Feb 2009 10:48:36 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: EED.02Oct2009~186 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f2585049438c3630362b07e6029ddb0130a03818;p=creaImageIO.git *** empty log message *** --- diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp index ebfd2c5..3f9d4aa 100644 --- 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 : "<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 : "< ProgressSignalType; typedef ProgressSignalType::slot_function_type ProgressCallbackType; //============================================= diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 900101a..06b7372 100644 --- 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 "<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 4d0db8a..174468c 100644 --- 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 a258ce8..474e7f4 100644 --- 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; kGetColumnCount(); 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 e216352..7e991ce 100644 --- 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 5a7c15e..f33fb52 100644 --- a/src2/doxygen/DoxyMainPage.txt.in +++ b/src2/doxygen/DoxyMainPage.txt.in @@ -8,7 +8,6 @@
Sequence Diagrams - \endhtmlonly