From 1df9f5be8aa11867e729a6c0c3464f800f5747b7 Mon Sep 17 00:00:00 2001
From: Joakim Lundborg <joakim@lind.surf>
Date: Wed, 4 Sep 2024 22:02:46 +0200
Subject: [PATCH] Add support for using a second Y axis when plotting

In addition:

* Make a separate checkbox for plotting data series.
This makes it easier when working with many data series at the same time
* Make columns with plot controls fixed width
---
 pages/pageloganalysis.cpp | 84 +++++++++++++++++++++++++++++++++++----
 pages/pageloganalysis.ui  | 65 ++++++++++++++++++------------
 2 files changed, 115 insertions(+), 34 deletions(-)

diff --git a/pages/pageloganalysis.cpp b/pages/pageloganalysis.cpp
index 68eca0791..85b136eba 100644
--- a/pages/pageloganalysis.cpp
+++ b/pages/pageloganalysis.cpp
@@ -27,6 +27,12 @@
 #include <QStandardPaths>
 #include <QScrollBar>
 
+const int dataTableColName = 0;
+const int dataTableColValue = 1;
+const int dataTableColPlot = 2;
+const int dataTableColAltAxis = 3;
+const int dataTableColScale = 4;
+
 PageLogAnalysis::PageLogAnalysis(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::PageLogAnalysis)
@@ -70,12 +76,20 @@ PageLogAnalysis::PageLogAnalysis(QWidget *parent) :
     ui->plot->axisRect()->setRangeZoom(Qt::Orientations());
     ui->plot->axisRect()->setRangeDrag(Qt::Orientations());
 
-    ui->dataTable->setColumnWidth(0, 140);
-    ui->dataTable->setColumnWidth(1, 120);
     ui->statTable->setColumnWidth(0, 140);
     ui->logTable->setColumnWidth(0, 250);
     ui->vescLogTable->setColumnWidth(0, 250);
 
+    ui->dataTable->horizontalHeader()->setSectionResizeMode(dataTableColName, QHeaderView::Interactive);
+    ui->dataTable->horizontalHeader()->setSectionResizeMode(dataTableColValue, QHeaderView::Stretch);
+    ui->dataTable->horizontalHeader()->setSectionResizeMode(dataTableColScale, QHeaderView::Fixed);
+    ui->dataTable->horizontalHeader()->setSectionResizeMode(dataTableColAltAxis, QHeaderView::Fixed);
+    ui->dataTable->horizontalHeader()->setSectionResizeMode(dataTableColPlot, QHeaderView::Fixed);
+
+    ui->dataTable->setColumnWidth(dataTableColAltAxis, 30);
+    ui->dataTable->setColumnWidth(dataTableColPlot, 45);
+    ui->dataTable->setColumnWidth(dataTableColScale, 60);
+
     m3dView = new Vesc3DView(this);
     m3dView->setMinimumWidth(200);
     m3dView->setRollPitchYaw(20, 20, 0);
@@ -739,7 +753,21 @@ void PageLogAnalysis::truncateDataAndPlot(bool zoomGraph)
 
 void PageLogAnalysis::updateGraphs()
 {
-    auto rows = ui->dataTable->selectionModel()->selectedRows();
+    QSet<QModelIndex> uniqueRows;
+
+    auto selectedRows = ui->dataTable->selectionModel()->selectedRows();
+    for (const QModelIndex &index : selectedRows) {
+        uniqueRows.insert(index);
+    }
+
+    for (int row = 0; row < ui->dataTable->rowCount(); ++row) {
+        QTableWidgetItem *item = ui->dataTable->item(row, dataTableColPlot);
+        if (item && item->checkState() == Qt::Checked) {
+            uniqueRows.insert(ui->dataTable->model()->index(row, 0));
+        }
+    }
+
+    auto rows = uniqueRows.values();
 
     QVector<double> xAxis;
     QVector<QVector<double> > yAxes;
@@ -789,6 +817,7 @@ void PageLogAnalysis::updateGraphs()
     }
 
     ui->plot->clearGraphs();
+    ui->plot->yAxis2->setVisible(false);
 
     for (int i = 0;i < yAxes.size();i++) {
         QPen pen = QPen(Utility::getAppQColor("plot_graph1"));
@@ -805,9 +834,26 @@ void PageLogAnalysis::updateGraphs()
             pen = QPen(Utility::getAppQColor("plot_graph4"));
         }
 
-        ui->plot->addGraph();
+        auto row = rows.at(i).row();
+
+        bool altAxis = false;
+        
+        if(QTableWidgetItem *aaWidget = ui->dataTable->item(row, dataTableColAltAxis)) {
+            altAxis = (aaWidget->checkState() == Qt::Checked);
+        }
+
+        if (altAxis){
+            ui->plot->addGraph(ui->plot->xAxis, ui->plot->yAxis2);
+            ui->plot->yAxis2->setVisible(true);
+        }
+        else{
+            ui->plot->addGraph();
+        }
+
+
         ui->plot->graph(i)->setPen(pen);
         ui->plot->graph(i)->setName(names.at(i));
+      
         ui->plot->graph(i)->setData(xAxis, yAxes.at(i));
     }
 
@@ -1105,8 +1151,8 @@ void PageLogAnalysis::addDataItem(QString name, bool hasScale, double scaleStep,
 {
     ui->dataTable->setRowCount(ui->dataTable->rowCount() + 1);
     auto item1 = new QTableWidgetItem(name);
-    ui->dataTable->setItem(ui->dataTable->rowCount() - 1, 0, item1);
-    ui->dataTable->setItem(ui->dataTable->rowCount() - 1, 1, new QTableWidgetItem(""));
+    ui->dataTable->setItem(ui->dataTable->rowCount() - 1, dataTableColName, item1);
+    ui->dataTable->setItem(ui->dataTable->rowCount() - 1, dataTableColValue, new QTableWidgetItem(""));
     if (hasScale) {
         QDoubleSpinBox *sb = new QDoubleSpinBox;
         sb->setSingleStep(scaleStep);
@@ -1114,15 +1160,37 @@ void PageLogAnalysis::addDataItem(QString name, bool hasScale, double scaleStep,
         sb->setMaximum(scaleMax);
         // Prevent mouse wheel focus to avoid changing the selection
         sb->setFocusPolicy(Qt::StrongFocus);
-        ui->dataTable->setCellWidget(ui->dataTable->rowCount() - 1, 2, sb);
+        ui->dataTable->setCellWidget(ui->dataTable->rowCount() - 1, dataTableColScale, sb);
         connect(sb, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
                 [this](double value) {
             (void)value;
+         printf("scale changed\n");
             updateGraphs();
         });
     } else {
-        ui->dataTable->setItem(ui->dataTable->rowCount() - 1, 2, new QTableWidgetItem("Not Plottable"));
+        ui->dataTable->setItem(ui->dataTable->rowCount() - 1, dataTableColScale, new QTableWidgetItem("N/A"));
     }
+
+    // Axis
+    QTableWidgetItem *axisItem = new QTableWidgetItem("");
+    axisItem->setCheckState(Qt::Unchecked);
+    ui->dataTable->setItem(ui->dataTable->rowCount() - 1, dataTableColAltAxis, axisItem);
+
+    connect(ui->dataTable, &QTableWidget::itemChanged, [this, axisItem](QTableWidgetItem *item) {
+        if (item == axisItem){
+            updateGraphs();
+        }
+    });
+
+    // Plot
+    QTableWidgetItem *plotItem = new QTableWidgetItem("");
+    plotItem->setCheckState(Qt::Unchecked);
+    ui->dataTable->setItem(ui->dataTable->rowCount() - 1, dataTableColPlot, plotItem);
+    connect(ui->dataTable, &QTableWidget::itemChanged, [this, plotItem](QTableWidgetItem *item) {
+        if (item == plotItem){
+            updateGraphs();
+        }
+    });
 }
 
 void PageLogAnalysis::openLog(QByteArray data)
diff --git a/pages/pageloganalysis.ui b/pages/pageloganalysis.ui
index 3b4970901..b14a0b062 100644
--- a/pages/pageloganalysis.ui
+++ b/pages/pageloganalysis.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QSplitter" name="mapSplitter">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <widget class="QWidget" name="layoutWidget">
       <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -171,7 +171,7 @@
          <item>
           <spacer name="verticalSpacer">
            <property name="orientation">
-            <enum>Qt::Vertical</enum>
+            <enum>Qt::Orientation::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -218,7 +218,7 @@
      </widget>
      <widget class="QSplitter" name="statSplitter">
       <property name="orientation">
-       <enum>Qt::Horizontal</enum>
+       <enum>Qt::Orientation::Horizontal</enum>
       </property>
       <widget class="QCustomPlot" name="plot" native="true">
        <property name="sizePolicy">
@@ -230,13 +230,13 @@
       </widget>
       <widget class="QTabWidget" name="tabWidget">
        <property name="tabPosition">
-        <enum>QTabWidget::North</enum>
+        <enum>QTabWidget::TabPosition::North</enum>
        </property>
        <property name="tabShape">
-        <enum>QTabWidget::Triangular</enum>
+        <enum>QTabWidget::TabShape::Triangular</enum>
        </property>
        <property name="currentIndex">
-        <number>0</number>
+        <number>1</number>
        </property>
        <widget class="QWidget" name="tab_4">
         <attribute name="title">
@@ -264,10 +264,10 @@
          <item>
           <widget class="QTabWidget" name="browseTabWidget">
            <property name="tabPosition">
-            <enum>QTabWidget::North</enum>
+            <enum>QTabWidget::TabPosition::North</enum>
            </property>
            <property name="tabShape">
-            <enum>QTabWidget::Triangular</enum>
+            <enum>QTabWidget::TabShape::Triangular</enum>
            </property>
            <property name="currentIndex">
             <number>0</number>
@@ -295,13 +295,13 @@
              <item>
               <widget class="QTableWidget" name="vescLogTable">
                <property name="editTriggers">
-                <set>QAbstractItemView::NoEditTriggers</set>
+                <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
                </property>
                <property name="selectionMode">
-                <enum>QAbstractItemView::ExtendedSelection</enum>
+                <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum>
                </property>
                <property name="selectionBehavior">
-                <enum>QAbstractItemView::SelectRows</enum>
+                <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
                </property>
                <attribute name="horizontalHeaderStretchLastSection">
                 <bool>true</bool>
@@ -363,7 +363,7 @@
                 <item>
                  <spacer name="horizontalSpacer_3">
                   <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
+                   <enum>Qt::Orientation::Horizontal</enum>
                   </property>
                   <property name="sizeHint" stdset="0">
                    <size>
@@ -455,13 +455,13 @@
              <item>
               <widget class="QTableWidget" name="logTable">
                <property name="editTriggers">
-                <set>QAbstractItemView::NoEditTriggers</set>
+                <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
                </property>
                <property name="selectionMode">
-                <enum>QAbstractItemView::SingleSelection</enum>
+                <enum>QAbstractItemView::SelectionMode::SingleSelection</enum>
                </property>
                <property name="selectionBehavior">
-                <enum>QAbstractItemView::SelectRows</enum>
+                <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
                </property>
                <attribute name="horizontalHeaderStretchLastSection">
                 <bool>true</bool>
@@ -483,7 +483,7 @@
                <item>
                 <spacer name="horizontalSpacer_2">
                  <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+                  <enum>Qt::Orientation::Horizontal</enum>
                  </property>
                  <property name="sizeHint" stdset="0">
                   <size>
@@ -543,19 +543,19 @@
          <item>
           <widget class="QTableWidget" name="dataTable">
            <property name="editTriggers">
-            <set>QAbstractItemView::NoEditTriggers</set>
+            <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
            </property>
            <property name="alternatingRowColors">
             <bool>true</bool>
            </property>
            <property name="selectionMode">
-            <enum>QAbstractItemView::ExtendedSelection</enum>
+            <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum>
            </property>
            <property name="selectionBehavior">
-            <enum>QAbstractItemView::SelectRows</enum>
+            <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
            </property>
            <attribute name="horizontalHeaderStretchLastSection">
-            <bool>true</bool>
+            <bool>false</bool>
            </attribute>
            <column>
             <property name="text">
@@ -569,7 +569,20 @@
            </column>
            <column>
             <property name="text">
-             <string>Plot Scale</string>
+             <string>Plot</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Y2</string>
+            </property>
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Show this data series on the second Y axis to the right&lt;/p&gt;&lt;p&gt;Y axes will be autoscaled independently&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Scale</string>
             </property>
            </column>
           </widget>
@@ -596,16 +609,16 @@
          <item>
           <widget class="QTableWidget" name="statTable">
            <property name="editTriggers">
-            <set>QAbstractItemView::NoEditTriggers</set>
+            <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
            </property>
            <property name="alternatingRowColors">
             <bool>true</bool>
            </property>
            <property name="selectionMode">
-            <enum>QAbstractItemView::NoSelection</enum>
+            <enum>QAbstractItemView::SelectionMode::NoSelection</enum>
            </property>
            <property name="selectionBehavior">
-            <enum>QAbstractItemView::SelectRows</enum>
+            <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
            </property>
            <attribute name="horizontalHeaderStretchLastSection">
             <bool>true</bool>
@@ -637,7 +650,7 @@
    <item>
     <widget class="SuperSlider" name="spanSlider">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
     </widget>
    </item>
@@ -677,7 +690,7 @@
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>