X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fvisualisations%2FDynamicVisualisationsUI.java;h=5cb80a15d5fca59c50a72827a1bcbad7ac0dc94e;hb=0249f20bb127e61c58db4432b8609ff0cb441480;hp=031e502963f544b057c14e71c09a277c191d3d97;hpb=e764d663bb48dbc4ce86ca5d90c80167d30338a8;p=simantics%2Fdistrict.git diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/visualisations/DynamicVisualisationsUI.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/visualisations/DynamicVisualisationsUI.java index 031e5029..5cb80a15 100644 --- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/visualisations/DynamicVisualisationsUI.java +++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/visualisations/DynamicVisualisationsUI.java @@ -28,7 +28,6 @@ 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; @@ -37,6 +36,7 @@ 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.layer0.util.RemoverUtil; import org.simantics.db.procedure.Listener; import org.simantics.district.network.DistrictNetworkUtil; import org.simantics.district.network.ontology.DistrictNetworkResource; @@ -56,9 +56,8 @@ import org.simantics.district.network.visualisations.model.DynamicVisualisation; import org.simantics.district.network.visualisations.model.SizeBarOptions; import org.simantics.district.network.visualisations.model.SizeBarOptions.SizeBarsLocation; import org.simantics.district.network.visualisations.model.SizeBarOptions.SizeBarsSize; -import org.simantics.ui.workbench.IResourceEditorPart; import org.simantics.utils.datastructures.Pair; -import org.simantics.utils.ui.workbench.WorkbenchUtils; +import org.simantics.utils.ui.dialogs.ShowError; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,10 +71,12 @@ public class DynamicVisualisationsUI extends Composite { private Button showSizeButton; private Button sizeTicksButton; + private Button sizeGradientButton; private Combo sizeLocationCombo; private Combo sizeSizeCombo; private Button showColorButton; private Button colorTicksButton; + private Button colorGradientButton; private Combo colorLocationCombo; private Combo colorSizeCombo; @@ -83,17 +84,35 @@ public class DynamicVisualisationsUI extends Composite { private List>> colorSuppliers; + private Button removeVisualisationTemplateButton; + + private Button applyButton; + public DynamicVisualisationsUI(Composite parent, int style) { super(parent, style); - - defaultInitializeUI(); +// ScrolledComposite scrolledComposite = new ScrolledComposite(this, SWT.V_SCROLL); +// scrolledComposite.setLayout(new GridLayout(1, false)); +// scrolledComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); +// +// Composite firstContent = new Composite(scrolledComposite, SWT.NONE); +// firstContent.setLayout(new GridLayout(1, false)); +// firstContent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + + defaultInitializeUI(this); + +// scrolledComposite.setContent(firstContent); +// scrolledComposite.setExpandHorizontal(true); +// scrolledComposite.setExpandVertical(true); +// scrolledComposite.setMinSize(firstContent.computeSize(SWT.DEFAULT, SWT.DEFAULT)); + } - private void defaultInitializeUI() { - GridDataFactory.fillDefaults().grab(true, true).applyTo(this); - GridLayoutFactory.fillDefaults().numColumns(1).margins(5, 5).applyTo(this); + private void defaultInitializeUI(Composite parent) { + + GridDataFactory.fillDefaults().grab(true, true).applyTo(parent); + GridLayoutFactory.fillDefaults().numColumns(1).margins(5, 5).applyTo(parent); - Composite selectionComposite = new Composite(this, SWT.NONE); + Composite selectionComposite = new Composite(parent, SWT.NONE); GridDataFactory.fillDefaults().grab(true, false).applyTo(selectionComposite); GridLayoutFactory.fillDefaults().numColumns(2).margins(5, 5).applyTo(selectionComposite); @@ -121,49 +140,82 @@ public class DynamicVisualisationsUI extends Composite { } }); - Composite coloringObjectsComposite = new Composite(this, SWT.NONE); + Composite coloringObjectsComposite = new Composite(parent, SWT.NONE); GridDataFactory.fillDefaults().grab(true, false).applyTo(coloringObjectsComposite); GridLayoutFactory.fillDefaults().numColumns(1).applyTo(coloringObjectsComposite); initializeColoringObjects(coloringObjectsComposite); - Composite colorBarsComposite = new Composite(this, SWT.NONE); + Composite colorBarsComposite = new Composite(parent, SWT.NONE); GridDataFactory.fillDefaults().grab(true, false).applyTo(colorBarsComposite); GridLayoutFactory.fillDefaults().numColumns(1).applyTo(colorBarsComposite); initializeColorBars(colorBarsComposite); - Composite objectSizesComposite = new Composite(this, SWT.NONE); + Composite objectSizesComposite = new Composite(parent, SWT.NONE); GridDataFactory.fillDefaults().grab(true, false).applyTo(objectSizesComposite); GridLayoutFactory.fillDefaults().numColumns(1).applyTo(objectSizesComposite); initializeObjectSizes(objectSizesComposite); - Composite sizeBarsComposite = new Composite(this, SWT.NONE); + Composite sizeBarsComposite = new Composite(parent, SWT.NONE); GridDataFactory.fillDefaults().grab(true, false).applyTo(sizeBarsComposite); 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() { + Composite buttonBarsComposite = new Composite(parent, SWT.NONE); + GridDataFactory.fillDefaults().grab(true, false).applyTo(buttonBarsComposite); + GridLayoutFactory.fillDefaults().numColumns(3).applyTo(buttonBarsComposite); + + Button saveVisualisationTemplateAsButton = new Button(buttonBarsComposite, SWT.NONE); + saveVisualisationTemplateAsButton.setText("Save as visualisation template"); + saveVisualisationTemplateAsButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - persistVisualisationTemplate(visualisation.getName(), Optional.of(visualisation.getVisualisationResource())); + showSaveVisualisationTemplateDialog(e.widget.getDisplay().getActiveShell()); } }); - Button saveVisualisationTemplateAsButton = new Button(this, SWT.NONE); - saveVisualisationTemplateAsButton.setText("Save as visualisation template"); - saveVisualisationTemplateAsButton.addSelectionListener(new SelectionAdapter() { + applyButton = new Button(buttonBarsComposite, SWT.NONE); + applyButton.setText("Apply"); + applyButton.setEnabled(visualisation != null); + applyButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - showSaveVisualisationTemplateDialog(e.widget.getDisplay().getActiveShell()); + try { + persistVisualisationTemplate(visualisation.getName(), Optional.of(visualisation.getVisualisationResource())); + } catch (Exception e1) { + LOGGER.error("Could not persist visualisation template", e1); + ShowError.showError("Could not persist visualisation template", e1.getMessage(), e1); + } + } + }); + + removeVisualisationTemplateButton = new Button(buttonBarsComposite, SWT.NONE); + removeVisualisationTemplateButton.setText("Remove"); + removeVisualisationTemplateButton.setEnabled(visualisation != null && visualisation.getVisualisationResource() != null); + removeVisualisationTemplateButton.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + removeVisualisationTemplate(visualisation.getName(), Optional.of(visualisation.getVisualisationResource())); } }); } + protected void removeVisualisationTemplate(String name, Optional of) { + if (of.isPresent()) { + Resource visualisation = of.get(); + Simantics.getSession().asyncRequest(new WriteRequest() { + + @Override + public void perform(WriteGraph graph) throws DatabaseException { + RemoverUtil.remove(graph, visualisation); + } + }); + } + } + private void showSaveVisualisationTemplateDialog(Shell shell) { InputDialog dialog = new InputDialog(shell, "Save visualisation template", "Give template a name", "", new IInputValidator() { @@ -178,11 +230,16 @@ public class DynamicVisualisationsUI extends Composite { if (dialog.open() == Dialog.OK) { String name = dialog.getValue(); - persistVisualisationTemplate(name, Optional.empty()); + try { + persistVisualisationTemplate(name, Optional.empty()); + } catch (Exception e) { + LOGGER.error("Could not persist visualisation template", e); + ShowError.showError("Could not persist visualisation template", e.getMessage(), e); + } } } - private void persistVisualisationTemplate(String templateName, Optional existing) { + private void persistVisualisationTemplate(String templateName, Optional existing) throws Exception { List> colorCollect = colorSuppliers.stream().map(s -> s.get()).filter(Objects::nonNull).collect(Collectors.toList()); @@ -192,6 +249,7 @@ public class DynamicVisualisationsUI extends Composite { ColorBarOptions colorBarOptions = new ColorBarOptions() .showColorBars(showColorButton.getSelection()) .showColorBarsTicks(colorTicksButton.getSelection()) + .useGradients(colorGradientButton.getSelection()) .withLocation(ColorBarsLocation.valueOf(colorLocation)) .withSize(ColorBarsSize.valueOf(colorSize)); @@ -203,6 +261,7 @@ public class DynamicVisualisationsUI extends Composite { SizeBarOptions sizeBarOptions = new SizeBarOptions() .showSizeBars(showSizeButton.getSelection()) .showSizeBarsTicks(sizeTicksButton.getSelection()) + .useGradients(sizeGradientButton.getSelection()) .withLocation(SizeBarsLocation.valueOf(sizeLocation)) .withSize(SizeBarsSize.valueOf(sizeSize)); @@ -255,24 +314,6 @@ public class DynamicVisualisationsUI extends Composite { LOGGER.error("Could not create coloring objecst", e); } } - { - Button applyButton = new Button(group, SWT.NONE); - applyButton.setText("Apply"); - applyButton.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(SelectionEvent e) { - List> 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, visualisation.getVisualisationResource(), collect); - } - }); - } - }); - } } private void createColoringObjectHeaderRow(Composite parent) { @@ -422,6 +463,12 @@ public class DynamicVisualisationsUI extends Composite { // break; // } // } + usedButton.setSelection(sizeContribution.isUsed()); + defaultButton.setSelection(sizeContribution.isUseDefault()); + + minText.setEnabled(!sizeContribution.isUseDefault()); + maxText.setEnabled(!sizeContribution.isUseDefault()); + sizeMapCombo.setEnabled(!sizeContribution.isUseDefault()); } } @@ -672,7 +719,7 @@ public class DynamicVisualisationsUI extends Composite { Group group = new Group(parent, SWT.NONE); group.setText("Color Bars"); GridDataFactory.fillDefaults().grab(true, false).applyTo(group); - GridLayoutFactory.fillDefaults().numColumns(2).margins(5, 5).applyTo(group); + GridLayoutFactory.fillDefaults().numColumns(8).margins(5, 5).applyTo(group); createColorBars(group); } @@ -685,46 +732,26 @@ public class DynamicVisualisationsUI extends Composite { colorTicksButton = new Button(parent, SWT.CHECK); colorTicksButton.setText("Ticks"); + colorGradientButton = new Button(parent, SWT.CHECK); + colorGradientButton.setText("Gradients"); + Label label = new Label(parent, SWT.NONE); label.setText("Location"); colorLocationCombo = new Combo(parent, SWT.READ_ONLY); - colorLocationCombo.setItems(Stream.of(ColorBarsLocation.values()).map(size -> size.toString()).toArray(String[]::new)); + String[] colorLocationItems = Stream.of(ColorBarsLocation.values()).map(size -> size.toString()).toArray(String[]::new); + colorLocationCombo.setItems(colorLocationItems); + if (colorLocationItems.length > 0) { + colorLocationCombo.select(0); + } label = new Label(parent, SWT.NONE); label.setText("Size"); colorSizeCombo = new Combo(parent, SWT.READ_ONLY); - colorSizeCombo.setItems(Stream.of(ColorBarsSize.values()).map(size -> size.toString()).toArray(String[]::new)); - - Button applyButton = new Button(parent, SWT.NONE); - applyButton.setText("Apply"); - - applyButton.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(SelectionEvent e) { - // persist changes - IEditorPart activeEditor = WorkbenchUtils.getActiveEditor(); - if (activeEditor instanceof IResourceEditorPart) { - - 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(colorLocation)) - .withSize(ColorBarsSize.valueOf(colorSize)); - - Simantics.getSession().asyncRequest(new WriteRequest() { - - @Override - public void perform(WriteGraph graph) throws DatabaseException { - DistrictNetworkUtil.setColorBarOptions(graph, visualisation.getVisualisationResource(), options); - } - }); - } - } - }); + String[] colorSizeItems = Stream.of(ColorBarsSize.values()).map(size -> size.toString()).toArray(String[]::new); + colorSizeCombo.setItems(colorSizeItems); + if (colorSizeItems.length > 0) { + colorSizeCombo.select(0); + } } private void initializeObjectSizes(Composite parent) { @@ -757,32 +784,13 @@ public class DynamicVisualisationsUI extends Composite { } catch (DatabaseException e) { LOGGER.error("Could not create object sizes", e); } - - { - Button applyButton = new Button(parent, SWT.NONE); - applyButton.setText("Apply"); - applyButton.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(SelectionEvent e) { - List> 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, visualisation.getVisualisationResource(), collect); - } - }); - } - }); - } } private void initializeSizeBars(Composite parent) { Group group = new Group(parent, SWT.NONE); group.setText("Size Bars"); GridDataFactory.fillDefaults().grab(true, false).applyTo(group); - GridLayoutFactory.fillDefaults().numColumns(2).margins(5, 5).applyTo(group); + GridLayoutFactory.fillDefaults().numColumns(8).margins(5, 5).applyTo(group); createSizeBars(group); } @@ -794,46 +802,26 @@ public class DynamicVisualisationsUI extends Composite { sizeTicksButton = new Button(parent, SWT.CHECK); sizeTicksButton.setText("Ticks"); + sizeGradientButton = new Button(parent, SWT.CHECK); + sizeGradientButton.setText("Gradient"); + Label label = new Label(parent, SWT.NONE); label.setText("Location"); sizeLocationCombo = new Combo(parent, SWT.READ_ONLY); - sizeLocationCombo.setItems(Stream.of(SizeBarsLocation.values()).map(size -> size.toString()).toArray(String[]::new)); + String[] sizeLocationItems = Stream.of(SizeBarsLocation.values()).map(size -> size.toString()).toArray(String[]::new); + sizeLocationCombo.setItems(sizeLocationItems); + if (sizeLocationItems.length > 0) { + sizeLocationCombo.select(0); + } label = new Label(parent, SWT.NONE); label.setText("Size"); 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); - applyButton.setText("Apply"); - - applyButton.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(SelectionEvent e) { - // persist changes - IEditorPart activeEditor = WorkbenchUtils.getActiveEditor(); - if (activeEditor instanceof IResourceEditorPart) { - - 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(sizeLocation)) - .withSize(SizeBarsSize.valueOf(sizeSize)); - - Simantics.getSession().asyncRequest(new WriteRequest() { - - @Override - public void perform(WriteGraph graph) throws DatabaseException { - DistrictNetworkUtil.setSizeBarOptions(graph, visualisation.getVisualisationResource(), options); - } - }); - } - } - }); + String[] sizeSizeItems = Stream.of(SizeBarsSize.values()).map(size -> size.toString()).toArray(String[]::new); + sizeSizeCombo.setItems(sizeSizeItems); + if (sizeSizeItems.length > 0) { + sizeSizeCombo.select(0); + } } public void setDiagramResource(Resource diagramResource) { @@ -919,12 +907,14 @@ public class DynamicVisualisationsUI extends Composite { public void updateVisualisation(DynamicVisualisation result) { this.visualisation = result; - if (visualisation != null) { - Display.getDefault().asyncExec(() -> { - if (getParent().isDisposed()) - return; - - + Display.getDefault().asyncExec(() -> { + if (getParent().isDisposed()) + return; + + applyButton.setEnabled(visualisation != null && visualisation.getVisualisationResource() != null); + removeVisualisationTemplateButton.setEnabled(visualisation != null && visualisation.getVisualisationResource() != null); + + if (visualisation != null) { String[] items = templateSelectionCombo.getItems(); for (int i = 0; i < items.length; i++) { if (visualisation.getName().equals(items[i])) { @@ -992,8 +982,8 @@ public class DynamicVisualisationsUI extends Composite { break; } } - }); - } + } + }); } public void updateVisualisations(Collection result) { @@ -1003,6 +993,17 @@ public class DynamicVisualisationsUI extends Composite { if (getParent().isDisposed()) return; templateSelectionCombo.setItems(visualisations.stream().map(NamedResource::getName).collect(Collectors.toList()).toArray(new String[visualisations.size()])); + + if (visualisation != null) { + String[] items = templateSelectionCombo.getItems(); + for (int i = 0; i < items.length; i++) { + if (visualisation.getName().equals(items[i])) { + templateSelectionCombo.select(i); + break; + } + } + } + }); } }