From f525de23c317a38fdb746ec3d7cb815b6d74c574 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 23 May 2022 17:13:44 +0200
Subject: [PATCH] setting name to 'Instrument' is pointless
---
GUI/View/FromDomain/GUIObjectBuilder.cpp | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/GUI/View/FromDomain/GUIObjectBuilder.cpp b/GUI/View/FromDomain/GUIObjectBuilder.cpp
index be3fbe118c9..7dc8faee771 100644
--- a/GUI/View/FromDomain/GUIObjectBuilder.cpp
+++ b/GUI/View/FromDomain/GUIObjectBuilder.cpp
@@ -79,17 +79,13 @@ void GUI::Transform::FromDomain::populateInstrumentItems(InstrumentItems* instru
{
ASSERT(instrumentItems);
- QString name = instrument_name.isEmpty()
- ? QString::fromStdString(simulation.instrument().className())
- : instrument_name;
-
if (const auto* gisasSimulation = dynamic_cast<const ScatteringSimulation*>(&simulation))
- createGISASInstrumentItem(instrumentItems, *gisasSimulation, name);
+ createGISASInstrumentItem(instrumentItems, *gisasSimulation, instrument_name);
else if (const auto* offSpecSimulation =
dynamic_cast<const OffSpecularSimulation*>(&simulation))
- createOffSpecularInstrumentItem(instrumentItems, *offSpecSimulation, name);
+ createOffSpecularInstrumentItem(instrumentItems, *offSpecSimulation, instrument_name);
else if (const auto* spec_simulation = dynamic_cast<const SpecularSimulation*>(&simulation))
- createSpecularInstrumentItem(instrumentItems, *spec_simulation, name);
+ createSpecularInstrumentItem(instrumentItems, *spec_simulation, instrument_name);
else
ASSERT(0);
}
--
GitLab