diff --git a/GUI/View/Instrument/InstrumentEditController.cpp b/GUI/View/Instrument/InstrumentEditController.cpp index 27f962fd2112bfb23dda79258772414229bc5434..226059cb21ee80832b43cc739034269b09d435e0 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 585ad9c9e68bc814325187d779cff9af11e0c96d..8ad3229d34a144db7f99eb79da06f57055b26780 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. //!