From c50de673d2b86b421c29a517eaa48112c170aab0 Mon Sep 17 00:00:00 2001 From: tzim Date: Wed, 6 Nov 2013 15:33:58 +0000 Subject: [PATCH] Optimisations --- DMX-2.0/Conduite.cs | 2 +- DMX-2.0/DMX-2.0.csproj | 1 + DMX-2.0/Info.cs | 12 ++++++++++++ DMX-2.0/MainWindow.cs | 1 + DMX-2.0/SeqLinUI.cs | 11 ++++++----- DMX-2.0/gtk-gui/DMX2.MainWindow.cs | 10 +++++----- DMX-2.0/gtk-gui/gui.stetic | 2 +- 7 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 DMX-2.0/Info.cs diff --git a/DMX-2.0/Conduite.cs b/DMX-2.0/Conduite.cs index 45645ca..91c2764 100644 --- a/DMX-2.0/Conduite.cs +++ b/DMX-2.0/Conduite.cs @@ -163,7 +163,7 @@ namespace DMX2 if (!Pause) { if (deltaT > TimeSpan.FromMilliseconds (15)) - Console.WriteLine ("{0}", deltaT); + Info.Publish(string.Format ("{0}", deltaT)); lock (this) { diff --git a/DMX-2.0/DMX-2.0.csproj b/DMX-2.0/DMX-2.0.csproj index 1659b7e..dc230b9 100644 --- a/DMX-2.0/DMX-2.0.csproj +++ b/DMX-2.0/DMX-2.0.csproj @@ -115,6 +115,7 @@ + diff --git a/DMX-2.0/Info.cs b/DMX-2.0/Info.cs new file mode 100644 index 0000000..73ebc00 --- /dev/null +++ b/DMX-2.0/Info.cs @@ -0,0 +1,12 @@ +using System; + +namespace DMX2 +{ + public class Info + { + public Info () + { + } + } +} + diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs index 09c39cb..b8171f7 100644 --- a/DMX-2.0/MainWindow.cs +++ b/DMX-2.0/MainWindow.cs @@ -460,6 +460,7 @@ namespace DMX2 void Update (object sender, EventArgs e) { + lblInfo.Text = Info.GetInfo(); if(Conduite.Courante==null)return; foreach (var notebookchild in onglets.Children) { SequenceurUI sequi = notebookchild as SequenceurUI; diff --git a/DMX-2.0/SeqLinUI.cs b/DMX-2.0/SeqLinUI.cs index b99b6e4..1006906 100644 --- a/DMX-2.0/SeqLinUI.cs +++ b/DMX-2.0/SeqLinUI.cs @@ -326,13 +326,14 @@ namespace DMX2 updating = true; foreach (Circuit c in tirettes.Keys) { tirettes[c].Value = sequenceur.ValeurBruteCircuit(c); - - if(sequenceur.EstChange(c)) - tirettes[c].Name="sclTiretteC"; + string tname; + if(sequenceur.EstChange(c)) + tname="sclTiretteC"; else if (sequenceur.EnTransition(c)) - tirettes[c].Name="sclTiretteT"; + tname="sclTiretteT"; else - tirettes[c].Name="sclTirette"; + tname="sclTirette"; + if (tirettes[c].Name != tname) tirettes[c].Name = tname; } updating=false; } diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs index 871d7b9..095e0c8 100644 --- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs +++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs @@ -47,7 +47,7 @@ namespace DMX2 private global::Gtk.HBox hbox4; private global::Gtk.Toolbar toolbar7; private global::Gtk.EventBox evInfo; - private global::Gtk.Label label2; + private global::Gtk.Label lblInfo; private global::Gtk.Toolbar toolbar8; protected virtual void Build () @@ -405,10 +405,10 @@ namespace DMX2 this.evInfo = new global::Gtk.EventBox (); this.evInfo.Name = "evInfo"; // Container child evInfo.Gtk.Container+ContainerChild - this.label2 = new global::Gtk.Label (); - this.label2.Name = "label2"; - this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("info"); - this.evInfo.Add (this.label2); + this.lblInfo = new global::Gtk.Label (); + this.lblInfo.Name = "lblInfo"; + this.lblInfo.LabelProp = global::Mono.Unix.Catalog.GetString ("info"); + this.evInfo.Add (this.lblInfo); this.hbox4.Add (this.evInfo); global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo])); w74.Position = 1; diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index b520faf..4f3e271 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -510,7 +510,7 @@ celle selectionnée - + info