Skip to content
Snippets Groups Projects
Commit 7f057f83 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

InstrumentEditController: DoubleDescriptor --> DoubleProperty

parent 0e94b5e4
No related branches found
No related tags found
1 merge request!1162rm DoubleDescriptor from code
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
// ************************************************************************************************ // ************************************************************************************************
#include "GUI/View/Instrument/InstrumentEditController.h" #include "GUI/View/Instrument/InstrumentEditController.h"
#include "GUI/Model/Descriptor/DoubleDescriptor.h"
#include "GUI/Model/Device/InstrumentItems.h" #include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentsEditController.h" #include "GUI/Model/Device/InstrumentsEditController.h"
#include "GUI/Model/Device/PointwiseAxisItem.h" #include "GUI/Model/Device/PointwiseAxisItem.h"
...@@ -30,7 +29,7 @@ void InstrumentEditController::setInstrumentName(const QString& name) ...@@ -30,7 +29,7 @@ void InstrumentEditController::setInstrumentName(const QString& name)
m_ec->setInstrumentName(m_instrumentItem, 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) { if (d.get() != newValue) {
d.set(newValue); d.set(newValue);
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
class InstrumentItem; class InstrumentItem;
class RealItem; class RealItem;
class InstrumentsEditController; class InstrumentsEditController;
class DoubleDescriptor; class DoubleProperty;
//! Single-instrument-adapter to InstrumentsEditorController //! Single-instrument-adapter to InstrumentsEditorController
//! //!
...@@ -42,7 +42,7 @@ public: ...@@ -42,7 +42,7 @@ public:
void setInstrumentName(const QString& name); void setInstrumentName(const QString& name);
//! Sets the double and emits InstrumentsEditController::instrumentChanged if the double changed //! 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. //! Call this if any instrument value has been changed outside this controller.
//! //!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment