LogicSignal: Make trace height adjustable

diff --git a/pv/views/trace/logicsignal.cpp b/pv/views/trace/logicsignal.cpp
index 9913d6873ddfd28639c36d1348203c1a921f9ddd..407551843bfdcaeaa633345108b69647c22fbc37 100644 (file)
--- a/pv/views/trace/logicsignal.cpp
+++ b/pv/views/trace/logicsignal.cpp
@@ -101,7 +101,6 @@ LogicSignal::LogicSignal(
        shared_ptr<devices::Device> device,
        shared_ptr<data::SignalBase> base) :
        Signal(session, base),
-       signal_height_(QFontMetrics(QApplication::font()).height() * 2),
        device_(device),
        trigger_none_(nullptr),
        trigger_rising_(nullptr),
@@ -114,6 +113,9 @@ LogicSignal::LogicSignal(
 
        base_->set_colour(SignalColours[base->index() % countof(SignalColours)]);
 
+       GlobalSettings gs;
+       signal_height_ = gs.value(GlobalSettings::Key_View_DefaultLogicHeight).toInt();
+
        /* Populate this channel's trigger setting with whatever we
         * find in the current session trigger, if anything. */
        trigger_match_ = nullptr;
@@ -134,6 +136,25 @@ shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
        return base_->logic_data();
 }
 
+void LogicSignal::save_settings(QSettings &settings) const
+{
+       settings.setValue("trace_height", signal_height_);
+}
+
+void LogicSignal::restore_settings(QSettings &settings)
+{
+       if (settings.contains("trace_height")) {
+               const int old_height = signal_height_;
+               signal_height_ = settings.value("trace_height").toInt();
+
+               if ((signal_height_ != old_height) && 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);
+               }
+       }
+}
+
 pair<int, int> LogicSignal::v_extents() const
 {
        const int signal_margin =
@@ -439,6 +460,16 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
        Signal::populate_popup_form(parent, form);
 
+       signal_height_sb_ = new QSpinBox(parent);
+       signal_height_sb_->setRange(5, 1000);
+       signal_height_sb_->setSingleStep(5);
+       signal_height_sb_->setSuffix(tr(" pixels"));
+       signal_height_sb_->setValue(signal_height_);
+       connect(signal_height_sb_, SIGNAL(valueChanged(int)),
+               this, SLOT(on_signal_height_changed(int)));
+       form->addRow(tr("Trace height"), signal_height_sb_);
+
+       // Trigger settings
        const vector<int32_t> trig_types = get_trigger_types();
 
        if (!trig_types.empty()) {
@@ -531,6 +562,17 @@ void LogicSignal::on_trigger()
        modify_trigger();
 }
 
+void LogicSignal::on_signal_height_changed(int height)
+{
+       signal_height_ = height;
+
+       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);
+       }
+}
+
 } // namespace trace
 } // namespace views
 } // namespace pv

diff --git a/pv/views/trace/logicsignal.hpp b/pv/views/trace/logicsignal.hpp
index 2f5c66baa219fb69dcb8e9e42e08de1c01ad1849..cf2f68d82cb90a2bed14560e72927202f100b47a 100644 (file)
--- a/pv/views/trace/logicsignal.hpp
+++ b/pv/views/trace/logicsignal.hpp
@@ -21,6 +21,7 @@
 #define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
 
 #include <QCache>
+#include <QSpinBox>
 
 #include "signal.hpp"
 
@@ -78,6 +79,9 @@ public:
 
        shared_ptr<pv::data::Logic> logic_data() const;
 
+       virtual void save_settings(QSettings &settings) const;
+       virtual void restore_settings(QSettings &settings);
+
        /**
         * Computes the vertical extents of the contents of this row item.
         * @return A pair containing the minimum and maximum y-values.
@@ -130,11 +134,15 @@ private:
 private Q_SLOTS:
        void on_trigger();
 
+       void on_signal_height_changed(int height);
+
 private:
        int signal_height_;
 
        shared_ptr<pv::devices::Device> device_;
 
+       QSpinBox *signal_height_sb_;
+
        const sigrok::TriggerMatchType *trigger_match_;
        QToolBar *trigger_bar_;
        QAction *trigger_none_;