diff --git a/GUI/coregui/DataLoaders/AbstractDataLoader.h b/GUI/coregui/DataLoaders/AbstractDataLoader.h index f99fe123b3ee71b927d9500cdecb157a34def38a..e6613ded1b3fdbaa8dd9d614e70905e24da8c787 100644 --- a/GUI/coregui/DataLoaders/AbstractDataLoader.h +++ b/GUI/coregui/DataLoaders/AbstractDataLoader.h @@ -37,8 +37,8 @@ public: //! Info about what this loader does. Is shown on the import dialog pane virtual QString info() const; - //! Fills the widget on the import dialog pane. This base class does nothing (=> no editable - //! properties) + //! Fills the widget on the import dialog pane. This base class' implementation does nothing + //! (meaning "no editable properties") virtual void populatePropertiesWidget(QWidget* parent); //! Read all values from the properties UI into the internal variables diff --git a/GUI/coregui/DataLoaders/AutomaticDataLoader1D.cpp b/GUI/coregui/DataLoaders/AutomaticDataLoader1D.cpp index 264341ae91a029a0ee6285cdfe6b87d4b4ae0d34..4f2623ae3c3cafa057eaa5b183b5e2e418382a39 100644 --- a/GUI/coregui/DataLoaders/AutomaticDataLoader1D.cpp +++ b/GUI/coregui/DataLoaders/AutomaticDataLoader1D.cpp @@ -38,11 +38,10 @@ QString table(int nColumns, const QStringList& entries, const QString& attribute int col = 0; bool bShowAsHorizontalHeader = bHasHorizontalHeader; for (QStringList::size_type i = 0; i < entries.size(); i++) { - if (bShowAsHorizontalHeader) { + if (bShowAsHorizontalHeader) result += "<th>" + entries[i] + "</th>"; - } else { + else result += "<td valign=\"top\">" + entries[i] + "</td>"; - } col++; if ((col == nColumns) && (i < entries.size() - 1)) // start new line? @@ -60,7 +59,7 @@ QString table(int nColumns, const QStringList& entries, const QString& attribute QString AutomaticDataLoader1D::name() const { - return "Automatic 1D import (BornAgain 1.18.0)"; + return "Legacy from BornAgain 1.18"; } QString AutomaticDataLoader1D::info() const diff --git a/GUI/coregui/DataLoaders/QREDataLoader.cpp b/GUI/coregui/DataLoaders/QREDataLoader.cpp index 3f31c19264dc7596b4d1c0c14815e67a7a8493ea..f8a88d1fcb19d1ec7b2b474e2652f2d51610effc 100644 --- a/GUI/coregui/DataLoaders/QREDataLoader.cpp +++ b/GUI/coregui/DataLoaders/QREDataLoader.cpp @@ -495,7 +495,7 @@ bool QREDataLoader::fillImportDetailsTable(QTableWidget* table, bool fileContent return true; } -void QREDataLoader::estimateSettings(const QString& filename) +void QREDataLoader::guessSettings(const QString& filename) { // #baimport implement estimateSettings (separator) // search for lines which have start with numbers, then try the separators @@ -633,8 +633,7 @@ void QREDataLoader::calculateFromParseResult() const continue; } - const bool isDuplicateQ = foundQValues.contains(q); - if (isDuplicateQ) { + if (foundQValues.contains(q)) { m_importResult.calculationErrors[lineNr] = QString("The value %1 for Q is duplicate - line is discarded").arg(q); continue; diff --git a/GUI/coregui/DataLoaders/QREDataLoader.h b/GUI/coregui/DataLoaders/QREDataLoader.h index e2d06b593493d1639e2211a7b8f7f99753a993f5..89f369d080964572f4d31f55550f002db60e5bdf 100644 --- a/GUI/coregui/DataLoaders/QREDataLoader.h +++ b/GUI/coregui/DataLoaders/QREDataLoader.h @@ -40,7 +40,7 @@ public: QStringList* warnings) const override; virtual bool fillImportDetailsTable(QTableWidget* table, bool fileContent, bool rawContent, bool processedContent) const override; - void estimateSettings(const QString& filename); + void guessSettings(const QString& filename); private: void parseFile(QString& fileContent) const;