Limite les MAJ de l'affichage à 1/10 s
Edition auto du nom a la sauvegarde de l'effet
This commit is contained in:
parent
cd89ce8c8b
commit
8be84ca4bd
3 changed files with 21 additions and 13 deletions
|
|
@ -2,12 +2,11 @@
|
||||||
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
|
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
|
||||||
<MonoDevelop.Ide.Workbench ActiveDocument="DMX-2.0/SeqLinUI.cs">
|
<MonoDevelop.Ide.Workbench ActiveDocument="DMX-2.0/SeqLinUI.cs">
|
||||||
<Files>
|
<Files>
|
||||||
<File FileName="DMX-2.0/SequenceurLineaire.cs" Line="236" Column="3" />
|
<File FileName="DMX-2.0/SequenceurLineaire.cs" Line="25" Column="6" />
|
||||||
<File FileName="DMX-2.0/SeqLinUI.cs" Line="145" Column="4" />
|
<File FileName="DMX-2.0/SeqLinUI.cs" Line="305" Column="3" />
|
||||||
<File FileName="DMX-2.0/Conduite.cs" Line="130" Column="4" />
|
<File FileName="DMX-2.0/Conduite.cs" Line="117" Column="6" />
|
||||||
<File FileName="DMX-2.0/GestionCircuits.cs" Line="34" Column="45" />
|
<File FileName="DMX-2.0/GestionCircuits.cs" Line="34" Column="45" />
|
||||||
<File FileName="DMX-2.0/MainWindow.cs" Line="137" Column="1" />
|
<File FileName="DMX-2.0/MainWindow.cs" Line="137" Column="1" />
|
||||||
<File FileName="Désassemblage" />
|
|
||||||
</Files>
|
</Files>
|
||||||
</MonoDevelop.Ide.Workbench>
|
</MonoDevelop.Ide.Workbench>
|
||||||
<MonoDevelop.Ide.DebuggingService.Breakpoints>
|
<MonoDevelop.Ide.DebuggingService.Breakpoints>
|
||||||
|
|
|
||||||
|
|
@ -14,12 +14,13 @@ namespace DMX2
|
||||||
|
|
||||||
Timer timer = null;
|
Timer timer = null;
|
||||||
DateTime lastTick;
|
DateTime lastTick;
|
||||||
|
DateTime lastUpd;
|
||||||
|
|
||||||
public Conduite()
|
public Conduite()
|
||||||
{
|
{
|
||||||
timer = new Timer(new TimerCallback(TimerTick),this,
|
timer = new Timer(new TimerCallback(TimerTick),this,
|
||||||
10,10);
|
10,10);
|
||||||
lastTick=DateTime.Now;
|
lastUpd = lastTick=DateTime.Now;
|
||||||
}
|
}
|
||||||
|
|
||||||
List<Circuit> circuits = new List<Circuit>();
|
List<Circuit> circuits = new List<Circuit>();
|
||||||
|
|
@ -125,7 +126,11 @@ namespace DMX2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 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
|
||||||
|
|
||||||
|
if(tickTime - lastUpd > TimeSpan.FromMilliseconds(100)){
|
||||||
MainWindow.Win.ScheduleUpdate();
|
MainWindow.Win.ScheduleUpdate();
|
||||||
|
lastUpd = DateTime.Now;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if( ts > TimeSpan.FromMilliseconds(15) )
|
if( ts > TimeSpan.FromMilliseconds(15) )
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ namespace DMX2
|
||||||
bool fullUpdFlag = true;
|
bool fullUpdFlag = true;
|
||||||
SequenceurLineaire sequenceur;
|
SequenceurLineaire sequenceur;
|
||||||
ListStore lsEffets=null;
|
ListStore lsEffets=null;
|
||||||
|
TreeViewColumn nomCol;
|
||||||
|
|
||||||
public SeqLinUI (SequenceurLineaire s ) : base (s)
|
public SeqLinUI (SequenceurLineaire s ) : base (s)
|
||||||
{
|
{
|
||||||
|
|
@ -22,7 +23,7 @@ namespace DMX2
|
||||||
#region Construction listeEffets
|
#region Construction listeEffets
|
||||||
// Construction de la liste d'effets
|
// Construction de la liste d'effets
|
||||||
var numCol = new TreeViewColumn();
|
var numCol = new TreeViewColumn();
|
||||||
var nomCol = new TreeViewColumn();
|
nomCol = new TreeViewColumn();
|
||||||
var dureeCol = new TreeViewColumn();
|
var dureeCol = new TreeViewColumn();
|
||||||
var transCol = new TreeViewColumn();
|
var transCol = new TreeViewColumn();
|
||||||
|
|
||||||
|
|
@ -46,6 +47,11 @@ namespace DMX2
|
||||||
dureeCol.SetCellDataFunc(dureeCell, new TreeCellDataFunc(RenderDuree));
|
dureeCol.SetCellDataFunc(dureeCell, new TreeCellDataFunc(RenderDuree));
|
||||||
transCol.SetCellDataFunc(transCell, new TreeCellDataFunc(RenderTrans));
|
transCol.SetCellDataFunc(transCell, new TreeCellDataFunc(RenderTrans));
|
||||||
|
|
||||||
|
nomCol.MinWidth = 150;
|
||||||
|
nomCol.Expand=true;
|
||||||
|
dureeCol.MaxWidth=50;
|
||||||
|
transCol.MaxWidth=50;
|
||||||
|
|
||||||
effetsListe.AppendColumn(numCol);
|
effetsListe.AppendColumn(numCol);
|
||||||
effetsListe.AppendColumn(nomCol);
|
effetsListe.AppendColumn(nomCol);
|
||||||
effetsListe.AppendColumn(transCol);
|
effetsListe.AppendColumn(transCol);
|
||||||
|
|
@ -269,9 +275,11 @@ namespace DMX2
|
||||||
protected void OnSaveActionActivated (object sender, EventArgs e)
|
protected void OnSaveActionActivated (object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
//int d,t; if(!int.TryParse(dureeEntry.Text,out d) || !int.TryParse(transEntry.Text,out t)) return;
|
//int d,t; if(!int.TryParse(dureeEntry.Text,out d) || !int.TryParse(transEntry.Text,out t)) return;
|
||||||
sequenceur.SauveEffet("Nouvel Effet", TimeSpan.Zero,TimeSpan.FromSeconds(5));
|
TreeIter iter;
|
||||||
|
int pos = sequenceur.SauveEffet("Nouvel Effet", TimeSpan.Zero,TimeSpan.FromSeconds(5));
|
||||||
UpdListeEffets();
|
UpdListeEffets();
|
||||||
|
lsEffets.IterNthChild(out iter, pos);
|
||||||
|
effetsListe.SetCursor(lsEffets.GetPath(iter),nomCol,true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -295,10 +303,6 @@ namespace DMX2
|
||||||
sequenceur.FinDeTransition();
|
sequenceur.FinDeTransition();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue