Remove old references to SummaryMetrics

.. cleaning up from last few commits.
GoldenCheetah · Dec 18, 2014 · eb3b245 · eb3b245
1 parent d1d1d88
commit eb3b245
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 63 deletions.
diff --git a/src/CompareDateRange.cpp b/src/CompareDateRange.cpp
@@ -21,7 +21,6 @@
 #include "Context.h"
 #include "RideFileCache.h"
 #include "Season.h"
-#include "SummaryMetrics.h"
 #include <QColor>
 
 RideFileCache *

diff --git a/src/CompareDateRange.h b/src/CompareDateRange.h
@@ -22,7 +22,6 @@
 class Context;
 class RideFileCache;
 
-#include "SummaryMetrics.h"
 #include "Specification.h"
 
 #include <QColor>
@@ -39,7 +38,6 @@ class CompareDateRange
         QString name;
         QColor color;
         Specification specification;
-        QList<SummaryMetrics> metrics; //XXX soon to be deprecated
         QDate start, end;
         int days;
         Context *sourceContext;

diff --git a/src/ComparePane.cpp b/src/ComparePane.cpp
@@ -28,9 +28,6 @@
 #include "Units.h"
 #include "Zones.h"
 
-#include "MetricAggregator.h"
-#include "SummaryMetrics.h"
-
 #include <QCheckBox>
 #include <QTextEdit>
 
@@ -247,17 +244,11 @@ ComparePane::refreshTable()
         foreach(CompareInterval x, context->compareIntervals) {
 
             // compute the metrics for this ride
-            SummaryMetrics metrics;
+            RideItem metrics;
             QHash<QString, RideMetricPtr> computed = RideMetric::computeMetrics(context, x.data,
                                                      context->athlete->zones(), context->athlete->hrZones(), worklist);
 
-            for(int i = 0; i < worklist.count(); i++) {
-                if (worklist[i] != "") {
-                    RideMetricPtr m = computed.value(worklist[i]);
-                    if (m) metrics.setForSymbol(worklist[i], m->value(true));
-                    else metrics.setForSymbol(worklist[i], 0.00);
-                }
-            }
+            metrics.setFrom(computed);
 
             // First few cols always the same
             // check - color - athlete - date - time
@@ -782,11 +773,6 @@ ComparePane::dropEvent(QDropEvent *event)
             // for now the specification is just a date range
             add.specification.setDateRange(DateRange(add.start,add.end));
 
-            // get summary metrics for the season
-            // FROM THE SOURCE CONTEXT
-            // WE DON'T FETCH BESTS -- THEY NEED TO BE DONE AS NEEDED
-            add.metrics = sourceContext->athlete->metricDB->getAllMetricsFor(QDateTime(add.start, QTime()),QDateTime(add.end, QTime()));
-
             // just use standard colors and cycle round
             // we will of course repeat, but the user can
             // just edit them using the button

diff --git a/src/HistogramWindow.h b/src/HistogramWindow.h
@@ -24,7 +24,6 @@
 #include "Context.h"
 #include "Athlete.h"
 #include "MetricAggregator.h"
-#include "SummaryMetrics.h"
 #include "ChartSettings.h"
 #include "ColorButton.h"
 #include "PowerHist.h"
@@ -35,7 +34,6 @@
 
 #include "Zones.h"
 #include "HrZones.h"
-#include "SummaryMetrics.h"
 
 #include "Season.h"
 #include "SeasonParser.h"
@@ -264,7 +262,6 @@ class HistogramWindow : public GcChartWindow
         // to have a slight lag before redrawing since it is expensive
         // and users are likely to move up and down with the arrow keys
         ColorButton *colorButton;
-        QList<SummaryMetrics> results;
         DateRange last;
 };
 

diff --git a/src/LTMPlot.h b/src/LTMPlot.h
@@ -35,6 +35,7 @@
 
 #include "Context.h"
 
+class SummaryMetrics; // for PMC curves, going soon XXX
 class LTMPlotBackground;
 class LTMWindow;
 class LTMPlotZoneLabel;

diff --git a/src/LTMSettings.h b/src/LTMSettings.h
@@ -38,7 +38,6 @@
 
 class LTMTool;
 class LTMSettings;
-class SummaryMetrics;
 class Context;
 class RideMetric;
 class RideBest;

diff --git a/src/Lucene.h b/src/Lucene.h
@@ -25,7 +25,6 @@
 
 #include "Context.h"
 #include "RideMetadata.h"
-#include "SummaryMetrics.h"
 #include "RideFile.h"
 
 #include "CLucene.h"

diff --git a/src/MetricAggregator.cpp b/src/MetricAggregator.cpp
@@ -491,8 +491,6 @@ MetricAggregator::refreshBestIntervals()
 }
 #endif
 
-
-
 /*----------------------------------------------------------------------
  * Calculate the metrics for a ride file using the metrics factory
  *----------------------------------------------------------------------*/
@@ -555,35 +553,3 @@ bool MetricAggregator::importRide(QDir /* no longer used ? */, RideFile *ride, Q
 
     return true;
 }
-
-/*----------------------------------------------------------------------
- * Query functions are wrappers around DBAccess functions
- *----------------------------------------------------------------------*/
-
-QList<SummaryMetrics>
-MetricAggregator::getAllMetricsFor(DateRange dr)
-{
-    return getAllMetricsFor(QDateTime(dr.from, QTime(0,0,0)), QDateTime(dr.to, QTime(23,59,59)));
-}
-
-QList<SummaryMetrics>
-MetricAggregator::getAllMetricsFor(QDateTime start, QDateTime end)
-{
-    if (context->athlete->isclean == false) refreshMetrics(); // get them up-to-date
-
-    QList<SummaryMetrics> empty;
-
-    // only if we have established a connection to the database
-    if (dbaccess == NULL) {
-        qDebug()<<"lost db connection?";
-        return empty;
-    }
-
-    // apparently using transactions for queries
-    // can improve performance!
-    dbaccess->connection().transaction();
-    QList<SummaryMetrics> results = dbaccess->getAllMetricsFor(start, end);
-    dbaccess->connection().commit();
-    return results;
-}
-
diff --git a/src/MetricAggregator.h b/src/MetricAggregator.h
@@ -49,9 +49,6 @@ class MetricAggregator : public QObject
         void refreshMetrics(QDateTime forceAfterThisDate);
 
         DBAccess *db() { return dbaccess; }
-        //SummaryMetrics getAllMetricsFor(QString filename); // for a single ride
-        QList<SummaryMetrics> getAllMetricsFor(QDateTime start, QDateTime end);
-        QList<SummaryMetrics> getAllMetricsFor(DateRange);
 
     signals:
         void dataChanged(); // when metricDB table changed

diff --git a/src/TreeMapWindow.h b/src/TreeMapWindow.h
@@ -176,7 +176,6 @@ class TreeMapWindow : public GcWindow
         QList<KeywordDefinition> keywordDefinitions;
         QList<FieldDefinition>   fieldDefinitions;
         QList<DefaultDefinition>   defaultDefinitions;
-        QList<SummaryMetrics> results;
 
         // Widgets
         QVBoxLayout *mainLayout;

diff --git a/src/TwitterDialog.h b/src/TwitterDialog.h
@@ -77,7 +77,6 @@ private slots:
 
      RideItem *ride;
      QString getTwitterMessage();
-     QString metricToString(const RideMetric *m, SummaryMetrics &metrics, bool metricUnits);
 };
 
 #endif // TWITTERDIALOG_H