[j.df2] assert -> throw as caused by wrong user input ()

Merging branch 'j.df2'  into 'main'.

See merge request !2171

GUI/View/Data/DatafilesSelector.cpp

@@ -292,9 +292,10 @@ void DatafilesSelector::importData1D()
             std::unique_ptr<Datafield> df(IO::readData1D(fname.toStdString(), ftype, settings));
             if (!df)
                 continue;
+            if (df->rank() == 1)
+                throw std::runtime_error("File does not contain a 1d data set");
             realItem = m_treeModel->injectDataItem(1);
             realItem->setDatafileItemName(QFileInfo(fname).baseName());
-            ASSERT(df->rank() == 1);
             realItem->setTheDatafield(*df);
             setCurrentItem(realItem);
 
@@ -304,7 +305,7 @@ void DatafilesSelector::importData1D()
         } catch (std::exception& ex) {
             m_treeModel->removeDataItem(realItem);
 
-            const QString message = QString("Error while trying to read file\n\n'%1'\n\n%2")
+            const QString message = QString("Cannot read file %1:\n\n%2")
                                         .arg(fname)
                                         .arg(QString::fromStdString(std::string(ex.what())));
             GUI::Message::warning(this, "File import", message);
@@ -351,15 +352,16 @@ void DatafilesSelector::importData2D()
             std::unique_ptr<Datafield> df(IO::readData2D(fname.toStdString(), ftype));
             if (!df)
                 continue;
+            if (df->rank() != 2)
+                throw std::runtime_error("File does not contain a 2d data set");
             realItem = m_treeModel->injectDataItem(2);
             realItem->setDatafileItemName(QFileInfo(fname).baseName());
-            ASSERT(df->rank() == 2);
             realItem->setTheDatafield(*df);
             setCurrentItem(realItem);
         } catch (std::exception& ex) {
             m_treeModel->removeDataItem(realItem);
 
-            const QString message = QString("Error while trying to read file\n\n'%1'\n\n%2")
+            const QString message = QString("Cannot read file %1\n\n%2")
                                         .arg(fname)
                                         .arg(QString::fromStdString(std::string(ex.what())));
             GUI::Message::warning(this, "File import", message);