[chronojump] On Run interval capture show Start/End dinamically
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] On Run interval capture show Start/End dinamically
- Date: Tue, 23 Jul 2019 15:05:45 +0000 (UTC)
commit a4194ae94cd3f5e54fd597ae08cd8e9519c361a9
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Jul 23 17:05:13 2019 +0200
On Run interval capture show Start/End dinamically
src/execute/run.cs | 4 ++--
src/gui/eventExecute.cs | 61 ++++++++++++++++++++++++++----------------------
src/gui/usefulObjects.cs | 4 +++-
3 files changed, 38 insertions(+), 31 deletions(-)
---
diff --git a/src/execute/run.cs b/src/execute/run.cs
index 92b4c89b..2893a8ec 100644
--- a/src/execute/run.cs
+++ b/src/execute/run.cs
@@ -967,7 +967,7 @@ public class RunIntervalExecute : RunExecute
//update graph
PrepareEventGraphRunIntervalObject = new PrepareEventGraphRunInterval(
distanceIntervalFixed, trackTime, intervalTimesString,
- distanceTotal, distancesString, startIn);
+ distanceTotal, distancesString, startIn, success);
needUpdateGraphType = eventType.RUNINTERVAL;
needUpdateGraph = true;
@@ -1201,7 +1201,7 @@ public class RunIntervalExecute : RunExecute
PrepareEventGraphRunIntervalObject = new PrepareEventGraphRunInterval(
distanceIntervalFixed, Util.GetLast(intervalTimesString),
- intervalTimesString, distanceTotal, distancesString, startIn);
+ intervalTimesString, distanceTotal, distancesString, startIn, true);
needUpdateGraphType = eventType.RUNINTERVAL;
needUpdateGraph = true;
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index a583d612..c3a1908e 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -503,7 +503,7 @@ public partial class ChronoJumpWindow
Gdk.Rectangle area = args.Event.Area;
- //sometimes this is called when pait is finished
+ //sometimes this is called when paint is finished
//don't let this erase win
if(event_execute_run_simple_double_contacts_pixmap != null) {
args.Event.Window.DrawDrawable(event_execute_drawingarea_run_simple_double_contacts.Style.WhiteGC,
event_execute_run_simple_double_contacts_pixmap,
@@ -765,7 +765,8 @@ public partial class ChronoJumpWindow
// distanceTotal is passed because it can change in variable distances test
public void PrepareRunIntervalGraph(double distance, double lastTime, string timesString,
double distanceTotal, string distancesString,
- bool startIn, bool volumeOn, Preferences.GstreamerTypes gstreamer,
+ bool startIn, bool finished,
+ bool volumeOn, Preferences.GstreamerTypes gstreamer,
RepetitiveConditionsWindow repetitiveConditionsWin, RunPhaseTimeList runPTL)
{
//check graph properties window is not null (propably user has closed it with the DeleteEvent
@@ -808,7 +809,7 @@ public partial class ChronoJumpWindow
paintRunInterval (event_execute_drawingarea, distance, distanceTotal, distancesString,
lastTime, timesString, Util.GetAverage(timesString),
maxValue, minValue, tracks, topMargin, bottomMargin,
- Util.GetPosMax(timesString), Util.GetPosMin(timesString), startIn,
+ Util.GetPosMax(timesString), Util.GetPosMin(timesString), startIn, finished,
volumeOn, gstreamer, repetitiveConditionsWin, runPTL);
// -- refresh
@@ -1205,7 +1206,7 @@ public partial class ChronoJumpWindow
int ancho2 = event_execute_drawingarea_run_simple_double_contacts.Allocation.Width;
paintRunSRunIContactChunks(event_execute_run_simple_double_contacts_pixmap, 20,
ancho2, 0,
- runPTLInListForPainting, timeTotal, timeTotalWithExtraPTL,
negativePTLTime, true);
+ runPTLInListForPainting, timeTotal, timeTotalWithExtraPTL,
negativePTLTime, true, true);
}
// end of contact chunks
@@ -1554,7 +1555,7 @@ public partial class ChronoJumpWindow
void paintRunSRunIContactChunks(Gdk.Pixmap pixmap, int alto, int ancho, int bottomMargin,
List<RunPhaseTimeListObject> runPTLInListForPainting,
double timeTotal, double timeTotalWithExtraPTL, double negativePTLTime,
- bool drawStartEnd)
+ bool drawStart, bool drawEnd)
{
int lastChunkStart = 0;
int chunkMargins = 4;
@@ -1596,36 +1597,39 @@ public partial class ChronoJumpWindow
}
- if(! drawStartEnd)
- return;
-
- //paint start vertical line (only on run simple)
- int xStart2 = event_execute_rightMargin + Convert.ToInt32((ancho -
2*event_execute_rightMargin) *
- (negativePTLTime) / timeTotalWithExtraPTL) -1;
- pixmap.DrawLine(pen_azul, xStart2, 10, xStart2, 20);
-
int lWidth = 1;
int lHeight = 1;
- layoutMid_run_simple.SetMarkup("Start");
- layoutMid_run_simple.GetPixelSize(out lWidth, out lHeight);
- event_execute_run_simple_double_contacts_pixmap.DrawLayout (pen_azul,
- xStart2 -lWidth/2, 0 - lHeight/4, layoutMid_run_simple);
-
- //paint end vertical line (only on run simple)
- int xEnd2 = event_execute_rightMargin + Convert.ToInt32((ancho - 2*event_execute_rightMargin)
*
- (timeTotal + negativePTLTime) / timeTotalWithExtraPTL);
- pixmap.DrawLine(pen_azul, xEnd2, 10, xEnd2, 20);
+ if(drawStart)
+ {
+ //paint start vertical line
+ int xStart2 = event_execute_rightMargin + Convert.ToInt32((ancho -
2*event_execute_rightMargin) *
+ (negativePTLTime) / timeTotalWithExtraPTL) -1;
+ pixmap.DrawLine(pen_azul, xStart2 +1, 10, xStart2 +1, 20);
+
+ layoutMid_run_simple.SetMarkup("Start");
+ layoutMid_run_simple.GetPixelSize(out lWidth, out lHeight);
+ pixmap.DrawLayout (pen_azul,
+ xStart2 -lWidth/2, 0 - lHeight/4, layoutMid_run_simple);
+ }
- layoutMid_run_simple.SetMarkup("End");
- layoutMid_run_simple.GetPixelSize(out lWidth, out lHeight);
- event_execute_run_simple_double_contacts_pixmap.DrawLayout (pen_azul,
- xEnd2 -lWidth/2, 0 - lHeight/4, layoutMid_run_simple);
+ if(drawEnd)
+ {
+ //paint end vertical line
+ int xEnd2 = event_execute_rightMargin + Convert.ToInt32((ancho -
2*event_execute_rightMargin) *
+ (timeTotal + negativePTLTime) / timeTotalWithExtraPTL);
+ pixmap.DrawLine(pen_azul, xEnd2, 10, xEnd2, 20);
+
+ layoutMid_run_simple.SetMarkup("End");
+ layoutMid_run_simple.GetPixelSize(out lWidth, out lHeight);
+ pixmap.DrawLayout (pen_azul,
+ xEnd2 -lWidth/2, 0 - lHeight/4, layoutMid_run_simple);
+ }
}
private void paintRunInterval (Gtk.DrawingArea drawingarea, double distance, double distanceTotal,
string distancesString,
double lastTime, string timesString, double avgTime,
double maxValue, double minValue, int tracks, int topMargin, int bottomMargin,
- int hightValuePosition, int lowValuePosition, bool startIn,
+ int hightValuePosition, int lowValuePosition, bool startIn, bool finished,
bool volumeOn, Preferences.GstreamerTypes gstreamer,
RepetitiveConditionsWindow repetitiveConditionsWin, RunPhaseTimeList runPTL)
{
@@ -1687,7 +1691,7 @@ public partial class ChronoJumpWindow
paintRunSRunIContactChunks(event_execute_pixmap, alto, ancho, bottomMargin,
- runPTLInListForPainting, timeTotal, timeTotalWithExtraPTL,
negativePTLTime, false);
+ runPTLInListForPainting, timeTotal, timeTotalWithExtraPTL,
negativePTLTime, true, finished);
}
// end of contact chunks
@@ -2224,6 +2228,7 @@ public partial class ChronoJumpWindow
currentEventExecute.PrepareEventGraphRunIntervalObject.distanceTotal,
currentEventExecute.PrepareEventGraphRunIntervalObject.distancesString,
currentEventExecute.PrepareEventGraphRunIntervalObject.startIn,
+
currentEventExecute.PrepareEventGraphRunIntervalObject.finished,
volumeOnHere, preferences.gstreamer,
repetitiveConditionsWin,
currentEventExecute.RunPTL
);
diff --git a/src/gui/usefulObjects.cs b/src/gui/usefulObjects.cs
index f19285af..b3f7ff6d 100644
--- a/src/gui/usefulObjects.cs
+++ b/src/gui/usefulObjects.cs
@@ -188,18 +188,20 @@ public class PrepareEventGraphRunInterval {
public double distanceTotal; //we pass this because it's dificult to calculate in runs with variable
distances
public string distancesString; //we pass this because it's dificult to calculate in runs with
variable distances
public bool startIn;
+ public bool finished;
public PrepareEventGraphRunInterval() {
}
public PrepareEventGraphRunInterval(double distance, double lastTime, string timesString,
- double distanceTotal, string distancesString, bool startIn) {
+ double distanceTotal, string distancesString, bool startIn, bool finished) {
this.distance = distance;
this.lastTime = lastTime;
this.timesString = timesString;
this.distanceTotal = distanceTotal;
this.distancesString = distancesString;
this.startIn = startIn;
+ this.finished = finished;
}
~PrepareEventGraphRunInterval() {}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
