diff --git a/src/Core/RouteItem.cpp b/deprecated/RouteItem.cpp similarity index 100% rename from src/Core/RouteItem.cpp rename to deprecated/RouteItem.cpp diff --git a/src/Core/RouteItem.h b/deprecated/RouteItem.h similarity index 100% rename from src/Core/RouteItem.h rename to deprecated/RouteItem.h diff --git a/src/Charts/RouteWindow.cpp b/deprecated/RouteWindow.cpp similarity index 100% rename from src/Charts/RouteWindow.cpp rename to deprecated/RouteWindow.cpp diff --git a/src/Charts/RouteWindow.h b/deprecated/RouteWindow.h similarity index 100% rename from src/Charts/RouteWindow.h rename to deprecated/RouteWindow.h diff --git a/src/Gui/GcWindowRegistry.cpp b/src/Gui/GcWindowRegistry.cpp index 51e629267..4b0582c5e 100644 --- a/src/Gui/GcWindowRegistry.cpp +++ b/src/Gui/GcWindowRegistry.cpp @@ -57,8 +57,6 @@ #include "Overview.h" #endif #include "UserChartWindow.h" -// Not until v4.0 -//#include "RouteWindow.h" // GcWindows initialization is done in initialize method to enable translations GcWindowRegistry* GcWindows; @@ -231,11 +229,7 @@ GcWindowRegistry::newGcWindow(GcWinID id, Context *context) case GcWindowTypes::WebPageWindow: returning = new WebPageWindow(context); break; case GcWindowTypes::LiveMapWebPageWindow: returning = new LiveMapWebPageWindow(context); break; case GcWindowTypes::ElevationChart: returning = new ElevationChartWindow(context); break; -#if 0 // not till v4.0 - case GcWindowTypes::RouteSegment: returning = new RouteWindow(context); break; -#else - case GcWindowTypes::RouteSegment: returning = new GcChartWindow(context); break; -#endif + case GcWindowTypes::RouteSegment: returning = new GcChartWindow(context); break; // Deprecated // summary and old ride summary charts now replaced with an Overview - note id gets reset case GcWindowTypes::Summary: diff --git a/src/Python/requirements.txt b/src/Python/requirements.txt index 91af42fea..7cc42eab1 100644 --- a/src/Python/requirements.txt +++ b/src/Python/requirements.txt @@ -9,6 +9,7 @@ scipy lmfit plotly importlib_metadata +Jinja2 # # Nice to have # diff --git a/src/Resources/xml/analysis-perspectives.xml b/src/Resources/xml/analysis-perspectives.xml index c8ce16700..ec4eb10f4 100644 --- a/src/Resources/xml/analysis-perspectives.xml +++ b/src/Resources/xml/analysis-perspectives.xml @@ -418,6 +418,18 @@ + + + + + + + + + + + + diff --git a/src/src.pro b/src/src.pro index 833804ec7..0489e4ed4 100644 --- a/src/src.pro +++ b/src/src.pro @@ -789,12 +789,6 @@ win32-msvc* { SOURCES += Core/WindowsCrashHandler.cpp } -###====================================== -### PENDING SOURCE FILES [not active yet] -###====================================== - -DEFERRES += Core/RouteWindow.h Core/RouteWindow.cpp Core/RouteItem.h Core/RouteItem.cpp - ###==================== ### MISCELLANEOUS FILES ###====================