projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
win32: Use -mwindows only for non-Debug targets.
[pulseview.git]
/
pv
/
views
/
trace
/
analogsignal.hpp
diff --git
a/pv/views/trace/analogsignal.hpp
b/pv/views/trace/analogsignal.hpp
index a36efce4879ca1c9e5602772ca41972ab2af280a..a66fb9e2fcefca99164644ac7ceb7dae75c209a4 100644
(file)
--- a/
pv/views/trace/analogsignal.hpp
+++ b/
pv/views/trace/analogsignal.hpp
@@
-50,6
+50,9
@@
private:
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 SamplingPointColourLo;
+ static const QColor SamplingPointColourNe;
+ static const QColor SamplingPointColourHi;
static const QColor ThresholdColor;
static const QColor ThresholdColorLo;
static const QColor ThresholdColorNe;
static const QColor ThresholdColor;
static const QColor ThresholdColorLo;
static const QColor ThresholdColorNe;
@@
-142,6
+145,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
+179,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
+196,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