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

Correction bug clignotement sur telecommande

Browse source
This commit is contained in:
tzim 2015-07-17 20:08:04 +00:00
parent 59d40ad743
commit ea2e765caa
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
DMX-2.0/Conduite.cs
View file

@ -229,10 +229,10 @@ namespace DMX2
}
}
List<Circuit> circuitTelecomande=new List<Circuit>();
HashSet<Circuit> circuitTelecomande=new HashSet<Circuit>();
int circuitTelecomandeVal=0;
public List<Circuit> CircuitTelecomande {
public HashSet<Circuit> CircuitTelecomande {
get {
return circuitTelecomande;
}
@ -250,6 +250,12 @@ namespace DMX2
}
}
bool IsCircuitTel(Circuit c){
if (circuitTelecomande.Count == 0)
return false;
return circuitTelecomande.Contains (c);
}
// On utilise un thread qui boucle au lieu d'un timer.
// C'est un peu moins précis, mais ca consomme beaucoup moins de ressources
@ -314,6 +320,8 @@ namespace DMX2
foreach (var seq in sequenceurs) {
val = Math.Max (val, seq.ValeurCircuit (c));
}
if (IsCircuitTel (c))
val = circuitTelecomandeVal;
c.ValeurCourante = val * master / 100;
}
} else {
@ -322,15 +330,17 @@ namespace DMX2
foreach (var seq in sequenceurs) {
val = Math.Max (val, seq.ValeurCircuit (c));
}
if (IsCircuitTel (c))
val = circuitTelecomandeVal;
c.ValeurCourante = val;
}
}
if (circuitTelecomande.Count > 0) {
/*if (circuitTelecomande.Count > 0) {
foreach (Circuit c in circuitTelecomande) {
c.ValeurCourante = circuitTelecomandeVal * master / 100;
}
}
}*/
EventManager.ProcessEvents();
}