mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-02-13 08:08:42 +00:00
Deprecate 3D chart
.. deprecate 3D chart as QwtPlot3d has very questionable support and the chart is not widely used.
This commit is contained in:
@@ -29,9 +29,6 @@
|
||||
#endif
|
||||
#include "HistogramWindow.h"
|
||||
#include "LTMWindow.h"
|
||||
#ifdef GC_HAVE_QWTPLOT3D
|
||||
#include "ModelWindow.h"
|
||||
#endif
|
||||
#ifdef Q_OS_MAC
|
||||
#include "QtMacVideoWindow.h"
|
||||
#else
|
||||
@@ -107,7 +104,6 @@ GcWindowRegistry::initialize()
|
||||
{ VIEW_HOME, tr("Python Chart "),GcWindowTypes::PythonSeason },
|
||||
//{ VIEW_ANALYSIS, tr("Bing Map"),GcWindowTypes::BingMap },
|
||||
{ VIEW_ANALYSIS, tr("2d Plot"),GcWindowTypes::Scatter },
|
||||
{ VIEW_ANALYSIS, tr("3d Plot"),GcWindowTypes::Model },
|
||||
{ VIEW_ANALYSIS, tr("Aerolab Chung Analysis"),GcWindowTypes::Aerolab },
|
||||
{ VIEW_DIARY, tr("Calendar"),GcWindowTypes::Diary },
|
||||
{ VIEW_DIARY, tr("Navigator"), GcWindowTypes::ActivityNavigator },
|
||||
@@ -208,11 +204,7 @@ GcWindowRegistry::newGcWindow(GcWinID id, Context *context)
|
||||
}
|
||||
break;
|
||||
case GcWindowTypes::LTM: returning = new LTMWindow(context); break;
|
||||
#ifdef GC_HAVE_QWTPLOT3D
|
||||
case GcWindowTypes::Model: returning = new ModelWindow(context); break;
|
||||
#else
|
||||
case GcWindowTypes::Model: returning = new GcChartWindow(context); break;
|
||||
#endif
|
||||
case GcWindowTypes::PfPv: returning = new PfPvWindow(context); break;
|
||||
case GcWindowTypes::HrPw: returning = new HrPwWindow(context); break;
|
||||
case GcWindowTypes::RideEditor: returning = new RideEditor(context); break;
|
||||
|
||||
@@ -35,10 +35,10 @@ enum gcwinid {
|
||||
GoogleMap =5,
|
||||
Histogram =6,
|
||||
LTM =7,
|
||||
Model =8,
|
||||
Model =8, // deprecated
|
||||
PerformanceManager =9,
|
||||
PfPv =10,
|
||||
Race =11,
|
||||
Race =11, // deprecated
|
||||
RideEditor =13,
|
||||
RideSummary =14,
|
||||
Scatter =15,
|
||||
@@ -54,7 +54,7 @@ enum gcwinid {
|
||||
WorkoutPlot = 25,
|
||||
MapWindow = 26,
|
||||
StreetViewWindow = 27,
|
||||
BingMap = 28,
|
||||
BingMap = 28, // deprecated
|
||||
RealtimeControls = 29,
|
||||
ActivityNavigator = 30,
|
||||
SpinScanPlot = 31,
|
||||
|
||||
24
src/src.pro
24
src/src.pro
@@ -410,30 +410,6 @@ unix:!macx {
|
||||
}
|
||||
|
||||
|
||||
###==================
|
||||
### OPTIONAL => QWT3D
|
||||
###==================
|
||||
|
||||
!isEmpty(QWT3D_INSTALL) {
|
||||
|
||||
# we will work out the rest if you tell use where it is installed
|
||||
isEmpty(QWT3D_INCLUDE) { QWT3D_INCLUDE = $${QWT3D_INSTALL}/include }
|
||||
isEmpty(QWT3D_LIBS) { QWT3D_LIBS = -L$${QWT3D_INSTALL}/lib -lqwtplot3d }
|
||||
|
||||
DEFINES += GC_HAVE_QWTPLOT3D
|
||||
INCLUDEPATH += $${QWT3D_INCLUDE}
|
||||
LIBS += $${QWT3D_LIBS}
|
||||
|
||||
# additional dependencies for 3d
|
||||
unix:!macx { LIBS += -lGLU }
|
||||
QT += opengl
|
||||
|
||||
# add 3d plot
|
||||
HEADERS += Charts/ModelPlot.h Charts/ModelWindow.h
|
||||
SOURCES += Charts/ModelPlot.cpp Charts/ModelWindow.cpp
|
||||
}
|
||||
|
||||
|
||||
###=====================================
|
||||
### OPTIONAL => GOOGLE KML IMPORT EXPORT
|
||||
###=====================================
|
||||
|
||||
Reference in New Issue
Block a user