Merge pull request #810 from juanmcloaiza/develop

Import multiple data files at once

GUI/coregui/Views/ImportDataWidgets/ImportDataUtils.cpp

@@ -79,25 +79,9 @@ std::unique_ptr<OutputData<double>> ImportDataUtils::ImportReflectometryData(QSt
     return result;
 }
 
-std::unique_ptr<OutputData<double>> ImportDataUtils::Import2dData(QString& baseNameOfLoadedFile)
+std::unique_ptr<OutputData<double>> ImportDataUtils::Import2dData(QString& fileName)
 {
-    QString dirname = AppSvc::projectManager()->userImportDir();
-    QString fileName = QFileDialog::getOpenFileName(Q_NULLPTR, QStringLiteral("Open Intensity File"),
-                                                    dirname, filter_string_ba);
-
-    if (fileName.isEmpty())
-        return nullptr;
-
-
-    QString newImportDir = GUIHelpers::fileDir(fileName);
-    if (newImportDir != dirname)
-        AppSvc::projectManager()->setImportDir(newImportDir);
-
-    QFileInfo info(fileName);
-    baseNameOfLoadedFile = info.baseName();
-
     return ImportKnownData(fileName);
-
 }
 
 ImportDataInfo ImportDataUtils::Import1dData(QString& fileName)

GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp

@@ -123,36 +123,24 @@ void RealDataSelectorActions::setSelectionModel(QItemSelectionModel* selectionMo
 
 }
 
-void RealDataSelectorActions::onImport2dDataAction()
-{
-    Q_ASSERT(m_realDataModel);
-    Q_ASSERT(m_selectionModel);
-    QString baseNameOfImportedFile;
-
-    std::unique_ptr<OutputData<double>> data = ImportDataUtils::Import2dData(baseNameOfImportedFile);
-    if (data) {
-        RealDataItem* realDataItem
-            = dynamic_cast<RealDataItem*>(m_realDataModel->insertNewItem(Constants::RealDataType));
-        realDataItem->setItemName(baseNameOfImportedFile);
-        realDataItem->setOutputData(data.release());
-        m_selectionModel->clearSelection();
-        m_selectionModel->select(realDataItem->index(), QItemSelectionModel::Select);
-    }
-}
 
-void RealDataSelectorActions::onImport1dDataAction()
-{
+void RealDataSelectorActions::importDataLoop(int ndim){
     Q_ASSERT(m_realDataModel);
     Q_ASSERT(m_selectionModel);
-    //QString baseNameOfImportedFile;
-
-    QString dirname = AppSvc::projectManager()->projectDir();
-    QStringList fileNames = QFileDialog::getOpenFileNames(nullptr, QStringLiteral("Open Intensity File"),
-                                                          dirname);
+    QString filter_string_ba;
+    if(ndim == 2){
+        filter_string_ba = "Intensity File (*.int *.gz *.tif *.tiff *.txt *.csv);;"
+                           "Other (*.*)";
+    }
+    else{
+        filter_string_ba = "";
+    }
+    QString dirname = AppSvc::projectManager()->userImportDir();
+    QStringList fileNames = QFileDialog::getOpenFileNames(Q_NULLPTR, QStringLiteral("Open Intensity Files"),
+                                                          dirname, filter_string_ba);
 
-    if (fileNames.isEmpty()){
+    if (fileNames.isEmpty())
         return;
-    }
 
     QString newImportDir = GUIHelpers::fileDir(fileNames[0]);
     if (newImportDir != dirname)
@@ -161,18 +149,42 @@ void RealDataSelectorActions::onImport1dDataAction()
     for(auto fileName : fileNames) {
         QFileInfo info(fileName);
         auto baseNameOfLoadedFile = info.baseName();
-        auto data = ImportDataUtils::Import1dData(fileName);
-        if (data) {
-            RealDataItem* realDataItem
-                            = dynamic_cast<RealDataItem*>(m_realDataModel->insertNewItem(Constants::RealDataType));
-            realDataItem->setItemName(baseNameOfLoadedFile);
-            realDataItem->setImportData(std::move(data));
-            m_selectionModel->clearSelection();
-            m_selectionModel->select(realDataItem->index(), QItemSelectionModel::Select);
+
+        if(ndim == 2){
+            std::unique_ptr<OutputData<double>> data = ImportDataUtils::Import2dData(fileName);
+            if (data) {
+                RealDataItem* realDataItem
+                                = dynamic_cast<RealDataItem*>(m_realDataModel->insertNewItem(Constants::RealDataType));
+                realDataItem->setItemName(baseNameOfLoadedFile);
+                realDataItem->setOutputData(data.release());
+                m_selectionModel->clearSelection();
+                m_selectionModel->select(realDataItem->index(), QItemSelectionModel::Select);
+            }
+        }
+        else if(ndim == 1){
+            auto data = ImportDataUtils::Import1dData(fileName);
+            if (data) {
+                RealDataItem* realDataItem
+                                = dynamic_cast<RealDataItem*>(m_realDataModel->insertNewItem(Constants::RealDataType));
+                realDataItem->setItemName(baseNameOfLoadedFile);
+                realDataItem->setImportData(std::move(data));
+                m_selectionModel->clearSelection();
+                m_selectionModel->select(realDataItem->index(), QItemSelectionModel::Select);
+            }
         }
     }
 }
 
+void RealDataSelectorActions::onImport2dDataAction()
+{
+    importDataLoop(2);
+}
+
+void RealDataSelectorActions::onImport1dDataAction()
+{
+    importDataLoop(1);
+}
+
 void RealDataSelectorActions::onRemoveDataAction()
 {
     QModelIndex currentIndex = m_selectionModel->currentIndex();

GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h

@@ -43,6 +43,7 @@ public slots:
 private:
     void setAllActionsEnabled(bool value);
     void updateSelection();
+    void importDataLoop(int ndim);
 
     QAction* m_import2dDataAction;
     QAction* m_import1dDataAction;