tzim/loupiottes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Suite modifs event

Browse source
This commit is contained in:
manu 2016-05-31 16:58:33 +02:00
parent 974f1b0d57
commit 6393439f31
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
DMX-2.0/SequenceurLineaire.cs
View file

@ -182,7 +182,10 @@ namespace DMX2
List<IFeedbackInfo> feedbacks = new List<IFeedbackInfo>(); List<IFeedbackInfo> feedbacks = new List<IFeedbackInfo>();
bool IEventTarget.CanFeedback { get { return true; } } bool IEventTarget.CanFeedback { get { return true; } }
void IEventTarget.ClearFeedBack(){
feedbacks.Clear ();
}
void IEventTarget.AddFeedback (IFeedbackInfo info) void IEventTarget.AddFeedback (IFeedbackInfo info)
{ {
feedbacks.Add(info); feedbacks.Add(info);
@ -231,6 +234,8 @@ namespace DMX2
SeqLinUI ui = null; SeqLinUI ui = null;
int master = 100; int master = 100;
int mastercible;
int masterinitial;
public int Master { public int Master {
get { get {
@ -400,6 +405,8 @@ namespace DMX2
targets[c].FeedBack((byte)valeurscourantes [c]); targets[c].FeedBack((byte)valeurscourantes [c]);
} }
} }
if(mastercible!=masterinitial)
Master = (int)(progression * (mastercible - masterinitial) + masterinitial);
} else { } else {
FinDeTransition (); FinDeTransition ();
} }
@ -424,6 +431,8 @@ namespace DMX2
if(targets.ContainsKey(c)) if(targets.ContainsKey(c))
targets[c].FeedBack((byte)valeurscourantes [c]); targets[c].FeedBack((byte)valeurscourantes [c]);
} }
if(masterinitial !=mastercible)
Master = mastercible;
} }
} }
@ -453,6 +462,7 @@ namespace DMX2
tempsTransition = effetcourrant.Transition; tempsTransition = effetcourrant.Transition;
enTransition = true; enTransition = true;
timeStamp = TimeSpan.Zero; timeStamp = TimeSpan.Zero;
masterinitial = mastercible = Master;
if (ui != null) if (ui != null)
ui.EffetChange (); ui.EffetChange ();
//foreach(var t in targets.Values) t.Attache = false; //foreach(var t in targets.Values) t.Attache = false;
@ -688,11 +698,11 @@ namespace DMX2
} }
static System.Text.RegularExpressions.Regex regexCommandExec = new System.Text.RegularExpressions.Regex( static System.Text.RegularExpressions.Regex regexCommandExec = new System.Text.RegularExpressions.Regex(
@"(?<effet>\d+)(t(?<transition>\d+))?", @"(?<effet>\d+)(m(?<master>\d+))?(t(?<transition>\d+))?",
System.Text.RegularExpressions.RegexOptions.Compiled); System.Text.RegularExpressions.RegexOptions.Compiled);
static System.Text.RegularExpressions.Regex regexCommandProcess = new System.Text.RegularExpressions.Regex( static System.Text.RegularExpressions.Regex regexCommandProcess = new System.Text.RegularExpressions.Regex(
@"(?<effet>\d+)(?<params>(t\d+)?)?", @"(?<effet>\d+)(?<params>(m\d+)?(t\d+)?)?",
System.Text.RegularExpressions.RegexOptions.Compiled); System.Text.RegularExpressions.RegexOptions.Compiled);
public override void Command (string command) public override void Command (string command)
@ -711,6 +721,10 @@ namespace DMX2
int transition = int.Parse (cmd.Groups ["transition"].Value); int transition = int.Parse (cmd.Groups ["transition"].Value);
tempsTransition = TimeSpan.FromMilliseconds( transition *100); tempsTransition = TimeSpan.FromMilliseconds( transition *100);
} }
if (cmd.Groups ["master"].Success) {
mastercible = int.Parse (cmd.Groups ["master"].Value);
}
} }
} }
} }