[chronojump] Improvements on runInterval capture graph
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Improvements on runInterval capture graph
- Date: Tue, 14 Jun 2016 15:53:25 +0000 (UTC)
commit 9c77833a76d0ea8d1028dc127d42ea78d4c5d1a3
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jun 14 17:49:52 2016 +0200
Improvements on runInterval capture graph
glade/chronojump.glade | 96 +++++++++++++++++++++++++++++++++++++++++++++--
src/gui/eventExecute.cs | 76 ++++++++++++++++++++++++++-----------
2 files changed, 145 insertions(+), 27 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 547f666..cbe4b96 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -7873,7 +7873,7 @@ after time</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">3</property>
- <property name="n_columns">2</property>
+ <property name="n_columns">3</property>
<property name="column_spacing">4</property>
<property name="row_spacing">4</property>
<property name="homogeneous">True</property>
@@ -7965,6 +7965,40 @@ after time</property>
<property name="y_options"/>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label151">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Total</property>
+ <property name="justify">center</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_EXPAND</property>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="event_execute_label_run_interval_time_total">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="justify">center</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"/>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -16532,6 +16566,9 @@ on current Chronojump version.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -21236,6 +21273,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -22421,6 +22461,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24098,6 +24141,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -24832,6 +24878,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -37894,6 +37943,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -40597,6 +40664,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -41837,9 +41916,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<widget class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -43024,6 +43100,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -47095,6 +47174,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -47944,6 +48026,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -48808,6 +48893,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 0407863..b79c531 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -91,6 +91,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label event_execute_label_run_interval_time_now;
[Widget] Gtk.Label event_execute_label_run_interval_time_avg;
+ [Widget] Gtk.Label event_execute_label_run_interval_time_total;
[Widget] Gtk.Label event_execute_label_run_interval_speed_now;
[Widget] Gtk.Label event_execute_label_run_interval_speed_avg;
@@ -355,6 +356,7 @@ public partial class ChronoJumpWindow
//initializeLabels
event_execute_label_run_interval_time_now.Text = "";
event_execute_label_run_interval_time_avg.Text = "";
+ event_execute_label_run_interval_time_total.Text = "";
event_execute_label_run_interval_speed_now.Text = "";
event_execute_label_run_interval_speed_avg.Text = "";
@@ -702,7 +704,7 @@ public partial class ChronoJumpWindow
//search min
double minValue = 1000;
- int bottomMargin = 0;
+ int bottomMargin = 20;
//if min value of graph is automatic
if(eventGraphConfigureWin.Min == -1) {
if(startIn)
@@ -1174,7 +1176,7 @@ public partial class ChronoJumpWindow
UtilGtk.ErasePaint(event_execute_drawingarea, event_execute_pixmap);
- writeMarginsText(maxValue, minValue, alto);
+ writeMarginsText(maxValue, minValue, alto, "");
//check now here that we will have not division by zero problems
if(maxValue - minValue > 0) {
@@ -1368,24 +1370,31 @@ public partial class ChronoJumpWindow
UtilGtk.ErasePaint(event_execute_drawingarea, event_execute_pixmap);
- writeMarginsText(maxValue, minValue, alto);
+ writeMarginBottom(minValue, alto, " m/s", bottomMargin, ancho);
int lWidth = 1;
int lHeight = 1;
+
+ double timeTotal = Util.GetTotalTime(timesString);
//check now here that we will have not division by zero problems
if(maxValue - minValue > 0)
{
+ /*
+ * removed avg line and value.
+ * value will be on the table at bottom
+ * also check distance/avgTime is the right value
+ *
if(tracks > 1) {
//blue speed average discountinuos line
drawGuideOrAVG(pen_azul_discont, distance/avgTime, alto, ancho, topMargin,
bottomMargin, maxValue, minValue);
}
+ */
//paint reference guide black and green if needed
drawGuideOrAVG(pen_black_discont, eventGraphConfigureWin.BlackGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
drawGuideOrAVG(pen_green_discont, eventGraphConfigureWin.GreenGuide, alto, ancho,
topMargin, bottomMargin, maxValue, minValue);
- double timeTotal = Util.GetTotalTime(timesString);
string [] myTimesStringFull = timesString.Split(new char[] {'='});
int count = 0;
int added0Value = 0;
@@ -1433,18 +1442,32 @@ public partial class ChronoJumpWindow
if(count == 0 && startIn) {
event_execute_pixmap.DrawLine(myPen,
xStart,
- //calculatePaintHeight(0, alto, maxValue, minValue,
topMargin, bottomMargin),
- alto,
+ alto-bottomMargin,
xEnd,
calculatePaintHeight(myValue, alto, maxValue,
minValue, topMargin, bottomMargin));
}
- else
+ else if(myDistance != 0) //on RSA don't plot speed on the rest phase
event_execute_pixmap.DrawLine(myPen,
xStart,
calculatePaintHeight(oldValue, alto, maxValue,
minValue, topMargin, bottomMargin),
xEnd,
calculatePaintHeight(myValue, alto, maxValue,
minValue, topMargin, bottomMargin));
+ if(myDistance > 0) { //on RSA don't plot speed on the rest phase
+ layoutSmall.SetMarkup((Math.Round(myValue,2)).ToString() + " m/s");
+ layoutSmall.GetPixelSize(out lWidth, out lHeight);
+ event_execute_pixmap.DrawLayout (pen_black, ((xStart + xEnd)/2)
-lWidth/2, 10, layoutSmall);
+ }
+
+ layoutSmall.SetMarkup((Math.Round(myDistance,1)).ToString() + " m");
+ layoutSmall.GetPixelSize(out lWidth, out lHeight);
+ event_execute_pixmap.DrawLayout (pen_black, ((xStart + xEnd)/2) -lWidth/2,
alto -10, layoutSmall);
+
+ layoutSmall.SetMarkup((Math.Round(myTimeDouble,2)).ToString() + " s");
+ layoutSmall.GetPixelSize(out lWidth, out lHeight);
+ event_execute_pixmap.DrawLayout (pen_black, xEnd -lWidth/2, alto -18,
layoutSmall);
+
+
//paint Y lines
if(eventGraphConfigureWin.VerticalGrid) {
if(count == 0)
@@ -1461,19 +1484,11 @@ public partial class ChronoJumpWindow
alto-topMargin);
}
- layoutSmall.SetMarkup((Math.Round(myDistance,1)).ToString() + "m");
- layoutSmall.GetPixelSize(out lWidth, out lHeight);
- event_execute_pixmap.DrawLayout (pen_black, ((xStart+ xEnd)/2) -lWidth/2,
alto -20, layoutSmall);
-
- layoutSmall.SetMarkup((Math.Round(myTimeDouble,2)).ToString() + "s");
- layoutSmall.GetPixelSize(out lWidth, out lHeight);
- event_execute_pixmap.DrawLayout (pen_black, ((xStart+ xEnd)/2) -lWidth/2,
alto -10, layoutSmall);
-
oldValue = myValue;
count ++;
}
- writeValue(myPen, myValue, (--count) + added0Value, tracks, ancho, alto, maxValue,
minValue, topMargin, bottomMargin);
+ //writeValue(myPen, myValue, (--count) + added0Value, tracks, ancho, alto, maxValue,
minValue, topMargin, bottomMargin);
//bells & images
@@ -1509,12 +1524,11 @@ public partial class ChronoJumpWindow
event_execute_label_run_interval_time_now.Text = "<b>" +
Util.TrimDecimals(lastTime.ToString(), preferences.digitsNumber) + "</b>";
event_execute_label_run_interval_time_now.UseMarkup = true;
-
event_execute_label_run_interval_time_avg.Text = Util.TrimDecimals(avgTime.ToString(),
preferences.digitsNumber);
+ event_execute_label_run_interval_time_total.Text = Util.TrimDecimals(timeTotal.ToString(),
preferences.digitsNumber);
event_execute_label_run_interval_speed_now.Text = "<b>" + Util.TrimDecimals((distance /
lastTime).ToString(), preferences.digitsNumber) + "</b>";
event_execute_label_run_interval_speed_now.UseMarkup = true;
-
event_execute_label_run_interval_speed_avg.Text = Util.TrimDecimals((distanceTotal /
Util.GetTotalTime(timesString)).ToString(), preferences.digitsNumber);
}
@@ -1527,7 +1541,7 @@ public partial class ChronoJumpWindow
UtilGtk.ErasePaint(event_execute_drawingarea, event_execute_pixmap);
- writeMarginsText(maxValue, minValue, alto);
+ writeMarginsText(maxValue, minValue, alto, "");
//check now here that we will have not division by zero problems
if(maxValue - minValue > 0) {
@@ -1799,15 +1813,31 @@ public partial class ChronoJumpWindow
return Convert.ToInt32(alto - bottomMargin - ((currentValue - minValue) * (alto - topMargin -
bottomMargin) / (maxValue - minValue)));
}
- private void writeMarginsText(double maxValue, double minValue, int alto) {
+ private void writeMarginsText(double maxValue, double minValue, int alto, string units)
+ {
//write margins textual data
- layoutSmall.SetMarkup((Math.Round(maxValue, 3)).ToString());
+ layoutSmall.SetMarkup((Math.Round(maxValue, 3)).ToString() + units);
event_execute_pixmap.DrawLayout (pen_gris, 0, 0, layoutSmall);
//event_execute_pixmap.DrawLayout (pen_gris, 0, 3, layoutSmall); //y to 3 (not 0) probably
this solves rando Pango problems where this is not written and interface gets "clumsy"
- layoutSmall.SetMarkup((Math.Round(minValue, 3)).ToString());
- event_execute_pixmap.DrawLayout (pen_gris, 0, alto -10, layoutSmall); //don't search Y using
alto - bottomMargin, because bottomMargin can be 0,
+
+ int y = alto - 10;
+ layoutSmall.SetMarkup((Math.Round(minValue, 3)).ToString() + units);
+ event_execute_pixmap.DrawLayout (pen_gris, 0, y, layoutSmall); //don't search Y using alto -
bottomMargin, because bottomMargin can be 0,
//and text goes down from the
baseline, and will not be seen
}
+
+ //better than above method
+ private void writeMarginBottom(double minValue, int alto, string units, int bottomMargin, int ancho)
+ {
+ int y = alto - (bottomMargin + 10/2);
+ layoutSmall.SetMarkup((Math.Round(minValue, 3)).ToString() + units);
+ event_execute_pixmap.DrawLayout (pen_gris, 0, y, layoutSmall);
+
+ //draw a line below
+ event_execute_pixmap.DrawLine(pen_gris,
+ event_execute_rightMargin, alto-bottomMargin,
+ ancho - event_execute_rightMargin-2, alto-bottomMargin);
+ }
private void hideButtons() {
event_execute_button_cancel.Sensitive = false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
