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

* SequenceurMacro.cs: Pas de saut sur evenements master

Browse source 
* SeqMacroUI.cs: Correction d'un petit bug d'affichage quand master =
  0
This commit is contained in:
tzim 2014-05-25 14:27:36 +00:00
parent 3a63307fba
commit 0610ed4150
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DMX-2.0/SeqMacroUI.cs
View file

@ -319,7 +319,7 @@ namespace DMX2
StringBuilder str = new StringBuilder (); StringBuilder str = new StringBuilder ();
bool a = false; bool a = false;
foreach (Circuit c in sequenceur.Circuits) { foreach (Circuit c in sequenceur.Circuits) {
if (sequenceur.ValeurCircuit (c) > 0) { if (sequenceur.ValeurBruteCircuit (c) > 0) {
if (sequenceur.EstActif (c) != a) { if (sequenceur.EstActif (c) != a) {
if(!a){ if(!a){
str.Append ("<span foreground='#FF8888'>"); str.Append ("<span foreground='#FF8888'>");

10
DMX-2.0/SequenceurMacro.cs
View file

@ -151,7 +151,7 @@ namespace DMX2
Dictionary<Circuit,int> valeurscourantes = new Dictionary<Circuit, int> (); Dictionary<Circuit,int> valeurscourantes = new Dictionary<Circuit, int> ();
Dictionary<Circuit,EffetMacro> effetsEnCours = new Dictionary<Circuit, EffetMacro>(); Dictionary<Circuit,EffetMacro> effetsEnCours = new Dictionary<Circuit, EffetMacro>();
actionEventTarget masterEventTarget=null; actionEventTargetEx masterEventTarget=null;
actionEventTarget goNextEventTarget=null; actionEventTarget goNextEventTarget=null;
actionEventTarget goBackEventTarget=null; actionEventTarget goBackEventTarget=null;
@ -182,11 +182,15 @@ namespace DMX2
public SequenceurMacro () public SequenceurMacro ()
{ {
masterEventTarget = new actionEventTarget ( masterEventTarget = new actionEventTargetEx (
delegate(EventData data) { delegate(EventData data) {
Master = 100 * data.value / 255; Master = 100 * data.value / 255;
return true; return true;
} },
delegate{
return Master *255/100;
},
false
); );
goNextEventTarget = new actionEventTarget ( goNextEventTarget = new actionEventTarget (