This commit is contained in:
tzim 2013-04-23 06:07:26 +00:00
parent 92691d2bfa
commit 363c377c5b
3 changed files with 20 additions and 2 deletions

View file

@ -60,6 +60,16 @@ namespace DMX2
} }
} }
int master=100;
public int Master {
get {
return master;
}
set {
master= value;
}
}
int IComparer<Circuit>.Compare (Circuit x, Circuit y) int IComparer<Circuit>.Compare (Circuit x, Circuit y)
{ {
@ -121,7 +131,7 @@ namespace DMX2
foreach (var seq in Sequenceurs) { foreach (var seq in Sequenceurs) {
val = Math.Max (val, seq.ValeurCircuit (c)); val = Math.Max (val, seq.ValeurCircuit (c));
} }
c.ValeurCourante = val; c.ValeurCourante = val * master /100;
} }
} }
// Cette fonction retourne quasi immédiatement, même si il y'a beaucoup a faire sur l'affichage // Cette fonction retourne quasi immédiatement, même si il y'a beaucoup a faire sur l'affichage

View file

@ -140,5 +140,12 @@ namespace DMX2
fullUpdateFlag=false; fullUpdateFlag=false;
updScheduled=false; updScheduled=false;
} }
protected void OnMasterScaleValueChanged (object sender, EventArgs e)
{
Conduite.Courante.Master = (int)(masterScale.Value);
}
} }
} }

View file

@ -245,7 +245,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<widget class="Gtk.VScale" id="vscale1"> <widget class="Gtk.VScale" id="masterScale">
<property name="MemberName" /> <property name="MemberName" />
<property name="HeightRequest">260</property> <property name="HeightRequest">260</property>
<property name="Inverted">True</property> <property name="Inverted">True</property>
@ -256,6 +256,7 @@
<property name="DrawValue">True</property> <property name="DrawValue">True</property>
<property name="Digits">0</property> <property name="Digits">0</property>
<property name="ValuePos">Top</property> <property name="ValuePos">Top</property>
<signal name="ValueChanged" handler="OnMasterScaleValueChanged" />
</widget> </widget>
<packing> <packing>
<property name="Position">5</property> <property name="Position">5</property>