diff --git a/DSLogic-gui/pv/view/signal.cpp b/DSLogic-gui/pv/view/signal.cpp index 44d8f3b8..11ef3198 100644 --- a/DSLogic-gui/pv/view/signal.cpp +++ b/DSLogic-gui/pv/view/signal.cpp @@ -44,7 +44,7 @@ const QColor Signal::dsLightBlue = QColor(17, 133, 209, 150); const QColor Signal::dsLightRed = QColor(213, 15, 37, 150); const QPen Signal::SignalAxisPen = QColor(128, 128, 128, 64); -const uint64_t Signal::vDialValue[Signal::vDialValueCount] = { +const quint64 Signal::vDialValue[Signal::vDialValueCount] = { 5, 10, 20, @@ -61,7 +61,7 @@ const QString Signal::vDialUnit[Signal::vDialUnitCount] = { "v", }; -const uint64_t Signal::hDialValue[Signal::hDialValueCount] = { +const quint64 Signal::hDialValue[Signal::hDialValueCount] = { 10, 20, 50, @@ -112,14 +112,14 @@ Signal::Signal(QString name, int index, int type, int order) : { _index_list.push_back(index); if (_type == DS_DSO) { - QVector vValue; - QVector vUnit; - QVector hValue; - QVector hUnit; - for(quint64 i = 0; i < Signal::vDialValueCount; i++) - vValue.append(Signal::vDialValue[i]); - for(quint64 i = 0; i < Signal::vDialUnitCount; i++) - vUnit.append(Signal::vDialUnit[i]); + QVector vValue; + QVector vUnit; + QVector hValue; + QVector hUnit; + for(quint64 i = 0; i < Signal::vDialValueCount; i++) + vValue.append(Signal::vDialValue[i]); + for(quint64 i = 0; i < Signal::vDialUnitCount; i++) + vUnit.append(Signal::vDialUnit[i]); for(quint64 i = 0; i < Signal::hDialValueCount; i++) hValue.append(Signal::hDialValue[i]); @@ -152,9 +152,9 @@ Signal::Signal(QString name, std::list index_list, int type, int order, int _active(true) { if (_type == DS_DSO) { - QVector vValue; + QVector vValue; QVector vUnit; - QVector hValue; + QVector hValue; QVector hUnit; for(quint64 i = 0; i < Signal::vDialValueCount; i++) vValue.append(Signal::vDialValue[i]); @@ -382,12 +382,12 @@ bool Signal::go_hDialNext() } } -uint64_t Signal::get_vDialValue() const +quint64 Signal::get_vDialValue() const { return _vDial->get_value(); } -uint64_t Signal::get_hDialValue() const +quint64 Signal::get_hDialValue() const { return _hDial->get_value(); } diff --git a/DSLogic-gui/pv/view/signal.h b/DSLogic-gui/pv/view/signal.h index f3a0207f..84203144 100644 --- a/DSLogic-gui/pv/view/signal.h +++ b/DSLogic-gui/pv/view/signal.h @@ -61,16 +61,16 @@ private: static const int Margin = 3; static const int SquareNum = 5; - static const uint64_t vDialValueCount = 10; - static const uint64_t vDialValueStep = 1000; - static const uint64_t vDialUnitCount = 2; - static const uint64_t hDialValueCount = 25; - static const uint64_t hDialValueStep = 1000; - static const uint64_t hDialUnitCount = 4; - static const uint64_t vDialValue[vDialValueCount]; + static const quint64 vDialValueCount = 10; + static const quint64 vDialValueStep = 1000; + static const quint64 vDialUnitCount = 2; + static const quint64 hDialValueCount = 25; + static const quint64 hDialValueStep = 1000; + static const quint64 hDialUnitCount = 4; + static const quint64 vDialValue[vDialValueCount]; static const QString vDialUnit[vDialUnitCount]; - static const uint64_t hDialValue[hDialValueCount]; + static const quint64 hDialValue[hDialValueCount]; static const QString hDialUnit[hDialUnitCount]; public: @@ -199,8 +199,8 @@ public: bool go_vDialNext(); bool go_hDialPre(); bool go_hDialNext(); - uint64_t get_vDialValue() const; - uint64_t get_hDialValue() const; + quint64 get_vDialValue() const; + quint64 get_hDialValue() const; uint16_t get_vDialSel() const; uint16_t get_hDialSel() const; bool get_acCoupling() const;