[chronojump] RunIntervalRealtimeCaptureGraph showing run type on the title
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] RunIntervalRealtimeCaptureGraph showing run type on the title
- Date: Mon, 13 Sep 2021 22:29:59 +0000 (UTC)
commit 3a14d2ca40dc2260270d3b3a56eefd0dfaec2a23
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Sep 14 00:24:39 2021 +0200
RunIntervalRealtimeCaptureGraph showing run type on the title
src/execute/run.cs | 10 +++++-----
src/gui/eventExecute.cs | 21 +++++++++++----------
src/gui/usefulObjects.cs | 10 +++++++---
3 files changed, 23 insertions(+), 18 deletions(-)
---
diff --git a/src/execute/run.cs b/src/execute/run.cs
index e5e9d8120..dce79928c 100644
--- a/src/execute/run.cs
+++ b/src/execute/run.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2004-2020 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2004-2021 Xavier de Blas <xaviblas gmail com>
*/
using System;
@@ -1112,10 +1112,10 @@ public class RunIntervalExecute : RunExecute
//update graph
PrepareEventGraphRunIntervalObject = new PrepareEventGraphRunInterval(
- distanceIntervalFixed, trackTime, intervalTimesString,
+ type, distanceIntervalFixed, trackTime, intervalTimesString,
distanceTotal, distancesString, startIn, success);
PrepareEventGraphRunIntervalRealtimeCaptureObject = new PrepareEventGraphRunInterval(
- distanceIntervalFixed, trackTime, intervalTimesString,
+ type, distanceIntervalFixed, trackTime, intervalTimesString,
distanceTotal, distancesString, startIn, success);
needUpdateGraphType = eventType.RUNINTERVAL;
@@ -1355,10 +1355,10 @@ public class RunIntervalExecute : RunExecute
needShowFeedbackMessage = true;
PrepareEventGraphRunIntervalObject = new PrepareEventGraphRunInterval(
- distanceIntervalFixed, Util.GetLast(intervalTimesString),
+ type, distanceIntervalFixed, Util.GetLast(intervalTimesString),
intervalTimesString, distanceTotal, distancesString, startIn, true);
PrepareEventGraphRunIntervalRealtimeCaptureObject = new PrepareEventGraphRunInterval(
- distanceIntervalFixed, trackTime, intervalTimesString,
+ type, distanceIntervalFixed, trackTime, intervalTimesString,
distanceTotal, distancesString, startIn, true);
needUpdateGraphType = eventType.RUNINTERVAL;
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index e8cb24ed4..6cccf6f72 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -552,7 +552,8 @@ public partial class ChronoJumpWindow
currentEventExecute.PrepareEventGraphRunIntervalObject.lastTime,
currentEventExecute.PrepareEventGraphRunIntervalObject.timesString,
currentEventExecute.PrepareEventGraphRunIntervalObject.distanceTotal,
- currentEventExecute.PrepareEventGraphRunIntervalObject.distancesString
+
currentEventExecute.PrepareEventGraphRunIntervalObject.distancesString,
+ currentEventExecute.PrepareEventGraphRunIntervalObject.type
);
}
}
@@ -837,7 +838,7 @@ public partial class ChronoJumpWindow
}
// Reactive jump
- public void PrepareRunIntervalRealtimeCaptureGraph (double distance, double lastTime, string
timesString, double distanceTotal, string distancesString)
+ public void PrepareRunIntervalRealtimeCaptureGraph (double distance, double lastTime, string
timesString, double distanceTotal, string distancesString, string type)
{
cairoPaintBarsPreRealTime = new CairoPaintBarsPreRunIntervalRealtimeCapture(
event_execute_drawingarea_realtime_capture_cairo,
preferences.fontType.ToString(), current_mode,
@@ -2246,14 +2247,14 @@ public partial class ChronoJumpWindow
currentEventExecute.RunPTL
);
- if(!
currentEventExecute.PrepareEventGraphRunIntervalObject.distancesString.Contains("R") ) //discard RSA
- PrepareRunIntervalRealtimeCaptureGraph(
-
currentEventExecute.PrepareEventGraphRunIntervalObject.distance,
-
currentEventExecute.PrepareEventGraphRunIntervalObject.lastTime,
-
currentEventExecute.PrepareEventGraphRunIntervalObject.timesString,
-
currentEventExecute.PrepareEventGraphRunIntervalObject.distanceTotal,
-
currentEventExecute.PrepareEventGraphRunIntervalObject.distancesString
- );
+ PrepareRunIntervalRealtimeCaptureGraph(
+
currentEventExecute.PrepareEventGraphRunIntervalObject.distance,
+
currentEventExecute.PrepareEventGraphRunIntervalObject.lastTime,
+
currentEventExecute.PrepareEventGraphRunIntervalObject.timesString,
+
currentEventExecute.PrepareEventGraphRunIntervalObject.distanceTotal,
+
currentEventExecute.PrepareEventGraphRunIntervalObject.distancesString,
+
currentEventExecute.PrepareEventGraphRunIntervalObject.type
+ );
}
break;
case EventType.Types.REACTIONTIME:
diff --git a/src/gui/usefulObjects.cs b/src/gui/usefulObjects.cs
index 3d6185161..6a6082f4a 100644
--- a/src/gui/usefulObjects.cs
+++ b/src/gui/usefulObjects.cs
@@ -294,7 +294,9 @@ public class PrepareEventGraphRunSimple {
~PrepareEventGraphRunSimple() {}
}
-public class PrepareEventGraphRunInterval {
+public class PrepareEventGraphRunInterval
+{
+ public string type;
public double distance;
public double lastTime;
public string timesString;
@@ -306,8 +308,10 @@ public class PrepareEventGraphRunInterval {
public PrepareEventGraphRunInterval() {
}
- public PrepareEventGraphRunInterval(double distance, double lastTime, string timesString,
- double distanceTotal, string distancesString, bool startIn, bool finished) {
+ public PrepareEventGraphRunInterval(string type, double distance, double lastTime, string timesString,
+ double distanceTotal, string distancesString, bool startIn, bool finished)
+ {
+ this.type = type;
this.distance = distance;
this.lastTime = lastTime;
this.timesString = timesString;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]