From 7f057f83cf22f18833c079585d911e6d61d35532 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Thu, 1 Dec 2022 11:56:30 +0100
Subject: [PATCH] InstrumentEditController: DoubleDescriptor --> DoubleProperty
---
GUI/View/Instrument/InstrumentEditController.cpp | 3 +--
GUI/View/Instrument/InstrumentEditController.h | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/GUI/View/Instrument/InstrumentEditController.cpp b/GUI/View/Instrument/InstrumentEditController.cpp
index 27f962fd211..226059cb21e 100644
--- a/GUI/View/Instrument/InstrumentEditController.cpp
+++ b/GUI/View/Instrument/InstrumentEditController.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/View/Instrument/InstrumentEditController.h"
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentsEditController.h"
#include "GUI/Model/Device/PointwiseAxisItem.h"
@@ -30,7 +29,7 @@ void InstrumentEditController::setInstrumentName(const QString& name)
m_ec->setInstrumentName(m_instrumentItem, name);
}
-void InstrumentEditController::setDouble(DoubleDescriptor& d, double newValue)
+void InstrumentEditController::setDouble(DoubleProperty& d, double newValue)
{
if (d.get() != newValue) {
d.set(newValue);
diff --git a/GUI/View/Instrument/InstrumentEditController.h b/GUI/View/Instrument/InstrumentEditController.h
index 585ad9c9e68..8ad3229d34a 100644
--- a/GUI/View/Instrument/InstrumentEditController.h
+++ b/GUI/View/Instrument/InstrumentEditController.h
@@ -20,7 +20,7 @@
class InstrumentItem;
class RealItem;
class InstrumentsEditController;
-class DoubleDescriptor;
+class DoubleProperty;
//! Single-instrument-adapter to InstrumentsEditorController
//!
@@ -42,7 +42,7 @@ public:
void setInstrumentName(const QString& name);
//! Sets the double and emits InstrumentsEditController::instrumentChanged if the double changed
- void setDouble(DoubleDescriptor& d, double newValue);
+ void setDouble(DoubleProperty& d, double newValue);
//! Call this if any instrument value has been changed outside this controller.
//!
--
GitLab