[chronojump] minor: triggerList.SpuriousType renamed triggerList.Type3
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] minor: triggerList.SpuriousType renamed triggerList.Type3
- Date: Wed, 5 Feb 2020 20:26:41 +0000 (UTC)
commit f92cc80a729a607b7a4fa2182a30d8d933e71031
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Feb 5 18:23:48 2020 +0100
minor: triggerList.SpuriousType renamed triggerList.Type3
src/encoderCapture.cs | 2 +-
src/gui/runEncoder.cs | 2 +-
src/trigger.cs | 28 ++++++++++++++--------------
3 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/src/encoderCapture.cs b/src/encoderCapture.cs
index f8a08b56..31af19ba 100644
--- a/src/encoderCapture.cs
+++ b/src/encoderCapture.cs
@@ -292,7 +292,7 @@ public abstract class EncoderCapture
}
Trigger trigger = new Trigger(Trigger.Modes.ENCODER, i, true);
- if(triggerList.IsSpurious(trigger, TriggerList.SpuriousType.ON, 50))
+ if(triggerList.IsSpurious(trigger, TriggerList.Type3.ON, 50))
{
triggerList.RemoveLastOff();
continue;
diff --git a/src/gui/runEncoder.cs b/src/gui/runEncoder.cs
index 5fdcd7c3..f42c05c2 100644
--- a/src/gui/runEncoder.cs
+++ b/src/gui/runEncoder.cs
@@ -489,7 +489,7 @@ public partial class ChronoJumpWindow
trigger = new Trigger(Trigger.Modes.RACEANALYZER, time, true);
if(! triggerListRunEncoder.NewSameTypeThanBefore(trigger) &&
- ! triggerListRunEncoder.IsSpurious(trigger,
TriggerList.SpuriousType.BOTH, 50))
+ ! triggerListRunEncoder.IsSpurious(trigger,
TriggerList.Type3.BOTH, 50))
triggerListRunEncoder.Add(trigger);
}
}
diff --git a/src/trigger.cs b/src/trigger.cs
index 68606655..bdf274ef 100644
--- a/src/trigger.cs
+++ b/src/trigger.cs
@@ -111,6 +111,7 @@ public class Trigger
public class TriggerList
{
public const string TriggersNotFoundString = "-1";
+ public enum Type3 { ON, OFF, BOTH }
private List<Trigger> l;
//constructors
@@ -233,18 +234,17 @@ public class TriggerList
return false;
}
- public enum SpuriousType { ON, OFF, BOTH }
//if ON will return last "on"
- private Trigger last(SpuriousType spt)
+ private Trigger last(Type3 type3)
{
int i = 0;
int lastPos = 0;
foreach(Trigger t in l)
{
if(
- spt == SpuriousType.BOTH ||
- spt == SpuriousType.ON && t.InOut ||
- spt == SpuriousType.OFF && ! t.InOut)
+ type3 == Type3.BOTH ||
+ type3 == Type3.ON && t.InOut ||
+ type3 == Type3.OFF && ! t.InOut)
lastPos = i;
i ++;
}
@@ -262,7 +262,7 @@ public class TriggerList
else if(! newTrigger.InOut && countOff() == 0)
return false;
- if(last(SpuriousType.BOTH).InOut == newTrigger.InOut)
+ if(last(Type3.BOTH).InOut == newTrigger.InOut)
return true;
return false;
@@ -270,22 +270,22 @@ public class TriggerList
/*
* this newTrigger is an On trigger, compare with last
- * encoder: spt.ON, 50ms
- * runEncoder: spt.BOTH, 50ms
+ * encoder: type3.ON, 50ms
+ * runEncoder: type3.BOTH, 50ms
*/
- public bool IsSpurious(Trigger newTrigger, SpuriousType spt, int ms)
+ public bool IsSpurious(Trigger newTrigger, Type3 type3, int ms)
{
//cannot be spurious if is the first of this type
- if(spt == SpuriousType.ON && countOn() == 0)
+ if(type3 == Type3.ON && countOn() == 0)
return false;
- else if(spt == SpuriousType.BOTH && (
+ else if(type3 == Type3.BOTH && (
newTrigger.InOut && countOn() == 0 ||
! newTrigger.InOut && countOff() == 0) )
return false;
- if(spt == SpuriousType.BOTH && (newTrigger.Ms - last(SpuriousType.BOTH).Ms) < ms )
+ if(type3 == Type3.BOTH && (newTrigger.Ms - last(Type3.BOTH).Ms) < ms )
return true;
- else if(spt == SpuriousType.ON && (newTrigger.Ms - last(SpuriousType.ON).Ms) < ms )
+ else if(type3 == Type3.ON && (newTrigger.Ms - last(Type3.ON).Ms) < ms )
return true;
return false;
@@ -298,7 +298,7 @@ public class TriggerList
*/
public void RemoveLastOff()
{
- l.Remove(last(SpuriousType.OFF));
+ l.Remove(last(Type3.OFF));
}
/*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]