static const QColor GridMajorColor, GridMinorColor;
static const QColor SamplingPointColour;
+ static const int64_t TracePaintBlockSize;
static const float EnvelopeThreshold;
static const int MaximumVDivs;
static const int MaxScaleIndex, MinScaleIndex;
static const int InfoTextMarginRight, InfoTextMarginBottom;
+ enum DisplayType {
+ DisplayAnalog = 0,
+ DisplayConverted = 1,
+ DisplayBoth = 2
+ };
+
public:
AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with..
*/
- void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+ void paint_back(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints the mid-layer of the signal with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with..
*/
- void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
+ void paint_mid(QPainter &p, ViewItemPaintParams &pp);
/**
* Paints the foreground layer of the item with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
*/
- void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+ void paint_fore(QPainter &p, ViewItemPaintParams &pp);
private:
void paint_grid(QPainter &p, int y, int left, int right);
int y, int left, const int64_t start, const int64_t end,
const double pixels_offset, const double samples_per_pixel);
+ void paint_logic_mid(QPainter &p, ViewItemPaintParams &pp);
+
+ void paint_logic_caps(QPainter &p, QLineF *const lines,
+ vector< pair<int64_t, bool> > &edges,
+ bool level, double samples_per_pixel, double pixels_offset,
+ float x_offset, float y_offset);
+
/**
* Computes the scale factor from the scale index and vdiv settings.
*/
void update_scale();
+ void update_conversion_type();
+
void perform_autoranging(bool force_update = false);
protected:
void on_autoranging_changed(int state);
+ void on_conversion_changed(int index);
+
+ void on_display_type_changed(int index);
+
private:
- QComboBox *resolution_cb_;
+ QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
float scale_;
int scale_index_;
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_;
};