From 3a12b3a010ef151d4964d10a52c55381d4fdccc3 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 26 May 2022 13:05:51 +0200
Subject: [PATCH] rename fcts -> itemsTo...
---
GUI/Model/ToDomain/DomainSimulationBuilder.cpp | 2 +-
GUI/Model/ToDomain/ToDomain.cpp | 6 +++---
GUI/Model/ToDomain/ToDomain.h | 4 ++--
GUI/View/SampleDesigner/ScriptPanel.cpp | 2 +-
Tests/Unit/GUI/TestLayerRoughnessItems.cpp | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/GUI/Model/ToDomain/DomainSimulationBuilder.cpp b/GUI/Model/ToDomain/DomainSimulationBuilder.cpp
index 2c126c564ec..7ab6ead60f9 100644
--- a/GUI/Model/ToDomain/DomainSimulationBuilder.cpp
+++ b/GUI/Model/ToDomain/DomainSimulationBuilder.cpp
@@ -206,7 +206,7 @@ GUI::Transform::ToDomain::createSimulation(const MultiLayerItem* sampleItem,
throw Error(message);
}
- auto P_sample = GUI::Transform::ToDomain::buildMultiLayer(*sampleItem);
+ auto P_sample = GUI::Transform::ToDomain::itemToSample(*sampleItem);
if (const auto* gisasInstrument = dynamic_cast<const GISASInstrumentItem*>(instrumentItem))
return createScatteringSimulation(std::move(P_sample), gisasInstrument, optionsItem);
diff --git a/GUI/Model/ToDomain/ToDomain.cpp b/GUI/Model/ToDomain/ToDomain.cpp
index 5bb04b0cf2e..56cbe1ec7ee 100644
--- a/GUI/Model/ToDomain/ToDomain.cpp
+++ b/GUI/Model/ToDomain/ToDomain.cpp
@@ -122,7 +122,7 @@ std::unique_ptr<Layer> buildLayer(const LayerItem& item)
} // namespace
std::unique_ptr<LayerRoughness>
-GUI::Transform::ToDomain::createLayerRoughness(LayerBasicRoughnessItem* roughness)
+GUI::Transform::ToDomain::itemToLayerRoughness(LayerBasicRoughnessItem* roughness)
{
if (!roughness)
return nullptr;
@@ -131,14 +131,14 @@ GUI::Transform::ToDomain::createLayerRoughness(LayerBasicRoughnessItem* roughnes
}
std::unique_ptr<MultiLayer>
-GUI::Transform::ToDomain::buildMultiLayer(const MultiLayerItem& sampleItem)
+GUI::Transform::ToDomain::itemToSample(const MultiLayerItem& sampleItem)
{
auto P_sample = createMultiLayer(sampleItem);
for (auto* layerItem : sampleItem.layers()) {
auto P_layer = buildLayer(*layerItem);
ASSERT(P_layer);
const auto roughness = layerItem->roughness().currentItem();
- auto P_roughness = createLayerRoughness(roughness);
+ auto P_roughness = itemToLayerRoughness(roughness);
if (P_roughness && !layerItem->isTopLayer())
P_sample->addLayerWithTopRoughness(*P_layer, *P_roughness);
else
diff --git a/GUI/Model/ToDomain/ToDomain.h b/GUI/Model/ToDomain/ToDomain.h
index e64634f7724..7b877a085a4 100644
--- a/GUI/Model/ToDomain/ToDomain.h
+++ b/GUI/Model/ToDomain/ToDomain.h
@@ -26,9 +26,9 @@ class LayerRoughness;
namespace GUI::Transform::ToDomain {
-std::unique_ptr<LayerRoughness> createLayerRoughness(LayerBasicRoughnessItem* roughness);
+std::unique_ptr<LayerRoughness> itemToLayerRoughness(LayerBasicRoughnessItem* roughness);
-std::unique_ptr<MultiLayer> buildMultiLayer(const MultiLayerItem& item);
+std::unique_ptr<MultiLayer> itemToSample(const MultiLayerItem& item);
} // namespace GUI::Transform::ToDomain
diff --git a/GUI/View/SampleDesigner/ScriptPanel.cpp b/GUI/View/SampleDesigner/ScriptPanel.cpp
index 262f12466e1..52a2b10acfc 100644
--- a/GUI/View/SampleDesigner/ScriptPanel.cpp
+++ b/GUI/View/SampleDesigner/ScriptPanel.cpp
@@ -107,7 +107,7 @@ QString ScriptPanel::generateCodeSnippet()
QString result;
try {
- auto sample = GUI::Transform::ToDomain::buildMultiLayer(*m_currentMultiLayerItem);
+ auto sample = GUI::Transform::ToDomain::itemToSample(*m_currentMultiLayerItem);
result.append(QString::fromStdString(Py::Export::sampleCode(*sample)));
} catch (const std::exception& ex) {
QString message =
diff --git a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
index 0998c92b03f..1f26b5e3e79 100644
--- a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
+++ b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
@@ -15,13 +15,13 @@ TEST_F(TestLayerRoughnessItems, LayerRoughnessToDomain)
roughnessItem.hurst().set(20.0);
roughnessItem.lateralCorrelationLength().set(30.0);
- auto P_roughness = GUI::Transform::ToDomain::createLayerRoughness(&roughnessItem);
+ auto P_roughness = GUI::Transform::ToDomain::itemToLayerRoughness(&roughnessItem);
EXPECT_EQ(P_roughness->sigma(), roughnessItem.sigma());
EXPECT_EQ(P_roughness->hurst(), roughnessItem.hurst());
EXPECT_EQ(P_roughness->lateralCorrLength(), roughnessItem.lateralCorrelationLength());
// No roughness
- EXPECT_TRUE(GUI::Transform::ToDomain::createLayerRoughness(nullptr) == nullptr);
+ EXPECT_TRUE(GUI::Transform::ToDomain::itemToLayerRoughness(nullptr) == nullptr);
}
TEST_F(TestLayerRoughnessItems, LayerRoughnessFromDomain)
--
GitLab