import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
+import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IEditorPart;
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.UniqueRead;
import org.simantics.db.common.request.WriteRequest;
import org.simantics.db.exception.DatabaseException;
import org.simantics.db.procedure.Listener;
import org.simantics.district.network.DistrictNetworkUtil;
+import org.simantics.district.network.ontology.DistrictNetworkResource;
+import org.simantics.district.network.profile.ActiveDynamicVisualisationsRequest;
import org.simantics.district.network.profile.DynamicVisualisationsRequest;
import org.simantics.district.network.visualisations.DynamicVisualisationsContributions;
import org.simantics.district.network.visualisations.DynamicVisualisationsContributions.DynamicColoringObject;
private Combo colorLocationCombo;
private Combo colorSizeCombo;
+ private Combo templateSelectionCombo;
+
+ private List<Supplier<Pair<String, DynamicColorContribution>>> colorSuppliers;
+
public DynamicVisualisationsUI(Composite parent, int style) {
super(parent, style);
GridDataFactory.fillDefaults().grab(true, true).applyTo(this);
GridLayoutFactory.fillDefaults().numColumns(1).margins(5, 5).applyTo(this);
+ Composite selectionComposite = new Composite(this, SWT.NONE);
+ GridDataFactory.fillDefaults().grab(true, false).applyTo(selectionComposite);
+ GridLayoutFactory.fillDefaults().numColumns(2).margins(5, 5).applyTo(selectionComposite);
+
+ Label templateNameLabel = new Label(selectionComposite, SWT.NONE);
+ templateNameLabel.setText("Visualisation template");
+ templateSelectionCombo = new Combo(selectionComposite, SWT.READ_ONLY);
+ GridDataFactory.fillDefaults().grab(true, false).applyTo(templateSelectionCombo);
+ templateSelectionCombo.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ String item = templateSelectionCombo.getItem(templateSelectionCombo.getSelectionIndex());
+ for (NamedResource template : visualisations) {
+ if (item.equals(template.getName())) {
+ Simantics.getSession().asyncRequest(new WriteRequest() {
+
+ @Override
+ public void perform(WriteGraph graph) throws DatabaseException {
+ DistrictNetworkUtil.setActiveVisualisation(graph, diagramResource, template.getResource());
+ }
+ });
+ break;
+ }
+ }
+ }
+ });
+
Composite coloringObjectsComposite = new Composite(this, SWT.NONE);
GridDataFactory.fillDefaults().grab(true, false).applyTo(coloringObjectsComposite);
GridLayoutFactory.fillDefaults().numColumns(1).applyTo(coloringObjectsComposite);
GridLayoutFactory.fillDefaults().numColumns(1).applyTo(sizeBarsComposite);
initializeSizeBars(sizeBarsComposite);
+ Button saveVisualisationTemplateButton = new Button(this, SWT.NONE);
+ saveVisualisationTemplateButton.setText("Save");
+ saveVisualisationTemplateButton.setEnabled(visualisation == null || visualisation.getVisualisationResource() != null);
+ saveVisualisationTemplateButton.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ persistVisualisationTemplate(visualisation.getName(), Optional.of(visualisation.getVisualisationResource()));
+ }
+ });
+
+ Button saveVisualisationTemplateAsButton = new Button(this, SWT.NONE);
+ saveVisualisationTemplateAsButton.setText("Save as visualisation template");
+ saveVisualisationTemplateAsButton.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ showSaveVisualisationTemplateDialog(e.widget.getDisplay().getActiveShell());
+ }
+ });
+
+ }
+
+ private void showSaveVisualisationTemplateDialog(Shell shell) {
+
+ InputDialog dialog = new InputDialog(shell, "Save visualisation template", "Give template a name", "", new IInputValidator() {
+
+ @Override
+ public String isValid(String newText) {
+ if (newText == null || newText.isEmpty())
+ return "Name cannot be empty";
+ return null;
+ }
+ });
+
+ if (dialog.open() == Dialog.OK) {
+ String name = dialog.getValue();
+ persistVisualisationTemplate(name, Optional.empty());
+ }
+ }
+
+ private void persistVisualisationTemplate(String templateName, Optional<Resource> existing) {
+
+ List<Pair<String, DynamicColorContribution>> colorCollect = colorSuppliers.stream().map(s -> s.get()).filter(Objects::nonNull).collect(Collectors.toList());
+
+ String colorLocation = colorLocationCombo.getItem(colorLocationCombo.getSelectionIndex());
+ String colorSize = colorSizeCombo.getItem(colorSizeCombo.getSelectionIndex());
+
+ ColorBarOptions colorBarOptions = new ColorBarOptions()
+ .showColorBars(showColorButton.getSelection())
+ .showColorBarsTicks(colorTicksButton.getSelection())
+ .withLocation(ColorBarsLocation.valueOf(colorLocation))
+ .withSize(ColorBarsSize.valueOf(colorSize));
+
+ List<Pair<String, DynamicSizeContribution>> sizeCollect = sizeSuppliers.stream().map(s -> s.get()).filter(Objects::nonNull).collect(Collectors.toList());
+
+ String sizeLocation = sizeLocationCombo.getItem(sizeLocationCombo.getSelectionIndex());
+ String sizeSize = sizeSizeCombo.getItem(sizeSizeCombo.getSelectionIndex());
+
+ SizeBarOptions sizeBarOptions = new SizeBarOptions()
+ .showSizeBars(showSizeButton.getSelection())
+ .showSizeBarsTicks(sizeTicksButton.getSelection())
+ .withLocation(SizeBarsLocation.valueOf(sizeLocation))
+ .withSize(SizeBarsSize.valueOf(sizeSize));
+
+ Simantics.getSession().asyncRequest(new WriteRequest() {
+
+ @Override
+ public void perform(WriteGraph graph) throws DatabaseException {
+ DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+ Resource exist;
+ if (existing.isPresent()) {
+ exist = existing.get();
+ } else {
+ exist = DistrictNetworkUtil.createVisualisation(graph, diagramResource, templateName);
+ }
+
+ DistrictNetworkUtil.setColorContributions(graph, exist, colorCollect);
+
+ DistrictNetworkUtil.setColorBarOptions(graph, exist, colorBarOptions);
+ DistrictNetworkUtil.setSizeContributions(graph, exist, sizeCollect);
+ DistrictNetworkUtil.setSizeBarOptions(graph, exist, sizeBarOptions);
+ }
+ });
}
private void initializeColoringObjects(Composite parent) {
{
createColoringObjectHeaderRow(group);
}
- List<Supplier<Pair<String, DynamicColorContribution>>> suppliers = new ArrayList<>();
+ colorSuppliers = new ArrayList<>();
{
try {
Collection<DynamicColoringObject> result = Simantics.getSession().syncRequest(new UniqueRead<Collection<DynamicColoringObject>>() {
});
for (DynamicColoringObject object : result) {
- suppliers.add(createColoringObjectRow(group, object));
+ colorSuppliers.add(createColoringObjectRow(group, object));
}
} catch (DatabaseException e) {
- e.printStackTrace();
+ LOGGER.error("Could not create coloring objecst", e);
}
}
{
@Override
public void widgetSelected(SelectionEvent e) {
- List<Pair<String, DynamicColorContribution>> collect = suppliers.stream().map(s -> s.get()).filter(Objects::nonNull).collect(Collectors.toList());
+ List<Pair<String, DynamicColorContribution>> collect = colorSuppliers.stream().map(s -> s.get()).filter(Objects::nonNull).collect(Collectors.toList());
Simantics.getSession().asyncRequest(new WriteRequest() {
@Override
public void perform(WriteGraph graph) throws DatabaseException {
- DistrictNetworkUtil.setColorContributions(graph, DynamicVisualisationsUI.this.diagramResource, collect);
+ DistrictNetworkUtil.setColorContributions(graph, visualisation.getVisualisationResource(), collect);
}
});
}
private Map<String, ColoringObjectRow> coloringRows = new HashMap<>();
private Map<String, SizingObjectRow> sizingRows = new HashMap<>();
+ private VisualisationsListener visualisationsListener;
+
+ private Collection<NamedResource> visualisations;
+
+ private List<Supplier<Pair<String, DynamicSizeContribution>>> sizeSuppliers;
+
private static class ColoringObjectRow {
private final Label label;
// break;
// }
// }
+ usedButton.setSelection(colorContribution.isUsed());
+ defaultButton.setSelection(colorContribution.isUseDefault());
+
+ minText.setEnabled(!colorContribution.isUseDefault());
+ maxText.setEnabled(!colorContribution.isUseDefault());
+ colorMapCombo.setEnabled(!colorContribution.isUseDefault());
}
}
Button defaultButton = new Button(parent, SWT.CHECK);
GridDataFactory.fillDefaults().align(SWT.CENTER, SWT.CENTER).applyTo(defaultButton);
+ defaultButton.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ int index = variableCombo.getSelectionIndex();
+ if (index >= 0) {
+ String key = variableCombo.getItem(index);
+ DynamicColorContribution cont = colorContributions.get(key);
+
+ minText.setText(Double.toString(cont.getDefaultMin()));
+ minText.setEnabled(!defaultButton.getSelection());
+ maxText.setText(Double.toString(cont.getDefaultMax()));
+ maxText.setEnabled(!defaultButton.getSelection());
+ unit.setText(cont.getUnit());
+
+ colorMapCombo.setItems(cont.getDefaultColorMap().getLabel());
+ colorMapCombo.select(0);
+ colorMapCombo.setEnabled(!defaultButton.getSelection());
+ }
+ }
+ });
variableCombo.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
// handle update for others
-
- DynamicColorContribution cont = colorContributions.get(variableCombo.getText());
-
- if (minText.getText().isEmpty()) {
- minText.setText(Double.toString(cont.getDefaultMin()));
- }
- if (maxText.getText().isEmpty()) {
- maxText.setText(Double.toString(cont.getDefaultMax()));
+ int index = variableCombo.getSelectionIndex();
+ if (index >= 0) {
+ String key = variableCombo.getItem(index);
+ DynamicColorContribution cont = colorContributions.get(key);
+
+ if (minText.getText().isEmpty()) {
+ minText.setText(Double.toString(cont.getDefaultMin()));
+ }
+ if (maxText.getText().isEmpty()) {
+ maxText.setText(Double.toString(cont.getDefaultMax()));
+ }
+ unit.setText(cont.getUnit());
+
+ colorMapCombo.setItems(cont.getDefaultColorMap().getLabel());
+ colorMapCombo.select(0);
+
+ defaultButton.setSelection(true);
}
- unit.setText(cont.getUnit());
-
- colorMapCombo.setItems(cont.getDefaultColorMap().getLabel());
- colorMapCombo.select(0);
-
- defaultButton.setSelection(true);
}
});
-
+
coloringRows.put(object.getColoringObject().getName(), new ColoringObjectRow(label, usedButton, variableCombo, minText, maxText, unit, colorMapCombo, defaultButton));
return new Supplier<Pair<String, DynamicColorContribution>>() {
@Override
public Pair<String, DynamicColorContribution> get() {
- DynamicColorContribution cont = colorContributions.get(variableCombo.getText());
- if (cont != null) {
- String colorMap = colorMapCombo.getItem(colorMapCombo.getSelectionIndex());
- try {
- Map<String, DynamicColorMap> colorMaps = Simantics.getSession().syncRequest(new UniqueRead<Map<String, DynamicColorMap>>() {
-
- @Override
- public Map<String, DynamicColorMap> perform(ReadGraph graph) throws DatabaseException {
- return DynamicVisualisationsContributions.dynamicColorMaps(graph);
- }
- });
- DynamicColorMap dColorMap = colorMaps.get(colorMap);
- String label = variableCombo.getItem(variableCombo.getSelectionIndex());
-
- DynamicColorContribution dcc = new DynamicColorContribution(label, cont.getModuleName(), cont.getAttributeName(), unit.getText(), cont.getVariableGain(), cont.getVariableBias(), dColorMap, Double.parseDouble(minText.getText()), Double.parseDouble(maxText.getText()));
- dcc.setUsed(usedButton.getSelection());
- dcc.setUseDefault(defaultButton.getSelection());
-
- return Pair.make(object.getColoringObject().getName(), dcc);
- } catch (DatabaseException e) {
- LOGGER.error("Could not get DynamicColorContribution", e);
+ int selectionIndex = variableCombo.getSelectionIndex();
+ if (selectionIndex >= 0) {
+ String key = variableCombo.getItem(selectionIndex);
+ DynamicColorContribution cont = colorContributions.get(key);
+ if (cont != null) {
+ String colorMap = colorMapCombo.getItem(colorMapCombo.getSelectionIndex());
+ try {
+ Map<String, DynamicColorMap> colorMaps = Simantics.getSession().syncRequest(new UniqueRead<Map<String, DynamicColorMap>>() {
+
+ @Override
+ public Map<String, DynamicColorMap> perform(ReadGraph graph) throws DatabaseException {
+ return DynamicVisualisationsContributions.dynamicColorMaps(graph);
+ }
+ });
+ DynamicColorMap dColorMap = colorMaps.get(colorMap);
+ String label = variableCombo.getItem(variableCombo.getSelectionIndex());
+
+ DynamicColorContribution dcc = new DynamicColorContribution(label, cont.getModuleName(), cont.getAttributeName(), unit.getText(), cont.getVariableGain(), cont.getVariableBias(), dColorMap, Double.parseDouble(minText.getText()), Double.parseDouble(maxText.getText()));
+ dcc.setUsed(usedButton.getSelection());
+ dcc.setUseDefault(defaultButton.getSelection());
+
+ return Pair.make(object.getColoringObject().getName(), dcc);
+ } catch (DatabaseException e) {
+ LOGGER.error("Could not get DynamicColorContribution", e);
+ }
}
}
return null;
@Override
public void widgetSelected(SelectionEvent e) {
// handle update for others
-
- DynamicSizeContribution cont = sizeContributions.get(variableCombo.getText());
+ String key = variableCombo.getItem(variableCombo.getSelectionIndex());
+ DynamicSizeContribution cont = sizeContributions.get(key);
if (minText.getText().isEmpty()) {
minText.setText(Double.toString(cont.getDefaultMin()));
@Override
public Pair<String, DynamicSizeContribution> get() {
- DynamicSizeContribution cont = sizeContributions.get(variableCombo.getText());
- if (cont != null) {
- String sizeMap = sizeMapCombo.getItem(sizeMapCombo.getSelectionIndex());
- try {
- Map<String, DynamicSizeMap> sizeMaps = Simantics.getSession().syncRequest(new UniqueRead<Map<String, DynamicSizeMap>>() {
-
- @Override
- public Map<String, DynamicSizeMap> perform(ReadGraph graph) throws DatabaseException {
- return DynamicVisualisationsContributions.dynamicSizeMaps(graph);
- }
- });
- DynamicSizeMap dColorMap = sizeMaps.get(sizeMap);
- String label = variableCombo.getItem(variableCombo.getSelectionIndex());
-
- DynamicSizeContribution dsc = new DynamicSizeContribution(label, cont.getModuleName(), cont.getAttributeName(), unit.getText(), cont.getVariableGain(), cont.getVariableBias(), dColorMap, Double.parseDouble(minText.getText()), Double.parseDouble(maxText.getText()));
- dsc.setUsed(usedButton.getSelection());
- dsc.setUseDefault(defaultButton.getSelection());
-
- return Pair.make(object.getSizingObject().getName(), dsc);
- } catch (DatabaseException e) {
- LOGGER.error("Could not get DynamicColorContribution", e);
+ int selectionIndex = variableCombo.getSelectionIndex();
+ if (selectionIndex >= 0) {
+ String key = variableCombo.getItem(selectionIndex);
+ DynamicSizeContribution cont = sizeContributions.get(key);
+ if (cont != null) {
+ String sizeMap = sizeMapCombo.getItem(sizeMapCombo.getSelectionIndex());
+ try {
+ Map<String, DynamicSizeMap> sizeMaps = Simantics.getSession().syncRequest(new UniqueRead<Map<String, DynamicSizeMap>>() {
+
+ @Override
+ public Map<String, DynamicSizeMap> perform(ReadGraph graph) throws DatabaseException {
+ return DynamicVisualisationsContributions.dynamicSizeMaps(graph);
+ }
+ });
+ DynamicSizeMap dColorMap = sizeMaps.get(sizeMap);
+ String label = variableCombo.getItem(variableCombo.getSelectionIndex());
+
+ DynamicSizeContribution dsc = new DynamicSizeContribution(label, cont.getModuleName(), cont.getAttributeName(), unit.getText(), cont.getVariableGain(), cont.getVariableBias(), dColorMap, Double.parseDouble(minText.getText()), Double.parseDouble(maxText.getText()));
+ dsc.setUsed(usedButton.getSelection());
+ dsc.setUseDefault(defaultButton.getSelection());
+
+ return Pair.make(object.getSizingObject().getName(), dsc);
+ } catch (DatabaseException e) {
+ LOGGER.error("Could not get DynamicColorContribution", e);
+ }
}
}
return null;
// persist changes
IEditorPart activeEditor = WorkbenchUtils.getActiveEditor();
if (activeEditor instanceof IResourceEditorPart) {
- Resource diagram = ((IResourceEditorPart) activeEditor).getResourceInput().getResource();
+
+ String colorLocation = colorLocationCombo.getItem(colorLocationCombo.getSelectionIndex());
+ String colorSize = colorSizeCombo.getItem(colorSizeCombo.getSelectionIndex());
+
ColorBarOptions options = new ColorBarOptions()
.showColorBars(showColorButton.getSelection())
.showColorBarsTicks(colorTicksButton.getSelection())
- .withLocation(ColorBarsLocation.valueOf(colorLocationCombo.getText().toUpperCase()))
- .withSize(ColorBarsSize.valueOf(colorSizeCombo.getText().toUpperCase()));
+ .withLocation(ColorBarsLocation.valueOf(colorLocation))
+ .withSize(ColorBarsSize.valueOf(colorSize));
Simantics.getSession().asyncRequest(new WriteRequest() {
@Override
public void perform(WriteGraph graph) throws DatabaseException {
- DistrictNetworkUtil.setColorBarOptions(graph, diagram, options);
+ DistrictNetworkUtil.setColorBarOptions(graph, visualisation.getVisualisationResource(), options);
}
});
}
private void createObjectSizes(Composite parent) {
- List<Supplier<Pair<String, DynamicSizeContribution>>> suppliers = new ArrayList<>();
+ sizeSuppliers = new ArrayList<>();
try {
Collection<DynamicSizingObject> resultSizing = Simantics.getSession().syncRequest(new UniqueRead<Collection<DynamicSizingObject>>() {
});
for (DynamicSizingObject object : resultSizing) {
- suppliers.add(createSizingObjectRow(parent, object));
+ sizeSuppliers.add(createSizingObjectRow(parent, object));
}
} catch (DatabaseException e) {
- e.printStackTrace();
+ LOGGER.error("Could not create object sizes", e);
}
{
@Override
public void widgetSelected(SelectionEvent e) {
- List<Pair<String, DynamicSizeContribution>> collect = suppliers.stream().map(s -> s.get()).filter(Objects::nonNull).collect(Collectors.toList());
+ List<Pair<String, DynamicSizeContribution>> collect = sizeSuppliers.stream().map(s -> s.get()).filter(Objects::nonNull).collect(Collectors.toList());
Simantics.getSession().asyncRequest(new WriteRequest() {
@Override
public void perform(WriteGraph graph) throws DatabaseException {
- DistrictNetworkUtil.setSizeContributions(graph, DynamicVisualisationsUI.this.diagramResource, collect);
+ DistrictNetworkUtil.setSizeContributions(graph, visualisation.getVisualisationResource(), collect);
}
});
}
label = new Label(parent, SWT.NONE);
label.setText("Size");
- sizeSizeCombo = new Combo(parent, SWT.NONE);
+ sizeSizeCombo = new Combo(parent, SWT.READ_ONLY);
sizeSizeCombo.setItems(Stream.of(SizeBarsSize.values()).map(size -> size.toString()).toArray(String[]::new));
Button applyButton = new Button(parent, SWT.READ_ONLY);
// persist changes
IEditorPart activeEditor = WorkbenchUtils.getActiveEditor();
if (activeEditor instanceof IResourceEditorPart) {
- Resource diagram = ((IResourceEditorPart) activeEditor).getResourceInput().getResource();
+
+ String sizeLocation = sizeLocationCombo.getItem(sizeLocationCombo.getSelectionIndex());
+ String sizeSize = sizeSizeCombo.getItem(sizeSizeCombo.getSelectionIndex());
+
SizeBarOptions options = new SizeBarOptions()
.showSizeBars(showSizeButton.getSelection())
.showSizeBarsTicks(sizeTicksButton.getSelection())
- .withLocation(SizeBarsLocation.valueOf(sizeLocationCombo.getText().toUpperCase()))
- .withSize(SizeBarsSize.valueOf(sizeSizeCombo.getText().toUpperCase()));
+ .withLocation(SizeBarsLocation.valueOf(sizeLocation))
+ .withSize(SizeBarsSize.valueOf(sizeSize));
Simantics.getSession().asyncRequest(new WriteRequest() {
@Override
public void perform(WriteGraph graph) throws DatabaseException {
- DistrictNetworkUtil.setSizeBarOptions(graph, diagram, options);
+ DistrictNetworkUtil.setSizeBarOptions(graph, visualisation.getVisualisationResource(), options);
}
});
}
}
private void updateListening() {
- if (listener != null) {
+ if (visualisationsListener != null)
+ visualisationsListener.dispose();
+ visualisationsListener = new VisualisationsListener(this);
+ Simantics.getSession().asyncRequest(new DynamicVisualisationsRequest(diagramResource), visualisationsListener);
+
+ if (listener != null)
listener.dispose();
- }
listener = new VisualisationListener(this);
- Simantics.getSession().asyncRequest(new DynamicVisualisationsRequest(diagramResource), listener);
+ Simantics.getSession().asyncRequest(new ActiveDynamicVisualisationsRequest(diagramResource), listener);
}
+ private static class VisualisationsListener implements Listener<Collection<NamedResource>> {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(VisualisationsListener.class);
+
+ private boolean disposed;
+ private DynamicVisualisationsUI ui;
+
+ public VisualisationsListener(DynamicVisualisationsUI ui) {
+ this.ui = ui;
+ }
+
+ @Override
+ public void execute(Collection<NamedResource> result) {
+ ui.updateVisualisations(result);
+ }
+
+ @Override
+ public void exception(Throwable t) {
+ LOGGER.error("Could not listen visualisation", t);
+ }
+
+ @Override
+ public boolean isDisposed() {
+ return disposed || ui.isDisposed();
+ }
+
+ public void dispose() {
+ this.disposed = true;
+ }
+ }
+
private static class VisualisationListener implements Listener<DynamicVisualisation> {
private static final Logger LOGGER = LoggerFactory.getLogger(VisualisationListener.class);
public void updateVisualisation(DynamicVisualisation result) {
this.visualisation = result;
- Display.getDefault().asyncExec(() -> {
- if (getParent().isDisposed())
- return;
-
- Map<String, DynamicColorContribution> colorContributions = visualisation.getColorContributions();
- for (Entry<String, DynamicColorContribution> entry : colorContributions.entrySet()) {
+ if (visualisation != null) {
+ Display.getDefault().asyncExec(() -> {
+ if (getParent().isDisposed())
+ return;
- ColoringObjectRow coloringObjectRow = coloringRows.get(entry.getKey());
- if (coloringObjectRow != null) {
-
- coloringObjectRow.update(entry.getValue());
+
+ String[] items = templateSelectionCombo.getItems();
+ for (int i = 0; i < items.length; i++) {
+ if (visualisation.getName().equals(items[i])) {
+ templateSelectionCombo.select(i);
+ break;
+ }
+ }
+
+ Map<String, DynamicColorContribution> colorContributions = visualisation.getColorContributions();
+ for (Entry<String, DynamicColorContribution> entry : colorContributions.entrySet()) {
- } else {
- LOGGER.info("No coloring object visualisation row for key {}", entry.getKey());
+ ColoringObjectRow coloringObjectRow = coloringRows.get(entry.getKey());
+ if (coloringObjectRow != null) {
+
+ coloringObjectRow.update(entry.getValue());
+
+ } else {
+ LOGGER.info("No coloring object visualisation row for key {}", entry.getKey());
+ }
}
- }
- ColorBarOptions colorOptions = visualisation.getColorBarOptions();
- showColorButton.setSelection(colorOptions.isShowColorBars());
- colorTicksButton.setSelection(colorOptions.isShowColorBarsTicks());
- for (int i = 0; i < colorLocationCombo.getItems().length; i++) {
- String item = colorLocationCombo.getItem(i);
- if (item.equals(colorOptions.getLocation().toString())) {
- colorLocationCombo.select(i);
- break;
+ ColorBarOptions colorOptions = visualisation.getColorBarOptions();
+ showColorButton.setSelection(colorOptions.isShowColorBars());
+ colorTicksButton.setSelection(colorOptions.isShowColorBarsTicks());
+ for (int i = 0; i < colorLocationCombo.getItems().length; i++) {
+ String item = colorLocationCombo.getItem(i);
+ if (item.equals(colorOptions.getLocation().toString())) {
+ colorLocationCombo.select(i);
+ break;
+ }
}
- }
- for (int i = 0; i < colorSizeCombo.getItems().length; i++) {
- String item = colorSizeCombo.getItem(i);
- if (item.equals(colorOptions.getSize().toString())) {
- colorSizeCombo.select(i);
- break;
+ for (int i = 0; i < colorSizeCombo.getItems().length; i++) {
+ String item = colorSizeCombo.getItem(i);
+ if (item.equals(colorOptions.getSize().toString())) {
+ colorSizeCombo.select(i);
+ break;
+ }
}
- }
-
- Map<String, DynamicSizeContribution> sizeContributions = visualisation.getSizeContributions();
- for (Entry<String, DynamicSizeContribution> entry : sizeContributions.entrySet()) {
- SizingObjectRow sizingObjectRow = sizingRows.get(entry.getKey());
- if (sizingObjectRow != null) {
-
- sizingObjectRow.update(entry.getValue());
+ Map<String, DynamicSizeContribution> sizeContributions = visualisation.getSizeContributions();
+ for (Entry<String, DynamicSizeContribution> entry : sizeContributions.entrySet()) {
- } else {
- LOGGER.info("No sizing object visualisation row for key {}", entry.getKey());
+ SizingObjectRow sizingObjectRow = sizingRows.get(entry.getKey());
+ if (sizingObjectRow != null) {
+
+ sizingObjectRow.update(entry.getValue());
+
+ } else {
+ LOGGER.info("No sizing object visualisation row for key {}", entry.getKey());
+ }
}
- }
- SizeBarOptions sizeOptions = visualisation.getSizeBarOptions();
- showSizeButton.setSelection(sizeOptions.isShowSizeBars());
- sizeTicksButton.setSelection(sizeOptions.isShowSizeBarsTicks());
- for (int i = 0; i < sizeLocationCombo.getItems().length; i++) {
- String item = sizeLocationCombo.getItem(i);
- if (item.equals(sizeOptions.getLocation().toString())) {
- sizeLocationCombo.select(i);
- break;
+ SizeBarOptions sizeOptions = visualisation.getSizeBarOptions();
+ showSizeButton.setSelection(sizeOptions.isShowSizeBars());
+ sizeTicksButton.setSelection(sizeOptions.isShowSizeBarsTicks());
+ for (int i = 0; i < sizeLocationCombo.getItems().length; i++) {
+ String item = sizeLocationCombo.getItem(i);
+ if (item.equals(sizeOptions.getLocation().toString())) {
+ sizeLocationCombo.select(i);
+ break;
+ }
}
- }
- for (int i = 0; i < sizeSizeCombo.getItems().length; i++) {
- String item = sizeSizeCombo.getItem(i);
- if (item.equals(sizeOptions.getSize().toString())) {
- sizeSizeCombo.select(i);
- break;
+ for (int i = 0; i < sizeSizeCombo.getItems().length; i++) {
+ String item = sizeSizeCombo.getItem(i);
+ if (item.equals(sizeOptions.getSize().toString())) {
+ sizeSizeCombo.select(i);
+ break;
+ }
}
- }
+ });
+ }
+ }
+
+ public void updateVisualisations(Collection<NamedResource> result) {
+ this.visualisations = result;
+
+ Display.getDefault().asyncExec(() -> {
+ if (getParent().isDisposed())
+ return;
+ templateSelectionCombo.setItems(visualisations.stream().map(NamedResource::getName).collect(Collectors.toList()).toArray(new String[visualisations.size()]));
});
}
}
return results;
}
- public static ColorBarOptions colorBarOptions(ReadGraph graph, Resource diagram) throws DatabaseException {
+ public static ColorBarOptions colorBarOptions(ReadGraph graph, Resource visualisation) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource visualisation = graph.getPossibleObject(diagram, DN.Diagram_hasVisualisation);
if (visualisation != null) {
String colorBarLocation = graph.getPossibleRelatedValue(visualisation, DN.Diagram_Visualisations_ColorBarLocation, Bindings.STRING);
String colorBarSize = graph.getPossibleRelatedValue(visualisation, DN.Diagram_Visualisations_ColorBarSize, Bindings.STRING);
return ColorBarOptions.useDefault();
}
- public static void setColorBarOptions(WriteGraph graph, Resource diagram, ColorBarOptions options) throws DatabaseException {
+ public static void setColorBarOptions(WriteGraph graph, Resource visualisation, ColorBarOptions options) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource visualisation = graph.getPossibleObject(diagram, DN.Diagram_hasVisualisation);
- if (visualisation == null) {
- Layer0 L0 = Layer0.getInstance(graph);
- visualisation = graph.newResource();
- graph.claim(visualisation, L0.InstanceOf, DN.Diagram_Visualisations);
- graph.claimLiteral(visualisation, L0.HasName, "Visualisation");
- graph.claim(diagram, DN.Diagram_hasVisualisation, visualisation);
- }
graph.claimLiteral(visualisation, DN.Diagram_Visualisations_ColorBarLocation, options.getLocation().toString(), Bindings.STRING);
graph.claimLiteral(visualisation, DN.Diagram_Visualisations_ColorBarSize, options.getSize().toString(), Bindings.STRING);
graph.claimLiteral(visualisation, DN.Diagram_Visualisations_ShowColorBars, options.isShowColorBars(), Bindings.BOOLEAN);
graph.claimLiteral(visualisation, DN.Diagram_Visualisations_ShowColorBarTicks, options.isShowColorBarsTicks(), Bindings.BOOLEAN);
}
+
+ public static Resource createVisualisation(WriteGraph graph, Resource diagram, String visualisationName) throws DatabaseException {
+ Layer0 L0 = Layer0.getInstance(graph);
+ DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+ Resource visualisation = graph.newResource();
+ graph.claim(visualisation, L0.InstanceOf, DN.Diagram_Visualisations);
+ graph.claimLiteral(visualisation, L0.HasName, visualisationName);
+ graph.claim(diagram, DN.Diagram_hasVisualisation, visualisation);
+ return visualisation;
+ }
- public static SizeBarOptions sizeBarOptions(ReadGraph graph, Resource diagram) throws DatabaseException {
+ public static SizeBarOptions sizeBarOptions(ReadGraph graph, Resource visualisation) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource visualisation = graph.getPossibleObject(diagram, DN.Diagram_hasVisualisation);
if (visualisation != null) {
String sizeBarLocation = graph.getPossibleRelatedValue(visualisation, DN.Diagram_Visualisations_SizeBarLocation, Bindings.STRING);
String sizeBarSize = graph.getPossibleRelatedValue(visualisation, DN.Diagram_Visualisations_SizeBarSize, Bindings.STRING);
return SizeBarOptions.useDefault();
}
- public static void setSizeBarOptions(WriteGraph graph, Resource diagram, SizeBarOptions options) throws DatabaseException {
+ public static void setSizeBarOptions(WriteGraph graph, Resource visualisation, SizeBarOptions options) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource visualisation = graph.getPossibleObject(diagram, DN.Diagram_hasVisualisation);
- if (visualisation == null) {
- Layer0 L0 = Layer0.getInstance(graph);
- visualisation = graph.newResource();
- graph.claim(visualisation, L0.InstanceOf, DN.Diagram_Visualisations);
- graph.claimLiteral(visualisation, L0.HasName, "Visualisation");
- graph.claim(diagram, DN.Diagram_hasVisualisation, visualisation);
- }
graph.claimLiteral(visualisation, DN.Diagram_Visualisations_SizeBarLocation, options.getLocation().toString(), Bindings.STRING);
graph.claimLiteral(visualisation, DN.Diagram_Visualisations_SizeBarSize, options.getSize().toString(), Bindings.STRING);
graph.claimLiteral(visualisation, DN.Diagram_Visualisations_ShowSizeBars, options.isShowSizeBars(), Bindings.BOOLEAN);
graph.claimLiteral(visualisation, DN.Diagram_Visualisations_ShowSizeBarTicks, options.isShowSizeBarsTicks(), Bindings.BOOLEAN);
}
- public static Map<String, DynamicColorContribution> colorContributions(ReadGraph graph, Resource diagram) throws DatabaseException {
+ public static Map<String, DynamicColorContribution> colorContributions(ReadGraph graph, Resource visualisation) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource visualisation = graph.getPossibleObject(diagram, DN.Diagram_hasVisualisation);
if (visualisation == null) {
return Collections.emptyMap();
}
return contributions;
}
- public static void setColorContributions(WriteGraph graph, Resource
diagram, List<Pair<String, DynamicColorContribution>> collect) throws DatabaseException {
+ public static void setColorContributions(WriteGraph graph, Resource
visualisation, List<Pair<String, DynamicColorContribution>> collect) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource visualisation = graph.getPossibleObject(diagram, DN.Diagram_hasVisualisation);
- if (visualisation == null) {
- Layer0 L0 = Layer0.getInstance(graph);
- visualisation = graph.newResource();
- graph.claim(visualisation, L0.InstanceOf, DN.Diagram_Visualisations);
- graph.claimLiteral(visualisation, L0.HasName, "Visualisation");
- graph.claim(diagram, DN.Diagram_hasVisualisation, visualisation);
- }
+ Layer0 L0 = Layer0.getInstance(graph);
+
graph.deny(visualisation, DN.Diagram_Visualisations_colorContributions);
for (Pair<String, DynamicColorContribution> coll : collect) {
Resource colorContribution = graph.newResource();
+ graph.claim(colorContribution, L0.InstanceOf, DN.Diagram_Visualisations_ColorContribution);
+ graph.claimLiteral(colorContribution, L0.HasName, coll.first);
DynamicColorContribution contr = coll.second;
graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_colorContributionContributorName, coll.first);
}
}
- public static Map<String, DynamicSizeContribution> sizeContributions(ReadGraph graph, Resource diagram) throws DatabaseException {
+ public static Map<String, DynamicSizeContribution> sizeContributions(ReadGraph graph, Resource visualisation) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource visualisation = graph.getPossibleObject(diagram, DN.Diagram_hasVisualisation);
if (visualisation == null) {
return Collections.emptyMap();
}
return contributions;
}
- public static void setSizeContributions(WriteGraph graph, Resource
diagram, List<Pair<String, DynamicSizeContribution>> collect) throws DatabaseException {
+ public static void setSizeContributions(WriteGraph graph, Resource
visualisation, List<Pair<String, DynamicSizeContribution>> collect) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource visualisation = graph.getPossibleObject(diagram, DN.Diagram_hasVisualisation);
- if (visualisation == null) {
- Layer0 L0 = Layer0.getInstance(graph);
- visualisation = graph.newResource();
- graph.claim(visualisation, L0.InstanceOf, DN.Diagram_Visualisations);
- graph.claimLiteral(visualisation, L0.HasName, "Visualisation");
- graph.claim(diagram, DN.Diagram_hasVisualisation, visualisation);
- }
+ Layer0 L0 = Layer0.getInstance(graph);
+
graph.deny(visualisation, DN.Diagram_Visualisations_sizeContributions);
for (Pair<String, DynamicSizeContribution> coll : collect) {
- Resource colorContribution = graph.newResource();
+ Resource sizeContribution = graph.newResource();
+ graph.claim(sizeContribution, L0.InstanceOf, DN.Diagram_Visualisations_SizeContribution);
+ graph.claimLiteral(sizeContribution, L0.HasName, coll.first);
DynamicSizeContribution contr = coll.second;
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionContributorName, coll.first);
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionLabel, contr.getLabel());
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionModuleName, contr.getModuleName());
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionModuleAttribute, contr.getAttributeName());
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionUnit, contr.getUnit());
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionVariableGain, contr.getVariableGain());
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionVariableBias, contr.getVariableBias());
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionDefaultSizeMap, contr.getDefaultSizeMap().getLabel());
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionDefaultMin, contr.getDefaultMin());
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionDefaultMax, contr.getDefaultMax());
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionUsed, contr.isUsed());
- graph.claimLiteral(colorContribution, DN.Diagram_Visualisations_sizeContributionUseDefault, contr.isUseDefault());
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionContributorName, coll.first);
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionLabel, contr.getLabel());
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionModuleName, contr.getModuleName());
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionModuleAttribute, contr.getAttributeName());
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionUnit, contr.getUnit());
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionVariableGain, contr.getVariableGain());
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionVariableBias, contr.getVariableBias());
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionDefaultSizeMap, contr.getDefaultSizeMap().getLabel());
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionDefaultMin, contr.getDefaultMin());
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionDefaultMax, contr.getDefaultMax());
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionUsed, contr.isUsed());
+ graph.claimLiteral(sizeContribution, DN.Diagram_Visualisations_sizeContributionUseDefault, contr.isUseDefault());
- graph.claim(visualisation, DN.Diagram_Visualisations_sizeContributions, colorContribution);
+ graph.claim(visualisation, DN.Diagram_Visualisations_sizeContributions, sizeContribution);
}
}
+ public static void setActiveVisualisation(WriteGraph graph, Resource diagram, Resource visualisationTemplate) throws DatabaseException {
+ DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+ graph.deny(diagram, DN.Diagram_hasActiveVisualisation);
+ graph.claim(diagram, DN.Diagram_hasActiveVisualisation, visualisationTemplate);
+ }
+
}
Code Review / simantics / district.git / commitdiff