mv from utils to anon namespace

GUI/Project/LinkInstrumentManager.cpp

@@ -17,13 +17,11 @@
 #include "GUI/Items/RealDataItem.h"
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
 #include <QMessageBox>
 #include <QPushButton>
 
-using namespace GUI::View;
-
 namespace {
+
 bool QuestionOnInstrumentReshaping(const QString& message)
 {
     QMessageBox msgBox;
@@ -42,6 +40,29 @@ bool QuestionOnInstrumentReshaping(const QString& message)
 
     return msgBox.clickedButton() == modifyInstrumentButton;
 }
+
+
+QString printShapeMessage(const std::vector<int>& instrument_shape,
+                          const std::vector<int>& data_shape)
+{
+    auto to_str = [](const std::vector<int>& shape) {
+        std::string result;
+        for (size_t i = 0, size = shape.size(); i < size; ++i) {
+            result += std::to_string(shape[i]);
+            if (i + 1 != size)
+                result += ", ";
+        }
+        return result;
+    };
+
+    std::string message_string = "instrument [";
+    message_string += to_str(instrument_shape);
+    message_string += "], data [";
+    message_string += to_str(data_shape);
+    message_string += "]";
+    return QString::fromStdString(std::move(message_string));
+}
+
 } // namespace
 
 LinkInstrumentManager::LinkInstrumentManager(InstrumentModel* instrumentModel,
@@ -65,7 +86,7 @@ bool LinkInstrumentManager::canLinkDataToInstrument(const RealDataItem* realData
     if (!instrumentItem)
         return true;
 
-    if (!ImportDataUtils::Compatible(*instrumentItem, *realDataItem)) {
+    if (instrumentItem->shape().size() != realDataItem->shape().size()) {
         if (parent)
             QMessageBox::warning(parent, "Can't link to instrument",
                                  "Can't link, data is incompatible with the instrument.");
@@ -84,7 +105,7 @@ bool LinkInstrumentManager::canLinkDataToInstrument(const RealDataItem* realData
     QString message =
         realDataItem->holdsDimensionalData()
             ? "Experimental data carries information on the range/points of measurement."
-            : ImportDataUtils::printShapeMessage(instrumentItem->shape(), realDataItem->shape());
+            : printShapeMessage(instrumentItem->shape(), realDataItem->shape());
     if (!QuestionOnInstrumentReshaping(message))
         return false;
 

GUI/Views/ImportDataWidgets/ImportDataUtils.cpp

@@ -16,9 +16,9 @@
 #include "Device/Data/OutputData.h"
 #include "Device/InputOutput/DataFormatUtils.h"
 #include "GUI/Views/Loaders/QREDataLoader.h"
-#include "GUI/Items/InstrumentItems.h"
 #include "GUI/Items/RealDataItem.h"
 #include "GUI/utils/OutputDataUtils.h"
+#include "GUI/Models/Data/ImportDataInfo.h"
 #include <QApplication>
 #include <QMessageBox>
 
@@ -29,16 +29,6 @@ const QString filter_string_ba = "Intensity File (*.int *.gz *.tif *.tiff *.txt
 const QString filter_string_ascii = "Intensity File (*.int *.int.gz *.txt *.csv *.dat *.ascii);;"
                                     "Ascii column-wise data (*.*)";
 
-int rank(const RealDataItem& item)
-{
-    return static_cast<int>(item.shape().size());
-}
-
-int rank(const InstrumentItem& item)
-{
-    return static_cast<int>(item.shape().size());
-}
-
 //! Imports for 2D or 1D data, using given loader.
 //! Allocates OutputData, and returns owning pointer.
 //! Currently used for all 2D, and some 1D data files.
@@ -135,30 +125,3 @@ QString GUI::View::ImportDataUtils::Import1dData(RealDataItem* realDataItem,
 
     return QString();
 }
-
-bool GUI::View::ImportDataUtils::Compatible(const InstrumentItem& instrumentItem,
-                                            const RealDataItem& realDataItem)
-{
-    return rank(instrumentItem) == rank(realDataItem);
-}
-
-QString GUI::View::ImportDataUtils::printShapeMessage(const std::vector<int>& instrument_shape,
-                                                      const std::vector<int>& data_shape)
-{
-    auto to_str = [](const std::vector<int>& shape) {
-        std::string result;
-        for (size_t i = 0, size = shape.size(); i < size; ++i) {
-            result += std::to_string(shape[i]);
-            if (i + 1 != size)
-                result += ", ";
-        }
-        return result;
-    };
-
-    std::string message_string = "instrument [";
-    message_string += to_str(instrument_shape);
-    message_string += "], data [";
-    message_string += to_str(data_shape);
-    message_string += "]";
-    return QString::fromStdString(std::move(message_string));
-}

GUI/Views/ImportDataWidgets/ImportDataUtils.h

@@ -16,10 +16,8 @@
 #define BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H
 
 #include "Device/Histo/IntensityDataIOFactory.h"
-#include "GUI/Models/Data/ImportDataInfo.h"
 #include <QString>
 #include <memory>
-#include <vector>
 
 template <class T> class OutputData;
 class RealDataItem;
@@ -44,12 +42,6 @@ std::unique_ptr<OutputData<double>> Import2dData(const QString& fileName,
 //! (or null if none selected).
 QString Import1dData(RealDataItem* realDataItem, const AbstractDataLoader* selectedLoader);
 
-//! Check whether data item is compatible with instrument (same rank)
-bool Compatible(const InstrumentItem& instrumentItem, const RealDataItem& realDataItem);
-
-//! Composes a message with the shapes of InstrumentItem and RealDataItem.
-QString printShapeMessage(const std::vector<int>& instrument_shape,
-                          const std::vector<int>& data_shape);
 }; // namespace GUI::View::ImportDataUtils
 
 #endif // BORNAGAIN_GUI_VIEWS_IMPORTDATAWIDGETS_IMPORTDATAUTILS_H