[chronojump] Removed circle at end on execute graphs
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Removed circle at end on execute graphs
- Date: Mon, 13 Jun 2016 15:47:17 +0000 (UTC)
commit 8e3a43d2614715706d5699587400e624b52b68a2
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Jun 13 17:41:54 2016 +0200
Removed circle at end on execute graphs
glade/chronojump.glade | 77 ++++++++++++++++++++++++++++++----------
src/gui/eventExecute.cs | 24 +++++--------
src/gui/eventGraphConfigure.cs | 8 ----
3 files changed, 67 insertions(+), 42 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index d43f86f..547f666 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -16529,6 +16529,9 @@ on current Chronojump version.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -21230,6 +21233,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -22412,6 +22418,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24086,6 +24095,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>
@@ -24817,6 +24829,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -30418,21 +30433,6 @@ Eg. value = 2, means person does twice force at half speed.</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_paint_circle">
- <property name="label" translatable="yes">Paint a circle at end</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkCheckButton" id="checkbutton_show_vertical_grid">
<property name="label" translatable="yes">Show grid (on repetitive tests)</property>
<property name="visible">True</property>
@@ -30444,7 +30444,7 @@ Eg. value = 2, means person does twice force at half speed.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -37876,6 +37876,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>
@@ -40567,6 +40585,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>
@@ -41810,9 +41840,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>
@@ -42994,6 +43021,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>
@@ -47062,6 +47092,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>
@@ -47908,6 +47941,9 @@ It starts before and arrives there with some speed.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -48769,6 +48805,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 02a495e..e2e21a4 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -1216,7 +1216,7 @@ public partial class ChronoJumpWindow
count ++;
}
- drawCircleAndWriteValue(pen_azul, myTVDouble, --count, jumps, ancho, alto, maxValue,
minValue, topMargin, bottomMargin);
+ writeValue(pen_azul, myTVDouble, --count, jumps, ancho, alto, maxValue, minValue,
topMargin, bottomMargin);
//read tc evolution
string [] myTCStringFull = tcString.Split(new char[] {'='});
@@ -1238,7 +1238,7 @@ public partial class ChronoJumpWindow
count ++;
}
- drawCircleAndWriteValue(pen_rojo, myTCDouble, --count, jumps, ancho, alto, maxValue,
minValue, topMargin, bottomMargin);
+ writeValue(pen_rojo, myTCDouble, --count, jumps, ancho, alto, maxValue, minValue,
topMargin, bottomMargin);
//draw best tv/tc
@@ -1443,14 +1443,13 @@ public partial class ChronoJumpWindow
//paint Y lines
if(eventGraphConfigureWin.VerticalGrid) {
- if(count == 0 && startIn) {
+ if(count == 0)
event_execute_pixmap.DrawLine(pen_beige_discont,
xStart,
topMargin,
xStart,
alto-topMargin);
- }
-
+
event_execute_pixmap.DrawLine(pen_beige_discont,
xEnd,
topMargin,
@@ -1462,7 +1461,7 @@ public partial class ChronoJumpWindow
count ++;
}
- drawCircleAndWriteValue(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
@@ -1554,7 +1553,7 @@ public partial class ChronoJumpWindow
count ++;
}
- drawCircleAndWriteValue(pen_azul, myTimeDouble, --count, pulses, ancho, alto,
maxValue, minValue, topMargin, bottomMargin);
+ writeValue(pen_azul, myTimeDouble, --count, pulses, ancho, alto, maxValue, minValue,
topMargin, bottomMargin);
plotSimulatedMessageIfNeededAtCenter(ancho, alto);
}
@@ -1759,17 +1758,12 @@ public partial class ChronoJumpWindow
}
- private void drawCircleAndWriteValue (Gdk.GC myPen, double myValue, int count, int total, int ancho,
int alto,
- double maxValue, double minValue, int topMargin, int bottomMargin) {
-
+ private void writeValue (Gdk.GC myPen, double myValue, int count, int total, int ancho, int alto,
+ double maxValue, double minValue, int topMargin, int bottomMargin)
+ {
//write text
layoutSmall.SetMarkup((Math.Round(myValue,3)).ToString());
event_execute_pixmap.DrawLayout (myPen, ancho -event_execute_rightMargin,
(int)calculatePaintHeight(myValue, alto, maxValue, minValue, topMargin, bottomMargin) -7, layoutSmall); //-7
for aligning (is baseline) (font is Courier 7)
-
- if(eventGraphConfigureWin.PaintCircle) {
- //put circle in last value
- event_execute_pixmap.DrawArc(myPen, true, Convert.ToInt32((ancho -
event_execute_rightMargin) *(count+.5)/total) - event_execute_radio/2 + event_execute_arcSystemCorrection,
calculatePaintHeight(myValue, alto, maxValue, minValue, topMargin, bottomMargin) - event_execute_radio/2,
event_execute_radio, event_execute_radio, 0, 360*64);
- }
}
diff --git a/src/gui/eventGraphConfigure.cs b/src/gui/eventGraphConfigure.cs
index 733b956..d939bc0 100644
--- a/src/gui/eventGraphConfigure.cs
+++ b/src/gui/eventGraphConfigure.cs
@@ -48,7 +48,6 @@ public class EventGraphConfigureWindow
[Widget] Gtk.SpinButton spinbutton_black_guide;
[Widget] Gtk.SpinButton spinbutton_green_guide;
- [Widget] Gtk.CheckButton checkbutton_paint_circle;
[Widget] Gtk.CheckButton checkbutton_show_vertical_grid;
[Widget] Gtk.RadioButton radiobutton_speed;
@@ -90,7 +89,6 @@ public class EventGraphConfigureWindow
checkbutton_show_black_guide.Active = false;
checkbutton_show_green_guide.Active = false;
- checkbutton_paint_circle.Active = true;
checkbutton_show_vertical_grid.Active = true;
spinbutton_black_guide.Sensitive = false;
spinbutton_green_guide.Sensitive = false;
@@ -182,12 +180,6 @@ public class EventGraphConfigureWindow
}
}
- public bool PaintCircle {
- get {
- return (checkbutton_paint_circle.Active);
- }
- }
-
public bool VerticalGrid {
get {
return (checkbutton_show_vertical_grid.Active);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
