From 175513d3bfd073faa94fa3932a32039525c4f374 Mon Sep 17 00:00:00 2001 From: jsimomaa Date: Mon, 30 Jul 2018 15:39:20 +0300 Subject: [PATCH] Save solver module name for later use after mapping gitlab #4 Change-Id: I48e3b96eab01bd29435993ff4bf5d9f7d0076500 --- .../graph.tg | Bin 25809 -> 26038 bytes .../graph/DistrictNetwork.pgraph | 5 +++++ .../ontology/DistrictNetworkResource.java | 6 ++++++ .../ui/nodes/DistrictNetworkEdgeNode.java | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/org.simantics.district.network.ontology/graph.tg b/org.simantics.district.network.ontology/graph.tg index 2bda23f8d57b1aa466c0c304240c0d739b4338d0..534183308172fb8f9284eef9f9b3a99df10272e3 100644 GIT binary patch literal 26038 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 literal 25809 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 Ay8r+H diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph index 64dbb60f..5c165085 100644 --- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph +++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph @@ -56,6 +56,11 @@ DN.HasId