From 473befc0b49a7a603f1ae58ab1d78d7fe69547d3 Mon Sep 17 00:00:00 2001 From: tzim Date: Mon, 8 Apr 2013 18:17:26 +0000 Subject: [PATCH] --- DMX-2.0/Conduite.cs | 8 ++--- DMX-2.0/DMX-2.0.csproj | 1 + DMX-2.0/Sequenceur.cs | 17 ++++++++++ DMX-2.0/SequenceurLineaire.cs | 64 +++++++++++++++++++++++++++++++++++ DMX-2.0/UniversDMX.cs | 7 ++++ 5 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 DMX-2.0/SequenceurLineaire.cs diff --git a/DMX-2.0/Conduite.cs b/DMX-2.0/Conduite.cs index fca5c37..6de1b12 100644 --- a/DMX-2.0/Conduite.cs +++ b/DMX-2.0/Conduite.cs @@ -15,17 +15,17 @@ namespace DMX2 } - List circuits = new List(); + Dictionary circuits = new Dictionary(); - public List Circuits { + public Dictionary Circuits { get { return circuits; } } - Dictionary sequenceurs= new Dictionary(); + Dictionary sequenceurs= new Dictionary(); - public Dictionary Sequenceurs { + public Dictionary Sequenceurs { get { return sequenceurs; } diff --git a/DMX-2.0/DMX-2.0.csproj b/DMX-2.0/DMX-2.0.csproj index 68e2290..3d0c00f 100644 --- a/DMX-2.0/DMX-2.0.csproj +++ b/DMX-2.0/DMX-2.0.csproj @@ -72,6 +72,7 @@ + \ No newline at end of file diff --git a/DMX-2.0/Sequenceur.cs b/DMX-2.0/Sequenceur.cs index 07eb39b..1d2d834 100644 --- a/DMX-2.0/Sequenceur.cs +++ b/DMX-2.0/Sequenceur.cs @@ -8,6 +8,23 @@ namespace DMX2 public Sequenceur () { } + + int id; + + public int ID { + get { + return id; + } + } + + + public abstract int EtatCircuit(Circuit c); + public abstract void Tick(TimeSpan time); + public static Sequenceur Load() + { + throw new NotImplementedException(); + } + public abstract void Save(); } } diff --git a/DMX-2.0/SequenceurLineaire.cs b/DMX-2.0/SequenceurLineaire.cs new file mode 100644 index 0000000..9397a26 --- /dev/null +++ b/DMX-2.0/SequenceurLineaire.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; + +namespace DMX2 +{ + public class SequenceurLineaire : Sequenceur + { + + TimeSpan timeStamp; + + public TimeSpan TimeStamp { + get { + return timeStamp; + } + } + + public class Effet { + public string Nom; + Dictionary valeurs = new Dictionary(); + public int this [Circuit index] { + get { + if(!valeurs.ContainsKey(index)) + valeurs.Add(index,0); + return valeurs[index]; + } + set { + if(valeurs.ContainsKey (index)) + valeurs[index] = value; + else + valeurs.Add(index,value); + } + } + public void RetireCircuit(Circuit c){ + valeurs.Remove(c); + } + public TimeSpan Duree; + public TimeSpan Transition; + } + + List circuitsSeq = new List(); + List effets; + + bool enTransition=false; + + + + public SequenceurLineaire () + { + + } + + public override int EtatCircuit (Circuit c) + { + if (!circuitsSeq.Contains (c)) + return 0; + } + + public override void Tick (TimeSpan time) + { + + } + + } +} diff --git a/DMX-2.0/UniversDMX.cs b/DMX-2.0/UniversDMX.cs index 1cfadc7..b152b12 100644 --- a/DMX-2.0/UniversDMX.cs +++ b/DMX-2.0/UniversDMX.cs @@ -28,6 +28,13 @@ namespace DMX2 } } + public void Save () + { + } + public void Load () + { + } + public void CalculUnivers(int[] valeurs) { Grada g;