projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert threshold display setting to a multi-value choice
[pulseview.git]
/
pv
/
views
/
trace
/
analogsignal.hpp
diff --git
a/pv/views/trace/analogsignal.hpp
b/pv/views/trace/analogsignal.hpp
index a1b3eeefac0139e916921a167322404acb1c8ab3..ffaac266020e3d2f098703efea3967591da32586 100644
(file)
--- a/
pv/views/trace/analogsignal.hpp
+++ b/
pv/views/trace/analogsignal.hpp
@@
-46,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;
@@
-144,7
+149,7
@@
private:
void update_scale();
void update_scale();
- void update_conversion_
type
();
+ void update_conversion_
widgets
();
void perform_autoranging(bool keep_divs, bool force_update);
void perform_autoranging(bool keep_divs, bool force_update);
@@
-152,22
+157,28
@@
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);
+ void on_div_height_changed(int height);
void on_resolution_changed(int index);
void on_autoranging_changed(int state);
void on_conversion_changed(int index);
void on_resolution_changed(int index);
void on_autoranging_changed(int state);
void on_conversion_changed(int index);
+ void on_conv_threshold_changed(int index=-1);
+ void on_delayed_conversion_starter();
void on_display_type_changed(int index);
void on_display_type_changed(int index);
+ void on_settingViewConversionThresholdDispMode_changed(const QVariant new_value);
+
private:
private:
- QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
- QSpinBox *pvdiv_sb_, *nvdiv_sb_;
+ QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_,
+ *display_type_cb_;
+ QSpinBox *pvdiv_sb_, *nvdiv_sb_, *div_height_sb_;
float scale_;
int scale_index_;
float scale_;
int scale_index_;
@@
-177,9
+188,9
@@
private:
int pos_vdivs_, neg_vdivs_; // divs per positive/negative side
float resolution_; // e.g. 10 for 10 V/div
int pos_vdivs_, neg_vdivs_; // divs per positive/negative side
float resolution_; // e.g. 10 for 10 V/div
- data::SignalBase::ConversionType conversion_type_;
DisplayType display_type_;
bool autoranging_;
DisplayType display_type_;
bool autoranging_;
+ int conversion_threshold_disp_mode_;
};
} // namespace trace
};
} // namespace trace