From c21f2dc656cbd621185a0bb88175db618d78eef9 Mon Sep 17 00:00:00 2001 From: Reino Ruusu Date: Wed, 30 Jan 2019 16:33:06 +0200 Subject: [PATCH] Bug fixes to element selection query processing * Accept STR.Composite in addition to DIA.Diagram * Fix error when selected element count in an NLowest or NHighest is higher than the number of elements available gitlab #28 TODO: * UI for listing stored queries * UI for defining/editing queries * UI for executing queries Change-Id: Ia88980863f4a64ec2c44df081596bb67417d298d --- .../simantics/district/selection/ElementSelector.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/org.simantics.district.selection/src/org/simantics/district/selection/ElementSelector.java b/org.simantics.district.selection/src/org/simantics/district/selection/ElementSelector.java index a45839c9..7d429e4e 100644 --- a/org.simantics.district.selection/src/org/simantics/district/selection/ElementSelector.java +++ b/org.simantics.district.selection/src/org/simantics/district/selection/ElementSelector.java @@ -13,7 +13,6 @@ import org.simantics.db.Resource; import org.simantics.db.common.request.ResourceRead; import org.simantics.db.common.utils.ListUtils; import org.simantics.db.exception.DatabaseException; -import org.simantics.db.exception.ServiceException; import org.simantics.db.layer0.request.ActiveModels; import org.simantics.db.layer0.request.ActiveRuns; import org.simantics.db.layer0.request.Configuration; @@ -287,7 +286,12 @@ public class ElementSelector { } } - private static Collection elementsOfDiagram(ReadGraph graph, Resource diagram) throws ServiceException { + private static Collection elementsOfDiagram(ReadGraph graph, Resource diagram) throws DatabaseException { + if (graph.isInstanceOf(diagram, STR.Composite)) { + // Resource is a composite - get diagram + return elementsOfDiagram(graph, graph.getSingleObject(diagram, MOD.CompositeToDiagram)); + } + Collection elements = graph.getObjects(diagram, L0.ConsistsOf); Collection result = new ArrayList<>(); for (Resource r : elements) @@ -466,7 +470,8 @@ public class ElementSelector { result2.sort((t1, t2) -> smallest ? Double.compare((Double) t1.c1, (Double) t2.c1) : Double.compare((Double) t2.c1, (Double) t1.c1)); - result2 = result2.subList(0, resultCount); + if (resultCount < result2.size()) + result2 = result2.subList(0, resultCount); result = Lists.map(new FunctionImpl1() { @Override -- 2.47.1