From 3803b2cf3450ba6e2ef59bc3c150057315f1e539 Mon Sep 17 00:00:00 2001 From: jsimomaa Date: Wed, 5 Dec 2018 11:32:00 +0200 Subject: [PATCH] Change map background color in network diagram gitlab #20 Change-Id: I4d81104cf61a99aeb4a02c9ade40337d253c6404 --- .../META-INF/MANIFEST.MF | 5 +- .../graph/DistrictNetwork.pgraph | 30 ++ .../DistrictNetworkDiagramSettings.pgraph | 3 +- .../ontology/DistrictNetworkResource.java | 30 ++ .../fragment.e4xmi | 3 + .../ChangeMapBackgroundColorHandler.java | 74 +++++ .../ChangeMappingTypeHandler.java | 279 ++++++++++++------ .../META-INF/MANIFEST.MF | 4 +- .../district/network/DistrictNetworkUtil.java | 12 + 9 files changed, 351 insertions(+), 89 deletions(-) create mode 100644 org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMapBackgroundColorHandler.java diff --git a/org.simantics.district.network.ontology/META-INF/MANIFEST.MF b/org.simantics.district.network.ontology/META-INF/MANIFEST.MF index a4cb4e14..9653d574 100644 --- a/org.simantics.district.network.ontology/META-INF/MANIFEST.MF +++ b/org.simantics.district.network.ontology/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Simantics District Network Ontology +Bundle-Name: http://www.simantics.org/DistrictNetwork-1.0 Bundle-SymbolicName: org.simantics.district.network.ontology Bundle-Version: 1.0.0.qualifier Require-Bundle: org.simantics.layer0, @@ -12,6 +12,7 @@ Require-Bundle: org.simantics.layer0, org.simantics.selectionview.ontology;bundle-version="1.2.0", org.simantics.selectionview.ui.ontology;bundle-version="1.1.0", org.simantics.g2d.ontology;bundle-version="1.1.0", - org.simantics.layer0x.ontology;bundle-version="1.1.0" + org.simantics.layer0x.ontology;bundle-version="1.1.0", + org.simantics.datatypes.ontology;bundle-version="1.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.district.network.ontology diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph index 64c1b6cd..c5195291 100644 --- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph +++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph @@ -154,6 +154,14 @@ DN.Diagram.MappedDiagram -- DN.Mapping.EdgeMapping.KSupplyAttribute --> L0.String -- DN.Mapping.EdgeMapping.TGroundAttribute --> L0.String -- DN.Mapping.EdgeMapping.ElevationAttribute --> L0.String SEL_UI = G2D = DN = +DATATYPES = // ---------------------------------------------------------------------------- @@ -78,7 +79,7 @@ DN.Diagram L0.HasLabel "Node Scale Bias" >-- DN.Diagram.nodeScaleProperty --> DN.Vertex.ScaleProperty -- DN.Diagram.backgroundColor ==> "String" -- DN.Diagram.backgroundColor --> DATATYPES.RGB.Integer -- DN.Diagram.drawMapEnabled ==> "Boolean" + @@ -14,6 +15,7 @@ + @@ -21,5 +23,6 @@ + diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMapBackgroundColorHandler.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMapBackgroundColorHandler.java new file mode 100644 index 00000000..d52124cd --- /dev/null +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMapBackgroundColorHandler.java @@ -0,0 +1,74 @@ +package org.simantics.district.network.ui.contributions; + +import java.util.List; + +import javax.inject.Named; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.e4.core.di.annotations.CanExecute; +import org.eclipse.e4.core.di.annotations.Execute; +import org.eclipse.e4.ui.services.IServiceConstants; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ui.progress.UIJob; +import org.simantics.DatabaseJob; +import org.simantics.Simantics; +import org.simantics.datatypes.literal.RGB; +import org.simantics.db.Resource; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.layer0.SelectionHints; +import org.simantics.db.request.Write; +import org.simantics.district.network.DistrictNetworkUtil; +import org.simantics.district.network.ui.internal.Activator; +import org.simantics.utils.ui.ISelectionUtils; +import org.simantics.utils.ui.color.Color; +import org.simantics.utils.ui.workbench.dialogs.ColorDialog; +import org.slf4j.LoggerFactory; + +public class ChangeMapBackgroundColorHandler { + + private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(ChangeMapBackgroundColorHandler.class); + + @CanExecute + public boolean canExecute(@Named(IServiceConstants.ACTIVE_SELECTION) ISelection selection) { + final List diagrams = ISelectionUtils.getPossibleKeys(selection, SelectionHints.KEY_MAIN, Resource.class); + return diagrams.size() > 0; + } + + @Execute + public void execute(@Named(IServiceConstants.ACTIVE_SELECTION) Object selection) { + final List diagrams = ISelectionUtils.getPossibleKeys(selection, SelectionHints.KEY_MAIN, Resource.class); + Job uijob = new UIJob("Change Map Background Color") { + + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { + ColorDialog dialog = new ColorDialog(getDisplay().getActiveShell()); + if (dialog.open() == Dialog.OK) { + Color c = dialog.getColor(); + + LOGGER.info("Found color {}", c); + Job job = new DatabaseJob("Toggle draw map") { + + @Override + protected IStatus run(IProgressMonitor monitor) { + try { + Simantics.getSession().syncRequest((Write) graph -> DistrictNetworkUtil.changeMapBackgroundColor(graph, diagrams.get(0), new RGB.Integer(c.getR(), c.getG(), c.getB()))); + } catch (DatabaseException e) { + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getName() + " failed.", e); + } + return Status.OK_STATUS; + } + }; + job.setUser(true); + job.schedule(); + } + return Status.OK_STATUS; + } + }; + uijob.setUser(true); + uijob.schedule(); + } +} diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMappingTypeHandler.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMappingTypeHandler.java index 2f3aae45..2b3d1888 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMappingTypeHandler.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMappingTypeHandler.java @@ -1,8 +1,12 @@ package org.simantics.district.network.ui.contributions; +import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; import javax.inject.Named; @@ -25,110 +29,172 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.SelectionStatusDialog; +import org.eclipse.ui.progress.UIJob; import org.simantics.DatabaseJob; import org.simantics.Simantics; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; +import org.simantics.db.common.NamedResource; +import org.simantics.db.common.request.IndexRoot; import org.simantics.db.common.request.ReadRequest; +import org.simantics.db.common.request.UniqueRead; import org.simantics.db.common.request.WriteRequest; +import org.simantics.db.common.utils.NameUtils; import org.simantics.db.exception.DatabaseException; +import org.simantics.db.exception.ServiceException; +import org.simantics.db.exception.ValidationException; import org.simantics.db.layer0.SelectionHints; -import org.simantics.db.request.Read; +import org.simantics.db.procedure.Procedure; import org.simantics.district.network.ontology.DistrictNetworkResource; import org.simantics.district.network.ui.function.Functions; import org.simantics.district.network.ui.internal.Activator; -import org.simantics.layer0.Layer0; import org.simantics.utils.ui.ISelectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ChangeMappingTypeHandler { - + private static final Logger LOGGER = LoggerFactory.getLogger(ChangeMappingTypeHandler.class); + @CanExecute public boolean canExecute(@Named(IServiceConstants.ACTIVE_SELECTION) ISelection selection) { - List elements = ISelectionUtils.getPossibleKeys(selection, SelectionHints.KEY_MAIN, Resource.class); - if (elements.size() < 1) - return false; - try { - return Simantics.getSession().syncRequest(new Read() { - - @Override - public Boolean perform(ReadGraph graph) throws DatabaseException { - Layer0 L0 = Layer0.getInstance(graph); - Resource instanceOf = null; - for (Resource element : elements) { - if (instanceOf == null) { - instanceOf = graph.getSingleObject(element, L0.InstanceOf); - } else { - Resource currentInstanceOf = graph.getSingleObject(element, L0.InstanceOf); - if (!currentInstanceOf.equals(instanceOf)) { - return false; - } - } - } - return true; - } - }); - } catch (DatabaseException e) { - e.printStackTrace(); - return false; - } +// List elements = ISelectionUtils.getPossibleKeys(selection, SelectionHints.KEY_MAIN, Resource.class); +// if (elements.size() < 1) +// return false; +// try { +// return Simantics.getSession().syncRequest(new Read() { +// +// @Override +// public Boolean perform(ReadGraph graph) throws DatabaseException { +// Layer0 L0 = Layer0.getInstance(graph); +// Resource instanceOf = null; +// for (Resource element : elements) { +// if (instanceOf == null) { +// instanceOf = graph.getSingleObject(element, L0.InstanceOf); +// } else { +// Resource currentInstanceOf = graph.getSingleObject(element, L0.InstanceOf); +// if (!currentInstanceOf.equals(instanceOf)) { +// return false; +// } +// } +// } +// return true; +// } +// }); +// } catch (DatabaseException e) { +// e.printStackTrace(); +// return false; +// } + return true; } @Execute public void execute(@Named(IServiceConstants.ACTIVE_SELECTION) Object selection) { final List elements = ISelectionUtils.getPossibleKeys(selection, SelectionHints.KEY_MAIN, Resource.class); - if (elements.size() < 1) - return; - - SelectMappingDialog dialog = new SelectMappingDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), elements); - if (dialog.open() != Dialog.OK) - return; +// if (elements.size() < 1) +// return; - Resource mapping = dialog.getDefaultVertexMapping(); - Job job = new DatabaseJob("Join selected vertices") { + CompletableFuture>> result = new CompletableFuture<>(); + Simantics.getSession().asyncRequest(new UniqueRead>>() { @Override - protected IStatus run(IProgressMonitor monitor) { - try { - Simantics.getSession().syncRequest(new WriteRequest() { - - @Override - public void perform(WriteGraph graph) throws DatabaseException { - DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph); - for (Resource element : elements) { - graph.deny(element, DN.HasMapping); - graph.claim(element, DN.HasMapping, mapping); - } + public Map> perform(ReadGraph graph) throws DatabaseException { + DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph); + + Map> currents = new HashMap<>(); + for (Resource element : elements) { + Resource currentMapping = graph.getPossibleObject(element, DN.HasMapping); + NamedResource mapping = new NamedResource(NameUtils.getSafeName(graph, currentMapping), currentMapping); + currents.compute(mapping, (t, u) -> { + if (u == null) + u = new HashSet<>(); + try { + u.add(new NamedResource(NameUtils.getSafeName(graph, element), element)); + } catch (ValidationException | ServiceException e) { + LOGGER.error("Could not compute name for {}", element, e); } + return u; }); - } catch (DatabaseException e) { - return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getName() + " failed.", e); } + return currents; + } + }, new Procedure>>() { + + @Override + public void execute(Map> results) { + result.complete(results); + } + + @Override + public void exception(Throwable t) { + LOGGER.error("Could not compute mappings for selection {}", elements, t); + result.completeExceptionally(t); + } + }); + + UIJob uiJob = new UIJob("Change mappings..") { + + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { + SelectMappingDialog dialog = new SelectMappingDialog(getDisplay().getActiveShell(), result); + if (dialog.open() != Dialog.OK) + return Status.OK_STATUS; + + Map> results = dialog.getResults(); + Job job = new DatabaseJob("Join selected vertices") { + + @Override + protected IStatus run(IProgressMonitor monitor) { + try { + Simantics.getSession().syncRequest(new WriteRequest() { + + @Override + public void perform(WriteGraph graph) throws DatabaseException { + DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph); + + for (Map.Entry> entry : results.entrySet()) { + Resource newMapping = entry.getKey(); + Collection elements = entry.getValue(); + for (NamedResource element : elements) { + graph.deny(element.getResource(), DN.HasMapping); + graph.claim(element.getResource(), DN.HasMapping, newMapping); + } + } + } + }); + } catch (DatabaseException e) { + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getName() + " failed.", e); + } + return Status.OK_STATUS; + } + }; + job.setUser(true); + job.schedule(); return Status.OK_STATUS; } }; - job.setUser(true); - job.schedule(); + uiJob.setUser(true); + uiJob.schedule(); } private static class SelectMappingDialog extends SelectionStatusDialog { - private Combo vertexMappingCombo; + private Map mappingCombos = new HashMap<>(); private Composite composite; - private List elements; - private Map vertexMappings = new HashMap<>(); + private CompletableFuture>> elements; + + private Map> possibleMappings = new HashMap<>(); private Resource defaultVertexMapping; - protected SelectMappingDialog(Shell parentShell, List elements) { + protected SelectMappingDialog(Shell parentShell, CompletableFuture>> elements) { super(parentShell); this.elements = elements; - setTitle("Select mappings for new DN diagram"); + setTitle("Change mappings"); } public Resource getDefaultVertexMapping() { @@ -147,44 +213,87 @@ public class ChangeMappingTypeHandler { @Override public void run(ReadGraph graph) throws DatabaseException { DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph); - Resource element = elements.get(0); - if (graph.isInstanceOf(element, DN.Vertex)) { - vertexMappings = Functions.getVertexMappings(graph, element); - } else if (graph.isInstanceOf(element, DN.Edge)) { - vertexMappings = Functions.getEdgeMappings(graph, element); + try { + for (Map.Entry> entry : elements.get().entrySet()) { + NamedResource currentMapping = entry.getKey(); + Resource resource = entry.getValue().iterator().next().getResource(); + Resource indexRoot = graph.sync(new IndexRoot(resource)); + if (graph.isInstanceOf(currentMapping.getResource(), DN.Mapping_VertexMapping)) { + possibleMappings.put(currentMapping, Functions.getVertexMappings(graph, indexRoot)); + } else if (graph.isInstanceOf(currentMapping.getResource(), DN.Mapping_EdgeMapping)) { + possibleMappings.put(currentMapping, Functions.getEdgeMappings(graph, indexRoot)); + } + } + } catch (InterruptedException | ExecutionException e) { + e.printStackTrace(); } composite.getDisplay().asyncExec(() -> { - vertexMappingCombo.setItems(vertexMappings.keySet().toArray(new String[vertexMappings.size()])); - vertexMappingCombo.select(0); - }); - + for (Map.Entry> entry : possibleMappings.entrySet()) { + NamedResource key = entry.getKey(); + Map value = entry.getValue(); + Combo combo = mappingCombos.get(key); + combo.setItems(value.keySet().toArray(new String[value.size()])); + combo.select(0); + } + }); } }); return composite; } + private Map> results = new HashMap<>(); + @Override protected void computeResult() { - defaultVertexMapping = vertexMappings.get(vertexMappingCombo.getItem(vertexMappingCombo.getSelectionIndex())); + for (Map.Entry combos : mappingCombos.entrySet()) { + NamedResource resource = combos.getKey(); + Combo c = combos.getValue(); + String item = c.getItem(c.getSelectionIndex()); + + Map map = possibleMappings.get(resource); + Resource newMapping = map.get(item); + results.compute(newMapping, (t, u) -> { + if (u == null) { + u = new HashSet<>(); + } + u.add(resource); + return u; + }); + } } - + + public Map> getResults() { + return results; + } + private void createMappingsGroup(Composite parent) { - Group group= new Group(parent, SWT.NONE); - group.setFont(parent.getFont()); - group.setText("Default mappings"); - GridDataFactory.fillDefaults().grab(true, false).applyTo(group); - group.setLayout(new GridLayout(1, false)); - - Composite cmposite = new Composite(group, SWT.NONE); - cmposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); - cmposite.setLayout(new GridLayout(2, false)); - - Label vertexMappingLabel = new Label(cmposite, SWT.NONE); - vertexMappingLabel.setText("Default vertex mapping"); + try { + for (Map.Entry> entry : elements.get().entrySet()) { + + NamedResource currentMapping = entry.getKey(); + + Collection mappedElements = entry.getValue(); + + Group group= new Group(parent, SWT.NONE); + group.setFont(parent.getFont()); + group.setText(currentMapping.getName() + " currently mapped to " + mappedElements.size() + " elements"); + GridDataFactory.fillDefaults().grab(true, false).applyTo(group); + group.setLayout(new GridLayout(1, false)); + + Composite cmposite = new Composite(group, SWT.NONE); + cmposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); + cmposite.setLayout(new GridLayout(2, false)); + + Label vertexMappingLabel = new Label(cmposite, SWT.NONE); + vertexMappingLabel.setText("New mapping type"); - vertexMappingCombo = new Combo(cmposite, SWT.READ_ONLY | SWT.BORDER); - GridDataFactory.fillDefaults().grab(true, false).applyTo(vertexMappingCombo); - + Combo c = new Combo(cmposite, SWT.READ_ONLY | SWT.BORDER); + GridDataFactory.fillDefaults().grab(true, false).applyTo(c); + mappingCombos.put(entry.getKey(), c); + } + } catch (InterruptedException | ExecutionException e) { + e.printStackTrace(); + } } } } diff --git a/org.simantics.district.network/META-INF/MANIFEST.MF b/org.simantics.district.network/META-INF/MANIFEST.MF index 8fb9329f..58fd3ab4 100644 --- a/org.simantics.district.network/META-INF/MANIFEST.MF +++ b/org.simantics.district.network/META-INF/MANIFEST.MF @@ -14,6 +14,8 @@ Require-Bundle: org.simantics.db, org.simantics.district.geotools;bundle-version="1.0.0", org.simantics.diagram, org.simantics.scenegraph.profile;bundle-version="1.0.0", - org.simantics;bundle-version="1.0.0" + org.simantics;bundle-version="1.0.0", + org.slf4j.api Export-Package: org.simantics.district.network, + org.simantics.district.network.changeset, org.simantics.district.network.profile diff --git a/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java b/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java index 82108517..550553f1 100644 --- a/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java +++ b/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java @@ -4,6 +4,8 @@ import java.util.Collection; import java.util.Iterator; import org.simantics.databoard.Bindings; +import org.simantics.datatypes.literal.RGB; +import org.simantics.datatypes.literal.RGB.Integer; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; import org.simantics.db.WriteGraph; @@ -220,4 +222,14 @@ public class DistrictNetworkUtil { Boolean current = graph.getPossibleRelatedValue(diagram, DN.Diagram_drawMapEnabled, Bindings.BOOLEAN); return current != null ? current : true; } + + public static void changeMapBackgroundColor(WriteGraph graph, Resource resource, Integer integer) throws DatabaseException { + DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph); + graph.claimLiteral(resource, DN.Diagram_backgroundColor, integer, Bindings.getBindingUnchecked(RGB.Integer.class)); + } + + public static Boolean trackChangesEnabled(ReadGraph graph, Resource diagram) throws DatabaseException { + return Boolean.TRUE.equals(graph.getPossibleRelatedValue(diagram, + DistrictNetworkResource.getInstance(graph).Diagram_trackChangesEnabled)); + } } -- 2.45.2