From 8191bd858508001620e1eae1366e1a43f448bc06 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Fri, 28 May 2010 14:10:22 +0000 Subject: [PATCH] *** empty log message *** --- src/creaImageIOWxGimmickPanel.h | 22 +++++++++++++++++----- src/creaImageIOWxGimmickReaderDialog.h | 6 +++++- src/creaImageIOWxGimmickView.cpp | 3 +-- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/creaImageIOWxGimmickPanel.h b/src/creaImageIOWxGimmickPanel.h index 0f0c494..ed206ee 100644 --- a/src/creaImageIOWxGimmickPanel.h +++ b/src/creaImageIOWxGimmickPanel.h @@ -56,12 +56,24 @@ namespace creaImageIO mView->GetSelectedImages(s, dim); } - void GetSelectedImagesInVector(std::vector& s, int dim) - { - mView->GetSelectedImagesInVector(s, dim); - } +//EED 28mai2010 Use new mechanism getSelected +// void GetSelectedImagesInVector(std::vector& s, int dim) +// { +// mView->GetSelectedImagesInVector(s, dim); +// } + + + // ----get selected files in an Output structure------- + // out: vector structure output < , ... > + // i_attr: list of dicom tags to extract + // mult: information of one file or multiple files + // outmodel: xml-filename that specifies images order..(todo) + void getSelected(std::vector &outG,std::vector< std::string> i_attr, bool mult, const std::string outmodel) + { + mView->getSelectedFiles(outG, i_attr, mult, outmodel); + } + - void OnSelectedImage(bool t); diff --git a/src/creaImageIOWxGimmickReaderDialog.h b/src/creaImageIOWxGimmickReaderDialog.h index 9750740..e037559 100644 --- a/src/creaImageIOWxGimmickReaderDialog.h +++ b/src/creaImageIOWxGimmickReaderDialog.h @@ -47,7 +47,11 @@ namespace creaImageIO void GetSelectedImagesInVector(std::vector& s, int dim) { mView->GetSelectedImagesInVector(s, dim); } - // get selected files in an Output structure + // ----get selected files in an Output structure------- + // out: vector structure output < , ... > + // i_attr: list of dicom tags to extract + // mult: information of one file or multiple files + // outmodel: xml-filename that specifies images order..(todo) void getSelected(std::vector &outG,std::vector< std::string> i_attr, bool mult, const std::string outmodel) { mView->getSelectedFiles(outG, i_attr, mult, outmodel); diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp index d9f727c..2f317e1 100644 --- a/src/creaImageIOWxGimmickView.cpp +++ b/src/creaImageIOWxGimmickView.cpp @@ -956,7 +956,7 @@ namespace creaImageIO 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?"), + if ( wxMessageBox(_T("Depending on the amount of Data the process can take several minutes. Do you want to continue?"), _T("Please confirm"), wxICON_QUESTION | wxYES_NO) == wxYES ) { Bruker2Dicom b2d; @@ -965,7 +965,6 @@ namespace creaImageIO b2d.SetConvertModeToDicom(); b2d.verbose=false; b2d.Execute(); - if (addToDB) { mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT ); -- 2.45.0