nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Activity Details from Sidebar

Browse Source 
Instead the defaut layout now has the ride summary
and details as the first chart in analysis view.

Funny how we've come full circle back to the original
layout. Kinda reassuring I suppose.

Also fixes SummaryWindow splitter handle being rather
ugly.

Fixes #518.
This commit is contained in:
Mark Liversedge
2011-11-19 14:41:41 +00:00
parent 63994e2ac4
commit 4bfca515fb
3 changed files with 104 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MainWindow.cpp
View File

@@ -184,6 +184,7 @@ MainWindow::MainWindow(const QDir &home) :
// Metadata fields
_rideMetadata = new RideMetadata(this,true);
_rideMetadata->hide();
metricDB = new MetricAggregator(this, home, zones(), hrZones()); // just to catch config updates!
metricDB->refreshMetrics();
@@ -474,7 +475,6 @@ MainWindow::MainWindow(const QDir &home) :
// POPULATE TOOLBOX
toolBox->addItem(listView, QIcon(":images/activity.png"), "Activity History");
toolBox->addItem(_rideMetadata, QIcon(":images/metadata.png"), "Activity Details");
toolBox->addItem(intervalSplitter, QIcon(":images/stopwatch.png"), "Activity Intervals");
toolBox->addItem(trainTool->controls(), QIcon(":images/library.png"), "Workout Library");
toolBox->addItem(masterControls, QIcon(":images/settings.png"), "Chart Settings");

1
src/SummaryWindow.cpp
View File

@@ -26,6 +26,7 @@ SummaryWindow::SummaryWindow(MainWindow *mainWindow) :
setRideItem(NULL);
splitter = new QSplitter(Qt::Vertical, this);
splitter->setHandleWidth(1);
QVBoxLayout *vlayout = new QVBoxLayout(this);
vlayout->setSpacing(0);
vlayout->setContentsMargins(1,1,1,1);

170
src/xml/analysis-layout.xml
View File

@@ -1,93 +1,94 @@
<layout name="analysis" style="0">
<chart id="14" name="Ride Summary Window" title="Summary" >
<property name="instanceName" type="QString" value="Ride Summary Window" />
<chart id="16" name="Summary Window" title="Summary" >
<property name="instanceName" type="QString" value="Summary Window" />
<property name="title" type="QString" value="Summary" />
<property name="widthFactor" type="double" value="1.7042" />
<property name="heightFactor" type="double" value="1.65821" />
<property name="resizable" type="bool" value="1" />
<property name="subtitle" type="QString" value="Sunday October 24, 2010, 9:56 AM" />
<property name="widthFactor" type="double" value="1" />
<property name="heightFactor" type="double" value="2" />
<property name="resizable" type="bool" value="0" />
</chart>
<chart id="5" name="Google Map" title="Map" >
<property name="instanceName" type="QString" value="Google Map" />
<property name="title" type="QString" value="Map" />
<property name="widthFactor" type="double" value="2.45521" />
<property name="heightFactor" type="double" value="1.66194" />
<property name="resizable" type="bool" value="1" />
<property name="subtitle" type="QString" value="Ferrier Hills" />
<property name="widthFactor" type="double" value="2.27273" />
<property name="heightFactor" type="double" value="2.08333" />
<property name="resizable" type="bool" value="0" />
</chart>
<chart id="6" name="Histogram Window" title="Power Distribution" >
<chart id="6" name="Histogram Window" title="Speed" >
<property name="instanceName" type="QString" value="Histogram Window" />
<property name="title" type="QString" value="Power Distribution" />
<property name="widthFactor" type="double" value="4" />
<property name="heightFactor" type="double" value="2.51311" />
<property name="resizable" type="bool" value="1" />
<property name="series" type="int" value="0" />
<property name="percent" type="int" value="0" />
<property name="bin" type="double" value="4" />
<property name="logY" type="bool" value="0" />
<property name="zeroes" type="bool" value="0" />
<property name="shade" type="bool" value="0" />
<property name="zoned" type="bool" value="0" />
<property name="scope" type="bool" value="0" />
</chart>
<chart id="6" name="Histogram Window" title="Cadence Distribution" >
<property name="instanceName" type="QString" value="Histogram Window" />
<property name="title" type="QString" value="Cadence Distribution" />
<property name="widthFactor" type="double" value="4" />
<property name="heightFactor" type="double" value="2.51349" />
<property name="resizable" type="bool" value="1" />
<property name="series" type="int" value="3" />
<property name="percent" type="int" value="0" />
<property name="bin" type="double" value="1" />
<property name="logY" type="bool" value="0" />
<property name="zeroes" type="bool" value="0" />
<property name="shade" type="bool" value="0" />
<property name="zoned" type="bool" value="0" />
<property name="scope" type="bool" value="0" />
</chart>
<chart id="6" name="Histogram Window" title="Heartrate Distribution" >
<property name="instanceName" type="QString" value="Histogram Window" />
<property name="title" type="QString" value="Heartrate Distribution" />
<property name="widthFactor" type="double" value="4" />
<property name="heightFactor" type="double" value="2.51349" />
<property name="resizable" type="bool" value="1" />
<property name="series" type="int" value="1" />
<property name="percent" type="int" value="0" />
<property name="bin" type="double" value="1" />
<property name="logY" type="bool" value="0" />
<property name="zeroes" type="bool" value="0" />
<property name="shade" type="bool" value="0" />
<property name="zoned" type="bool" value="0" />
<property name="scope" type="bool" value="0" />
</chart>
<chart id="6" name="Histogram Window" title="Speed Distribution" >
<property name="instanceName" type="QString" value="Histogram Window" />
<property name="title" type="QString" value="Speed Distribution" />
<property name="widthFactor" type="double" value="4" />
<property name="heightFactor" type="double" value="2.51349" />
<property name="resizable" type="bool" value="1" />
<property name="title" type="QString" value="Speed" />
<property name="subtitle" type="QString" value="" />
<property name="widthFactor" type="double" value="3.61395" />
<property name="heightFactor" type="double" value="4" />
<property name="resizable" type="bool" value="0" />
<property name="series" type="int" value="2" />
<property name="percent" type="int" value="0" />
<property name="bin" type="double" value="20" />
<property name="bin" type="double" value="7" />
<property name="logY" type="bool" value="0" />
<property name="zeroes" type="bool" value="0" />
<property name="shade" type="bool" value="0" />
<property name="zoned" type="bool" value="0" />
<property name="scope" type="bool" value="0" />
</chart>
<chart id="23" name="Metadata Window" title="Information" >
<property name="instanceName" type="QString" value="Metadata Window" />
<property name="title" type="QString" value="Information" />
<property name="widthFactor" type="double" value="1.00103" />
<property name="heightFactor" type="double" value="2.16898" />
<property name="resizable" type="bool" value="1" />
<chart id="6" name="Histogram Window" title="Cadence" >
<property name="instanceName" type="QString" value="Histogram Window" />
<property name="title" type="QString" value="Cadence" />
<property name="subtitle" type="QString" value="" />
<property name="widthFactor" type="double" value="3.55947" />
<property name="heightFactor" type="double" value="4" />
<property name="resizable" type="bool" value="0" />
<property name="series" type="int" value="3" />
<property name="percent" type="int" value="0" />
<property name="bin" type="double" value="5" />
<property name="logY" type="bool" value="0" />
<property name="zeroes" type="bool" value="0" />
<property name="shade" type="bool" value="0" />
<property name="zoned" type="bool" value="0" />
<property name="scope" type="bool" value="0" />
</chart>
<chart id="2" name="Ride Plot Window" title="Ride Plot" >
<chart id="6" name="Histogram Window" title="Power" >
<property name="instanceName" type="QString" value="Histogram Window" />
<property name="title" type="QString" value="Power" />
<property name="subtitle" type="QString" value="" />
<property name="widthFactor" type="double" value="3.61152" />
<property name="heightFactor" type="double" value="4" />
<property name="resizable" type="bool" value="0" />
<property name="series" type="int" value="0" />
<property name="percent" type="int" value="0" />
<property name="bin" type="double" value="5" />
<property name="logY" type="bool" value="0" />
<property name="zeroes" type="bool" value="0" />
<property name="shade" type="bool" value="0" />
<property name="zoned" type="bool" value="0" />
<property name="scope" type="bool" value="0" />
</chart>
<chart id="6" name="Histogram Window" title="Heartrate" >
<property name="instanceName" type="QString" value="Histogram Window" />
<property name="title" type="QString" value="Heartrate" />
<property name="subtitle" type="QString" value="" />
<property name="widthFactor" type="double" value="3.55947" />
<property name="heightFactor" type="double" value="4" />
<property name="resizable" type="bool" value="0" />
<property name="series" type="int" value="1" />
<property name="percent" type="int" value="0" />
<property name="bin" type="double" value="2" />
<property name="logY" type="bool" value="0" />
<property name="zeroes" type="bool" value="0" />
<property name="shade" type="bool" value="0" />
<property name="zoned" type="bool" value="0" />
<property name="scope" type="bool" value="0" />
</chart>
<chart id="2" name="Ride Plot Window" title="Ride" >
<property name="instanceName" type="QString" value="Ride Plot Window" />
<property name="title" type="QString" value="Ride Plot" />
<property name="title" type="QString" value="Ride" />
<property name="subtitle" type="QString" value="" />
<property name="widthFactor" type="double" value="1" />
<property name="heightFactor" type="double" value="1" />
<property name="resizable" type="bool" value="1" />
<property name="resizable" type="bool" value="0" />
<property name="stacked" type="bool" value="0" />
<property name="showGrid" type="int" value="2" />
<property name="showFull" type="int" value="2" />
<property name="showHr" type="int" value="2" />
<property name="showSpeed" type="int" value="2" />
<property name="showCad" type="int" value="2" />
@@ -95,5 +96,38 @@
<property name="showPower" type="int" value="1" />
<property name="byDistance" type="int" value="0" />
<property name="smoothing" type="int" value="1" />
<property name="paintBrush" type="int" value="0" />
</chart>
<chart id="3" name="Critical Power Window" title="CP" >
<property name="instanceName" type="QString" value="Critical Power Window" />
<property name="title" type="QString" value="CP" />
<property name="subtitle" type="QString" value="" />
<property name="widthFactor" type="double" value="2" />
<property name="heightFactor" type="double" value="2" />
<property name="resizable" type="bool" value="0" />
<property name="season" type="int" value="0" />
<property name="mode" type="int" value="0" />
</chart>
<chart id="10" name="Pf/Pv Window" title="QA" >
<property name="instanceName" type="QString" value="Pf/Pv Window" />
<property name="title" type="QString" value="QA" />
<property name="subtitle" type="QString" value="" />
<property name="widthFactor" type="double" value="2" />
<property name="heightFactor" type="double" value="2" />
<property name="resizable" type="bool" value="0" />
<property name="watts" type="QString" value="235" />
<property name="rpm" type="QString" value="80" />
<property name="crank" type="QString" value="0.1725" />
<property name="shade" type="bool" value="1" />
<property name="merge" type="bool" value="0" />
<property name="frame" type="bool" value="1" />
</chart>
<chart id="13" name="Ride Editor" title="Edit" >
<property name="instanceName" type="QString" value="Ride Editor" />
<property name="title" type="QString" value="Edit" />
<property name="subtitle" type="QString" value="" />
<property name="widthFactor" type="double" value="1.00359" />
<property name="heightFactor" type="double" value="0.980868" />
<property name="resizable" type="bool" value="0" />
</chart>
</layout>