Implement moveSeriesUp and moveSeriesDown for User Charts

To enable series reordering.
GoldenCheetah · Oct 20, 2020 · b7a56a9 · b7a56a9
1 parent cde4ec0
commit b7a56a9
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/src/Charts/UserChart.cpp b/src/Charts/UserChart.cpp
@@ -549,8 +549,8 @@ UserChartSettings::UserChartSettings(Context *context, bool rangemode, GenericCh
     upSeriesButton = new QPushButton(tr("Up"));
     downSeriesButton = new QPushButton(tr("Down"));
 #endif
-    //connect(upSeriesButton, SIGNAL(clicked()), this, SLOT(moveSeriesUp()));
-    //connect(downSeriesButton, SIGNAL(clicked()), this, SLOT(moveSeriesDown()));
+    connect(upSeriesButton, SIGNAL(clicked()), this, SLOT(moveSeriesUp()));
+    connect(downSeriesButton, SIGNAL(clicked()), this, SLOT(moveSeriesDown()));
 
 
     QHBoxLayout *seriesButtons = new QHBoxLayout;
@@ -781,6 +781,7 @@ UserChartSettings::editSeries()
         chartConfigChanged();
     }
 }
+
 void
 UserChartSettings::deleteSeries()
 {
@@ -793,6 +794,38 @@ UserChartSettings::deleteSeries()
     emit chartConfigChanged();
 }
 
+void
+UserChartSettings::moveSeriesUp()
+{
+    QList<QTableWidgetItem*> items = seriesTable->selectedItems();
+    if (items.count() < 1) return; // nothing selected
+
+    int index = seriesTable->row(items.first());
+    if (index == 0) return; // already at the top
+
+    // move and update the table preserving selection
+    seriesinfo.move(index, index-1);
+    refreshSeriesTab();
+    seriesTable->setCurrentCell(index-1, 0);
+    emit chartConfigChanged();
+}
+
+void
+UserChartSettings::moveSeriesDown()
+{
+    QList<QTableWidgetItem*> items = seriesTable->selectedItems();
+    if (items.count() < 1) return; // nothing selected
+
+    int index = seriesTable->row(items.first());
+    if (index == seriesinfo.count()-1) return; // already at the bottom
+
+    // move and update the table preserving selection
+    seriesinfo.move(index, index+1);
+    refreshSeriesTab();
+    seriesTable->setCurrentCell(index+1, 0);
+    emit chartConfigChanged();
+}
+
 void
 UserChartSettings::refreshSeriesTab()
 {

diff --git a/src/Charts/UserChart.h b/src/Charts/UserChart.h
@@ -143,6 +143,8 @@ class UserChartSettings : public QWidget {
         void seriesClicked(int,int);
         void addSeries();
         void deleteSeries();
+        void moveSeriesUp();
+        void moveSeriesDown();
 
         // configuration - axes
         void refreshAxesTab(); // update gui with current config