AnalogSignal: Allow separate vdiv counts for pos/neg

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 41f46dfcc75b414e47fbf8dd6bf47d2d7ff8502a..bf1f9017731f679f73d9a836ea706efc47722557 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -76,7 +76,8 @@ AnalogSignal::AnalogSignal(
        scale_index_(4), // 20 per div
        scale_index_drag_offset_(0),
        div_height_(3 * QFontMetrics(QApplication::font()).height()),
        scale_index_(4), // 20 per div
        scale_index_drag_offset_(0),
        div_height_(3 * QFontMetrics(QApplication::font()).height()),

-       vdivs_(1),
+       pos_vdivs_(1),
+       neg_vdivs_(1),

        resolution_(0)
 {
        base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);
        resolution_(0)
 {
        base_->set_colour(SignalColours[base_->index() % countof(SignalColours)]);


@@ -90,14 +91,18 @@ shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 
 void AnalogSignal::save_settings(QSettings &settings) const
 {
 
 void AnalogSignal::save_settings(QSettings &settings) const
 {

-       settings.setValue("vdivs", vdivs_);
+       settings.setValue("pos_vdivs", pos_vdivs_);
+       settings.setValue("neg_vdivs", neg_vdivs_);

        settings.setValue("scale_index", scale_index_);
 }
 
 void AnalogSignal::restore_settings(QSettings &settings)
 {
        settings.setValue("scale_index", scale_index_);
 }
 
 void AnalogSignal::restore_settings(QSettings &settings)
 {

-       if (settings.contains("vdivs"))
-               vdivs_ = settings.value("vdivs").toInt();
+       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();
 
        if (settings.contains("scale_index")) {
                scale_index_ = settings.value("scale_index").toInt();


@@ -107,13 +112,14 @@ void AnalogSignal::restore_settings(QSettings &settings)
 
 std::pair<int, int> AnalogSignal::v_extents() const
 {
 
 std::pair<int, int> AnalogSignal::v_extents() const
 {

-       const int h = vdivs_ * div_height_;
-       return make_pair(-h, h);
+       const int ph = pos_vdivs_ * div_height_;
+       const int nh = neg_vdivs_ * div_height_;
+       return make_pair(-ph, nh);

 }
 
 int AnalogSignal::scale_handle_offset() const
 {
 }
 
 int AnalogSignal::scale_handle_offset() const
 {

-       const int h = vdivs_ * div_height_;
+       const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;

 
        return ((scale_index_drag_offset_ - scale_index_) *
                h / 4) - h / 2;
 
        return ((scale_index_drag_offset_ - scale_index_) *
                h / 4) - h / 2;


@@ -121,7 +127,7 @@ int AnalogSignal::scale_handle_offset() const
 
 void AnalogSignal::scale_handle_dragged(int offset)
 {
 
 void AnalogSignal::scale_handle_dragged(int offset)
 {

-       const int h = vdivs_ * div_height_;
+       const int h = (pos_vdivs_ + neg_vdivs_) * div_height_;

 
        scale_index_ = scale_index_drag_offset_ -
                (offset + h / 2) / (h / 4);
 
        scale_index_ = scale_index_drag_offset_ -
                (offset + h / 2) / (h / 4);


@@ -211,25 +217,42 @@ void AnalogSignal::paint_grid(QPainter &p, int y, int left, int right)
 {
        p.setRenderHint(QPainter::Antialiasing, false);
 
 {
        p.setRenderHint(QPainter::Antialiasing, false);
 

-       p.setPen(QPen(GridMajorColor, 1, Qt::DashLine));
-       for (int i = 1; i <= vdivs_; i++) {
-               const float dy = i * div_height_;
-               p.drawLine(QLineF(left, y - dy, right, y - dy));
-               p.drawLine(QLineF(left, y + dy, right, y + dy));
+       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));
+               }

        }
 
        }
 

-       p.setPen(QPen(GridMinorColor, 1, Qt::DashLine));
-       for (int i = 0; i < 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 + dy25, right, y + dy25));
-               p.drawLine(QLineF(left, y - dy50, right, y - dy50));
-               p.drawLine(QLineF(left, y + dy50, right, y + dy50));
-               p.drawLine(QLineF(left, y - dy75, right, y - dy75));
-               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);
        }
 
        p.setRenderHint(QPainter::Antialiasing, true);


@@ -333,12 +356,19 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
        QFormLayout *const layout = new QFormLayout;
 
        // Add the number of vdivs
        QFormLayout *const layout = new QFormLayout;
 
        // Add the number of vdivs

-       QSpinBox *vdiv_sb = new QSpinBox(parent);
-       vdiv_sb->setRange(1, MaximumVDivs);
-       vdiv_sb->setValue(vdivs_);
-       connect(vdiv_sb, SIGNAL(valueChanged(int)),
-               this, SLOT(on_vdivs_changed(int)));
-       layout->addRow(tr("Number of vertical divs"), vdiv_sb);
+       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);
 
        // Add the vertical resolution
        resolution_cb_ = new QComboBox(parent);


@@ -364,9 +394,20 @@ void AnalogSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
        form->addRow(layout);
 }
 
        form->addRow(layout);
 }
 

-void AnalogSignal::on_vdivs_changed(int vdivs)
+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)

 {
 {

-       vdivs_ = vdivs;
+       neg_vdivs_ = vdivs;

 
        if (owner_) {
                // Call order is important, otherwise the lazy event handler won't work
 
        if (owner_) {
                // Call order is important, otherwise the lazy event handler won't work

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 9ec566b682945e7f290f4755ae16eed394942e04..7f0a2568fba3deea455f54bdc738cb46e1dd5ee9 100644 (file)
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -130,7 +130,8 @@ protected:
        void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private Q_SLOTS:
        void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private Q_SLOTS:

-       void on_vdivs_changed(int vdivs);
+       void on_pos_vdivs_changed(int vdivs);
+       void on_neg_vdivs_changed(int vdivs);

 
        void on_resolution_changed(int index);
 
 
        void on_resolution_changed(int index);
 


@@ -142,7 +143,7 @@ private:
        int scale_index_drag_offset_;
 
        int div_height_;
        int scale_index_drag_offset_;
 
        int div_height_;

-       int vdivs_;  // divs per positive/negative side
+       int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side

        float resolution_; // e.g. 10 for 10 V/div
 };
 
        float resolution_; // e.g. 10 for 10 V/div
 };