diff --git a/DMX-2.0/SeqMacroUI.cs b/DMX-2.0/SeqMacroUI.cs index 27f29b3..6b9e0e5 100644 --- a/DMX-2.0/SeqMacroUI.cs +++ b/DMX-2.0/SeqMacroUI.cs @@ -319,7 +319,7 @@ namespace DMX2 StringBuilder str = new StringBuilder (); bool a = false; foreach (Circuit c in sequenceur.Circuits) { - if (sequenceur.ValeurCircuit (c) > 0) { + if (sequenceur.ValeurBruteCircuit (c) > 0) { if (sequenceur.EstActif (c) != a) { if(!a){ str.Append (""); diff --git a/DMX-2.0/SequenceurMacro.cs b/DMX-2.0/SequenceurMacro.cs index 47ffc19..b99b750 100644 --- a/DMX-2.0/SequenceurMacro.cs +++ b/DMX-2.0/SequenceurMacro.cs @@ -151,7 +151,7 @@ namespace DMX2 Dictionary valeurscourantes = new Dictionary (); Dictionary effetsEnCours = new Dictionary(); - actionEventTarget masterEventTarget=null; + actionEventTargetEx masterEventTarget=null; actionEventTarget goNextEventTarget=null; actionEventTarget goBackEventTarget=null; @@ -182,11 +182,15 @@ namespace DMX2 public SequenceurMacro () { - masterEventTarget = new actionEventTarget ( + masterEventTarget = new actionEventTargetEx ( delegate(EventData data) { Master = 100 * data.value / 255; return true; - } + }, + delegate{ + return Master *255/100; + }, + false ); goNextEventTarget = new actionEventTarget (