From 9d6e08547f14e79c8aef1f9688336c76c2497775 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Fri, 9 Jul 2021 09:02:50 +0100 Subject: [PATCH] Deprecate RideSummaryWindow .. the ride summary on analysis and trends is now replaced by the overview dashboard. .. since RideSummaryWindow uses html to deliver content via an embedded web browser it had become unwieldy and the UX was klunky and static. .. additionally the code was unwieldy and difficult to maintain and update when new feature were introduced. .. this is a happy day, goodbye and farewell. --- .../RideSummaryWindow.cpp | 0 .../Charts => deprecated}/RideSummaryWindow.h | 0 {src/Charts => deprecated}/SummaryWindow.cpp | 0 {src/Charts => deprecated}/SummaryWindow.h | 0 src/Charts/DiaryWindow.h | 4 ---- src/Gui/GcWindowRegistry.cpp | 19 ++++++------------- src/Metrics/RideMetadata.cpp | 9 ++------- src/src.pro | 8 ++++---- 8 files changed, 12 insertions(+), 28 deletions(-) rename {src/Charts => deprecated}/RideSummaryWindow.cpp (100%) rename {src/Charts => deprecated}/RideSummaryWindow.h (100%) rename {src/Charts => deprecated}/SummaryWindow.cpp (100%) rename {src/Charts => deprecated}/SummaryWindow.h (100%) diff --git a/src/Charts/RideSummaryWindow.cpp b/deprecated/RideSummaryWindow.cpp similarity index 100% rename from src/Charts/RideSummaryWindow.cpp rename to deprecated/RideSummaryWindow.cpp diff --git a/src/Charts/RideSummaryWindow.h b/deprecated/RideSummaryWindow.h similarity index 100% rename from src/Charts/RideSummaryWindow.h rename to deprecated/RideSummaryWindow.h diff --git a/src/Charts/SummaryWindow.cpp b/deprecated/SummaryWindow.cpp similarity index 100% rename from src/Charts/SummaryWindow.cpp rename to deprecated/SummaryWindow.cpp diff --git a/src/Charts/SummaryWindow.h b/deprecated/SummaryWindow.h similarity index 100% rename from src/Charts/SummaryWindow.h rename to deprecated/SummaryWindow.h diff --git a/src/Charts/DiaryWindow.h b/src/Charts/DiaryWindow.h index b0334afc0..a20522412 100644 --- a/src/Charts/DiaryWindow.h +++ b/src/Charts/DiaryWindow.h @@ -35,10 +35,6 @@ #include #include "GcCalendarModel.h" -// ride view -#include "RideSummaryWindow.h" - - class DiaryWindow : public GcChartWindow { Q_OBJECT diff --git a/src/Gui/GcWindowRegistry.cpp b/src/Gui/GcWindowRegistry.cpp index 1a6f3007f..b2a41b8fc 100644 --- a/src/Gui/GcWindowRegistry.cpp +++ b/src/Gui/GcWindowRegistry.cpp @@ -38,10 +38,8 @@ #include "HrPwWindow.h" #include "RideEditor.h" #include "RideNavigator.h" -#include "RideSummaryWindow.h" #include "RideMapWindow.h" #include "ScatterWindow.h" -#include "SummaryWindow.h" #include "MetadataWindow.h" #include "TreeMapWindow.h" #include "DialWindow.h" @@ -83,7 +81,7 @@ GcWindowRegistry::initialize() //{ VIEW_TRENDS|VIEW_DIARY, tr("Performance Manager"),GcWindowTypes::PerformanceManager }, { VIEW_ANALYSIS, tr("User Chart "),GcWindowTypes::UserAnalysis }, { VIEW_ANALYSIS, tr("Overview"),GcWindowTypes::Overview }, - { VIEW_ANALYSIS, tr("Summary"),GcWindowTypes::RideSummary }, + //{ VIEW_ANALYSIS, tr("Summary"),GcWindowTypes::RideSummary }, // DEPRECATED IN V3.6 { VIEW_ANALYSIS, tr("Data"),GcWindowTypes::MetadataWindow }, //{ VIEW_ANALYSIS, tr("Summary and Details"),GcWindowTypes::Summary }, //{ VIEW_ANALYSIS, tr("Editor"),GcWindowTypes::RideEditor }, @@ -103,7 +101,7 @@ GcWindowRegistry::initialize() { VIEW_ANALYSIS, tr("Aerolab"),GcWindowTypes::Aerolab }, { VIEW_DIARY, tr("Calendar"),GcWindowTypes::Diary }, { VIEW_DIARY, tr("Navigator"), GcWindowTypes::ActivityNavigator }, - { VIEW_DIARY|VIEW_TRENDS, tr("Summary "), GcWindowTypes::DateRangeSummary }, + //{ VIEW_DIARY|VIEW_TRENDS, tr("Summary "), GcWindowTypes::DateRangeSummary }, // DEPRECATED IN V3.6 { VIEW_TRAIN, tr("Telemetry"),GcWindowTypes::DialWindow }, { VIEW_TRAIN, tr("Workout"),GcWindowTypes::WorkoutPlot }, { VIEW_TRAIN, tr("Realtime"),GcWindowTypes::RealtimePlot }, @@ -203,12 +201,10 @@ GcWindowRegistry::newGcWindow(GcWinID id, Context *context) case GcWindowTypes::PfPv: returning = new PfPvWindow(context); break; case GcWindowTypes::HrPw: returning = new HrPwWindow(context); break; case GcWindowTypes::RideEditor: returning = NULL; break; - case GcWindowTypes::RideSummary: returning = new RideSummaryWindow(context, true); break; - case GcWindowTypes::DateRangeSummary: returning = new RideSummaryWindow(context, false); break; + case GcWindowTypes::RideSummary: returning = NULL; break; case GcWindowTypes::Scatter: returning = new ScatterWindow(context); break; - case GcWindowTypes::Summary: returning = NULL; break; case GcWindowTypes::TreeMap: returning = new TreeMapWindow(context); break; - case GcWindowTypes::WeeklySummary: returning = new SummaryWindow(context); break; // deprecated + case GcWindowTypes::WeeklySummary: returning = NULL; break; // deprecated #ifdef GC_VIDEO_NONE case GcWindowTypes::VideoPlayer: returning = new GcChartWindow(context); break; #else @@ -239,13 +235,10 @@ GcWindowRegistry::newGcWindow(GcWinID id, Context *context) #else case GcWindowTypes::RouteSegment: returning = new GcChartWindow(context); break; #endif -#if GC_HAVE_OVERVIEW + case GcWindowTypes::Summary: // deprecated so now replace with overview case GcWindowTypes::Overview: returning = new OverviewWindow(context, ANALYSIS); break; + case GcWindowTypes::DateRangeSummary: // deprecated so now replace with overview case GcWindowTypes::OverviewTrends: returning = new OverviewWindow(context, TRENDS); break; -#else - case GcWindowTypes::OverviewTrends: - case GcWindowTypes::Overview: returning = new GcChartWindow(context); break; -#endif case GcWindowTypes::SeasonPlan: returning = new PlanningWindow(context); break; case GcWindowTypes::UserAnalysis: returning = new UserChart(context, false); break; case GcWindowTypes::UserTrends: returning = new UserChart(context, true); break; diff --git a/src/Metrics/RideMetadata.cpp b/src/Metrics/RideMetadata.cpp index 9c79b36b2..567c0395e 100644 --- a/src/Metrics/RideMetadata.cpp +++ b/src/Metrics/RideMetadata.cpp @@ -24,7 +24,6 @@ #include "RideItem.h" #include "Context.h" #include "Athlete.h" -#include "RideSummaryWindow.h" #include "Settings.h" #include "Colors.h" #include "Units.h" @@ -44,7 +43,7 @@ #define ourRideItem meta->property("ride").value() /*---------------------------------------------------------------------- - * Master widget for Metadata Entry "on" RideSummaryWindow + * Master widget for Metadata Entry *--------------------------------------------------------------------*/ RideMetadata::RideMetadata(Context *context, bool singlecolumn) : QWidget(context != NULL ? context->mainWindow : NULL), singlecolumn(singlecolumn), context(context) @@ -775,11 +774,7 @@ FormField::~FormField() if (completer) delete completer; break; - case FIELD_TEXTBOX : if (definition.name == "Summary") - delete ((RideSummaryWindow *)widget); - else - delete ((GTextEdit*)widget); - break; + case FIELD_TEXTBOX : delete ((GTextEdit*)widget); break; case FIELD_INTEGER : delete ((QSpinBox*)widget); break; case FIELD_DOUBLE : { if (!isTime) delete ((QDoubleSpinBox*)widget); diff --git a/src/src.pro b/src/src.pro index 6d1a43992..cdaa15e2b 100644 --- a/src/src.pro +++ b/src/src.pro @@ -692,8 +692,8 @@ HEADERS += Charts/Aerolab.h Charts/AerolabWindow.h Charts/AllPlot.h Charts/AllPl Charts/LTMCanvasPicker.h Charts/LTMChartParser.h Charts/LTMOutliers.h Charts/LTMPlot.h Charts/LTMPopup.h \ Charts/LTMSettings.h Charts/LTMTool.h Charts/LTMTrend2.h Charts/LTMTrend.h Charts/LTMWindow.h \ Charts/MetadataWindow.h Charts/MUPlot.h Charts/MUPool.h Charts/MUWidget.h Charts/PfPvPlot.h Charts/PfPvWindow.h \ - Charts/PowerHist.h Charts/ReferenceLineDialog.h Charts/RideEditor.h Charts/RideMapWindow.h Charts/RideSummaryWindow.h \ - Charts/ScatterPlot.h Charts/ScatterWindow.h Charts/SmallPlot.h Charts/SummaryWindow.h Charts/TreeMapPlot.h \ + Charts/PowerHist.h Charts/ReferenceLineDialog.h Charts/RideEditor.h Charts/RideMapWindow.h \ + Charts/ScatterPlot.h Charts/ScatterWindow.h Charts/SmallPlot.h Charts/TreeMapPlot.h \ Charts/TreeMapWindow.h Charts/ZoneScaleDraw.h # cloud services @@ -790,8 +790,8 @@ SOURCES += Charts/Aerolab.cpp Charts/AerolabWindow.cpp Charts/AllPlot.cpp Charts Charts/LTMCanvasPicker.cpp Charts/LTMChartParser.cpp Charts/LTMOutliers.cpp Charts/LTMPlot.cpp Charts/LTMPopup.cpp \ Charts/LTMSettings.cpp Charts/LTMTool.cpp Charts/LTMTrend.cpp Charts/LTMWindow.cpp \ Charts/MetadataWindow.cpp Charts/MUPlot.cpp Charts/MUWidget.cpp Charts/PfPvPlot.cpp Charts/PfPvWindow.cpp \ - Charts/PowerHist.cpp Charts/ReferenceLineDialog.cpp Charts/RideEditor.cpp Charts/RideMapWindow.cpp Charts/RideSummaryWindow.cpp \ - Charts/ScatterPlot.cpp Charts/ScatterWindow.cpp Charts/SmallPlot.cpp Charts/SummaryWindow.cpp Charts/TreeMapPlot.cpp \ + Charts/PowerHist.cpp Charts/ReferenceLineDialog.cpp Charts/RideEditor.cpp Charts/RideMapWindow.cpp \ + Charts/ScatterPlot.cpp Charts/ScatterWindow.cpp Charts/SmallPlot.cpp Charts/TreeMapPlot.cpp \ Charts/TreeMapWindow.cpp ## Cloud Services / Web resources