From: Antti Villberg <antti.villberg@semantum.fi>
Date: Wed, 9 Nov 2016 10:02:47 +0000 (+0200)
Subject: Added property SEL.hidden that is tested in VariablePropertyRule
X-Git-Tag: v1.25.0~58
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=3ad6657f324fc85a6495161910eda83c2010b8a3;p=simantics%2Fplatform.git

Added property SEL.hidden that is tested in VariablePropertyRule

refs #6798

Change-Id: I0a23da64589abef202a3ac3ee9a5ee2210703b01
---

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 757158d3b..49a3f113f 100644
Binary files a/bundles/org.simantics.selectionview.ontology/graph.tg and b/bundles/org.simantics.selectionview.ontology/graph.tg differ
diff --git a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
index f9eb00666..8905c6252 100644
--- a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
+++ b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
@@ -99,6 +99,8 @@ SEL.SortingName ==> "String" <R L0.HasProperty : L0.FunctionalRelation
 
 SEL.canBeLifted ==> "Boolean" <R L0.HasProperty : L0.FunctionalRelation
 
+SEL.hidden ==> "Boolean" <R L0.HasProperty : L0.FunctionalRelation
+
 SEL.GenericParameterType <T L0.FunctionalRelation
   @L0.assert SEL.HasDisplayProperty
     _ : SEL.DisplayProperty
diff --git a/bundles/org.simantics.selectionview.ontology/src/org/simantics/selectionview/SelectionViewResources.java b/bundles/org.simantics.selectionview.ontology/src/org/simantics/selectionview/SelectionViewResources.java
index 00d59a686..c497214d7 100644
--- a/bundles/org.simantics.selectionview.ontology/src/org/simantics/selectionview/SelectionViewResources.java
+++ b/bundles/org.simantics.selectionview.ontology/src/org/simantics/selectionview/SelectionViewResources.java
@@ -97,6 +97,8 @@ public class SelectionViewResources {
     public final Resource canBeLifted_Inverse;
     public final Resource getSpecialCategory;
     public final Resource getSpecialCategory_Inverse;
+    public final Resource hidden;
+    public final Resource hidden_Inverse;
         
     public static class URIs {
         public static final String AbstractResourceTabContribution = "http://www.simantics.org/SelectionView-1.2/AbstractResourceTabContribution";
@@ -186,6 +188,8 @@ public class SelectionViewResources {
         public static final String canBeLifted_Inverse = "http://www.simantics.org/SelectionView-1.2/canBeLifted/Inverse";
         public static final String getSpecialCategory = "http://www.simantics.org/SelectionView-1.2/getSpecialCategory";
         public static final String getSpecialCategory_Inverse = "http://www.simantics.org/SelectionView-1.2/getSpecialCategory/Inverse";
+        public static final String hidden = "http://www.simantics.org/SelectionView-1.2/hidden";
+        public static final String hidden_Inverse = "http://www.simantics.org/SelectionView-1.2/hidden/Inverse";
     }
     
     public static Resource getResourceOrNull(ReadGraph graph, String uri) {
@@ -285,6 +289,8 @@ public class SelectionViewResources {
         canBeLifted_Inverse = getResourceOrNull(graph, URIs.canBeLifted_Inverse);
         getSpecialCategory = getResourceOrNull(graph, URIs.getSpecialCategory);
         getSpecialCategory_Inverse = getResourceOrNull(graph, URIs.getSpecialCategory_Inverse);
+        hidden = getResourceOrNull(graph, URIs.hidden);
+        hidden_Inverse = getResourceOrNull(graph, URIs.hidden_Inverse);
     }
     
     public static SelectionViewResources getInstance(ReadGraph graph) {