]>
gerrit.simantics Code Review - simantics/district.git/log
summary |
shortlog | log |
commit |
commitdiff |
review |
tree
first ⋅ prev ⋅ next
Tuukka Lehtonen [Thu, 27 Dec 2018 08:38:39 +0000 (10:38 +0200)]
Enable routing problem UI feedback for users
gitlab #25
Change-Id: I80f6bdb349ca44997d63882ef433813cf45c8504
Tuukka Lehtonen [Wed, 19 Dec 2018 10:11:29 +0000 (12:11 +0200)]
Removed unnecessary browse context include
The include broke Model Browser viewpoint by adding the standard
property browsing viewpoint to the effective model browser viewpoint.
gitlab #26
Change-Id: I0fbfd7ffaa34a50e283631d8514cdea4ceb852f4
Tuukka Lehtonen [Tue, 18 Dec 2018 12:36:45 +0000 (14:36 +0200)]
Improved Routes view functionality
Context menu now has:
* Select Route on Diagram (actually works now)
* Discard Route
* Rename Route
Route waypoint names are resolved properly already during creation and
show address if defined.
Route rename can also be initiated with F2 from the tree.
gitlab #25
Change-Id: If5edbe63032b2a5b42a616d4c058d2ea7f3a88c1
jsimomaa [Tue, 18 Dec 2018 06:13:00 +0000 (08:13 +0200)]
Trying to get map background coloring to work
gitlab #20
Change-Id: I6f4d3ff243784c33f8114990e27cdf83104909e3
jsimomaa [Mon, 17 Dec 2018 10:44:50 +0000 (12:44 +0200)]
Fix context menu for route view
gitlab #25
Change-Id: I3e7af22cc0775e3b98fc7a6864c26098f8a224c4
Tuukka Lehtonen [Mon, 17 Dec 2018 09:25:30 +0000 (11:25 +0200)]
Fixed NPE from Activator
gitlab #25
Change-Id: Ib4c2f6534ebdf09129f1491578f0d2df86e9b6cf
Tuukka Lehtonen [Sat, 15 Dec 2018 09:27:45 +0000 (11:27 +0200)]
Add org.simantics.district.route.feature to published P2 repository
gitlab #25
Change-Id: I6605ce0784622723fb0a94200e94be7600fcc8a7
Tuukka Lehtonen [Fri, 14 Dec 2018 22:13:25 +0000 (22:13 +0000)]
Merge "Initial version of the district network Routes view."
Tuukka Lehtonen [Fri, 14 Dec 2018 22:01:14 +0000 (00:01 +0200)]
Initial version of the district network Routes view.
The backend for the view is an OSGi service called RouteService which
defines an interface for managing routes. The backend handles database
writeback in the background. The UI only talks with the RouteService,
not the database.
Doesn't do much yet and nothing in the UI is finished yet. Just storing
initial work.
gitlab #25
Change-Id: Ifc79f7aebe943bdd5edae3a16052bf44ca3d3cbe
Tuukka Lehtonen [Fri, 14 Dec 2018 22:01:35 +0000 (22:01 +0000)]
Merge "Changed Network Properties selection view tab title to Input Data"
Tuukka Lehtonen [Fri, 14 Dec 2018 21:43:35 +0000 (23:43 +0200)]
Changed Network Properties selection view tab title to Input Data
gitlab #24
Change-Id: I062584e7ea52f533fe39679431cba8eec67b4f2a
jsimomaa [Thu, 13 Dec 2018 11:39:09 +0000 (13:39 +0200)]
Fix ChangeMappingTypeHandler to work only with selections of DN.Element
gitlab #22
Change-Id: If3e2e54df5980aa37a628da71c6167478c0be7b2
Tuukka Lehtonen [Mon, 10 Dec 2018 13:16:17 +0000 (15:16 +0200)]
Added new functions to Simantics/District
* possibleMappedComponent
* possibleDNElementMappedToComponent
* dnElementsMappedToComponents
gitlab #23
Change-Id: Ic6775beef2f6be30af655f4af243f1ee733b8842
jsimomaa [Fri, 7 Dec 2018 06:51:47 +0000 (08:51 +0200)]
Change mapping of elements, not the mapping itself
gitlab #22
Change-Id: I93210fdb5c66469c5eb40451435745f23528313f
jsimomaa [Wed, 5 Dec 2018 09:41:33 +0000 (11:41 +0200)]
Track changes control & split mapping to multiple diagrams control
gitlab #21
Change-Id: If516d580664ca4fa976f08cf1d4f3be1e973be2b
jsimomaa [Wed, 5 Dec 2018 09:04:53 +0000 (11:04 +0200)]
Use indexRoot directly for searching vertex/edge mappings
gitlab #19
Change-Id: I991bc43cd5f9654f90c7409224ecd069d216f27d
jsimomaa [Wed, 5 Dec 2018 09:03:09 +0000 (11:03 +0200)]
Change listening for district elements on network-diagram
gitlab #18
Change-Id: Iccb7ac53473f8981f36d66f1f3499afd2b1d415c
jsimomaa [Wed, 5 Dec 2018 09:32:00 +0000 (11:32 +0200)]
Change map background color in network diagram
gitlab #20
Change-Id: I4d81104cf61a99aeb4a02c9ade40337d253c6404
jsimomaa [Wed, 5 Dec 2018 09:01:24 +0000 (11:01 +0200)]
Use EPSG code instead of full WKT for creating CRS
gitlab #17
Change-Id: Ida549b67167259252f3fafd43dac03d3bc1ae116
Tuukka Lehtonen [Fri, 9 Nov 2018 08:52:38 +0000 (10:52 +0200)]
Added regions feature to repository
gitlab #14
Tuukka Lehtonen [Fri, 9 Nov 2018 08:48:39 +0000 (10:48 +0200)]
Added region bundles to tycho build
gitlab #14
(cherry picked from commit
69925558bf014de865292cc6a008c0263f4f4715 )
jsimomaa [Wed, 7 Nov 2018 09:18:54 +0000 (11:18 +0200)]
Fix variable exceptions for certain properties in district diagram
gitlab #16
Change-Id: I2fdcdeeb1c56122462862ddd1d056493842375fe
jsimomaa [Tue, 6 Nov 2018 08:03:04 +0000 (10:03 +0200)]
Enabling/Disabling map painting
gitlab #15
Change-Id: I034a334c4a47753342f9871ae68551ceda0b1d19
jsimomaa [Mon, 5 Nov 2018 14:07:02 +0000 (16:07 +0200)]
Add initial version of regions to source control
gitlab #14
Change-Id: I57884758ed59938fa61ef6e4139d9771183a7e21
Tuukka Lehtonen [Sun, 21 Oct 2018 13:39:21 +0000 (16:39 +0300)]
Fixed regressions in box selection and element color function validation
* Edge element box selection didn't work because the contained picking
logic was not implemented properly in the edge element class.
* Element coloring brightness function validation did not set "graph"
key for SCLContext which caused compilation to fail occasionally which
broke the function evaluation.
* Fixed vertex selection visualization to stroke the edge of the normal
rendered rectangular shape which is much cleaner than the old default
selection visualization that was geometrically out of place for some
reason.
gitlab #2
Change-Id: Ib1f5e03a1eeb6101ffe0f527c5a54ece97e1ea8e
(cherry picked from commit
a4105d9cb79a428fbe3a4aa918fc6d1527f1988a )
Tuukka Lehtonen [Sun, 21 Oct 2018 07:41:19 +0000 (10:41 +0300)]
Make more discrete colors available to support more steep functions
gitlab #2
Change-Id: I45d82151557adab08c48dd858cc46f7c630d9826
Tuukka Lehtonen [Sat, 20 Oct 2018 22:59:48 +0000 (01:59 +0300)]
First prototype of HSV color space based dynamic DN element coloring
Both VertexNode and EdgeNode support a new property 'dynamicColor' that
can be set to either a Color or null.
DN.Diagram has three new properties:
* Element Color Hue
* Element Color Saturation
* Element Color Brightness Function
where the first two are constants and the last one is a (Resource ->
<ReadGraph> Double) function that is expected to return a value in [0,1]
which is then used to get the final element color from the HSV gradient.
The Resource argument is the DN diagram element.
The function allows users to define any complex functions in SCLMain to
perform the evaluation for the DN element.
gitlab #2
Change-Id: Ia8dbe0df9400242670949da91e373d68cf7ff758
Tuukka Lehtonen [Fri, 19 Oct 2018 12:00:46 +0000 (15:00 +0300)]
Use DatabaseJob instead of Job to prevent UI from getting stuck
The breakdown calculation can take a long time, thus it is better to
reverse the database for that time so that the rest of the UI doesn't
start synchronously waiting for DB access.
gitlab #11
Change-Id: If4556559009ea8109b95cf6c12d7bae2243d59f3
Tuukka Lehtonen [Fri, 12 Oct 2018 06:42:40 +0000 (09:42 +0300)]
Disconnected subgraph analysis for district network diagrams
* There is a new view called District Network Breakdown that can be used
to see the different disconnected subnetworks inside each district
network diagram.
* The view allows selecting the selected subnetworks on the actual
diagram to give the user an idea where they are
* The algorithm to calculate the disconnected subnetworks comes through
OSGi services (interface SubgraphProvider) and this change has no
implementation for the provider yet. It is on the Apros side for now
because the logic contains Apros-specific analysis.
* The district network diagram can now be opened and focused at certain
elements e.g. through CTRL+R open resource dialog by entering a district
network diagram element's name and pressing enter.
gitlab #11
gitlab #13
Change-Id: I98b9adfa589026530d84e65d5db08c0670349fa2
Tuukka Lehtonen [Thu, 11 Oct 2018 12:05:01 +0000 (15:05 +0300)]
Added Simantics/District/Algorithm SCL module
For now it only contains functions `findDisconnectedSubnetworks`,
`reportDisconnectedSubnetworks` for finding and reporting disconnected
subgraphs within a district network diagram. This helps in finding
possible errors in models generated from this district network model.
gitlab #11
Change-Id: I848f91b3e90684085b83bfa5c559f61f4a33ad7c
Tuukka Lehtonen [Wed, 10 Oct 2018 10:23:29 +0000 (13:23 +0300)]
Ensure ITileProviders return BufferedImages with compatible ColorModel
gitlab #12
Change-Id: Ic47ae73cfdf6d71efdf7099fd67b1e674425682c
(cherry picked from commit
d3de128e6d55f9f6a1325985695b925a1056c469 )
Tuukka Lehtonen [Fri, 28 Sep 2018 13:33:33 +0000 (16:33 +0300)]
First draft of vertex size adjusting district network diagram profiles
* Non-scaling edge/vertex rendering is now limited to view scale range
[1,5] which supports seems to work well for current models.
* View zooming is now limited to range [0.01, 10000].
* Vertices and edges can be separately hidden with respective profile
entries
gitlab #2
Change-Id: If8015fc4d65db88abb8c307b14be9139a4450c0d
(cherry picked from commit
29914be09d4a237840e5c793bdb562ec83093b8d )
jsimomaa [Fri, 14 Sep 2018 10:38:32 +0000 (13:38 +0300)]
New additions to district properties
gitlab #10
Change-Id: I4d2e9071e1eeee98aa048edca47d4fcd7b29d08e
jsimomaa [Wed, 12 Sep 2018 17:32:15 +0000 (20:32 +0300)]
Make optional to calculate elevation for edge during CSV import
gitlab #10
Change-Id: I64141c02990cf306acbec11d05833e8ed7890471
Tuukka Lehtonen [Thu, 6 Sep 2018 06:50:52 +0000 (09:50 +0300)]
Added gitignore for graph.tg files and removed generated resource files
gitlab #2
Change-Id: Ibd866521c61d81d57ad33af4a20a3427a3993159
(cherry picked from commit
9dfc6df7a701cd8b91f0a55d42ae0ed93270ae49 )
Tuukka Lehtonen [Thu, 6 Sep 2018 06:43:34 +0000 (09:43 +0300)]
Added graph compilation to fix broken builds
gitlab #2
Tuukka Lehtonen [Thu, 6 Sep 2018 05:50:05 +0000 (08:50 +0300)]
Fixed pgraph to compile
gitlab #2
Change-Id: I5d1c6dca8f0522b86c73ad782470240a41f233fd
(cherry picked from commit
279b8c6d3d3341f086e131f1f0ba834138bbe646 )
Tuukka Lehtonen [Wed, 5 Sep 2018 21:24:28 +0000 (00:24 +0300)]
Added Edge.ThicknessProperty for generic edge-thickness styling
gitlab #2
Change-Id: I9ce4bb9274a184d3e4ae83669c2079e3720dd412
(cherry picked from commit
a3b6137601545ac6e3484995d0ec6d39224bbf3f )
Tuukka Lehtonen [Tue, 4 Sep 2018 22:01:02 +0000 (01:01 +0300)]
Added DN.Element as base type for DH diagram elements
Removed useless part descriptor from fragment.e4xmi.
gitlab #9
Change-Id: I34c7003e4e2655f16ab02b356e90a512bce953da
(cherry picked from commit
1e6f4461465fc45d71b30535d02bbe1cd7672d4a )
Tuukka Lehtonen [Tue, 4 Sep 2018 09:16:51 +0000 (12:16 +0300)]
Avoid duplicate validity checks when injecting layer listener
gitlab #8
Change-Id: I86f31fc6a640c69be5dc9cce7784ba8903abbad6
jsimomaa [Sun, 2 Sep 2018 21:29:28 +0000 (00:29 +0300)]
Add MappedComponent and remove HasSolverRVI
gitlab #7
Change-Id: I53ab1801acf719a483d7d45de6eaadeb26a13527
Tuukka Lehtonen [Thu, 30 Aug 2018 05:23:36 +0000 (08:23 +0300)]
Use PickRequest with ICanvasContext for improved performance
gitlab #6
Change-Id: Iaf0bd5aa99f3ad01fefe57cd75ec5b8aadd204da
jsimomaa [Wed, 22 Aug 2018 20:51:41 +0000 (23:51 +0300)]
Add address information for district import
gitlab #5
Change-Id: I0bb9bcefa9a7da2cf858e7ee5e3873f62d5cacc5
jsimomaa [Mon, 30 Jul 2018 12:39:20 +0000 (15:39 +0300)]
Save solver module name for later use after mapping
gitlab #4
Change-Id: I48e3b96eab01bd29435993ff4bf5d9f7d0076500
jsimomaa [Mon, 30 Jul 2018 07:19:22 +0000 (10:19 +0300)]
Stash for edge styling & import progress monitoring
gitlab #2
Change-Id: I6f2b2349936641c9b4405335dc81bf7dbbce401c
jsimomaa [Fri, 27 Jul 2018 06:32:18 +0000 (09:32 +0300)]
Edge styling (e.g. width, color etc)
gitlab #2
Change-Id: I4fda3892eb614ec0d170d66c7f85709a229d7403
jsimomaa [Thu, 21 Jun 2018 11:22:51 +0000 (14:22 +0300)]
Adding pkg-precompiled tileserver-mapnik to avoid npm install
gitlab #1
Change-Id: Ia445d450b7fd1a9c59463140950270f70f2f791d
jsimomaa [Thu, 21 Jun 2018 09:58:42 +0000 (12:58 +0300)]
Unzip installed maps server at install time
gitlab #1
Change-Id: I7de0ad8d8cbdb3e2d5f5e18503c42fe4899d5964
jsimomaa [Wed, 20 Jun 2018 11:47:41 +0000 (14:47 +0300)]
Pushing some (very) old changes to remote.. should have done long ago
gitlab #1
Change-Id: I3ec1b6b460d82851f9c16188d3e6d80386f90770
jsimomaa [Fri, 6 Oct 2017 05:17:52 +0000 (08:17 +0300)]
Additions to district features
Change-Id: I3362da74bce33736a730345c1b03833703696dfb
Tuukka Lehtonen [Thu, 14 Jun 2018 11:44:07 +0000 (14:44 +0300)]
Added LICENSE
Tuukka Lehtonen [Thu, 28 Sep 2017 13:56:33 +0000 (16:56 +0300)]
org.simantics.district.network.ontology/graph.tg wants to be committed.
refs #6958
Change-Id: I58dd70df8ade421b9cdf0168443eb0ed9c494930
Tuukka Lehtonen [Thu, 28 Sep 2017 13:56:03 +0000 (16:56 +0300)]
Removed useless OpenDistrictEditor E4 handler.
refs #6958
Change-Id: I945e956116e5f474de3b54432bfa98705180d154
Tuukka Lehtonen [Thu, 28 Sep 2017 13:55:28 +0000 (16:55 +0300)]
Fixed tycho build to work
build.properties definitions were incorrect.
refs #6958
Change-Id: I6ffb9b2b4ca95ffd1e00306f1d1ac832bbbd9b06
Tuukka Lehtonen [Thu, 28 Sep 2017 13:39:48 +0000 (16:39 +0300)]
Tycho build draft for Simantics District components
refs #6958
jsimomaa [Thu, 29 Jun 2017 05:00:52 +0000 (08:00 +0300)]
Updates to Simantics district CSV import
refs #6958
Change-Id: I7310b62f2b456d36c11d01b8c604b4e3e60b8b2a
jsimomaa [Tue, 13 Jun 2017 08:48:54 +0000 (11:48 +0300)]
Adding org.simantics.district.geotools plugin
Change-Id: Iacc44ac5435593c334fa208c40d79f07572c69ef
jsimomaa [Mon, 12 Jun 2017 05:31:01 +0000 (08:31 +0300)]
Some cleaning and fixing of district functionalities
Change-Id: I976cf29c0f606264749025e1998849652cd3c076
jsimomaa [Mon, 15 May 2017 11:06:05 +0000 (14:06 +0300)]
Enhancements to district functionalities and code
Change-Id: Ia388a879d9624724a66f6ce7c7d7891e553bb172
jsimomaa [Fri, 28 Apr 2017 13:02:42 +0000 (16:02 +0300)]
Final push of district changes
refs #6958
Change-Id: I5a6429a9bde4528f2fbc402c3483c2bea7789f70
jsimomaa [Tue, 4 Apr 2017 06:58:56 +0000 (09:58 +0300)]
Adding missing bin in tileserver-mapnik
refs #6958
Change-Id: I711cfa80c3102bb6cb52a3c5b82706fd79016b9c
jsimomaa [Tue, 4 Apr 2017 06:55:06 +0000 (09:55 +0300)]
Adding missing bin folder in integrated tile server
refs #6958
Change-Id: I598b394c67b0f32e1fa88f867dc5ee37f1eb361c
jsimomaa [Tue, 4 Apr 2017 06:23:12 +0000 (09:23 +0300)]
Adding integrated tile server
refs #6958
Change-Id: I3e65ec92b2c7c60f95b7fd56f64a7805d1b6c5db
jsimomaa [Wed, 29 Mar 2017 16:47:59 +0000 (19:47 +0300)]
Some fixes to district stuff 3
refs #6958
Change-Id: I58d80b1c6d5b80ff8dd465305f19865c3c9db99f
jsimomaa [Wed, 29 Mar 2017 16:31:14 +0000 (19:31 +0300)]
Some fixes to district stuff
refs #6958
Change-Id: I55cd490238b75fede3e0b90dcf720cb28c23433f
jsjani [Wed, 29 Mar 2017 16:28:19 +0000 (19:28 +0300)]
Lots of changes to district stuff
refs #6958
Change-Id: Ic44eba4146630d8364cc09c765e5413e130b34df
jsimomaa [Thu, 2 Feb 2017 10:43:22 +0000 (12:43 +0200)]
Adding more functionality to dialog for creating DN diagram
refs #6958
Change-Id: I5a23c319e80965da518b992ec6e321174bf72e2c
jsimomaa [Wed, 1 Feb 2017 09:40:42 +0000 (11:40 +0200)]
Share some projects for Simantics District
refs #6958
Change-Id: If9cb332a4bea53da2960da9343c6939acd1c177a
jsimomaa [Wed, 1 Feb 2017 09:26:31 +0000 (11:26 +0200)]
Some more added functionality to simantics district editor etc
refs #6958
Change-Id: I92a39fffe451b11fe5fa3ab57414f9729637fce9
jsimomaa [Fri, 13 Jan 2017 18:11:00 +0000 (20:11 +0200)]
Adding gitattributes with to have constant line endings
refs #6958
jsimomaa [Fri, 13 Jan 2017 13:19:53 +0000 (15:19 +0200)]
Implement district features to Simantics platform
* Fix picking to pick vertex before edge
* Do not create new vertices if one already exists (need to configure
the picking threshold though)
* Add visual aids to drawing before the drawing is persisted to db
Change-Id: I7e1a59e032fcd47f75bd576c96ea3214ba172969
jsimomaa [Fri, 13 Jan 2017 07:48:14 +0000 (09:48 +0200)]
Implement district features to Simantics platform
refs #6958
Change-Id: I4200a696e3ddca7fafa5d2a1e3dd34aee8bac914
jsimomaa [Tue, 20 Dec 2016 15:25:07 +0000 (17:25 +0200)]
Adding basic import utilities - WIP!
jsimomaa [Tue, 20 Dec 2016 09:29:41 +0000 (11:29 +0200)]
Initial commit of simantics/district