projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
decodetrace.cpp: Drop unused "using std::all_of".
[pulseview.git]
/
pv
/
views
/
trace
/
analogsignal.hpp
diff --git
a/pv/views/trace/analogsignal.hpp
b/pv/views/trace/analogsignal.hpp
index a36efce4879ca1c9e5602772ca41972ab2af280a..6afc394227170c99151acc9d8220daa3fed63def 100644
(file)
--- a/
pv/views/trace/analogsignal.hpp
+++ b/
pv/views/trace/analogsignal.hpp
@@
-20,13
+20,14
@@
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
-#include "signal.hpp"
-
#include <memory>
#include <QComboBox>
#include <QSpinBox>
#include <memory>
#include <QComboBox>
#include <QSpinBox>
+#include <pv/globalsettings.hpp>
+#include <pv/views/trace/signal.hpp>
+
using std::pair;
using std::shared_ptr;
using std::pair;
using std::shared_ptr;
@@
-41,15
+42,18
@@
class SignalBase;
namespace views {
namespace trace {
namespace views {
namespace trace {
-class AnalogSignal : public Signal
+class AnalogSignal : public Signal
, public GlobalSettingsInterface
{
Q_OBJECT
private:
static const QPen AxisPen;
{
Q_OBJECT
private:
static const QPen AxisPen;
- static const QColor SignalColo
u
rs[4];
+ static const QColor SignalColors[4];
static const QColor GridMajorColor, GridMinorColor;
static const QColor GridMajorColor, GridMinorColor;
- static const QColor SamplingPointColour;
+ static const QColor SamplingPointColor;
+ static const QColor SamplingPointColorLo;
+ static const QColor SamplingPointColorNe;
+ static const QColor SamplingPointColorHi;
static const QColor ThresholdColor;
static const QColor ThresholdColorLo;
static const QColor ThresholdColorNe;
static const QColor ThresholdColor;
static const QColor ThresholdColorLo;
static const QColor ThresholdColorNe;
@@
-71,7
+75,7
@@
private:
public:
AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
public:
AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
-
virtual ~AnalogSignal() = default
;
+
~AnalogSignal()
;
shared_ptr<pv::data::SignalData> data() const;
shared_ptr<pv::data::SignalData> data() const;
@@
-101,6
+105,8
@@
public:
*/
void scale_handle_drag_release();
*/
void scale_handle_drag_release();
+ void on_setting_changed(const QString &key, const QVariant &value);
+
/**
* Paints the background layer of the signal with a QPainter
* @param p the QPainter to paint into.
/**
* Paints the background layer of the signal with a QPainter
* @param p the QPainter to paint into.
@@
-142,6
+148,9
@@
private:
bool level, double samples_per_pixel, double pixels_offset,
float x_offset, float y_offset);
bool level, double samples_per_pixel, double pixels_offset,
float x_offset, float y_offset);
+ shared_ptr<pv::data::AnalogSegment> get_analog_segment_to_paint() const;
+ shared_ptr<pv::data::LogicSegment> get_logic_segment_to_paint() const;
+
/**
* Computes the scale factor from the scale index and vdiv settings.
*/
/**
* Computes the scale factor from the scale index and vdiv settings.
*/
@@
-173,7
+182,7
@@
private Q_SLOTS:
void on_display_type_changed(int index);
void on_display_type_changed(int index);
- void on_settingView
ShowConversionThresholds
_changed(const QVariant new_value);
+ void on_settingView
ConversionThresholdDispMode
_changed(const QVariant new_value);
private:
QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_,
private:
QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_,
@@
-190,7
+199,7
@@
private:
DisplayType display_type_;
bool autoranging_;
DisplayType display_type_;
bool autoranging_;
-
bool show_conversion_thresholds
_;
+
int conversion_threshold_disp_mode
_;
};
} // namespace trace
};
} // namespace trace