From 15713186af7812e99c2dd49db93219f1ee221634 Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Tue, 13 Nov 2018 19:34:05 -0800 Subject: [PATCH] Compact display of models in job editor. --- src/Mod/Path/PathScripts/PathJobGui.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathJobGui.py b/src/Mod/Path/PathScripts/PathJobGui.py index 5619b764b8..26125b55ab 100644 --- a/src/Mod/Path/PathScripts/PathJobGui.py +++ b/src/Mod/Path/PathScripts/PathJobGui.py @@ -527,9 +527,6 @@ class TaskPanel: self.obj.PostProcessor = postProcessors self.obj.PostProcessor = currentPostProcessor - for base in self.obj.Model.Group: - self.form.jobModel.addItem(base.Label) - self.postProcessorDefaultTooltip = self.form.postProcessor.toolTip() self.postProcessorArgsDefaultTooltip = self.form.postProcessorArguments.toolTip() @@ -696,8 +693,11 @@ class TaskPanel: self.form.operationsList.addItem(item) self.form.jobModel.clear() - for base in self.obj.Model.Group: - self.form.jobModel.addItem(base.Label) + for name, count in PathUtil.keyValueIter(Counter([self.obj.Proxy.baseObject(self.obj, o).Label for o in self.obj.Model.Group])): + if count == 1: + self.form.jobModel.addItem(name) + else: + self.form.jobModel.addItem("%s (%d)" % (name, count)) self.updateToolController() self.stockEdit.setFields(self.obj)