check if 2D

GUI/View/Data/DatafilesSelector.cpp

@@ -279,20 +279,25 @@ void DatafilesSelector::importData1D()
     const IO::Filetype1D global_ftype = ::filterkey2type(filters1D, selectedFilter);
 
     for (const QString& fname : fnames) {
-        const ImportSettings1D* settings = nullptr;
-
-        IO::Filetype1D ftype = global_ftype;
-        if (ftype == IO::unknown1D)
-            ftype = IO::filename2type1D(fname.toStdString());
-        if (ftype == IO::csv1D) {
-            Legacy1dDialog dialog(this, fname);
-            const auto result = dialog.exec();
-            if (result != QDialog::Accepted)
-                return;
-            settings = &Legacy1dDialog::Msettings;
-        }
-
         try {
+            if (IO::isPure2dFile(fname.toStdString()))
+                throw std::runtime_error("File \""
+                                         + ZipUtil::uncompressedExtension(fname.toStdString())
+                                         + "\" may contain only 2D data");
+
+            const ImportSettings1D* settings = nullptr;
+
+            IO::Filetype1D ftype = global_ftype;
+            if (ftype == IO::unknown1D)
+                ftype = IO::filename2type1D(fname.toStdString());
+            if (ftype == IO::csv1D) {
+                Legacy1dDialog dialog(this, fname);
+                const auto result = dialog.exec();
+                if (result != QDialog::Accepted)
+                    return;
+                settings = &Legacy1dDialog::Msettings;
+            }
+
             Datafield df = IO::readData1D(fname.toStdString(), ftype, settings);
             if (df.rank() != 1)
                 throw std::runtime_error("File does not contain a 1d data set");