From 3f948acca2540e02e25dd477396bcf3d2b6abe68 Mon Sep 17 00:00:00 2001
From: tzim <tzim@tzim.net>
Date: Mon, 8 Apr 2013 16:36:30 +0000
Subject: [PATCH] Separation classes

---
 DMX-2.0/Conduite.cs    | 70 +++++++-----------------------------------
 DMX-2.0/DMX-2.0.csproj |  2 ++
 DMX-2.0/Sequenceur.cs  | 13 ++++++++
 DMX-2.0/UniversDMX.cs  | 54 ++++++++++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 59 deletions(-)
 create mode 100644 DMX-2.0/Sequenceur.cs
 create mode 100644 DMX-2.0/UniversDMX.cs

diff --git a/DMX-2.0/Conduite.cs b/DMX-2.0/Conduite.cs
index 05bf37a..fca5c37 100644
--- a/DMX-2.0/Conduite.cs
+++ b/DMX-2.0/Conduite.cs
@@ -7,6 +7,9 @@ namespace DMX2
 {
 	public class Conduite
 	{
+
+		public static Conduite ConduiteCourante = new Conduite();
+
 		public Conduite()
 		{
 
@@ -18,9 +21,6 @@ namespace DMX2
 			get {
 				return circuits;
 			}
-			private set {
-				circuits = value;
-			}
 		}
 
 		Dictionary<string, Sequenceur> sequenceurs= new Dictionary<string, Sequenceur>();
@@ -29,9 +29,6 @@ namespace DMX2
 			get {
 				return sequenceurs;
 			}
-			private set {
-				sequenceurs = value;
-			}
 		}
 
 		List<UniversDMX> univers;
@@ -40,17 +37,10 @@ namespace DMX2
 			get {
 				return univers;
 			}
-			private set {
-				univers = value;
-			}
 		}
 
 	}
 
-	public abstract class Sequenceur
-	{
-	}
-
 	public class Circuit
 	{
 		string name;
@@ -64,6 +54,14 @@ namespace DMX2
 			}
 		}
 
+		int id;
+
+		public int ID {
+			get {
+				return id;
+			}
+		}
+
 		int _curval;
 
 		public int ValeurCourante {
@@ -77,52 +75,6 @@ namespace DMX2
 
 	}
 
-	public class UniversDMX
-	{
-
-		Grada[] _gradas = new Grada[512];
-
-		public enum FTransfer {
-			lineaire,
-			log,
-			exp
-		}
-		public struct Grada {
-			public Circuit circuitAssocié;
-			public FTransfer fonctionTransfert;
-			public float param1; // Paramètres pour fonction de transfert
-			public float param2;
-		}
-
-		public Grada[] Gradas  {
-			get
-			{
-				return _gradas;
-			}
-		}
-
-		public void CalculUnivers(int[] valeurs)
-		{
-			Grada g;
-			Debug.Assert(valeurs.Length == _gradas.Length);
-			for(int i = 0 ; i<512; i++)
-			{
-				g= _gradas[i];
-				switch (g.fonctionTransfert) {
-				case FTransfer.lineaire:
-					valeurs[i] = g.circuitAssocié.ValeurCourante;
-					break;
-				case FTransfer.log:
-					break;
-				case FTransfer.exp:
-					break;
-				default:
-					throw new ArgumentOutOfRangeException ();
-				}
-			}
-		}
-
-	}
 
 }
 
diff --git a/DMX-2.0/DMX-2.0.csproj b/DMX-2.0/DMX-2.0.csproj
index ea7d1f7..68e2290 100644
--- a/DMX-2.0/DMX-2.0.csproj
+++ b/DMX-2.0/DMX-2.0.csproj
@@ -70,6 +70,8 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Conduite.cs" />
     <Compile Include="gtk-gui\DMX2.MainWindow.cs" />
+    <Compile Include="UniversDMX.cs" />
+    <Compile Include="Sequenceur.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/DMX-2.0/Sequenceur.cs b/DMX-2.0/Sequenceur.cs
new file mode 100644
index 0000000..07eb39b
--- /dev/null
+++ b/DMX-2.0/Sequenceur.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace DMX2
+{
+	public abstract class Sequenceur
+	{
+		public Sequenceur ()
+		{
+		}
+	}
+}
+
diff --git a/DMX-2.0/UniversDMX.cs b/DMX-2.0/UniversDMX.cs
new file mode 100644
index 0000000..1cfadc7
--- /dev/null
+++ b/DMX-2.0/UniversDMX.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace DMX2
+{
+	public class UniversDMX
+	{
+
+		Grada[] _gradas = new Grada[512];
+
+		public enum FTransfer {
+			lineaire,
+			log,
+			exp
+		}
+		public struct Grada {
+			public Circuit circuitAssocié;
+			public FTransfer fonctionTransfert;
+			public float param1; // Paramètres pour fonction de transfert
+			public float param2;
+		}
+
+		public Grada[] Gradas  {
+			get
+			{
+				return _gradas;
+			}
+		}
+
+		public void CalculUnivers(int[] valeurs)
+		{
+			Grada g;
+			Debug.Assert(valeurs.Length == _gradas.Length);
+			for(int i = 0 ; i<512; i++)
+			{
+				g= _gradas[i];
+				switch (g.fonctionTransfert) {
+				case FTransfer.lineaire:
+					valeurs[i] = g.circuitAssocié.ValeurCourante;
+					break;
+				case FTransfer.log:
+					break;
+				case FTransfer.exp:
+					break;
+				default:
+					throw new ArgumentOutOfRangeException ();
+				}
+			}
+		}
+
+	}
+
+}
\ No newline at end of file