From 3ad6657f324fc85a6495161910eda83c2010b8a3 Mon Sep 17 00:00:00 2001 From: Antti Villberg Date: Wed, 9 Nov 2016 12:02:47 +0200 Subject: [PATCH] Added property SEL.hidden that is tested in VariablePropertyRule refs #6798 Change-Id: I0a23da64589abef202a3ac3ee9a5ee2210703b01 --- .../ui/viewpoint/VariablePropertyRule.java | 3 +++ .../graph.tg | Bin 11214 -> 11392 bytes .../graph/Selectionview.pgraph | 2 ++ .../selectionview/SelectionViewResources.java | 6 ++++++ 4 files changed, 11 insertions(+) diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/viewpoint/VariablePropertyRule.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/viewpoint/VariablePropertyRule.java index 76ec9b919..0323cfad4 100644 --- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/viewpoint/VariablePropertyRule.java +++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/viewpoint/VariablePropertyRule.java @@ -76,6 +76,9 @@ public class VariablePropertyRule implements ChildRule { if (isUnder(graph, L0, SEL, property, propertiesPredicates)) continue props; + Boolean hidden = property.getPossiblePropertyValue(graph, SEL.hidden, Bindings.BOOLEAN); + if(hidden != null && hidden) continue props; + for(String req : requiredProperties) if(property.getPossibleProperty(graph, req) == null) continue props; for(String req : filteredProperties) if(property.getName(graph).equals(req)) continue props; diff --git a/bundles/org.simantics.selectionview.ontology/graph.tg b/bundles/org.simantics.selectionview.ontology/graph.tg index 757158d3bf4087c45981b5ebc2ddcf5d58127e0e..49a3f113fe75e9b05e284fbbc135154403e939a8 100644 GIT binary patch literal 11392 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 "String" "Boolean" "Boolean"