Ready to publish v3.0-RC5X

.. updated version string.
Fix WPK interval metric crash
2026-02-14 08:38:45 +00:00 · 2013-05-22 19:03:24 +01:00 · 2013-05-22 18:50:49 +01:00 · 2013-05-22 15:58:01 +01:00 · 2013-05-21 15:41:08 +01:00 · 2013-05-21 11:24:29 +01:00
5 changed files with 50 additions and 5 deletions
--- a/src/GcUpgrade.cpp
+++ b/src/GcUpgrade.cpp
@@ -57,7 +57,28 @@ GcUpgrade::upgrade(const QDir &home)
            double weight_ = appsettings->cvalue(home.dirName(), GC_WEIGHT, "75.0").toString().toDouble();
            if (weight_ <= 0.00) appsettings->setCValue(home.dirName(), GC_WEIGHT, "75.0");

-            // 5. Set latest version - so only tries to upgrade once
+            // 5. startup with common sidebars shown (less ugly)
+            appsettings->setCValue(home.dirName(), "splitter/LTM/hide", true);
+            appsettings->setCValue(home.dirName(), "splitter/LTM/hide/0", false);
+            appsettings->setCValue(home.dirName(), "splitter/LTM/hide/1", false);
+            appsettings->setCValue(home.dirName(), "splitter/LTM/hide/2", false);
+            appsettings->setCValue(home.dirName(), "splitter/LTM/hide/3", true);
+            appsettings->setCValue(home.dirName(), "splitter/analysis/hide", true);
+            appsettings->setCValue(home.dirName(), "splitter/analysis/hide/0", false);
+            appsettings->setCValue(home.dirName(), "splitter/analysis/hide/1", true);
+            appsettings->setCValue(home.dirName(), "splitter/analysis/hide/2", false);
+            appsettings->setCValue(home.dirName(), "splitter/analysis/hide/3", true);
+            appsettings->setCValue(home.dirName(), "splitter/diary/hide", true);
+            appsettings->setCValue(home.dirName(), "splitter/diary/hide/0", false);
+            appsettings->setCValue(home.dirName(), "splitter/diary/hide/1", false);
+            appsettings->setCValue(home.dirName(), "splitter/diary/hide/2", true);
+            appsettings->setCValue(home.dirName(), "splitter/train/hide", true);
+            appsettings->setCValue(home.dirName(), "splitter/train/hide/0", false);
+            appsettings->setCValue(home.dirName(), "splitter/train/hide/1", false);
+            appsettings->setCValue(home.dirName(), "splitter/train/hide/2", false);
+            appsettings->setCValue(home.dirName(), "splitter/train/hide/3", false);
+
+            // FINALLY -- Set latest version - so only tries to upgrade once
            appsettings->setCValue(home.dirName(), GC_VERSION_USED, VERSION_LATEST);
        }
    }
--- a/src/GcUpgrade.h
+++ b/src/GcUpgrade.h
@@ -26,8 +26,8 @@
 // 3001 - V3 RC1
 // 3002 - V3 RC2
 // 3003 - V3 RC3
-// 3004 - V3 RC4
-// 300n - V3 RCn
+// 3004 - V3 RC4 / 4X
+// 3005 - V3 RC5 / 5X
 // 3010 - V3.0 Full Release
 // 3011 - V3.0 SP1
 // 301n - V3.0 SPn
@@ -35,8 +35,8 @@
 // 310n - V3.1 RCn
 //

-#define VERSION_LATEST 3004
-#define VERSION_STRING "V3.0 RC4"
+#define VERSION_LATEST 3005
+#define VERSION_STRING "V3.0 RC5X"

 class GcUpgrade
 {
--- a/src/MetricAggregator.cpp
+++ b/src/MetricAggregator.cpp
@@ -193,8 +193,10 @@ void MetricAggregator::refreshMetrics(QDateTime forceAfterThisDate)
    dbaccess->connection().commit();

 #ifdef GC_HAVE_LUCENE
+#ifndef WIN32 // windows crashes here....
    out << "OPTIMISE: " << QDateTime::currentDateTime().toString() + "\r\n";
    main->lucene->optimise();
+#endif
 #endif
    main->isclean = true;

--- a/src/NewCyclistDialog.cpp
+++ b/src/NewCyclistDialog.cpp
@@ -185,6 +185,27 @@ NewCyclistDialog::saveClicked()
                // set the last version to the latest version
                appsettings->setCValue(name->text(), GC_VERSION_USED, GcUpgrade::version());

+                // nice sidebars please!
+                appsettings->setCValue(name->text(), "splitter/LTM/hide", true);
+                appsettings->setCValue(name->text(), "splitter/LTM/hide/0", false);
+                appsettings->setCValue(name->text(), "splitter/LTM/hide/1", false);
+                appsettings->setCValue(name->text(), "splitter/LTM/hide/2", false);
+                appsettings->setCValue(name->text(), "splitter/LTM/hide/3", true);
+                appsettings->setCValue(name->text(), "splitter/analysis/hide", true);
+                appsettings->setCValue(name->text(), "splitter/analysis/hide/0", false);
+                appsettings->setCValue(name->text(), "splitter/analysis/hide/1", true);
+                appsettings->setCValue(name->text(), "splitter/analysis/hide/2", false);
+                appsettings->setCValue(name->text(), "splitter/analysis/hide/3", true);
+                appsettings->setCValue(name->text(), "splitter/diary/hide", true);
+                appsettings->setCValue(name->text(), "splitter/diary/hide/0", false);
+                appsettings->setCValue(name->text(), "splitter/diary/hide/1", false);
+                appsettings->setCValue(name->text(), "splitter/diary/hide/2", true);
+                appsettings->setCValue(name->text(), "splitter/train/hide", true);
+                appsettings->setCValue(name->text(), "splitter/train/hide/0", false);
+                appsettings->setCValue(name->text(), "splitter/train/hide/1", false);
+                appsettings->setCValue(name->text(), "splitter/train/hide/2", false);
+                appsettings->setCValue(name->text(), "splitter/train/hide/3", false);
+
                // lets setup!
                if (unitCombo->currentIndex()==0)
                    appsettings->setCValue(name->text(), GC_UNIT, GC_UNIT_METRIC);
--- a/src/RideSummaryWindow.cpp
+++ b/src/RideSummaryWindow.cpp
@@ -429,6 +429,7 @@ RideSummaryWindow::htmlSummary() const
            bool even = false;
            foreach (RideFileInterval interval, ride->intervals()) {
                RideFile f(ride->startTime(), ride->recIntSecs());
+                f.mainwindow = mainWindow; // hack, until we refactor athlete and mainwindow
                for (int i = ride->intervalBegin(interval); i < ride->dataPoints().size(); ++i) {
                    const RideFilePoint *p = ride->dataPoints()[i];
                    if (p->secs >= interval.stop)
Author	SHA1	Message	Date
Mark Liversedge	c56786683f	Ready to publish v3.0-RC5X .. updated version string.	2013-05-22 19:03:24 +01:00
Mark Liversedge	bea0b1a7d1	Fix WPK interval metric crash .. recent update to use getWeight() in the ride file caused a SEGV as interval metric computation is done on the fly against a 'manufactured' ride file. .. That ridefile doesn't have a mainwindow reference in it, so when getWeight() references mainwindow->metricDB a SEGV occurred.	2013-05-22 18:50:49 +01:00
Mark Liversedge	92e7ed0d23	UI Nits: Defaut sidebar settings When a new athlete is created or when running v3 for the first time for this user the sidebars shown are yucky. This just updates the settings to make sure you start up with a simple sidebar for the four views.	2013-05-22 15:58:01 +01:00
Mark Liversedge	98e3931ad0	No CLucene optimise on Windows .. it looks like it crashes.	2013-05-21 15:41:08 +01:00
Mark Liversedge	193117646e	RC5 Update Build ID and String .. build 3005.	2013-05-21 11:24:29 +01:00