*** empty log message ***

diff --git a/src/creaImageIOWxGimmickPanel.h b/src/creaImageIOWxGimmickPanel.h
index 0f0c494f5951ddcd4ae558e379a8fd34711d8d9d..ed206eef7a98abf56db00912c3244aa6ab1dcafc 100644 (file)
--- a/src/creaImageIOWxGimmickPanel.h
+++ b/src/creaImageIOWxGimmickPanel.h
@@ -56,12 +56,24 @@ namespace creaImageIO
        mView->GetSelectedImages(s, dim); 
     }
 
-    void GetSelectedImagesInVector(std::vector<vtkImageData*>& s, int dim)
-    { 
-       mView->GetSelectedImagesInVector(s, dim); 
-    }
+//EED 28mai2010      Use new mechanism getSelected
+//    void GetSelectedImagesInVector(std::vector<vtkImageData*>& s, int dim)
+//    { 
+//     mView->GetSelectedImagesInVector(s, dim); 
+//    }
+
+
+       // ----get selected files in an Output structure-------
+       // out: vector structure output  < <img, info>, ... >
+       // 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<OutStrGimmick> &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 975074062580e1b21e438da17b50a779c90a73a0..e037559b6c08c503ae61800805c31f70addc3acb 100644 (file)
--- a/src/creaImageIOWxGimmickReaderDialog.h
+++ b/src/creaImageIOWxGimmickReaderDialog.h
@@ -47,7 +47,11 @@ namespace creaImageIO
     void GetSelectedImagesInVector(std::vector<vtkImageData*>& 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  < <img, info>, ... >
+       // 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<OutStrGimmick> &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 d9f727cc56096b3acadd402892a59e2c1943ea98..2f317e1546fd9c0839a576186794a5b2dfb8ffbe 100644 (file)
--- 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 );