[chronojump] Removed sending app1 to execute classes
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Removed sending app1 to execute classes
- Date: Fri, 2 Jul 2021 13:50:16 +0000 (UTC)
commit ace9a97208327d79ce1dad590450722025284667
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jul 2 15:40:19 2021 +0200
Removed sending app1 to execute classes
src/execute/event.cs | 1 -
src/execute/jump.cs | 6 ++----
src/execute/multiChronopic.cs | 22 ++--------------------
src/execute/pulse.cs | 8 ++------
src/execute/reactionTime.cs | 3 +--
src/execute/run.cs | 2 --
src/gui/app1/chronojump.cs | 13 +++++--------
7 files changed, 12 insertions(+), 43 deletions(-)
---
diff --git a/src/execute/event.cs b/src/execute/event.cs
index c186ae463..c7959e93d 100644
--- a/src/execute/event.cs
+++ b/src/execute/event.cs
@@ -118,7 +118,6 @@ public class EventExecute
protected States loggedState; //log of last state
//protected Gtk.ProgressBar progressBar;
- protected Gtk.Window app;
protected int pDN;
protected int timesForSavingRepetitive; //number of times that this repetive event needs for being
recorded in temporal table
diff --git a/src/execute/jump.cs b/src/execute/jump.cs
index e4d2c75c3..73577e575 100644
--- a/src/execute/jump.cs
+++ b/src/execute/jump.cs
@@ -56,7 +56,7 @@ public class JumpExecute : EventExecute
//jump execution
public JumpExecute(int personID, string personName, int sessionID, string type, double fall, double
weight,
- Chronopic cp, Gtk.Window app, int pDN,
+ Chronopic cp, int pDN,
bool volumeOn, Preferences.GstreamerTypes gstreamer,
double progressbarLimit, ExecutingGraphData egd, string description,
bool avoidGraph, //on configChronojump.Exhibition do not show graph because it gets
too slow with big database
@@ -71,7 +71,6 @@ public class JumpExecute : EventExecute
this.weight = weight;
this.cp = cp;
- this.app = app;
this.pDN = pDN;
this.volumeOn = volumeOn;
@@ -562,7 +561,7 @@ public class JumpRjExecute : JumpExecute
public JumpRjExecute(int personID, string personName,
int sessionID, string type, double fall, double weight,
double limitAsDouble, bool jumpsLimited,
- Chronopic cp, Gtk.Window app, int pDN, bool allowFinishAfterTime,
+ Chronopic cp, int pDN, bool allowFinishAfterTime,
bool volumeOn, Preferences.GstreamerTypes gstreamer,
RepetitiveConditionsWindow repetitiveConditionsWin,
double progressbarLimit, ExecutingGraphData egd
@@ -584,7 +583,6 @@ public class JumpRjExecute : JumpExecute
}
this.cp = cp;
- this.app = app;
this.pDN = pDN;
this.allowFinishAfterTime = allowFinishAfterTime;
diff --git a/src/execute/multiChronopic.cs b/src/execute/multiChronopic.cs
index f95254bdc..3e647096f 100644
--- a/src/execute/multiChronopic.cs
+++ b/src/execute/multiChronopic.cs
@@ -74,8 +74,7 @@ public class MultiChronopicExecute : EventExecute
//execution
public MultiChronopicExecute(int personID, string personName, int sessionID, string type,
- Chronopic cp, bool syncFirst, bool deleteFirst, string vars, Gtk.Window app,
- //double progressbarLimit,
+ Chronopic cp, bool syncFirst, bool deleteFirst, string vars,
ExecutingGraphData egd
) {
this.personID = personID;
@@ -87,9 +86,6 @@ public class MultiChronopicExecute : EventExecute
this.syncFirst = syncFirst;
this.deleteFirst = deleteFirst;
this.vars = vars;
-
- this.app = app;
-// this.progressbarLimit = progressbarLimit;
this.egd = egd;
chronopics = 1;
@@ -97,8 +93,7 @@ public class MultiChronopicExecute : EventExecute
}
public MultiChronopicExecute(int personID, string personName, int sessionID, string type,
- Chronopic cp, Chronopic cp2, bool syncFirst, bool deleteFirst, string vars,
Gtk.Window app,
- //double progressbarLimit,
+ Chronopic cp, Chronopic cp2, bool syncFirst, bool deleteFirst, string vars,
ExecutingGraphData egd
) {
this.personID = personID;
@@ -111,9 +106,6 @@ public class MultiChronopicExecute : EventExecute
this.syncFirst = syncFirst;
this.deleteFirst = deleteFirst;
this.vars = vars;
-
- this.app = app;
-// this.progressbarLimit = progressbarLimit;
this.egd = egd;
chronopics = 2;
@@ -122,8 +114,6 @@ public class MultiChronopicExecute : EventExecute
public MultiChronopicExecute(int personID, string personName, int sessionID, string type,
Chronopic cp, Chronopic cp2, Chronopic cp3, bool syncFirst, bool deleteFirst, string
vars,
- Gtk.Window app,
- //double progressbarLimit,
ExecutingGraphData egd
) {
@@ -138,9 +128,6 @@ public class MultiChronopicExecute : EventExecute
this.syncFirst = syncFirst;
this.deleteFirst = deleteFirst;
this.vars = vars;
-
- this.app = app;
-// this.progressbarLimit = progressbarLimit;
this.egd = egd;
chronopics = 3;
@@ -149,8 +136,6 @@ public class MultiChronopicExecute : EventExecute
public MultiChronopicExecute(int personID, string personName, int sessionID, string type,
Chronopic cp, Chronopic cp2, Chronopic cp3, Chronopic cp4, bool syncFirst, bool
deleteFirst, string vars,
- Gtk.Window app,
- //double progressbarLimit,
ExecutingGraphData egd
) {
@@ -166,9 +151,6 @@ public class MultiChronopicExecute : EventExecute
this.syncFirst = syncFirst;
this.deleteFirst = deleteFirst;
this.vars = vars;
-
- this.app = app;
-// this.progressbarLimit = progressbarLimit;
this.egd = egd;
chronopics = 4;
diff --git a/src/execute/pulse.cs b/src/execute/pulse.cs
index 1d368491f..f638ea5bc 100644
--- a/src/execute/pulse.cs
+++ b/src/execute/pulse.cs
@@ -54,9 +54,8 @@ public class PulseExecute : EventExecute
//execution
public PulseExecute(int personID, string personName, int sessionID, string type, double fixedPulse,
int totalPulsesNum,
- Chronopic cp, Gtk.Window app, int pDN,
+ Chronopic cp, int pDN,
bool volumeOn, Preferences.GstreamerTypes gstreamer,
- //double progressbarLimit,
ExecutingGraphData egd
)
{
@@ -66,15 +65,12 @@ public class PulseExecute : EventExecute
this.type = type;
this.fixedPulse = fixedPulse;
this.totalPulsesNum = totalPulsesNum;
-
-
+
this.cp = cp;
- this.app = app;
this.pDN = pDN;
this.volumeOn = volumeOn;
this.gstreamer = gstreamer;
-// this.progressbarLimit = progressbarLimit;
this.egd = egd;
fakeButtonUpdateGraph = new Gtk.Button();
diff --git a/src/execute/reactionTime.cs b/src/execute/reactionTime.cs
index fb921005d..6ea9b7f0c 100644
--- a/src/execute/reactionTime.cs
+++ b/src/execute/reactionTime.cs
@@ -39,7 +39,7 @@ public class ReactionTimeExecute : EventExecute
//reactionTime execution
public ReactionTimeExecute(int personID, string personName, int sessionID, string type,
- Chronopic cp, Gtk.Window app, int pDN,
+ Chronopic cp, int pDN,
bool volumeOn, Preferences.GstreamerTypes gstreamer,
double progressbarLimit, ExecutingGraphData egd, string description
)
@@ -50,7 +50,6 @@ public class ReactionTimeExecute : EventExecute
this.type = type;
this.cp = cp;
- this.app = app;
this.pDN = pDN;
this.volumeOn = volumeOn;
diff --git a/src/execute/run.cs b/src/execute/run.cs
index 2280af5ab..4fcafb8c8 100644
--- a/src/execute/run.cs
+++ b/src/execute/run.cs
@@ -104,7 +104,6 @@ public class RunExecute : EventExecute
this.wirelessBauds = wirelessBauds;
wireless = (wirelessPort != "" && wirelessBauds > 0);
LogB.Information(string.Format("This is a run simple capture with wireless?: {0}", wireless));
- this.app = app;
this.pDN = pDN;
this.metersSecondsPreferred = metersSecondsPreferred;
@@ -940,7 +939,6 @@ public class RunIntervalExecute : RunExecute
this.wirelessBauds = wirelessBauds;
wireless = (wirelessPort != "" && wirelessBauds > 0);
LogB.Information(string.Format("This is a run interval capture with wireless?: {0}",
wireless));
- this.app = app;
this.metersSecondsPreferred = metersSecondsPreferred;
this.pDN = pDN;
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 4f024f852..419ae6914 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -4507,8 +4507,7 @@ public partial class ChronoJumpWindow
currentEventExecute = new JumpExecute(currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID, currentJumpType.Name, myFall, jumpWeight,
- //chronopicWin.CP, event_execute_label_message, app1,
preferences.digitsNumber, preferences.volumeOn,
- cp2016.CP, app1, preferences.digitsNumber,
+ cp2016.CP, preferences.digitsNumber,
preferences.volumeOn, preferences.gstreamer,
progressbarLimit, egd, description, configChronojump.Exhibition,
preferences.heightPreferred,
@@ -4804,7 +4803,7 @@ public partial class ChronoJumpWindow
currentEventExecute = new JumpRjExecute(currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID, currentJumpRjType.Name, myFall, jumpWeight,
progressbarLimit, currentJumpRjType.JumpsLimited,
- cp2016.CP, app1, preferences.digitsNumber,
+ cp2016.CP, preferences.digitsNumber,
checkbutton_allow_finish_rj_after_time.Active,
preferences.volumeOn, preferences.gstreamer,
repetitiveConditionsWin, progressbarLimit, egd);
@@ -5331,7 +5330,7 @@ public partial class ChronoJumpWindow
currentEventExecute = new ReactionTimeExecute(currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID, currentReactionTimeType.Name,
- cp2016.CP, app1, preferences.digitsNumber,
+ cp2016.CP, preferences.digitsNumber,
preferences.volumeOn, preferences.gstreamer,
progressbarLimit, egd, description);
@@ -5491,8 +5490,7 @@ public partial class ChronoJumpWindow
currentEventExecute = new PulseExecute(currentPerson.UniqueID, currentPerson.Name,
currentSession.UniqueID, currentPulseType.Name, pulseStep, totalPulses,
- cp2016.CP,
- app1, preferences.digitsNumber,
+ cp2016.CP, preferences.digitsNumber,
preferences.volumeOn, preferences.gstreamer, egd);
if(! canCaptureC)
@@ -5784,8 +5782,7 @@ public partial class ChronoJumpWindow
currentSession.UniqueID, currentMultiChronopicType.Name,
cp2016.CP, cp2016.CP2,
syncAvailable, extra_window_check_multichronopic_delete_first.Active,
- extra_window_spin_run_analysis_distance.Value.ToString(),
- app1, egd
+ extra_window_spin_run_analysis_distance.Value.ToString(), egd
);
//mark to only get inside on_multi_chronopic_finished one time
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
