diff --git a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp index 1c6f5399e44fb4c1b8759e9108a38f06a5df5ac5..afea9a15517568a9efdced3300296e2fbcb62209 100644 --- a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp +++ b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp @@ -15,7 +15,6 @@ #include "GUI/coregui/Models/DepthProbeInstrumentItem.h" #include "Base/Const/Units.h" #include "Core/Simulation/DepthProbeSimulation.h" -#include "Device/Detector/UnitConverter2D.h" #include "GUI/coregui/Models/AxesItems.h" #include "GUI/coregui/Models/BeamItems.h" #include "GUI/coregui/Models/BeamWavelengthItem.h" @@ -98,8 +97,3 @@ std::unique_ptr<DepthProbeSimulation> DepthProbeInstrumentItem::createSimulation return simulation; } - -std::unique_ptr<IUnitConverter> DepthProbeInstrumentItem::createUnitConverter() const -{ - return createSimulation()->createUnitConverter(); -} diff --git a/GUI/coregui/Models/DepthProbeInstrumentItem.h b/GUI/coregui/Models/DepthProbeInstrumentItem.h index 73d92b9c1daa3ec07319adb6f6d22db6c16793fd..ba1f29d09a04c2e0c6fe03242fb8bf7731100855 100644 --- a/GUI/coregui/Models/DepthProbeInstrumentItem.h +++ b/GUI/coregui/Models/DepthProbeInstrumentItem.h @@ -38,8 +38,6 @@ public: // FIXME switch to base ISimulation class after InstrumentItem refactoring and // after ISimulation gets createUnitConverter method std::unique_ptr<DepthProbeSimulation> createSimulation() const; - - std::unique_ptr<IUnitConverter> createUnitConverter() const; }; #endif // BORNAGAIN_GUI_COREGUI_MODELS_DEPTHPROBEINSTRUMENTITEM_H diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/coregui/Models/DomainObjectBuilder.cpp index 12708ff1b0f4e572e1c1b8c8028885770ec3c2d7..a2a359ef452bbb7d4195708fbc0e967dd5306fb0 100644 --- a/GUI/coregui/Models/DomainObjectBuilder.cpp +++ b/GUI/coregui/Models/DomainObjectBuilder.cpp @@ -15,6 +15,7 @@ #include "GUI/coregui/Models/DomainObjectBuilder.h" #include "Base/Const/Units.h" #include "Core/Scan/UnitConverter1D.h" +#include "Core/Simulation/DepthProbeSimulation.h" #include "Device/Detector/IDetector2D.h" #include "Device/Detector/UnitConverter2D.h" #include "GUI/coregui/Models/AxesItems.h" @@ -133,7 +134,7 @@ DomainObjectBuilder::createUnitConverter(const InstrumentItem* instrumentItem) return specular_instrument->createUnitConverter(); if (auto depth_instrument = dynamic_cast<const DepthProbeInstrumentItem*>(instrumentItem)) - return depth_instrument->createUnitConverter(); + return depth_instrument->createSimulation()->createUnitConverter(); const auto instrument = instrumentItem->createInstrument(); instrument->initDetector();