X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=bf1f9017731f679f73d9a836ea706efc47722557;hp=eb828a1bfff61c93b58386618e03cb534f6ff850;hb=459db2c5cd2ab084dcf46f9e44c43916cb3ae9cf;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d
diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index eb828a1b..bf1f9017 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -14,26 +14,41 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
-#include
+#include
+#include
+#include
+#include
-#include "analogsignal.h"
-#include "pv/data/analog.h"
-#include "pv/data/analogsnapshot.h"
-#include "pv/view/view.h"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "analogsignal.hpp"
+#include "pv/data/analog.hpp"
+#include "pv/data/analogsegment.hpp"
+#include "pv/data/signalbase.hpp"
+#include "pv/view/view.hpp"
+
+#include
-using boost::shared_ptr;
using std::max;
+using std::make_pair;
using std::min;
+using std::shared_ptr;
using std::deque;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const QColor AnalogSignal::SignalColours[4] = {
QColor(0xC4, 0xA0, 0x00), // Yellow
@@ -42,146 +57,268 @@ const QColor AnalogSignal::SignalColours[4] = {
QColor(0x4E, 0x9A, 0x06) // Green
};
+const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40*256/100);
+const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20*256/100);
+
const float AnalogSignal::EnvelopeThreshold = 256.0f;
-AnalogSignal::AnalogSignal(pv::SigSession &session, sr_probe *const probe,
- shared_ptr data) :
- Signal(session, probe),
- _data(data),
- _scale(1.0f)
+const int AnalogSignal::MaximumVDivs = 10;
+const int AnalogSignal::MinScaleIndex = -6;
+const int AnalogSignal::MaxScaleIndex = 7;
+
+const int AnalogSignal::InfoTextMarginRight = 20;
+const int AnalogSignal::InfoTextMarginBottom = 5;
+
+AnalogSignal::AnalogSignal(
+ pv::Session &session,
+ shared_ptr base) :
+ Signal(session, base),
+ scale_index_(4), // 20 per div
+ scale_index_drag_offset_(0),
+ div_height_(3 * QFontMetrics(QApplication::font()).height()),
+ pos_vdivs_(1),
+ neg_vdivs_(1),
+ resolution_(0)
+{
+ base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);
+ update_scale();
+}
+
+shared_ptr AnalogSignal::data() const
+{
+ return base_->analog_data();
+}
+
+void AnalogSignal::save_settings(QSettings &settings) const
{
- _colour = SignalColours[probe->index % countof(SignalColours)];
+ settings.setValue("pos_vdivs", pos_vdivs_);
+ settings.setValue("neg_vdivs", neg_vdivs_);
+ settings.setValue("scale_index", scale_index_);
}
-AnalogSignal::~AnalogSignal()
+void AnalogSignal::restore_settings(QSettings &settings)
{
+ if (settings.contains("pos_vdivs"))
+ pos_vdivs_ = settings.value("pos_vdivs").toInt();
+
+ if (settings.contains("neg_vdivs"))
+ neg_vdivs_ = settings.value("neg_vdivs").toInt();
+
+ if (settings.contains("scale_index")) {
+ scale_index_ = settings.value("scale_index").toInt();
+ update_scale();
+ }
}
-boost::shared_ptr AnalogSignal::data() const
+std::pair AnalogSignal::v_extents() const
{
- return _data;
+ const int ph = pos_vdivs_ * div_height_;
+ const int nh = neg_vdivs_ * div_height_;
+ return make_pair(-ph, nh);
}
-void AnalogSignal::set_scale(float scale)
+int AnalogSignal::scale_handle_offset() const
{
- _scale = scale;
+ const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
+
+ return ((scale_index_drag_offset_ - scale_index_) *
+ h / 4) - h / 2;
}
-void AnalogSignal::paint_back(QPainter &p, int left, int right)
+void AnalogSignal::scale_handle_dragged(int offset)
{
- if (_probe->enabled)
- paint_axis(p, get_y(), left, right);
+ const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;
+
+ scale_index_ = scale_index_drag_offset_ -
+ (offset + h / 2) / (h / 4);
+
+ update_scale();
}
-void AnalogSignal::paint_mid(QPainter &p, int left, int right)
+void AnalogSignal::scale_handle_drag_release()
{
- assert(_data);
- assert(right >= left);
+ scale_index_drag_offset_ = scale_index_;
+ update_scale();
+}
- assert(_view);
- const int y = _v_offset - _view->v_offset();
+void AnalogSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
+ if (base_->enabled()) {
+ Trace::paint_back(p, pp);
+ paint_axis(p, pp, get_visual_y());
+ }
+}
- const double scale = _view->scale();
- assert(scale > 0);
+void AnalogSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
+{
+ assert(base_->analog_data());
+ assert(owner_);
- const double offset = _view->offset();
+ const int y = get_visual_y();
- if (!_probe->enabled)
+ if (!base_->enabled())
return;
- const deque< shared_ptr > &snapshots =
- _data->get_snapshots();
- if (snapshots.empty())
+ paint_grid(p, y, pp.left(), pp.right());
+
+ const deque< shared_ptr > &segments =
+ base_->analog_data()->analog_segments();
+ if (segments.empty())
return;
- const shared_ptr &snapshot =
- snapshots.front();
+ const shared_ptr &segment =
+ segments.front();
- const double pixels_offset = offset / scale;
- const double samplerate = _data->samplerate();
- const double start_time = _data->get_start_time();
- const int64_t last_sample = snapshot->get_sample_count() - 1;
- const double samples_per_pixel = samplerate * scale;
- const double start = samplerate * (offset - start_time);
- const double end = start + samples_per_pixel * (right - left);
+ 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 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();
- const int64_t start_sample = min(max((int64_t)floor(start),
+ const int64_t start_sample = min(max(floor(start).convert_to(),
(int64_t)0), last_sample);
- const int64_t end_sample = min(max((int64_t)ceil(end) + 1,
+ const int64_t end_sample = min(max((ceil(end) + 1).convert_to(),
(int64_t)0), last_sample);
if (samples_per_pixel < EnvelopeThreshold)
- paint_trace(p, snapshot, y, left,
+ paint_trace(p, segment, y, pp.left(),
start_sample, end_sample,
pixels_offset, samples_per_pixel);
else
- paint_envelope(p, snapshot, y, left,
+ paint_envelope(p, segment, y, pp.left(),
start_sample, end_sample,
pixels_offset, samples_per_pixel);
}
+void AnalogSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+ if (!enabled())
+ return;
+
+ const int y = get_visual_y();
+
+ // Show the info section on the right side of the trace
+ const QString infotext = QString("%1 V/div").arg(resolution_);
+
+ p.setPen(base_->colour());
+ p.setFont(QApplication::font());
+
+ const QRectF bounding_rect = QRectF(pp.left(),
+ y + v_extents().first,
+ pp.width() - InfoTextMarginRight,
+ v_extents().second - v_extents().first - InfoTextMarginBottom);
+
+ p.drawText(bounding_rect, Qt::AlignRight | Qt::AlignBottom, infotext);
+}
+
+void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
+{
+ p.setRenderHint(QPainter::Antialiasing, false);
+
+ if (pos_vdivs_ > 0) {
+ p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
+ for (int i = 1; i <= pos_vdivs_; i++) {
+ const float dy = i * div_height_;
+ p.drawLine(QLineF(left, y - dy, right, y - dy));
+ }
+
+ p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
+ for (int i = 0; i < pos_vdivs_; i++) {
+ const float dy = i * div_height_;
+ const float dy25 = dy + (0.25 * div_height_);
+ const float dy50 = dy + (0.50 * div_height_);
+ const float dy75 = dy + (0.75 * div_height_);
+ p.drawLine(QLineF(left, y - dy25, right, y - dy25));
+ p.drawLine(QLineF(left, y - dy50, right, y - dy50));
+ p.drawLine(QLineF(left, y - dy75, right, y - dy75));
+ }
+ }
+
+ if (neg_vdivs_ > 0) {
+ p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
+ for (int i = 1; i <= neg_vdivs_; i++) {
+ const float dy = i * div_height_;
+ p.drawLine(QLineF(left, y + dy, right, y + dy));
+ }
+
+ p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
+ for (int i = 0; i < neg_vdivs_; i++) {
+ const float dy = i * div_height_;
+ const float dy25 = dy + (0.25 * div_height_);
+ const float dy50 = dy + (0.50 * div_height_);
+ const float dy75 = dy + (0.75 * div_height_);
+ p.drawLine(QLineF(left, y + dy25, right, y + dy25));
+ p.drawLine(QLineF(left, y + dy50, right, y + dy50));
+ p.drawLine(QLineF(left, y + dy75, right, y + dy75));
+ }
+ }
+
+ p.setRenderHint(QPainter::Antialiasing, true);
+}
+
void AnalogSignal::paint_trace(QPainter &p,
- const shared_ptr &snapshot,
+ const shared_ptr &segment,
int y, int left, const int64_t start, const int64_t end,
const double pixels_offset, const double samples_per_pixel)
{
- const int64_t sample_count = end - start;
-
- const float *const samples = snapshot->get_samples(start, end);
- assert(samples);
-
- p.setPen(_colour);
+ p.setPen(base_->colour());
- QPointF *points = new QPointF[sample_count];
+ QPointF *points = new QPointF[end - start];
QPointF *point = points;
+ pv::data::SegmentAnalogDataIterator* it =
+ segment->begin_sample_iteration(start);
+
for (int64_t sample = start; sample != end; sample++) {
const float x = (sample / samples_per_pixel -
pixels_offset) + left;
- *point++ = QPointF(x,
- y - samples[sample - start] * _scale);
+
+ *point++ = QPointF(x, y - *((float*)it->value) * scale_);
+ segment->continue_sample_iteration(it, 1);
}
+ segment->end_sample_iteration(it);
p.drawPolyline(points, point - points);
- delete[] samples;
delete[] points;
}
void AnalogSignal::paint_envelope(QPainter &p,
- const shared_ptr &snapshot,
+ const shared_ptr &segment,
int y, int left, const int64_t start, const int64_t end,
const double pixels_offset, const double samples_per_pixel)
{
- using pv::data::AnalogSnapshot;
+ using pv::data::AnalogSegment;
- AnalogSnapshot::EnvelopeSection e;
- snapshot->get_envelope_section(e, start, end, samples_per_pixel);
+ AnalogSegment::EnvelopeSection e;
+ segment->get_envelope_section(e, start, end, samples_per_pixel);
if (e.length < 2)
return;
p.setPen(QPen(Qt::NoPen));
- p.setBrush(_colour);
+ p.setBrush(base_->colour());
QRectF *const rects = new QRectF[e.length];
QRectF *rect = rects;
- for(uint64_t sample = 0; sample < e.length-1; sample++) {
+ for (uint64_t sample = 0; sample < e.length-1; sample++) {
const float x = ((e.scale * sample + e.start) /
samples_per_pixel - pixels_offset) + left;
- const AnalogSnapshot::EnvelopeSample *const s =
+ const AnalogSegment::EnvelopeSample *const s =
e.samples + sample;
// We overlap this sample with the next so that vertical
// gaps do not appear during steep rising or falling edges
- const float b = y - max(s->max, (s+1)->min) * _scale;
- const float t = y - min(s->min, (s+1)->max) * _scale;
+ const float b = y - max(s->max, (s+1)->min) * scale_;
+ const float t = y - min(s->min, (s+1)->max) * scale_;
float h = b - t;
- if(h >= 0.0f && h <= 1.0f)
+ if (h >= 0.0f && h <= 1.0f)
h = 1.0f;
- if(h <= 0.0f && h >= -1.0f)
+ if (h <= 0.0f && h >= -1.0f)
h = -1.0f;
*rect++ = QRectF(x, t, 1.0f, h);
@@ -193,5 +330,101 @@ void AnalogSignal::paint_envelope(QPainter &p,
delete[] e.samples;
}
-} // namespace view
+float AnalogSignal::get_resolution(int scale_index)
+{
+ const float seq[] = {1.0f, 2.0f, 5.0f};
+
+ const int offset = std::numeric_limits::max() / (2 * countof(seq));
+ const std::div_t d = std::div(
+ (int)(scale_index + countof(seq) * offset),
+ countof(seq));
+
+ return powf(10.0f, d.quot - offset) * seq[d.rem];
+}
+
+void AnalogSignal::update_scale()
+{
+ resolution_ = get_resolution(scale_index_);
+ scale_ = div_height_ / resolution_;
+}
+
+void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+ // Add the standard options
+ Signal::populate_popup_form(parent, form);
+
+ QFormLayout *const layout = new QFormLayout;
+
+ // Add the number of vdivs
+ QSpinBox *pvdiv_sb = new QSpinBox(parent);
+ pvdiv_sb->setRange(0, MaximumVDivs);
+ pvdiv_sb->setValue(pos_vdivs_);
+ connect(pvdiv_sb, SIGNAL(valueChanged(int)),
+ this, SLOT(on_pos_vdivs_changed(int)));
+ layout->addRow(tr("Number of pos vertical divs"), pvdiv_sb);
+
+ QSpinBox *nvdiv_sb = new QSpinBox(parent);
+ nvdiv_sb->setRange(0, MaximumVDivs);
+ nvdiv_sb->setValue(neg_vdivs_);
+ connect(nvdiv_sb, SIGNAL(valueChanged(int)),
+ this, SLOT(on_neg_vdivs_changed(int)));
+ layout->addRow(tr("Number of neg vertical divs"), nvdiv_sb);
+
+ // Add the vertical resolution
+ resolution_cb_ = new QComboBox(parent);
+
+ for (int i = MinScaleIndex; i < MaxScaleIndex; i++) {
+ const QString label = QString("%1").arg(get_resolution(i));
+ resolution_cb_->insertItem(0, label, QVariant(i));
+ }
+
+ const int cur_idx = resolution_cb_->findData(QVariant(scale_index_));
+ resolution_cb_->setCurrentIndex(cur_idx);
+
+ connect(resolution_cb_, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(on_resolution_changed(int)));
+
+ QGridLayout *const vdiv_layout = new QGridLayout;
+ QLabel *const vdiv_unit = new QLabel(tr("V/div"));
+ vdiv_layout->addWidget(resolution_cb_, 0, 0);
+ vdiv_layout->addWidget(vdiv_unit, 0, 1);
+
+ layout->addRow(tr("Vertical resolution"), vdiv_layout);
+
+ form->addRow(layout);
+}
+
+void AnalogSignal::on_pos_vdivs_changed(int vdivs)
+{
+ pos_vdivs_ = vdivs;
+
+ if (owner_) {
+ // Call order is important, otherwise the lazy event handler won't work
+ owner_->extents_changed(false, true);
+ owner_->row_item_appearance_changed(false, true);
+ }
+}
+
+void AnalogSignal::on_neg_vdivs_changed(int vdivs)
+{
+ neg_vdivs_ = vdivs;
+
+ if (owner_) {
+ // Call order is important, otherwise the lazy event handler won't work
+ owner_->extents_changed(false, true);
+ owner_->row_item_appearance_changed(false, true);
+ }
+}
+
+void AnalogSignal::on_resolution_changed(int index)
+{
+ scale_index_ = resolution_cb_->itemData(index).toInt();
+ update_scale();
+
+ if (owner_)
+ owner_->row_item_appearance_changed(false, true);
+}
+
+} // namespace TraceView
+} // namespace views
} // namespace pv