Commit 03c71ee1 authored by Xavier de Blas's avatar Xavier de Blas

finished presentation of stats, closed task 295

added enunciate (comments) to all stats and graphs

decimals number in CSV and report set to 4

improved presentation of report, improved css
added report_web_style.css
added chronojump_logo.png

TODO: solve how chronojump_logo.png and report_web_style.css go to .chronojump dir in the installation of chronojump.
parent 2355827e
CHANGELOG:
21 set 2005
finished presentation of stats, closed task 295
added enunciate (comments) to all stats and graphs
decimals number in CSV and report set to 4
improved presentation of report, improved css
added report_web_style.css
added chronojump_logo.png
TODO: solve how chronojump_logo.png and report_web_style.css go to
.chronojump dir in the installation of chronojump.
20 set 2005
report prints session, persons, all jumps and runs
report to UTF-8 solved latin char problems
......
No preview for this file type
......@@ -76,7 +76,7 @@
<signal name="activate" handler="on_open_activate" last_modification_time="Wed, 22 Sep 2004 23:55:11 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1218">
<widget class="GtkImage" id="image1243">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
......@@ -97,7 +97,7 @@
<signal name="activate" handler="on_edit_session_activate" last_modification_time="Tue, 26 Jul 2005 19:12:07 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1219">
<widget class="GtkImage" id="image1244">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
......@@ -119,7 +119,7 @@
<signal name="activate" handler="on_delete_session_activate" last_modification_time="Thu, 28 Jul 2005 13:37:42 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1220">
<widget class="GtkImage" id="image1245">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -146,7 +146,7 @@
<signal name="activate" handler="on_export_session_activate" last_modification_time="Sat, 12 Feb 2005 21:57:07 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1221">
<widget class="GtkImage" id="image1246">
<property name="visible">True</property>
<property name="stock">gtk-convert</property>
<property name="icon_size">1</property>
......@@ -217,7 +217,7 @@
<signal name="activate" handler="on_person_add_single_activate" last_modification_time="Thu, 18 Aug 2005 23:07:39 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1222">
<widget class="GtkImage" id="image1247">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
......@@ -238,7 +238,7 @@
<signal name="activate" handler="on_person_add_multiple_activate" last_modification_time="Thu, 18 Aug 2005 23:01:23 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1223">
<widget class="GtkImage" id="image1248">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
......@@ -265,7 +265,7 @@
<signal name="activate" handler="on_recuperate_person_activate" last_modification_time="Sun, 12 Dec 2004 00:40:31 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1224">
<widget class="GtkImage" id="image1249">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
......@@ -286,7 +286,7 @@
<signal name="activate" handler="on_recuperate_persons_from_session_activate" last_modification_time="Tue, 26 Jul 2005 19:12:07 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1225">
<widget class="GtkImage" id="image1250">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
......@@ -313,7 +313,7 @@
<signal name="activate" handler="on_edit_current_person_clicked" last_modification_time="Sun, 17 Oct 2004 11:43:33 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1226">
<widget class="GtkImage" id="image1251">
<property name="visible">True</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon_size">1</property>
......@@ -334,7 +334,7 @@
<signal name="activate" handler="on_show_all_person_events_activate" last_modification_time="Mon, 29 Aug 2005 09:51:24 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1227">
<widget class="GtkImage" id="image1252">
<property name="visible">True</property>
<property name="stock">gtk-index</property>
<property name="icon_size">1</property>
......@@ -361,7 +361,7 @@
<signal name="activate" handler="on_delete_current_person_from_session_activate" last_modification_time="Thu, 28 Jul 2005 15:49:38 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1228">
<widget class="GtkImage" id="image1253">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -449,7 +449,7 @@
<signal name="activate" handler="on_button_more_clicked" last_modification_time="Thu, 10 Mar 2005 18:52:25 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1229">
<widget class="GtkImage" id="image1254">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
......@@ -474,7 +474,7 @@
<signal name="activate" handler="on_edit_selected_jump_clicked" last_modification_time="Sun, 17 Oct 2004 11:47:42 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1230">
<widget class="GtkImage" id="image1255">
<property name="visible">True</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon_size">1</property>
......@@ -495,7 +495,7 @@
<signal name="activate" handler="on_delete_selected_jump_clicked" last_modification_time="Tue, 19 Oct 2004 11:54:17 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1231">
<widget class="GtkImage" id="image1256">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -559,7 +559,7 @@
<signal name="activate" handler="on_button_more_rj_clicked" last_modification_time="Fri, 11 Mar 2005 14:45:23 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1232">
<widget class="GtkImage" id="image1257">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
......@@ -584,7 +584,7 @@
<signal name="activate" handler="on_edit_selected_jump_rj_clicked" last_modification_time="Sun, 07 Nov 2004 17:37:37 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1233">
<widget class="GtkImage" id="image1258">
<property name="visible">True</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon_size">1</property>
......@@ -605,7 +605,7 @@
<signal name="activate" handler="on_delete_selected_jump_rj_clicked" last_modification_time="Sun, 07 Nov 2004 17:37:37 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1234">
<widget class="GtkImage" id="image1259">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -632,7 +632,7 @@
<signal name="activate" handler="on_jump_type_add_activate" last_modification_time="Thu, 10 Mar 2005 18:52:25 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1235">
<widget class="GtkImage" id="image1260">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
......@@ -738,7 +738,7 @@
<signal name="activate" handler="on_button_run_more_clicked" last_modification_time="Fri, 22 Apr 2005 14:37:06 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1236">
<widget class="GtkImage" id="image1261">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
......@@ -763,7 +763,7 @@
<signal name="activate" handler="on_edit_selected_run_clicked" last_modification_time="Fri, 22 Apr 2005 14:34:58 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1237">
<widget class="GtkImage" id="image1262">
<property name="visible">True</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon_size">1</property>
......@@ -784,7 +784,7 @@
<signal name="activate" handler="on_delete_selected_run_clicked" last_modification_time="Fri, 22 Apr 2005 14:34:58 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1238">
<widget class="GtkImage" id="image1263">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -847,7 +847,7 @@
<signal name="activate" handler="on_button_run_interval_more_clicked" last_modification_time="Tue, 16 Aug 2005 01:18:41 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1239">
<widget class="GtkImage" id="image1264">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
......@@ -872,7 +872,7 @@
<signal name="activate" handler="on_edit_selected_run_interval_clicked" last_modification_time="Tue, 16 Aug 2005 12:33:39 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1240">
<widget class="GtkImage" id="image1265">
<property name="visible">True</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon_size">1</property>
......@@ -893,7 +893,7 @@
<signal name="activate" handler="on_delete_selected_run_interval_clicked" last_modification_time="Tue, 16 Aug 2005 12:33:39 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1241">
<widget class="GtkImage" id="image1266">
<property name="visible">True</property>
<property name="stock">gtk-remove</property>
<property name="icon_size">1</property>
......@@ -920,7 +920,7 @@
<signal name="activate" handler="on_run_type_add_activate" last_modification_time="Fri, 22 Apr 2005 14:34:58 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1242">
<widget class="GtkImage" id="image1267">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
......@@ -946,11 +946,23 @@
<widget class="GtkMenu" id="menu_view_menu">
<child>
<widget class="GtkMenuItem" id="menuitem_view_stats">
<widget class="GtkImageMenuItem" id="menuitem_view_stats">
<property name="visible">True</property>
<property name="label" translatable="yes">Stats window</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menuitem_view_stats_activate" last_modification_time="Tue, 26 Jul 2005 23:54:29 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1268">
<property name="visible">True</property>
<property name="stock">gtk-select-color</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
......@@ -962,7 +974,7 @@
<signal name="activate" handler="on_show_report_activate" last_modification_time="Tue, 06 Sep 2005 09:10:32 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1243">
<widget class="GtkImage" id="image1269">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
......@@ -1900,6 +1912,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_sort_by_type">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">sort by type or by jump date</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">by type</property>
<property name="use_underline">True</property>
......@@ -2392,6 +2405,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_sort_by_type_rj">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">sort by type or by jump date</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">by type</property>
<property name="use_underline">True</property>
......@@ -2923,6 +2937,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_sort_by_type_run">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">sort by type or by run date</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">by type</property>
<property name="use_underline">True</property>
......@@ -3415,6 +3430,7 @@
<child>
<widget class="GtkCheckButton" id="checkbutton_sort_by_type_run_interval">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">sort by type or by run date</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">by type</property>
<property name="use_underline">True</property>
......@@ -7379,7 +7395,7 @@ options</property>
<widget class="GtkWindow" id="stats_window">
<property name="border_width">10</property>
<property name="height_request">480</property>
<property name="height_request">500</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Chronojump Statistics window</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
......@@ -7815,7 +7831,7 @@ best's</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal name="clicked" handler="on_checkbutton_show_enunciate_clicked" last_modification_time="Mon, 08 Nov 2004 03:47:53 GMT"/>
......@@ -8288,7 +8304,7 @@ best's</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow_enunciate">
<property name="height_request">40</property>
<property name="height_request">36</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
......
/* CSS Document */
body {
color: #444;
background: #fff;
position: relative;
margin: 20px;
font-family: verdana, trebuchet ms,luxi sans,sans-serif;
/*font-size: x-small;*/
font-size: small;
text-align: left;
}
h1 {
color: #666666;
clear: both;
font-size:16pt;
}
h2 {
color: #556a80;
clear: both;
font-size:14pt;
}
table {
background-color:ffffff;
border-style:solid;
border-color:666666;
border-width:1px;
}
.empty {
border-width:0px;
}
th {
background-color:ddeeff;
color:333333;
font-weight:bold;
font-size:10pt;
}
td {
font-family:verdana,arial;
font-size:8pt;
}
td > h2 {
font-family: verdana, trebuchet ms,luxi sans,sans-serif;
font-size:14pt;
}
#footer {
position: relative;
text-align: right;
}
......@@ -403,6 +403,7 @@ public class ChronoJump
report.PrefsDigitsNumber = prefsDigitsNumber;
report.HeightPreferred = heightPreferred;
report.WeightStatsPercent = weightStatsPercent;
report.Progversion = progversion;
Console.WriteLine ( Catalog.GetString ("Preferences loaded") );
......
......@@ -146,7 +146,7 @@ public class ExportSession
}
protected void printSessionInfo()
protected virtual void printSessionInfo()
{
ArrayList myData = new ArrayList(2);
myData.Add( "\n" +
......@@ -158,9 +158,10 @@ public class ExportSession
myData.Add ( mySession.UniqueID + ":" + mySession.Name + ":" +
mySession.Place + ":" + mySession.Date + ":" + mySession.Comments );
writeData(myData);
writeData("VERTICAL-SPACE");
}
protected void printJumpers()
protected virtual void printJumpers()
{
ArrayList myData = new ArrayList(1);
myData.Add ( "\n" + Catalog.GetString ("ID") + ":" + Catalog.GetString ("Name"));
......@@ -170,42 +171,50 @@ public class ExportSession
myData.Add(myStr[0] + ":" + myStr[1]); //person.id, person.name
}
writeData(myData);
writeData("VERTICAL-SPACE");
}
protected void printJumps()
{
ArrayList myData = new ArrayList(1);
myData.Add( "\n" +
Catalog.GetString("Jumper name") + ":" +
Catalog.GetString("jump ID") + ":" +
Catalog.GetString("Type") + ":" +
"TV:" +
"TC:" +
Catalog.GetString("Fall") + ":" +
Catalog.GetString("Weight") + ":" +
Catalog.GetString("Height") + ":" +
Catalog.GetString("Initial Speed") + ":" +
Catalog.GetString("Description") );
int dec=4; //decimals
foreach (string jumpString in myJumps) {
string [] myStr = jumpString.Split(new char[] {':'});
myData.Add (
myStr[0] + ":" + myStr[1] + ":" + //person.name, jump.uniqueID
//myStr[2] + ":" + myStr[3] + ":" + //jump.personID, jump.sessionID
myStr[4] + ":" + myStr[5] + ":" + //jump.type, jump.tv
myStr[6] + ":" + myStr[7] + ":" + //jump.tc, jump.fall
myStr[8] + ":" + //jump.weight,
Util.GetHeightInCentimeters(myStr[5]) + ":" +
Util.GetInitialSpeed(myStr[5]) + ":" +
myStr[9] //jump.description
);
if(myJumps.Length > 0) {
ArrayList myData = new ArrayList(1);
myData.Add( "\n" +
Catalog.GetString("Jumper name") + ":" +
Catalog.GetString("jump ID") + ":" +
Catalog.GetString("Type") + ":" +
"TC:" +
"TV:" +
Catalog.GetString("Fall") + ":" +
Catalog.GetString("Weight") + ":" +
Catalog.GetString("Height") + ":" +
Catalog.GetString("Initial Speed") + ":" +
Catalog.GetString("Description") );
foreach (string jumpString in myJumps) {
string [] myStr = jumpString.Split(new char[] {':'});
myData.Add (
myStr[0] + ":" + myStr[1] + ":" + //person.name, jump.uniqueID
//myStr[2] + ":" + myStr[3] + ":" + //jump.personID, jump.sessionID
myStr[4] + ":" + Util.TrimDecimals(myStr[6], dec) + ":" + //jump.type, jump.tc
Util.TrimDecimals(myStr[5], dec) + ":" + myStr[7] + ":" + //jump.tv, jump.fall
myStr[8] + ":" + //jump.weight,
Util.TrimDecimals(Util.GetHeightInCentimeters(myStr[5]), dec) + ":" +
Util.TrimDecimals(Util.GetInitialSpeed(myStr[5]), dec) + ":" +
myStr[9] //jump.description
);
}
writeData(myData);
writeData("VERTICAL-SPACE");
}
writeData(myData);
}
protected void printJumpsRj()
{
int dec=4; //decimals
foreach (string jump in myJumpsRj) {
ArrayList myData = new ArrayList(1);
......@@ -226,24 +235,25 @@ public class ExportSession
Catalog.GetString("Jumps") + ":" +
Catalog.GetString("Time") + ":" +
Catalog.GetString("Limited") + ":" +
Catalog.GetString("Description" ) );
Catalog.GetString("Description" )
);
string [] myStr = jump.Split(new char[] {':'});
myData.Add (
myData.Add ( "\n" +
myStr[0] + ":" + myStr[1] + ":" + //person.name, jumpRj.uniqueID
//myStr[2] + ":" + myStr[3] + ":" + //jumpRj.personID, jumpRj.sessionID
myStr[4] + ":" + //jumpRj.type
myStr[6] + ":" + //jumpRj.tcMax
myStr[5] + ":" + //jumpRj.tvMax
Util.GetHeightInCentimeters(myStr[5]) + ":" + //Max height
Util.GetInitialSpeed(myStr[5]) + ":" + //Max initial speed
myStr[11] + ":" + //jumpRj.tcAvg
myStr[10] + ":" + //jumpRj.tvAvg
Util.GetHeightInCentimeters(myStr[10]) + ":" + //Avg height
Util.GetInitialSpeed(myStr[10]) + ":" + //Avg Initial speed
Util.TrimDecimals(myStr[6], dec) + ":" + //jumpRj.tcMax
Util.TrimDecimals(myStr[5], dec) + ":" + //jumpRj.tvMax
Util.TrimDecimals(Util.GetHeightInCentimeters(myStr[5]), dec) + ":" + //Max height
Util.TrimDecimals(Util.GetInitialSpeed(myStr[5]), dec) + ":" + //Max initial speed
Util.TrimDecimals(myStr[11], dec) + ":" + //jumpRj.tcAvg
Util.TrimDecimals(myStr[10], dec) + ":" + //jumpRj.tvAvg
Util.TrimDecimals(Util.GetHeightInCentimeters(myStr[10]), dec) + ":" + //Avg height
Util.TrimDecimals(Util.GetInitialSpeed(myStr[10]), dec) + ":" + //Avg Initial speed
myStr[7] + ":" + //jumpRj.Fall
myStr[8] + ":" + myStr[14] + ":" + //jumpRj.Weight, jumpRj.Jumps
myStr[15] + ":" + myStr[16] + ":" + //jumpRj.Time, jumpRj.Limited
Util.TrimDecimals(myStr[15], dec) + ":" + myStr[16] + ":" + //jumpRj.Time, jumpRj.Limited
myStr[9] //jumpRj.Description
);
......@@ -253,9 +263,11 @@ public class ExportSession
string [] tvString = myStr[12].Split(new char[] {'='});
string [] tcString = myStr[13].Split(new char[] {'='});
int count = 0;
myData.Add( Catalog.GetString ( "TV:TC" ) );
myData.Add( Catalog.GetString("Count") + ":TC:TV" );
foreach(string myTv in tvString) {
myData.Add(myTv + ":" + tcString[count]);
myData.Add((count+1).ToString() + ":" +
Util.TrimDecimals(tcString[count], dec) + ":" +
Util.TrimDecimals(myTv, dec));
count ++;
}
writeData(myData);
......@@ -265,31 +277,39 @@ public class ExportSession
protected void printRuns()
{
ArrayList myData = new ArrayList(1);
myData.Add( "\n" +
Catalog.GetString("Runner name") + ":" +
Catalog.GetString("run ID") + ":" +
Catalog.GetString("Type") + ":" +
Catalog.GetString("Distance") + ":" +
Catalog.GetString("Time") + ":" +
Catalog.GetString("Speed") + ":" +
Catalog.GetString("Description") );
int dec=4; //decimals
foreach (string runString in myRuns) {
string [] myStr = runString.Split(new char[] {':'});
myData.Add (
myStr[0] + ":" + myStr[1] + ":" + //person.name, run.uniqueID
myStr[4] + ":" + myStr[5] + ":" + //run.type, run.distance
myStr[6] + ":" + Util.GetSpeed(myStr[5], myStr[6]) + ":" + //run.time, speed
myStr[7] //run.description
);
if(myRuns.Length > 0) {
ArrayList myData = new ArrayList(1);
myData.Add( "\n" +
Catalog.GetString("Runner name") + ":" +
Catalog.GetString("run ID") + ":" +
Catalog.GetString("Type") + ":" +
Catalog.GetString("Distance") + ":" +
Catalog.GetString("Time") + ":" +
Catalog.GetString("Speed") + ":" +
Catalog.GetString("Description") );
foreach (string runString in myRuns) {
string [] myStr = runString.Split(new char[] {':'});
myData.Add (
myStr[0] + ":" + myStr[1] + ":" + //person.name, run.uniqueID
myStr[4] + ":" + myStr[5] + ":" + //run.type, run.distance
Util.TrimDecimals(myStr[6], dec) + ":" + //run.time
Util.TrimDecimals(Util.GetSpeed(myStr[5], myStr[6]), dec) + ":" + //speed
myStr[7] //run.description
);
}
writeData(myData);
writeData("VERTICAL-SPACE");
}
writeData(myData);
}
protected void printRunsInterval()
{
int dec=4; //decimals
foreach (string runString in myRunsInterval) {
ArrayList myData = new ArrayList(1);
......@@ -309,9 +329,9 @@ public class ExportSession
string [] myStr = runString.Split(new char[] {':'});
myData.Add (
myStr[0] + ":" + myStr[1] + ":" + //person.name, run.uniqueID
myStr[4] + ":" + myStr[5] + ":" + //run.type, run.distancetotal
myStr[6] + ":" + //run.timetotal
Util.GetSpeed(myStr[5], myStr[6]) + ":" + //speed AVG
myStr[4] + ":" + Util.TrimDecimals(myStr[5], dec) + ":" + //run.type, run.distancetotal
Util.TrimDecimals(myStr[6], dec) + ":" + //run.timetotal
Util.TrimDecimals(Util.GetSpeed(myStr[5], myStr[6]), dec) + ":" + //speed AVG
myStr[7] + ":" + //run.distanceInterval
myStr[9] + ":" + myStr[11] + ":" + //tracks, limited
myStr[10] //description
......@@ -321,9 +341,15 @@ public class ExportSession
myData = new ArrayList(1);
//print intervalTimesString
string [] timeString = myStr[8].Split(new char[] {'='});
myData.Add( Catalog.GetString ( "Interval speed:interval times" ) );
myData.Add( Catalog.GetString ("Count") + ":" +
Catalog.GetString ("Interval speed") + ":" +
Catalog.GetString("interval times") );
int count = 1;
foreach(string myTime in timeString) {
myData.Add(Util.GetSpeed(myStr[7], myTime) + ":" + myTime);
myData.Add((count++).ToString() + ":" +
Util.TrimDecimals(Util.GetSpeed(myStr[7], myTime), dec) + ":" +
Util.TrimDecimals(myTime, dec)
);
}
writeData(myData);
writeData("VERTICAL-SPACE");
......@@ -365,69 +391,6 @@ public class ExportSessionCSV : ExportSession
//do nothing
}
/*
protected override void printRuns()
{
writer.WriteLine( "\n" + Catalog.GetString ( "Normal Runs" ) );
writer.WriteLine( "\n" +
Catalog.GetString("Runner name") + ", " +
Catalog.GetString("run ID") + ", " +
Catalog.GetString("Type") + ", " +
Catalog.GetString("Distance") + ", " +
Catalog.GetString("Time") + ", " +
Catalog.GetString("Speed") + ", " +
Catalog.GetString("Description") );
foreach (string runString in myRuns) {
string [] myStr = runString.Split(new char[] {':'});
writer.WriteLine ("{0}, {1}, {2}, {3}, {4}, {5}",
myStr[0], myStr[1], //person.name, run.uniqueID
myStr[4], myStr[5], //run.type, run.distance
myStr[6], Util.GetSpeed(myStr[5], myStr[6]), //run.time, speed
myStr[7] //run.description
);
}
}
protected override void printRunsInterval()
{
writer.WriteLine( "\n" + Catalog.GetString ( "Interval Runs" ) );
writer.WriteLine( "\n" +
Catalog.GetString("Runner name") + ", " +
Catalog.GetString("run ID") + ", " +
Catalog.GetString("Type") + ", " +
Catalog.GetString("Distance total") + ", " +
Catalog.GetString("Time total") + ", " +
Catalog.GetString("Average speed") + ", " +
Catalog.GetString("Distance interval") + ", " +
Catalog.GetString("Tracks") + ", " +
Catalog.GetString("Limited") + ", " +
Catalog.GetString("Description") );
foreach (string runString in myRunsInterval) {
string [] myStr = runString.Split(new char[] {':'});
writer.WriteLine ("{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}",
myStr[0], myStr[1], //person.name, run.uniqueID
myStr[4], myStr[5], //run.type, run.distancetotal
myStr[6], //run.timetotal,
Util.GetSpeed(myStr[5], myStr[6]), //speed AVG
myStr[7], //run.distanceInterval
myStr[9], myStr[11], //tracks, limited
myStr[10] //description
);
//print intervalTimesString
string [] timeString = myStr[8].Split(new char[] {'='});
writer.WriteLine( Catalog.GetString ( "Interval speed, interval times" ) );
foreach(string myTime in timeString) {
writer.WriteLine("{0}, {1}", Util.GetSpeed(myStr[7], myTime), myTime);
}
}
}
*/
protected override void printFooter()
{
Console.WriteLine( "Correctly exported" );
......
......@@ -139,8 +139,8 @@ public class StatsWindow {
updateComboStats();
textview_enunciate.Hide();
scrolledwindow_enunciate.Hide();
//textview_enunciate.Hide();
//scrolledwindow_enunciate.Hide();
}
......@@ -356,14 +356,11 @@ public class StatsWindow {
bool allFine = myStatType.ChooseStat();
/*
//show enunciate of the stat in textview_enunciate
TextBuffer tb = new TextBuffer (new TextTagTable());
tb.SetText(myStat.ToString());
tb.SetText(myStatType.Enunciate);
textview_enunciate.Buffer = tb;
//all was fine
*/