import org.simantics.db.common.request.ObjectsWithType;
import org.simantics.db.common.request.ReadRequest;
import org.simantics.db.common.request.WriteRequest;
+import org.simantics.db.common.request.WriteResultRequest;
import org.simantics.db.exception.DatabaseException;
import org.simantics.db.exception.RuntimeDatabaseException;
import org.simantics.db.exception.ServiceException;
import org.simantics.db.layer0.variable.Variables;
import org.simantics.db.layer0.variable.Variables.Role;
import org.simantics.db.procedure.Procedure;
+import org.simantics.district.network.DistrictNetworkUtil;
import org.simantics.district.network.ontology.DistrictNetworkResource;
import org.simantics.layer0.Layer0;
import org.simantics.modeling.ModelingResources;
@SCLValue(type = "ReadGraph -> Resource -> Variable -> b")
public static Object defaultVertexMappingModifier(ReadGraph graph, Resource resource, final Variable context) throws DatabaseException {
- System.out.println(graph.getURI(resource));
- System.out.println(context.getURI(graph));
-
Resource diagram = resolveElement(graph, context);
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
return baseMappingModifier(graph, diagram, DN.VertexDefaultMapping, DN.Mapping_VertexMapping, context);
}
-
+
+ @SCLValue(type = "ReadGraph -> Resource -> Variable -> b")
+ public static Object rightClickVertexMappingModifier(ReadGraph graph, Resource resource, final Variable context) throws DatabaseException {
+ Resource diagram = resolveElement(graph, context);
+ DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+ return baseMappingModifier(graph, diagram, DN.RightClickDefaultMapping, DN.Mapping_VertexMapping, context);
+ }
+
+ @SCLValue(type = "ReadGraph -> Resource -> Variable -> b")
+ public static Object leftClickVertexMappingModifier(ReadGraph graph, Resource resource, final Variable context) throws DatabaseException {
+ Resource diagram = resolveElement(graph, context);
+ DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+ return baseMappingModifier(graph, diagram, DN.LeftClickDefaultMapping, DN.Mapping_VertexMapping, context);
+ }
+
@SCLValue(type = "ReadGraph -> Resource -> Variable -> b")
public static Object mappingModifier(ReadGraph graph, Resource resource, final Variable context) throws DatabaseException {
return baseMappingModifier(graph, element, DistrictNetworkResource.getInstance(graph).HasMapping, mappingType, context);
}
- public static Map<String, Resource> getVertexMappings(ReadGraph graph, Resource resource) throws DatabaseException {
- Map<String, Resource> second = getNetworkMappingsByType(graph, resource , DistrictNetworkResource.getInstance(graph).Mapping_VertexMapping);
+ public static Map<String, Resource> getVertexMappings(ReadGraph graph, Resource indexRoot) throws DatabaseException {
+ Map<String, Resource> second = getNetworkMappingsByType(graph, indexRoot, DistrictNetworkResource.getInstance(graph).Mapping_VertexMapping);
return second;
}
- public static Map<String, Resource> getEdgeMappings(ReadGraph graph, Resource resource) throws DatabaseException {
- Map<String, Resource> second = getNetworkMappingsByType(graph, resource , DistrictNetworkResource.getInstance(graph).Mapping_EdgeMapping);
+ public static Map<String, Resource> getEdgeMappings(ReadGraph graph, Resource indexRoot) throws DatabaseException {
+ Map<String, Resource> second = getNetworkMappingsByType(graph, indexRoot, DistrictNetworkResource.getInstance(graph).Mapping_EdgeMapping);
return second;
}
public static Map<String, Resource> getCRSs(ReadGraph graph, Resource resource) throws DatabaseException {
- Map<String, Resource> result = getNetworkMappingsByType(graph, resource, DistrictNetworkResource.getInstance(graph).SpatialRefSystem);
+ Map<String, Resource> result = getNetworkMappingsByType(graph, graph.sync(new IndexRoot(resource)), DistrictNetworkResource.getInstance(graph).SpatialRefSystem);
return result;
}
- public static Map<String, Resource> getNetworkMappingsByType(ReadGraph graph, Resource element, Resource mappingType) throws DatabaseException {
- Resource indexRoot = graph.sync(new IndexRoot(element));
+ public static Map<String, Resource> getNetworkMappingsByType(ReadGraph graph, Resource indexRoot, Resource mappingType) throws DatabaseException {
List<Resource> mappings = QueryIndexUtils.searchByType(graph, indexRoot, mappingType);
Map<String, Resource> result = new HashMap<>(mappings.size());
Layer0 L0 = Layer0.getInstance(graph);
@SCLValue(type = "ReadGraph -> Resource -> a -> b")
public static Object enumerationValues(ReadGraph graph, Resource resource, Object context) throws DatabaseException {
Variable var = (Variable) context;
- System.out.println(graph.getURI(resource));
- System.out.println(var.getURI(graph));
return Collections.emptyList();
}
private static class DefaultMappingsDialog extends SelectionStatusDialog {
private Combo vertexMappingCombo;
+ private Combo rightClickMappingCombo;
+ private Combo leftClickMappingCombo;
private Combo edgeMappingCombo;
- private Combo crsCombo;
+ //private Combo crsCombo;
private Composite composite;
private Resource configuration;
private Resource defaultVertexMapping;
private Resource defaultEdgeMapping;
- private Resource defaultCRS;
+ private Resource rightClickVertexMapping;
+ private Resource leftClickVertexMapping;
+ //private Resource defaultCRS;
- private Combo compositeMappingCombo;
- private Combo componentMappingCombo;
+ //private Combo compositeMappingCombo;
+ //private Combo componentMappingCombo;
protected DefaultMappingsDialog(Shell parentShell, Resource configuration) {
super(parentShell);
return defaultVertexMapping;
}
+ public Resource getRightClickVertexMapping() {
+ return rightClickVertexMapping;
+ }
+
+ public Resource getLeftClickVertexMapping() {
+ return leftClickVertexMapping;
+ }
+
public Resource getDefaultEdgeMapping() {
return defaultEdgeMapping;
}
composite = (Composite) super.createDialogArea(parent);
createMappingsGroup(composite);
- createExistingCompositeGroup(composite);
- createCRSSettingsGroup(composite);
+ //createExistingCompositeGroup(composite);
+ //createCRSSettingsGroup(composite);
// compute default values
Simantics.getSession().asyncRequest(new ReadRequest() {
@Override
public void run(ReadGraph graph) throws DatabaseException {
-
- vertexMappings = getVertexMappings(graph, configuration);
- edgeMappings = getEdgeMappings(graph, configuration);
+ Resource indexRoot = graph.sync(new IndexRoot(configuration));
+ vertexMappings = getVertexMappings(graph, indexRoot);
+ edgeMappings = getEdgeMappings(graph, indexRoot);
composites = getComposites(graph, configuration);
composite.getDisplay().asyncExec(() -> {
vertexMappingCombo.setItems(vertexMappings.keySet().toArray(new String[vertexMappings.size()]));
+ rightClickMappingCombo.setItems(vertexMappings.keySet().toArray(new String[vertexMappings.size()]));
+ leftClickMappingCombo.setItems(vertexMappings.keySet().toArray(new String[vertexMappings.size()]));
edgeMappingCombo.setItems(edgeMappings.keySet().toArray(new String[edgeMappings.size()]));
- crsCombo.setItems(crss.keySet().toArray(new String[crss.size()]));
+ //crsCombo.setItems(crss.keySet().toArray(new String[crss.size()]));
- compositeMappingCombo.setItems(composites.keySet().toArray(new String[composites.size()]));
+ //compositeMappingCombo.setItems(composites.keySet().toArray(new String[composites.size()]));
vertexMappingCombo.select(0);
+ rightClickMappingCombo.select(0);
+ leftClickMappingCombo.select(0);
edgeMappingCombo.select(0);
- crsCombo.select(0);
+ //crsCombo.select(0);
- if (!composites.isEmpty())
- compositeMappingCombo.select(0);
+ //if (!composites.isEmpty())
+ // compositeMappingCombo.select(0);
});
}
vertexMappingCombo = new Combo(cmposite, SWT.READ_ONLY | SWT.BORDER);
GridDataFactory.fillDefaults().grab(true, false).applyTo(vertexMappingCombo);
-
+
+ Label rightClickMappingLabel = new Label(cmposite, SWT.NONE);
+ rightClickMappingLabel.setText("Default right click mapping");
+
+ rightClickMappingCombo = new Combo(cmposite, SWT.READ_ONLY | SWT.BORDER);
+ GridDataFactory.fillDefaults().grab(true, false).applyTo(vertexMappingCombo);
+
+ Label leftClickMappingLabel = new Label(cmposite, SWT.NONE);
+ leftClickMappingLabel.setText("Default left click mapping");
+
+ leftClickMappingCombo = new Combo(cmposite, SWT.READ_ONLY | SWT.BORDER);
+ GridDataFactory.fillDefaults().grab(true, false).applyTo(vertexMappingCombo);
+
Label edgeMappingLabel = new Label(cmposite, SWT.NONE);
edgeMappingLabel.setText("Default edge mapping");
Label compositeMappingLabel = new Label(cmposite, SWT.NONE);
compositeMappingLabel.setText("Select composite");
- compositeMappingCombo = new Combo(cmposite, SWT.READ_ONLY | SWT.BORDER);
- GridDataFactory.fillDefaults().grab(true, false).applyTo(compositeMappingCombo);
- compositeMappingCombo.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- super.widgetSelected(e);
- recalculateMappapleComponents();
- }
- });
+// compositeMappingCombo = new Combo(cmposite, SWT.READ_ONLY | SWT.BORDER);
+// GridDataFactory.fillDefaults().grab(true, false).applyTo(compositeMappingCombo);
+// compositeMappingCombo.addSelectionListener(new SelectionAdapter() {
+//
+// @Override
+// public void widgetSelected(SelectionEvent e) {
+// super.widgetSelected(e);
+// recalculateMappapleComponents();
+// }
+// });
- Label compojnentMappingLabel = new Label(cmposite, SWT.NONE);
- compojnentMappingLabel.setText("Select component");
-
- componentMappingCombo = new Combo(cmposite, SWT.READ_ONLY | SWT.BORDER);
- GridDataFactory.fillDefaults().grab(true, false).applyTo(componentMappingCombo);
+// Label compojnentMappingLabel = new Label(cmposite, SWT.NONE);
+// compojnentMappingLabel.setText("Select component");
+//
+// componentMappingCombo = new Combo(cmposite, SWT.READ_ONLY | SWT.BORDER);
+// GridDataFactory.fillDefaults().grab(true, false).applyTo(componentMappingCombo);
}
protected void recalculateMappapleComponents() {
Label vertexMappingLabel = new Label(cmposite, SWT.NONE);
vertexMappingLabel.setText("Default CRS");
- crsCombo = new Combo(cmposite, SWT.READ_ONLY | SWT.BORDER);
- GridData textData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- crsCombo.setLayoutData(textData);
+ //crsCombo = new Combo(cmposite, SWT.READ_ONLY | SWT.BORDER);
+ //GridData textData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+ //crsCombo.setLayoutData(textData);
}
protected void computeResult() {
defaultVertexMapping = vertexMappings.get(vertexMappingCombo.getItem(vertexMappingCombo.getSelectionIndex()));
defaultEdgeMapping = edgeMappings.get(edgeMappingCombo.getItem(edgeMappingCombo.getSelectionIndex()));
- defaultCRS = crss.get(crsCombo.getItem(crsCombo.getSelectionIndex()));
+ rightClickVertexMapping = vertexMappings.get(rightClickMappingCombo.getItem(rightClickMappingCombo.getSelectionIndex()));
+ leftClickVertexMapping = vertexMappings.get(leftClickMappingCombo.getItem(leftClickMappingCombo.getSelectionIndex()));
+ //defaultCRS = crss.get(crsCombo.getItem(crsCombo.getSelectionIndex()));
}
public Resource getCRS() {
- return defaultCRS;
+ return crss.get("EPSG_4326"); // this is only supported
}
}
procedure.execute(null);
return;
}
- Simantics.getSession().asyncRequest(
- NewCompositeActionFactory.createCompositeRequest(target, defaultName, compositeType),
- new Procedure<Resource>() {
- @Override
- public void execute(Resource composite) {
- Simantics.getSession().asyncRequest(new WriteRequest() {
-
- @Override
- public void perform(WriteGraph graph) throws DatabaseException {
- DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
- Resource diagram = graph.getSingleObject(composite, ModelingResources.getInstance(graph).CompositeToDiagram);
- graph.claim(diagram, DN.EdgeDefaultMapping, dialog.getDefaultEdgeMapping());
- graph.claim(diagram, DN.VertexDefaultMapping, dialog.getDefaultVertexMapping());
- graph.claim(diagram, DN.HasSpatialRefSystem, dialog.getCRS());
-
- // Generated name prefix from composite name
- String compositeName = graph.getRelatedValue2(composite, Layer0.getInstance(graph).HasName, Bindings.STRING);
- graph.claimLiteral(diagram, Layer0X.getInstance(graph).HasGeneratedNamePrefix, "N" + compositeName.substring(compositeName.length() - 1, compositeName.length()));
- }
- });
- DefaultActions.asyncPerformDefaultAction(Simantics.getSession(), composite, false, false, true);
- procedure.execute(composite);
- }
-
- @Override
- public void exception(Throwable t) {
- LOGGER.error("Failed to create composite, see exception for details.", t);
- procedure.exception(t);
- }
- });
+ Simantics.getSession().asyncRequest(new WriteResultRequest<Resource>() {
+
+ @Override
+ public Resource perform(WriteGraph graph) throws DatabaseException {
+ return DistrictNetworkUtil.createNetworkDiagram(graph, target, compositeType, defaultName,
+ dialog.getDefaultEdgeMapping(),
+ dialog.getDefaultVertexMapping(),
+ dialog.getRightClickVertexMapping(),
+ dialog.getLeftClickVertexMapping(),
+ dialog.getCRS()
+ );
+ }
+
+
+ }, new Procedure<Resource>() {
+
+ @Override
+ public void execute(Resource composite) {
+ DefaultActions.asyncPerformDefaultAction(Simantics.getSession(), composite, false, false, true);
+ procedure.execute(composite);
+ }
+
+ @Override
+ public void exception(Throwable t) {
+ LOGGER.error("Failed to create composite, see exception for details.", t);
+ procedure.exception(t);
+ }
+ });
}
public static Collection<Resource> getDistrictDiagrams(ReadGraph graph) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
return listInstanceNames(graph, context, DN.Edge_ThicknessProperty);
}
-
+
+ @SCLValue(type = "ReadGraph -> Resource -> Variable -> b")
+ public static Object arrowLengthPropertyEnumerationValues(ReadGraph graph, Resource resource, Variable context) throws DatabaseException {
+ DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+ return listInstanceNames(graph, context, DN.Edge_ArrowLengthProperty);
+ }
+
@SCLValue(type = "ReadGraph -> Resource -> Variable -> b")
public static Object nodeScalePropertyEnumerationValues(ReadGraph graph, Resource resource, Variable context) throws DatabaseException {
DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
return baseMappingModifier(graph, diagram, DN.Diagram_edgeThicknessProperty, DN.Edge_ThicknessProperty, context);
}
+ @SCLValue(type = "ReadGraph -> Resource -> Variable -> b")
+ public static Object arrowLengthPropertyModifier(ReadGraph graph, Resource resource, Variable context) throws DatabaseException {
+ Resource diagram = resolveElement(graph, context);
+ DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+ return baseMappingModifier(graph, diagram, DN.Diagram_arrowLengthProperty, DN.Edge_ArrowLengthProperty, context);
+ }
+
@SCLValue(type = "ReadGraph -> Resource -> Variable -> b")
public static Object nodeScalePropertyModifier(ReadGraph graph, Resource resource, Variable context) throws DatabaseException {
Resource diagram = resolveElement(graph, context);
Code Review / simantics / district.git / blobdiff