From 43cf7e0126421e80bc10ea4a3f8bc61443848f67 Mon Sep 17 00:00:00 2001 From: "Sean C. Rhea" Date: Thu, 26 Apr 2007 20:10:21 +0000 Subject: [PATCH] - MacOS case-insensitive file system confuses our Time.h with /usr/include/time.h, so renamed the former. - Bug fixes for when there is no power.zones file --- src/gui/AllPlot.cpp | 1 + src/gui/GoldenCheetah.pro | 10 ++++++---- src/gui/MainWindow.cpp | 30 +++++++++++++++-------------- src/gui/RideItem.cpp | 2 +- src/gui/{Time.cpp => TimeUtils.cpp} | 2 +- src/gui/{Time.h => TimeUtils.h} | 6 +++--- src/gui/Zones.cpp | 2 +- 7 files changed, 29 insertions(+), 24 deletions(-) rename src/gui/{Time.cpp => TimeUtils.cpp} (98%) rename src/gui/{Time.h => TimeUtils.h} (93%) diff --git a/src/gui/AllPlot.cpp b/src/gui/AllPlot.cpp index baa9ab0de..7142e8efa 100644 --- a/src/gui/AllPlot.cpp +++ b/src/gui/AllPlot.cpp @@ -18,6 +18,7 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "AllPlot.h" #include "RawFile.h" #include "Settings.h" diff --git a/src/gui/GoldenCheetah.pro b/src/gui/GoldenCheetah.pro index ebb902d68..700c30fcf 100644 --- a/src/gui/GoldenCheetah.pro +++ b/src/gui/GoldenCheetah.pro @@ -5,14 +5,16 @@ TEMPLATE = app TARGET += DEPENDPATH += . -INCLUDEPATH += /home/srhea/src/qwt-5.0.1/src ../lib ../srm ../cpint +INCLUDEPATH += /usr/local/qwt/include ../lib ../srm ../cpint CONFIG += static debug -LIBS += /home/srhea/src/qwt-5.0.1/lib/libqwt.a +LIBS += /usr/local/qwt/lib/libqwt.a LIBS += ../lib/libgc.a ../cpint/libcpint.a ../srm/libsrm.a LIBS += -lm -lz macx { LIBS += -framework Carbon } +QMAKE_CC=/usr/bin/gcc-4.0 +QMAKE_CXX=/usr/bin/g++-4.0 # Input HEADERS += \ @@ -26,7 +28,7 @@ HEADERS += \ PowerHist.h \ RawFile.h \ RideItem.h \ - Time.h \ + TimeUtils.h \ Zones.h SOURCES += \ @@ -40,7 +42,7 @@ SOURCES += \ PowerHist.cpp \ RawFile.cpp \ RideItem.cpp \ - Time.cpp \ + TimeUtils.cpp \ Zones.cpp \ \ main.cpp diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 2a98c5a64..03094977a 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -27,7 +27,7 @@ #include "RawFile.h" #include "RideItem.h" #include "Settings.h" -#include "Time.h" +#include "TimeUtils.h" #include "Zones.h" #include #include @@ -44,7 +44,7 @@ static char *rideFileRegExp = ("^(\\d\\d\\d\\d)_(\\d\\d)_(\\d\\d)" "_(\\d\\d)_(\\d\\d)_(\\d\\d)\\.(raw|srm)$"); MainWindow::MainWindow(const QDir &home) : - home(home), settings(GC_SETTINGS_CO, GC_SETTINGS_APP) + home(home), settings(GC_SETTINGS_CO, GC_SETTINGS_APP), zones(NULL) { setWindowTitle(home.dirName()); settings.setValue(GC_SETTINGS_LAST, home.dirName()); @@ -462,8 +462,8 @@ MainWindow::rideSelected() double weeklyDistance = 0.0; double weeklyWork = 0.0; - double *time_in_zone = NULL; int zone_range = -1; + double *time_in_zone = NULL; int num_zones = -1; bool zones_ok = true; @@ -475,17 +475,19 @@ MainWindow::rideSelected() weeklySeconds += item->secsMovingOrPedaling(); weeklyDistance += item->totalDistance(); weeklyWork += item->totalWork(); - if (zone_range == -1) { - zone_range = item->zoneRange(); - num_zones = item->numZones(); - time_in_zone = new double[num_zones]; - } - else if (item->zoneRange() != zone_range) { - zones_ok = false; - } - if (zone_range != -1) { - for (int j = 0; j < num_zones; ++j) - time_in_zone[j] += item->timeInZone(j); + if (zones) { + if (zone_range == -1) { + zone_range = item->zoneRange(); + num_zones = item->numZones(); + time_in_zone = new double[num_zones]; + } + else if (item->zoneRange() != zone_range) { + zones_ok = false; + } + if (zone_range != -1) { + for (int j = 0; j < num_zones; ++j) + time_in_zone[j] += item->timeInZone(j); + } } } } diff --git a/src/gui/RideItem.cpp b/src/gui/RideItem.cpp index 675ecf61d..40c95406a 100644 --- a/src/gui/RideItem.cpp +++ b/src/gui/RideItem.cpp @@ -21,7 +21,7 @@ #include "RideItem.h" #include "RawFile.h" #include "Settings.h" -#include "Time.h" +#include "TimeUtils.h" #include "Zones.h" #include #include diff --git a/src/gui/Time.cpp b/src/gui/TimeUtils.cpp similarity index 98% rename from src/gui/Time.cpp rename to src/gui/TimeUtils.cpp index 464250281..086773e65 100644 --- a/src/gui/Time.cpp +++ b/src/gui/TimeUtils.cpp @@ -1,5 +1,5 @@ -#include "Time.h" +#include "TimeUtils.h" #include QString time_to_string(double secs) diff --git a/src/gui/Time.h b/src/gui/TimeUtils.h similarity index 93% rename from src/gui/Time.h rename to src/gui/TimeUtils.h index 4839adb81..57325aedf 100644 --- a/src/gui/Time.h +++ b/src/gui/TimeUtils.h @@ -18,13 +18,13 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _Time_h -#define _Time_h +#ifndef _TimeUtils_h +#define _TimeUtils_h #include QString interval_to_str(double secs); // output like 1h 2m 3s QString time_to_string(double secs); // output like 1:02:03 -#endif // _Time_h +#endif // _TimeUtils_h diff --git a/src/gui/Zones.cpp b/src/gui/Zones.cpp index 14371935d..1093a7a7b 100644 --- a/src/gui/Zones.cpp +++ b/src/gui/Zones.cpp @@ -19,7 +19,7 @@ */ #include "Zones.h" -#include "Time.h" +#include "TimeUtils.h" #include #include