Skip to content

Commit

Permalink
V3.6 Upgrade processing - put the current chart config into a general…
Browse files Browse the repository at this point in the history 
… perspective

Renamed Resouces/xml/*-layout.xml files to Resources/xml/*-perspectives.xml
Removed deprecated Summary from Activities and Trends, and added default Overview to Trends
Added enclosing <Layouts></Layouts> and General perspective with proper type to each one
This provides default layouts for newly created athletes.
We still need to update layouts before release and to enable Reset Layout.
  • Loading branch information
@amtriathlon
amtriathlon committed Aug 8, 2021
1 parent 91f2c46 commit 1f77f08
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 35 deletions.
8 changes: 4 additions & 4 deletions src/Resources/application.qrc
View file
Expand Up @@ -107,11 +107,11 @@
<file>translations/gc_sv.qm</file>
<file>xml/charts.xml</file>
<file>xml/metadata.xml</file>
<file>xml/train-layout.xml</file>
<file>xml/train-perspectives.xml</file>
<file>xml/video-layout.xml</file>
<file>xml/diary-layout.xml</file>
<file>xml/analysis-layout.xml</file>
<file>xml/home-layout.xml</file>
<file>xml/diary-perspectives.xml</file>
<file>xml/analysis-perspectives.xml</file>
<file>xml/home-perspectives.xml</file>
<file>ini/measures.ini</file>
<file>html/ltm-summary.html</file>
<file>images/oxygen/power-off.png</file>
Expand Down
20 changes: 3 additions & 17 deletions src/Resources/xml/analysis-layout.xml → src/Resources/xml/analysis-perspectives.xml
View file
@@ -1,4 +1,5 @@
<layout name="analysis" style="0">
<layouts>
<layout name="General" style="0" type="2" expression="">
<chart id="42" name="" title="Overview" >
<property name="title" type="QString" value="Overview" />
<property name="subtitle" type="QString" value="" />
Expand All @@ -8,22 +9,6 @@
<property name="resizable" type="bool" value="0" />
<property name="config" type="QString" value="{\n &quot;version&quot;:&quot;1.0&quot;,\n &quot;columns&quot;:[1200,1200,1200,1200,1200,1200,1200,1200,1200,1200],\n &quot;CARDS&quot;:[\n { &quot;type&quot;:6,&quot;name&quot;:&quot;PMC&quot;,&quot;deep&quot;:9,&quot;column&quot;:0,&quot;order&quot;:0,&quot;series&quot;:4,&quot;symbol&quot;:&quot;coggan_tss&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:4,&quot;name&quot;:&quot;Sport&quot;,&quot;deep&quot;:5,&quot;column&quot;:0,&quot;order&quot;:1,&quot;series&quot;:2,&quot;symbol&quot;:&quot;Sport&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:4,&quot;name&quot;:&quot;Workout Code&quot;,&quot;deep&quot;:5,&quot;column&quot;:0,&quot;order&quot;:2,&quot;series&quot;:2,&quot;symbol&quot;:&quot;Workout Code&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:3,&quot;name&quot;:&quot;Duration&quot;,&quot;deep&quot;:9,&quot;column&quot;:0,&quot;order&quot;:3,&quot;series&quot;:2,&quot;symbol&quot;:&quot;workout_time&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:4,&quot;name&quot;:&quot;Notes&quot;,&quot;deep&quot;:13,&quot;column&quot;:0,&quot;order&quot;:4,&quot;series&quot;:637927936,&quot;symbol&quot;:&quot;Notes&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:3,&quot;name&quot;:&quot;HRV rMSSD&quot;,&quot;deep&quot;:9,&quot;column&quot;:1,&quot;order&quot;:0,&quot;series&quot;:5,&quot;symbol&quot;:&quot;rMSSD&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:3,&quot;name&quot;:&quot;Heartrate&quot;,&quot;deep&quot;:5,&quot;column&quot;:1,&quot;order&quot;:1,&quot;series&quot;:0,&quot;symbol&quot;:&quot;average_hr&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:9,&quot;name&quot;:&quot;Heartrate Zones&quot;,&quot;deep&quot;:11,&quot;column&quot;:1,&quot;order&quot;:2,&quot;series&quot;:3,&quot;symbol&quot;:&quot;&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:3,&quot;name&quot;:&quot;Climbing&quot;,&quot;deep&quot;:5,&quot;column&quot;:1,&quot;order&quot;:3,&quot;series&quot;:47,&quot;symbol&quot;:&quot;elevation_gain&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:3,&quot;name&quot;:&quot;Cadence&quot;,&quot;deep&quot;:5,&quot;column&quot;:1,&quot;order&quot;:4,&quot;series&quot;:0,&quot;symbol&quot;:&quot;average_cad&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:3,&quot;name&quot;:&quot;Equivalent Power&quot;,&quot;deep&quot;:5,&quot;column&quot;:1,&quot;order&quot;:5,&quot;series&quot;:0,&quot;symbol&quot;:&quot;coggan_np&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:1,&quot;name&quot;:&quot;RPE&quot;,&quot;deep&quot;:9,&quot;column&quot;:2,&quot;order&quot;:0,&quot;series&quot;:0,&quot;symbol&quot;:&quot;RPE&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:3,&quot;name&quot;:&quot;Stress&quot;,&quot;deep&quot;:5,&quot;column&quot;:2,&quot;order&quot;:1,&quot;series&quot;:0,&quot;symbol&quot;:&quot;coggan_tss&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:9,&quot;name&quot;:&quot;Fatigue Zones&quot;,&quot;deep&quot;:11,&quot;column&quot;:2,&quot;order&quot;:2,&quot;series&quot;:50,&quot;symbol&quot;:&quot;&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:8,&quot;name&quot;:&quot;Intervals&quot;,&quot;deep&quot;:17,&quot;column&quot;:2,&quot;order&quot;:3,&quot;series&quot;:0,&quot;symbol&quot;:&quot;&quot;,&quot;xsymbol&quot;:&quot;elapsed_time&quot;,&quot;ysymbol&quot;:&quot;average_power&quot;,&quot;zsymbol&quot;:&quot;workout_time&quot; },\n { &quot;type&quot;:3,&quot;name&quot;:&quot;Intensity&quot;,&quot;deep&quot;:9,&quot;column&quot;:3,&quot;order&quot;:0,&quot;series&quot;:-16777216,&quot;symbol&quot;:&quot;coggan_if&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:3,&quot;name&quot;:&quot;Power&quot;,&quot;deep&quot;:5,&quot;column&quot;:3,&quot;order&quot;:1,&quot;series&quot;:0,&quot;symbol&quot;:&quot;average_power&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:9,&quot;name&quot;:&quot;Power Zones&quot;,&quot;deep&quot;:11,&quot;column&quot;:3,&quot;order&quot;:2,&quot;series&quot;:10,&quot;symbol&quot;:&quot;&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:0,&quot;name&quot;:&quot;Power Model&quot;,&quot;deep&quot;:17,&quot;column&quot;:3,&quot;order&quot;:3,&quot;series&quot;:-16777216,&quot;symbol&quot;:&quot;&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:3,&quot;name&quot;:&quot;Distance&quot;,&quot;deep&quot;:9,&quot;column&quot;:4,&quot;order&quot;:0,&quot;series&quot;:-16777216,&quot;symbol&quot;:&quot;total_distance&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:3,&quot;name&quot;:&quot;Speed&quot;,&quot;deep&quot;:5,&quot;column&quot;:4,&quot;order&quot;:1,&quot;series&quot;:-16777216,&quot;symbol&quot;:&quot;average_speed&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:9,&quot;name&quot;:&quot;Pace Zones&quot;,&quot;deep&quot;:11,&quot;column&quot;:4,&quot;order&quot;:2,&quot;series&quot;:6,&quot;symbol&quot;:&quot;&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; },\n { &quot;type&quot;:2,&quot;name&quot;:&quot;Route&quot;,&quot;deep&quot;:17,&quot;column&quot;:4,&quot;order&quot;:3,&quot;series&quot;:0,&quot;symbol&quot;:&quot;&quot;,&quot;xsymbol&quot;:&quot;&quot;,&quot;ysymbol&quot;:&quot;&quot;,&quot;zsymbol&quot;:&quot;&quot; }\n ]\n}\n" />
</chart>
<chart id="14" name="" title="Summary" >
<property name="title" type="QString" value="Summary" />
<property name="subtitle" type="QString" value="Sunday July 22, 2018, 12:32" />
<property name="widthFactor" type="double" value="2" />
<property name="heightFactor" type="double" value="2" />
<property name="style" type="int" value="0" />
<property name="resizable" type="bool" value="0" />
<property name="filter" type="QString" value="" />
<property name="fromDate" type="QDate" value="Sat Jan 1 2000" />
<property name="toDate" type="QDate" value="Sat Jan 1 2000" />
<property name="startDate" type="QDate" value="Sat Oct 12 2013" />
<property name="lastN" type="int" value="7" />
<property name="lastNX" type="int" value="0" />
<property name="prevN" type="int" value="0" />
<property name="useSelected" type="int" value="0" />
</chart>
<chart id="23" name="" title="Details" >
<property name="title" type="QString" value="Details" />
<property name="subtitle" type="QString" value="" />
Expand Down Expand Up @@ -464,3 +449,4 @@
<property name="resizable" type="bool" value="0" />
</chart>
</layout>
</layouts>
4 changes: 3 additions & 1 deletion src/Resources/xml/diary-layout.xml → src/Resources/xml/diary-perspectives.xml
View file
@@ -1,4 +1,5 @@
<layout name="diary" style="2">
<layouts>
<layout name="General" style="2" type="4" expression="">
<chart id="7" name="" title="Time and Distance" >
<property name="title" type="QString" value="Time and Distance" />
<property name="subtitle" type="QString" value="" />
Expand Down Expand Up @@ -133,3 +134,4 @@
<property name="useSelected" type="int" value="4" />
</chart>
</layout>
</layouts>
19 changes: 7 additions & 12 deletions src/Resources/xml/home-layout.xml → src/Resources/xml/home-perspectives.xml
View file
@@ -1,19 +1,13 @@
<layout name="home" style="0">
<chart id="32" name="" title="Summary" >
<property name="title" type="QString" value="Summary" />
<property name="subtitle" type="QString" value="All Dates" />
<layouts>
<layout name="General" style="0" type="8" expression="">
<chart id="47" name="" title="Overview " >
<property name="title" type="QString" value="Overview " />
<property name="subtitle" type="QString" value="" />
<property name="widthFactor" type="double" value="2" />
<property name="heightFactor" type="double" value="2" />
<property name="style" type="int" value="0" />
<property name="resizable" type="bool" value="0" />
<property name="filter" type="QString" value="search:" />
<property name="fromDate" type="QDate" value="Sat Jan 1 2000" />
<property name="toDate" type="QDate" value="Sat Jan 1 2000" />
<property name="startDate" type="QDate" value="Thu Aug 15 2013" />
<property name="lastN" type="int" value="7" />
<property name="lastNX" type="int" value="0" />
<property name="prevN" type="int" value="0" />
<property name="useSelected" type="int" value="4" />
<property name="config" type="QString" value="{\n &quot;version&quot;:&quot;2.0&quot;,\n &quot;CHARTS&quot;:[\n { &quot;type&quot;:107,&quot;span&quot;:1,&quot;deep&quot;:8,&quot;column&quot;:0,&quot;order&quot;:0,&quot;program&quot;:&quot;{ round(sum(metrics(Distance))); } &quot;,&quot;units&quot;:&quot;km&quot;,&quot;istime&quot;:0,&quot;start&quot;:0,&quot;stop&quot;:10000,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Distance&quot; },\n { &quot;type&quot;:108,&quot;span&quot;:1,&quot;deep&quot;:25,&quot;column&quot;:0,&quot;order&quot;:1,&quot;symbol&quot;:&quot;total_distance&quot;,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Going Long&quot; },\n { &quot;type&quot;:107,&quot;span&quot;:1,&quot;deep&quot;:7,&quot;column&quot;:0,&quot;order&quot;:2,&quot;program&quot;:&quot;{ weeks &lt;- (daterange(stop)-daterange(start))\/7; sum(metrics(Duration))\/weeks; } &quot;,&quot;units&quot;:&quot;hh:mm:ss&quot;,&quot;istime&quot;:1,&quot;start&quot;:0,&quot;stop&quot;:54000,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Weekly Hours&quot; },\n { &quot;type&quot;:107,&quot;span&quot;:1,&quot;deep&quot;:8,&quot;column&quot;:1,&quot;order&quot;:0,&quot;program&quot;:&quot;{ round(sort(descend, metrics(Power_Index))[0]); } &quot;,&quot;units&quot;:&quot;%&quot;,&quot;istime&quot;:0,&quot;start&quot;:0,&quot;stop&quot;:150,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Peak Power Index&quot; },\n { &quot;type&quot;:101,&quot;span&quot;:1,&quot;deep&quot;:7,&quot;column&quot;:1,&quot;order&quot;:1,&quot;symbol&quot;:&quot;max_power&quot;,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Max Power&quot; },\n { &quot;type&quot;:101,&quot;span&quot;:1,&quot;deep&quot;:7,&quot;column&quot;:1,&quot;order&quot;:2,&quot;symbol&quot;:&quot;average_power&quot;,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Average Power&quot; },\n { &quot;type&quot;:103,&quot;span&quot;:1,&quot;deep&quot;:9,&quot;column&quot;:1,&quot;order&quot;:3,&quot;series&quot;:10,&quot;polarized&quot;:0,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Power Zones&quot; },\n { &quot;type&quot;:101,&quot;span&quot;:1,&quot;deep&quot;:7,&quot;column&quot;:1,&quot;order&quot;:4,&quot;symbol&quot;:&quot;coggan_tss&quot;,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Total TSS&quot; },\n { &quot;type&quot;:107,&quot;span&quot;:1,&quot;deep&quot;:8,&quot;column&quot;:2,&quot;order&quot;:0,&quot;program&quot;:&quot;{ sum(metrics(Duration)); } &quot;,&quot;units&quot;:&quot;hh:mm:ss&quot;,&quot;istime&quot;:1,&quot;start&quot;:0,&quot;stop&quot;:0,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Total Hours&quot; },\n { &quot;type&quot;:108,&quot;span&quot;:1,&quot;deep&quot;:25,&quot;column&quot;:2,&quot;order&quot;:1,&quot;symbol&quot;:&quot;skiba_wprime_exp&quot;,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Going Hard&quot; },\n { &quot;type&quot;:101,&quot;span&quot;:1,&quot;deep&quot;:7,&quot;column&quot;:2,&quot;order&quot;:2,&quot;symbol&quot;:&quot;skiba_wprime_exp&quot;,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Total W&apos; Work&quot; },\n { &quot;type&quot;:107,&quot;span&quot;:1,&quot;deep&quot;:8,&quot;column&quot;:3,&quot;order&quot;:0,&quot;program&quot;:&quot;{ round((sum(metrics(W&apos;_Work)) \/ sum(metrics(Work))) * 100); } &quot;,&quot;units&quot;:&quot;%&quot;,&quot;istime&quot;:0,&quot;start&quot;:0,&quot;stop&quot;:100,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;W&apos; Ratio&quot; },\n { &quot;type&quot;:107,&quot;span&quot;:1,&quot;deep&quot;:7,&quot;column&quot;:3,&quot;order&quot;:1,&quot;program&quot;:&quot;{ round(max(estimates(cp3,cp))); } &quot;,&quot;units&quot;:&quot;watts&quot;,&quot;istime&quot;:0,&quot;start&quot;:0,&quot;stop&quot;:360,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Peak CP Estimate &quot; },\n { &quot;type&quot;:107,&quot;span&quot;:1,&quot;deep&quot;:7,&quot;column&quot;:3,&quot;order&quot;:2,&quot;program&quot;:&quot;{ round(max(estimates(cp3,w&apos;)\/1000)*10)\/10; } &quot;,&quot;units&quot;:&quot;kJ&quot;,&quot;istime&quot;:0,&quot;start&quot;:0,&quot;stop&quot;:25,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Peak W&apos; Estimate &quot; },\n { &quot;type&quot;:103,&quot;span&quot;:1,&quot;deep&quot;:9,&quot;column&quot;:3,&quot;order&quot;:3,&quot;series&quot;:50,&quot;polarized&quot;:0,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Fatigue Zones&quot; },\n { &quot;type&quot;:101,&quot;span&quot;:1,&quot;deep&quot;:7,&quot;column&quot;:3,&quot;order&quot;:4,&quot;symbol&quot;:&quot;total_work&quot;,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Total Work&quot; },\n { &quot;type&quot;:101,&quot;span&quot;:1,&quot;deep&quot;:8,&quot;column&quot;:4,&quot;order&quot;:0,&quot;symbol&quot;:&quot;coggan_if&quot;,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Intensity Factor&quot; },\n { &quot;type&quot;:108,&quot;span&quot;:1,&quot;deep&quot;:25,&quot;column&quot;:4,&quot;order&quot;:1,&quot;symbol&quot;:&quot;skiba_wprime_low&quot;,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;Going Deep&quot; },\n { &quot;type&quot;:107,&quot;span&quot;:1,&quot;deep&quot;:7,&quot;column&quot;:4,&quot;order&quot;:2,&quot;program&quot;:&quot;{ count(metrics(IF)[x&gt;0.85]); } &quot;,&quot;units&quot;:&quot;activities&quot;,&quot;istime&quot;:0,&quot;start&quot;:0,&quot;stop&quot;:0,&quot;datafilter&quot;:&quot; &quot;,&quot;name&quot;:&quot;IF &gt; 0.85&quot; }\n ]\n}\n" />
</chart>
<chart id="7" name="" title="Tracker" >
<property name="title" type="QString" value="Tracker" />
Expand Down Expand Up @@ -362,3 +356,4 @@
<property name="useSelected" type="int" value="4" />
</chart>
</layout>
</layouts>
4 changes: 3 additions & 1 deletion src/Resources/xml/train-layout.xml → src/Resources/xml/train-perspectives.xml
View file
@@ -1,4 +1,5 @@
<layout name="train" style="2">
<layouts>
<layout name="General" style="2" type="1" expression="">
<chart id="22" name="" title="Power" >
<property name="title" type="QString" value="Power" />
<property name="subtitle" type="QString" value="" />
Expand Down Expand Up @@ -189,3 +190,4 @@
<property name="style" type="int" value="2" />
</chart>
</layout>
</layouts>

0 comments on commit 1f77f08

Please sign in to comment.