nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Say who is the owner of executing tasks. This allows us to filter running tasks displays

Browse source 
issue: MatterHackers/MCCentral#4660
Not printing printer tab showing print progress from printing printer tab
This commit is contained in:
Lars Brubaker 2018-12-05 13:48:25 -08:00
parent 273e20be89
commit 8de283dbfe
20 changed files with 87 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

29
MatterControlLib/PartPreviewWindow/RunningTasksWidget.cs
View file

@ -40,9 +40,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private ThemeConfig theme;
private Color borderColor;
private FlowLayoutWidget pendingTasksList;
private object owner;
public RunningTasksWidget(ThemeConfig theme)
public RunningTasksWidget(ThemeConfig theme, object owner)
{
this.owner = owner;
this.theme = theme;
if (theme.IsDarkTheme)
@ -95,16 +97,25 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Add new items
foreach (var taskItem in tasks.RunningTasks.Where(t => !displayedTasks.Contains(t)))
{
var taskRow = new RunningTaskRow("", taskItem, theme)
// show tasks that are unfiltered (owner == null) or are owned by us
if (taskItem.Owner == null
|| taskItem.Owner == owner)
{
HAnchor = HAnchor.Stretch,
BackgroundColor = theme.AccentMimimalOverlay,
Border = new BorderDouble(1, 1, 1, 0),
BorderColor = borderColor,
ProgressBackgroundColor = progressBackgroundColor
};
var taskRow = new RunningTaskRow("", taskItem, theme)
{
HAnchor = HAnchor.Stretch,
BackgroundColor = theme.AccentMimimalOverlay,
Border = new BorderDouble(1, 1, 1, 0),
BorderColor = borderColor,
ProgressBackgroundColor = progressBackgroundColor
};
pendingTasksList.AddChild(taskRow);
pendingTasksList.AddChild(taskRow);
}
else
{
int a = 0;
}
}
this.Visible = pendingTasksList.Children.Count > 0;