LogicSignal: Added set_logic_data

[pulseview.git] / pv / view / logicsignal.cpp

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 3acf1b5cb03ebf53c8a632075a07f32adfa0f7f3..0d31696100545ae99e80c4fd0f64bc749bc67b48 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -34,10 +34,10 @@
 #include <pv/session.hpp>
 #include <pv/devicemanager.hpp>
 #include <pv/data/logic.hpp>
-#include <pv/data/logicsnapshot.hpp>
+#include <pv/data/logicsegment.hpp>
 #include <pv/view/view.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::deque;
 using std::max;
@@ -140,18 +140,23 @@ shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
        return data_;
 }
 
+void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
+{
+       data_ = data;
+}
+
 std::pair<int, int> LogicSignal::v_extents() const
 {
        return make_pair(-SignalHeight - SignalMargin, SignalMargin);
 }
 
-void LogicSignal::paint_back(QPainter &p, const RowItemPaintParams &pp)
+void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
        if (channel_->enabled())
                paint_axis(p, pp, get_visual_y());
 }
 
-void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
+void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 {
        QLineF *line;
 
@@ -169,28 +174,28 @@ void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
        const float high_offset = y - SignalHeight + 0.5f;
        const float low_offset = y + 0.5f;
 
-       const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
-               data_->get_snapshots();
-       if (snapshots.empty())
+       const deque< shared_ptr<pv::data::LogicSegment> > &segments =
+               data_->logic_segments();
+       if (segments.empty())
                return;
 
-       const shared_ptr<pv::data::LogicSnapshot> &snapshot =
-               snapshots.front();
+       const shared_ptr<pv::data::LogicSegment> &segment =
+               segments.front();
 
-       double samplerate = data_->samplerate();
+       double samplerate = segment->samplerate();
 
        // Show sample rate as 1Hz when it is unknown
        if (samplerate == 0.0)
                samplerate = 1.0;
 
        const double pixels_offset = pp.pixels_offset();
-       const double start_time = data_->get_start_time();
-       const int64_t last_sample = snapshot->get_sample_count() - 1;
+       const double start_time = segment->start_time();
+       const int64_t last_sample = segment->get_sample_count() - 1;
        const double samples_per_pixel = samplerate * pp.scale();
        const double start = samplerate * (pp.offset() - start_time);
        const double end = start + samples_per_pixel * pp.width();
 
-       snapshot->get_subsampled_edges(edges,
+       segment->get_subsampled_edges(edges,
                min(max((int64_t)floor(start), (int64_t)0), last_sample),
                min(max((int64_t)ceil(end), (int64_t)0), last_sample),
                samples_per_pixel / Oversampling, channel_->index());
@@ -225,7 +230,7 @@ void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
        delete[] cap_lines;
 }
 
-void LogicSignal::paint_fore(QPainter &p, const RowItemPaintParams &pp)
+void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
 {
        // Draw the trigger marker
        if (!trigger_match_)
@@ -246,15 +251,15 @@ void LogicSignal::paint_fore(QPainter &p, const RowItemPaintParams &pp)
                if (!pixmap)
                        continue;
 
-               const int pad = TriggerMarkerPadding;
+               const float pad = TriggerMarkerPadding - 0.5f;
                const QSize size = pixmap->size();
                const QPoint point(
                        pp.right() - size.width() - pad * 2,
                        y - (SignalHeight + size.height()) / 2);
 
-               p.setPen(QPen(Qt::NoPen));
+               p.setPen(QPen(TriggerMarkerBackgroundColour.darker()));
                p.setBrush(TriggerMarkerBackgroundColour);
-               p.drawRoundedRect(QRect(point, size).adjusted(
+               p.drawRoundedRect(QRectF(point, size).adjusted(
                        -pad, -pad, pad, pad), pad, pad);
                p.drawPixmap(point, *pixmap);
 
@@ -316,14 +321,22 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 
 const vector<int32_t> LogicSignal::get_trigger_types() const
 {
-       try {
-               const Glib::VariantContainerBase gvar =
-                       device_->config_list(ConfigKey::TRIGGER_MATCH);
-               return Glib::VariantBase::cast_dynamic<
-                       Glib::Variant<vector<int32_t>>>(gvar).get();
-       } catch (Error e) {
-               return vector<int32_t>();
+       const auto keys = device_->config_keys(ConfigKey::DEVICE_OPTIONS);
+       const auto iter = keys.find(ConfigKey::TRIGGER_MATCH);
+       if (iter != keys.end() &&
+               (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
+               try {
+                       const Glib::VariantContainerBase gvar =
+                               device_->config_list(ConfigKey::TRIGGER_MATCH);
+                       return Glib::VariantBase::cast_dynamic<
+                               Glib::Variant<vector<int32_t>>>(gvar).get();
+               } catch (Error e) {
+                       // Failed to enumerate triggers
+                       (void)e;
+               }
        }
+
+       return vector<int32_t>();
 }
 
 QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
@@ -376,21 +389,23 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
        Signal::populate_popup_form(parent, form);
 
-       trigger_bar_ = new QToolBar(parent);
-       init_trigger_actions(trigger_bar_);
-       trigger_bar_->addAction(trigger_none_);
-       trigger_none_->setChecked(!trigger_match_);
-
        const vector<int32_t> trig_types = get_trigger_types();
-       for (auto type_id : trig_types) {
-               const TriggerMatchType *const type =
-                       TriggerMatchType::get(type_id);
-               QAction *const action = action_from_trigger_type(type);
-               trigger_bar_->addAction(action);
-               action->setChecked(trigger_match_ == type);
-       }
-       form->addRow(tr("Trigger"), trigger_bar_);
 
+       if (!trig_types.empty()) {
+               trigger_bar_ = new QToolBar(parent);
+               init_trigger_actions(trigger_bar_);
+               trigger_bar_->addAction(trigger_none_);
+               trigger_none_->setChecked(!trigger_match_);
+
+               for (auto type_id : trig_types) {
+                       const TriggerMatchType *const type =
+                               TriggerMatchType::get(type_id);
+                       QAction *const action = action_from_trigger_type(type);
+                       trigger_bar_->addAction(action);
+                       action->setChecked(trigger_match_ == type);
+               }
+               form->addRow(tr("Trigger"), trigger_bar_);
+       }
 }
 
 void LogicSignal::modify_trigger()
@@ -422,7 +437,7 @@ void LogicSignal::modify_trigger()
                new_trigger->stages().empty() ? nullptr : new_trigger);
 
        if (owner_)
-               owner_->appearance_changed(false, true);
+               owner_->row_item_appearance_changed(false, true);
 }
 
 const QIcon* LogicSignal::get_icon(const char *path)