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.
This commit is contained in:
Mark Liversedge
2021-07-09 09:02:50 +01:00
parent 39a7e67085
commit 9d6e08547f
8 changed files with 12 additions and 28 deletions

View File

@@ -35,10 +35,6 @@
#include <QTableView> #include <QTableView>
#include "GcCalendarModel.h" #include "GcCalendarModel.h"
// ride view
#include "RideSummaryWindow.h"
class DiaryWindow : public GcChartWindow class DiaryWindow : public GcChartWindow
{ {
Q_OBJECT Q_OBJECT

View File

@@ -38,10 +38,8 @@
#include "HrPwWindow.h" #include "HrPwWindow.h"
#include "RideEditor.h" #include "RideEditor.h"
#include "RideNavigator.h" #include "RideNavigator.h"
#include "RideSummaryWindow.h"
#include "RideMapWindow.h" #include "RideMapWindow.h"
#include "ScatterWindow.h" #include "ScatterWindow.h"
#include "SummaryWindow.h"
#include "MetadataWindow.h" #include "MetadataWindow.h"
#include "TreeMapWindow.h" #include "TreeMapWindow.h"
#include "DialWindow.h" #include "DialWindow.h"
@@ -83,7 +81,7 @@ GcWindowRegistry::initialize()
//{ VIEW_TRENDS|VIEW_DIARY, tr("Performance Manager"),GcWindowTypes::PerformanceManager }, //{ VIEW_TRENDS|VIEW_DIARY, tr("Performance Manager"),GcWindowTypes::PerformanceManager },
{ VIEW_ANALYSIS, tr("User Chart "),GcWindowTypes::UserAnalysis }, { VIEW_ANALYSIS, tr("User Chart "),GcWindowTypes::UserAnalysis },
{ VIEW_ANALYSIS, tr("Overview"),GcWindowTypes::Overview }, { 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("Data"),GcWindowTypes::MetadataWindow },
//{ VIEW_ANALYSIS, tr("Summary and Details"),GcWindowTypes::Summary }, //{ VIEW_ANALYSIS, tr("Summary and Details"),GcWindowTypes::Summary },
//{ VIEW_ANALYSIS, tr("Editor"),GcWindowTypes::RideEditor }, //{ VIEW_ANALYSIS, tr("Editor"),GcWindowTypes::RideEditor },
@@ -103,7 +101,7 @@ GcWindowRegistry::initialize()
{ VIEW_ANALYSIS, tr("Aerolab"),GcWindowTypes::Aerolab }, { VIEW_ANALYSIS, tr("Aerolab"),GcWindowTypes::Aerolab },
{ VIEW_DIARY, tr("Calendar"),GcWindowTypes::Diary }, { VIEW_DIARY, tr("Calendar"),GcWindowTypes::Diary },
{ VIEW_DIARY, tr("Navigator"), GcWindowTypes::ActivityNavigator }, { 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("Telemetry"),GcWindowTypes::DialWindow },
{ VIEW_TRAIN, tr("Workout"),GcWindowTypes::WorkoutPlot }, { VIEW_TRAIN, tr("Workout"),GcWindowTypes::WorkoutPlot },
{ VIEW_TRAIN, tr("Realtime"),GcWindowTypes::RealtimePlot }, { 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::PfPv: returning = new PfPvWindow(context); break;
case GcWindowTypes::HrPw: returning = new HrPwWindow(context); break; case GcWindowTypes::HrPw: returning = new HrPwWindow(context); break;
case GcWindowTypes::RideEditor: returning = NULL; break; case GcWindowTypes::RideEditor: returning = NULL; break;
case GcWindowTypes::RideSummary: returning = new RideSummaryWindow(context, true); break; case GcWindowTypes::RideSummary: returning = NULL; break;
case GcWindowTypes::DateRangeSummary: returning = new RideSummaryWindow(context, false); break;
case GcWindowTypes::Scatter: returning = new ScatterWindow(context); 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::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 #ifdef GC_VIDEO_NONE
case GcWindowTypes::VideoPlayer: returning = new GcChartWindow(context); break; case GcWindowTypes::VideoPlayer: returning = new GcChartWindow(context); break;
#else #else
@@ -239,13 +235,10 @@ GcWindowRegistry::newGcWindow(GcWinID id, Context *context)
#else #else
case GcWindowTypes::RouteSegment: returning = new GcChartWindow(context); break; case GcWindowTypes::RouteSegment: returning = new GcChartWindow(context); break;
#endif #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::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; 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::SeasonPlan: returning = new PlanningWindow(context); break;
case GcWindowTypes::UserAnalysis: returning = new UserChart(context, false); break; case GcWindowTypes::UserAnalysis: returning = new UserChart(context, false); break;
case GcWindowTypes::UserTrends: returning = new UserChart(context, true); break; case GcWindowTypes::UserTrends: returning = new UserChart(context, true); break;

View File

@@ -24,7 +24,6 @@
#include "RideItem.h" #include "RideItem.h"
#include "Context.h" #include "Context.h"
#include "Athlete.h" #include "Athlete.h"
#include "RideSummaryWindow.h"
#include "Settings.h" #include "Settings.h"
#include "Colors.h" #include "Colors.h"
#include "Units.h" #include "Units.h"
@@ -44,7 +43,7 @@
#define ourRideItem meta->property("ride").value<RideItem*>() #define ourRideItem meta->property("ride").value<RideItem*>()
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
* Master widget for Metadata Entry "on" RideSummaryWindow * Master widget for Metadata Entry
*--------------------------------------------------------------------*/ *--------------------------------------------------------------------*/
RideMetadata::RideMetadata(Context *context, bool singlecolumn) : RideMetadata::RideMetadata(Context *context, bool singlecolumn) :
QWidget(context != NULL ? context->mainWindow : NULL), singlecolumn(singlecolumn), context(context) QWidget(context != NULL ? context->mainWindow : NULL), singlecolumn(singlecolumn), context(context)
@@ -775,11 +774,7 @@ FormField::~FormField()
if (completer) if (completer)
delete completer; delete completer;
break; break;
case FIELD_TEXTBOX : if (definition.name == "Summary") case FIELD_TEXTBOX : delete ((GTextEdit*)widget); break;
delete ((RideSummaryWindow *)widget);
else
delete ((GTextEdit*)widget);
break;
case FIELD_INTEGER : delete ((QSpinBox*)widget); break; case FIELD_INTEGER : delete ((QSpinBox*)widget); break;
case FIELD_DOUBLE : { case FIELD_DOUBLE : {
if (!isTime) delete ((QDoubleSpinBox*)widget); if (!isTime) delete ((QDoubleSpinBox*)widget);

View File

@@ -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/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/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/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/PowerHist.h Charts/ReferenceLineDialog.h Charts/RideEditor.h Charts/RideMapWindow.h \
Charts/ScatterPlot.h Charts/ScatterWindow.h Charts/SmallPlot.h Charts/SummaryWindow.h Charts/TreeMapPlot.h \ Charts/ScatterPlot.h Charts/ScatterWindow.h Charts/SmallPlot.h Charts/TreeMapPlot.h \
Charts/TreeMapWindow.h Charts/ZoneScaleDraw.h Charts/TreeMapWindow.h Charts/ZoneScaleDraw.h
# cloud services # 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/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/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/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/PowerHist.cpp Charts/ReferenceLineDialog.cpp Charts/RideEditor.cpp Charts/RideMapWindow.cpp \
Charts/ScatterPlot.cpp Charts/ScatterWindow.cpp Charts/SmallPlot.cpp Charts/SummaryWindow.cpp Charts/TreeMapPlot.cpp \ Charts/ScatterPlot.cpp Charts/ScatterWindow.cpp Charts/SmallPlot.cpp Charts/TreeMapPlot.cpp \
Charts/TreeMapWindow.cpp Charts/TreeMapWindow.cpp
## Cloud Services / Web resources ## Cloud Services / Web resources