X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2FdiagramEditor%2FDiagramViewerSelectionProvider.java;h=42c489e24d4b866d310507cf7d1d00d4cc1508cf;hp=c3070d9cceb9f60ccd3fde3aef1e7407a14b9957;hb=55ca14c4198659b908aeffc8d16e240b35a75e66;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerSelectionProvider.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerSelectionProvider.java
index c3070d9cc..42c489e24 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerSelectionProvider.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerSelectionProvider.java
@@ -18,6 +18,7 @@ import org.simantics.db.layer0.request.PossibleModel;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.layer0.variable.Variables;
 import org.simantics.diagram.Logger;
+import org.simantics.diagram.flag.FlagUtil;
 import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.diagram.ui.DiagramModelHints;
 import org.simantics.diagram.ui.WorkbenchSelectionProvider;
@@ -25,6 +26,7 @@ import org.simantics.g2d.diagram.IDiagram;
 import org.simantics.g2d.element.ElementHints;
 import org.simantics.g2d.element.ElementUtils;
 import org.simantics.g2d.element.IElement;
+import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ModelingResources;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.ui.selection.AnyResource;
@@ -62,6 +64,7 @@ public class DiagramViewerSelectionProvider extends WorkbenchSelectionProvider {
                         public Variable perform(ReadGraph graph) throws DatabaseException {
 
                             DiagramResource DIA = DiagramResource.getInstance(graph);
+                            ModelingResources MOD = ModelingResources.getInstance(graph);
 
                             String uri = graph.getPossibleRelatedValue(resource, DIA.RuntimeDiagram_HasVariable);
                             if (uri == null)
@@ -71,9 +74,28 @@ public class DiagramViewerSelectionProvider extends WorkbenchSelectionProvider {
                             if (var == null)
                                 return null;
 
-                            Resource config = graph.getPossibleObject(resource2, ModelingResources.getInstance(graph).ElementToComponent);
-                            if (config == null)
+                            Resource config = graph.getPossibleObject(resource2, MOD.ElementToComponent);
+                            if (config == null) {
+                                // Apros #9646: if resource2 is the diagram
+                                // itself, return the diagram composite variable
+                                // since it is generally more useful than the
+                                // variable to the diagram.
+                                Resource composite = graph.getPossibleObject(resource2, MOD.DiagramToComposite);
+                                if (composite != null && composite.equals(var.getPossibleRepresents(graph))) {
+                                    //return Variables.getPossibleVariable(graph, resource2);
+                                    return var;
+                                }
+                                
+                                if(graph.isInstanceOf(resource2, DIA.Flag)) {
+                                	Layer0 L0 = Layer0.getInstance(graph);
+                                	Variable signal = FlagUtil.getPossibleFlagSignal(graph, var, resource2, L0.Entity);
+                                	if(signal != null)
+                                		return signal;
+                                }
+
                                 return null;
+                                
+                            }
 
                             return var.browsePossible(graph, config);