projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Draw analog thresholds differently
[pulseview.git]
/
pv
/
views
/
trace
/
analogsignal.hpp
diff --git
a/pv/views/trace/analogsignal.hpp
b/pv/views/trace/analogsignal.hpp
index 7dc1e0d9de9917135c7e1dbb60747e1fbdfca11f..536fc8a61714b6bf323f4a991b934389022b962c 100644
(file)
--- a/
pv/views/trace/analogsignal.hpp
+++ b/
pv/views/trace/analogsignal.hpp
@@
-26,7
+26,6
@@
#include <QComboBox>
#include <QSpinBox>
#include <QComboBox>
#include <QSpinBox>
-#include <QTimer>
using std::pair;
using std::shared_ptr;
using std::pair;
using std::shared_ptr;
@@
-47,9
+46,14
@@
class AnalogSignal : public Signal
Q_OBJECT
private:
Q_OBJECT
private:
+ static const QPen AxisPen;
static const QColor SignalColours[4];
static const QColor GridMajorColor, GridMinorColor;
static const QColor SamplingPointColour;
static const QColor SignalColours[4];
static const QColor GridMajorColor, GridMinorColor;
static const QColor SamplingPointColour;
+ static const QColor ThresholdColor;
+ static const QColor ThresholdColorLo;
+ static const QColor ThresholdColorNe;
+ static const QColor ThresholdColorHi;
static const int64_t TracePaintBlockSize;
static const float EnvelopeThreshold;
static const int64_t TracePaintBlockSize;
static const float EnvelopeThreshold;
@@
-153,7
+157,7
@@
protected:
void populate_popup_form(QWidget *parent, QFormLayout *form);
private Q_SLOTS:
void populate_popup_form(QWidget *parent, QFormLayout *form);
private Q_SLOTS:
- void on_
samples_added(
);
+ void on_
min_max_changed(float min, float max
);
void on_pos_vdivs_changed(int vdivs);
void on_neg_vdivs_changed(int vdivs);
void on_pos_vdivs_changed(int vdivs);
void on_neg_vdivs_changed(int vdivs);
@@
-174,8
+178,6
@@
private:
*display_type_cb_;
QSpinBox *pvdiv_sb_, *nvdiv_sb_, *div_height_sb_;
*display_type_cb_;
QSpinBox *pvdiv_sb_, *nvdiv_sb_, *div_height_sb_;
- QTimer delayed_conversion_starter_;
-
float scale_;
int scale_index_;
int scale_index_drag_offset_;
float scale_;
int scale_index_;
int scale_index_drag_offset_;