diff --git a/DMX-2.0/WebServer.cs b/DMX-2.0/WebServer.cs index 4fd092f..65f0b52 100644 --- a/DMX-2.0/WebServer.cs +++ b/DMX-2.0/WebServer.cs @@ -40,10 +40,28 @@ namespace DMX2 Console.WriteLine (context.Request.RawUrl); string responseString = GetResponse (context); - // TODO : gerer autrement les resources - byte[] buffer = System.Text.Encoding.UTF8.GetBytes (responseString); - context.Response.ContentLength64 = buffer.Length; - context.Response.OutputStream.Write (buffer, 0, buffer.Length); + // Pour les resources, on les renvoie si elles existent + if (context.Request.Url.LocalPath.StartsWith ("/res/")) { + string res = context.Request.Url.LocalPath.Remove(0,5).Replace('/','.'); + if(resources.Contains(res)) + using (System.IO.Stream stream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(res)) + + { + byte[] buff = new byte[1024]; int l; + while( (l=stream.Read(buff,0,buff.Length))>0){ + context.Response.OutputStream.Write(buff,0,l); + } + } + + } + else + { + + byte[] buffer = System.Text.Encoding.UTF8.GetBytes (responseString); + context.Response.ContentLength64 = buffer.Length; + context.Response.OutputStream.Write (buffer, 0, buffer.Length); + + } context.Response.OutputStream.Close (); } } catch { @@ -57,16 +75,7 @@ namespace DMX2 // Pas de conduite chargée, on renvoi un simple message if (Conduite.Courante == null) return "Pas de conduite"; - // Pour les resources, on les renvoie si elles existent - if (req.Url.LocalPath.StartsWith ("/res/")) { - string res = req.Url.LocalPath.Remove(0,5).Replace('/','.'); - if(resources.Contains(res)) - using (System.IO.Stream stream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(res)) - using (System.IO.TextReader reader = new System.IO.StreamReader(stream)) - return reader.ReadToEnd(); - else return ""; - } - + int circuit, univ, dimmer, val; // En fonction du http://xxxxxx:yyyy/?id= diff --git a/DMX-2.0/html/page.html b/DMX-2.0/html/page.html index 0fc9aa4..2458a9f 100644 --- a/DMX-2.0/html/page.html +++ b/DMX-2.0/html/page.html @@ -11,15 +11,33 @@ A=Math.min(A,512); A=Math.max(A,1); this.dimmer.value=A; + B=$( "#slider").slider( "value" ); + trans1(form.univ.value,form.dimmer.value,B); } - function hop2(code) - { - A=parseInt(this.circuit.value)+parseInt(code); - A=Math.max(A,1); - this.circuit.value=A; - } - + + function hop2(code) + { + A=parseInt(this.circuit.value)+parseInt(code); + A=Math.max(A,1); + this.circuit.value=A; + B=$( "#slider2").slider( "value" ); + trans2(form2.circuit.value,B); + } + function Balckout() + { + $( "#slider2").slider( "value",0 ); + //B=$( "#slider2").slider( "value" ); + //trans2(form2.circuit.value,B); + } + + function Full() + { + $( "#slider2").slider( "value",255 ); + //B=$( "#slider2").slider( "value" ); + //trans2(form2.circuit.value,B); + } + function remplir() { $( "#slider" ).slider({ @@ -44,11 +62,12 @@ B=$( "#slider").slider( "value" ); trans1(form.univ.value,form.dimmer.value,B); } - function refreshSwatch2() - { - B=$( "#slider2").slider( "value" ); - trans2(form2.circuit.value,B); - } + + function refreshSwatch2() + { + B=$( "#slider2").slider( "value" ); + trans2(form2.circuit.value,B); + } function trans1(univ,dimmer,val) { @@ -78,7 +97,7 @@
- +
- +
@@ -98,7 +117,7 @@
@@ -109,7 +128,7 @@
- +
+ + + +
@@ -121,11 +140,14 @@
-