#include <libsigrokcxx/libsigrokcxx.hpp>
-using std::bind;
using std::deque;
using std::div;
using std::div_t;
using std::numeric_limits;
using std::out_of_range;
using std::pair;
-using std::placeholders::_1;
using std::shared_ptr;
using std::vector;
connect(analog_data, SIGNAL(min_max_changed(float, float)),
this, SLOT(on_min_max_changed(float, float)));
- GlobalSettings::register_change_handler(GlobalSettings::Key_View_ConversionThresholdDispMode,
- bind(&AnalogSignal::on_settingViewConversionThresholdDispMode_changed, this, _1));
+ GlobalSettings::add_change_handler(this);
GlobalSettings gs;
conversion_threshold_disp_mode_ =
update_scale();
}
+AnalogSignal::~AnalogSignal()
+{
+ GlobalSettings::remove_change_handler(this);
+}
+
shared_ptr<pv::data::SignalData> AnalogSignal::data() const
{
return base_->analog_data();
update_scale();
}
+void AnalogSignal::on_setting_changed(const QString &key, const QVariant &value)
+{
+ if (key == GlobalSettings::Key_View_ConversionThresholdDispMode)
+ on_settingViewConversionThresholdDispMode_changed(value);
+}
+
void AnalogSignal::paint_back(QPainter &p, ViewItemPaintParams &pp)
{
if (!base_->enabled())
const double pixels_offset = pp.pixels_offset();
const double samplerate = max(1.0, segment->samplerate());
const pv::util::Timestamp& start_time = segment->start_time();
- const int64_t last_sample = segment->get_sample_count() - 1;
+ const int64_t last_sample = (int64_t)segment->get_sample_count() - 1;
const double samples_per_pixel = samplerate * pp.scale();
const pv::util::Timestamp start = samplerate * (pp.offset() - start_time);
const pv::util::Timestamp end = start + samples_per_pixel * pp.width();
}
}
- sampling_points[idx].push_back(
- QRectF(x - (w / 2), y - sample_block[block_sample] * scale_ - (w / 2), w, w));
+ sampling_points[idx].emplace_back(x - (w / 2), y - sample_block[block_sample] * scale_ - (w / 2), w, w);
}
}
delete[] sample_block;
const double pixels_offset = pp.pixels_offset();
const pv::util::Timestamp& start_time = segment->start_time();
- const int64_t last_sample = segment->get_sample_count() - 1;
+ const int64_t last_sample = (int64_t)segment->get_sample_count() - 1;
const double samples_per_pixel = samplerate * pp.scale();
const double pixels_per_sample = 1 / samples_per_pixel;
const pv::util::Timestamp start = samplerate * (pp.offset() - start_time);
if (segment_display_mode_ == ShowLastSegmentOnly)
segment = segments.back();
- if (segment_display_mode_ == ShowSingleSegmentOnly) {
+ if ((segment_display_mode_ == ShowSingleSegmentOnly) ||
+ (segment_display_mode_ == ShowLastCompleteSegmentOnly)) {
try {
segment = segments.at(current_segment_);
} catch (out_of_range) {
- qDebug() << "Current analog segment out of range for signal" << base_->name();
+ qDebug() << "Current analog segment out of range for signal" << base_->name() << ":" << current_segment_;
}
}
}
if (segment_display_mode_ == ShowLastSegmentOnly)
segment = segments.back();
- if (segment_display_mode_ == ShowSingleSegmentOnly) {
+ if ((segment_display_mode_ == ShowSingleSegmentOnly) ||
+ (segment_display_mode_ == ShowLastCompleteSegmentOnly)) {
try {
segment = segments.at(current_segment_);
} catch (out_of_range) {
- qDebug() << "Current logic segment out of range for signal" << base_->name();
+ qDebug() << "Current logic segment out of range for signal" << base_->name() << ":" << current_segment_;
}
}
}