]> gerrit.simantics Code Review - simantics/district.git/log
simantics/district.git
4 years agoMoved compareNatural to TechTypeUtils 20/4520/2
Reino Ruusu [Fri, 2 Oct 2020 05:47:21 +0000 (08:47 +0300)]
Moved compareNatural to TechTypeUtils

gitlab #93

Change-Id: I7450918d7580e92519d92e3a6e53dce9986667fb

4 years agoUtilities for checking component consistency against tech type data 12/4512/1
Reino Ruusu [Fri, 25 Sep 2020 06:27:23 +0000 (09:27 +0300)]
Utilities for checking component consistency against tech type data

gitlab #96

Change-Id: I3039933e89a214eb29d8f339c5385ed1e5876b6c

4 years agoMerge changes I2ff9124d,If885cde4 into release/1.35.3
Tuukka Lehtonen [Thu, 24 Sep 2020 12:11:09 +0000 (12:11 +0000)]
Merge changes I2ff9124d,If885cde4 into release/1.35.3

* changes:
  Add conductance to edge properties
  Refactor CSV import wizard to only list each property once

4 years agoUpdate SCL interface for element selection 09/4509/1
Reino Ruusu [Thu, 24 Sep 2020 11:45:24 +0000 (14:45 +0300)]
Update SCL interface for element selection

gitlab #62

Change-Id: I511c65f318f8a28297267d539349bc86b6d0bae6

4 years agoAdd conductance to edge properties 11/4511/1
Reino Ruusu [Thu, 24 Sep 2020 11:30:44 +0000 (14:30 +0300)]
Add conductance to edge properties

gitlab #99

Change-Id: I2ff9124ded117047988778bae6947400f2535a89

4 years agoRefactor CSV import wizard to only list each property once 10/4510/1
Reino Ruusu [Thu, 24 Sep 2020 11:05:47 +0000 (14:05 +0300)]
Refactor CSV import wizard to only list each property once

gitlab #97

Change-Id: If885cde4972fefe6db9fb71b5fce0d7190d09590

4 years agoFix error that hides last tech type table row. 08/4508/1
Reino Ruusu [Thu, 24 Sep 2020 07:53:08 +0000 (10:53 +0300)]
Fix error that hides last tech type table row.

gitlab #93

Change-Id: I4ca2402f53b7a748ccd41ff964b5d09944994a5d

4 years agoAdd UI for resetting component values 03/4503/1
Reino Ruusu [Wed, 23 Sep 2020 13:17:39 +0000 (16:17 +0300)]
Add UI for resetting component values

gitlab #93

Change-Id: I206d0eb815d06c66bd27ab48a0a33a28b02d0880

4 years agoEnumerated value function for tech type table keys. 02/4502/1
Reino Ruusu [Wed, 23 Sep 2020 11:16:38 +0000 (14:16 +0300)]
Enumerated value function for tech type table keys.

gitlab #100

Change-Id: I8b8508aef8db573e4536d0c3ea87d42055af1664

4 years agoAdd an SCL interface for loading tech type files 66/4466/1
Reino Ruusu [Mon, 21 Sep 2020 15:16:07 +0000 (18:16 +0300)]
Add an SCL interface for loading tech type files

gitlab #93

Change-Id: Ie6d3fa4ccd71d967422c798bb7834c57cabd9416

4 years agoSupport for new edge properties in district import wizard 65/4465/1
Reino Ruusu [Mon, 21 Sep 2020 13:49:32 +0000 (16:49 +0300)]
Support for new edge properties in district import wizard

gitlab #99

Change-Id: Ief14e7e33c24680c0b2aac7fb3a9c02d67138684

4 years agoUtilities for resetting map diagram element to tech type data 64/4464/1
Reino Ruusu [Fri, 18 Sep 2020 14:21:29 +0000 (17:21 +0300)]
Utilities for resetting map diagram element to tech type data

gitlab #98

Change-Id: I996dc6d89c44a8082460e60a86cdb1357838b9f2

4 years agoTrim whitespace from tech type table data 63/4463/1
Reino Ruusu [Fri, 18 Sep 2020 14:20:40 +0000 (17:20 +0300)]
Trim whitespace from tech type table data

gitlab #93

Change-Id: I72cf316d3e99b35fdfa12e404e62a41a3e1858cf

4 years agoNew properties for Edge elements 62/4462/1
Reino Ruusu [Fri, 18 Sep 2020 13:00:16 +0000 (16:00 +0300)]
New properties for Edge elements

gitlab #99

Change-Id: I3d934ffd74549890bc1be1b54022f65971376a42

4 years agoConnections between mapping Relations and element properties 61/4461/1
Reino Ruusu [Fri, 18 Sep 2020 12:59:29 +0000 (15:59 +0300)]
Connections between mapping Relations and element properties

gitlab #97

Change-Id: Ie65c3ca037b0519162d2db4a8dc1a811cdb3671e

4 years agoRemove generated code from repository 60/4460/1
Reino Ruusu [Fri, 18 Sep 2020 13:05:11 +0000 (16:05 +0300)]
Remove generated code from repository

Change-Id: I855f6b87cb631d02491558ede8b3f537753aea1f

4 years agoMerge "Tech type table content validation" into release/1.35.3
Tuukka Lehtonen [Mon, 14 Sep 2020 15:03:42 +0000 (15:03 +0000)]
Merge "Tech type table content validation" into release/1.35.3

4 years agoTech type table content validation 55/4455/1
Reino Ruusu [Mon, 14 Sep 2020 14:12:37 +0000 (17:12 +0300)]
Tech type table content validation

gitlab #96

Change-Id: Icbb92e366748d8de9205cd29487d03eaacb5e7a4

4 years agoAmendment to 99bc6569
Tuukka Lehtonen [Fri, 11 Sep 2020 09:00:01 +0000 (12:00 +0300)]
Amendment to 99bc6569

gitlab #93

4 years agoSet license/copyright information for district features
Tuukka Lehtonen [Wed, 22 Apr 2020 07:38:06 +0000 (10:38 +0300)]
Set license/copyright information for district features

Used EPL 2.0 for license and THTH ry as vendor.

gitlab #83

Change-Id: I75739448ed900a80f7a882da7551e1dc0f9a8a58
(cherry picked from commit 4ad7f53b7ed5bcd782ca39020e5e662d8d4c67a1)

4 years agoPrevent leakage of OSGI service references
Tuukka Lehtonen [Thu, 10 Sep 2020 21:06:58 +0000 (00:06 +0300)]
Prevent leakage of OSGI service references

gitlab #95

Change-Id: I7dfa5f7f21664e248be73f60927b8e2b6eee294f
(cherry picked from commit c3fe71cfddafe8288d9242f9c1eef98cf5c5ecd3)

4 years agoUse org.apache.commons.csv from platform's external dependencies 46/4446/1
Tuukka Lehtonen [Thu, 10 Sep 2020 18:47:25 +0000 (21:47 +0300)]
Use org.apache.commons.csv from platform's external dependencies

Remove commons-csv-1.4 JAR from org.simantics.district.imports in favor
of commons-csv 1.6 from platform externals.

gitlab #93

Change-Id: I4016fcf2f39d45b1ce599682aa7d7112621a5a12

4 years agoTechTypeTable features 45/4445/1
jsimomaa [Wed, 12 Aug 2020 14:35:56 +0000 (17:35 +0300)]
TechTypeTable features

Squashed cherry pick of change ids
* I552cfac33369bf960342836428bc005ed3b1505f
* I24f2b651176a7b9aa8b8871cf8e49473350d9193
* I37e9db42c3e7b4a95ba12bed87107cddccd66bc1
* Iee2cae3751983d059216fea7ec11fd47a9e9dda4
* Iba22b4ea4db7a772664e2b76ab44a88a70ea8e80
* I7f7dd9aae0d90b00250ecf42e01ce566e57544d0
* I8550ac1edb7d650211c51ce6379487788001569c
* Ia5ac3f513adfd57d4a2e499c9a7dd4ef77355e9f

gitlab #93

Change-Id: I33967fb28b9ec41364d68787c359d6c363089b65

4 years agoFixed broken icon references from District Finder UI contributions 59/4359/1
Tuukka Lehtonen [Tue, 28 Jul 2020 12:20:54 +0000 (15:20 +0300)]
Fixed broken icon references from District Finder UI contributions

gitlab #86

Change-Id: I72636e52f2c63403260e70ab7f3fba84277b95a7
(cherry picked from commit 80aef302ef8e28f72e861c93ac71421f289af8c0)

4 years agoFinder visualisation coloring to diagram & checkbox for enable/disable 46/4346/1
jsimomaa [Tue, 28 Jul 2020 10:57:49 +0000 (13:57 +0300)]
Finder visualisation coloring to diagram & checkbox for enable/disable

gitlab #86

Change-Id: I5ef0badf730300778b8ae6ff7c73eeb158fd66d1

4 years agoAmendment to 165a995bf446be802c4623b46706a257a5367c69
Tuukka Lehtonen [Mon, 15 Jun 2020 10:49:10 +0000 (13:49 +0300)]
Amendment to 165a995bf446be802c4623b46706a257a5367c69

gitlab #91

4 years agoAdd missing visualization trigger code 15/4315/2
jsimomaa [Mon, 15 Jun 2020 09:01:09 +0000 (12:01 +0300)]
Add missing visualization trigger code

gitlab #91

Change-Id: I99e6c8f256fb4de4cc84e83599f951be8238694e

4 years agoAdd participant for visualizing district finder search results 95/4295/2
jsimomaa [Mon, 8 Jun 2020 05:52:36 +0000 (08:52 +0300)]
Add participant for visualizing district finder search results

gitlab #86

Change-Id: I418faea0ecacaf2f056620c7980992f781611044

4 years agoFix district finder search result comparison 31/4231/2
jsimomaa [Mon, 18 May 2020 10:27:12 +0000 (13:27 +0300)]
Fix district finder search result comparison

gitlab #86

Change-Id: I1d6431c41d3d9cf300a6af47e1f493b5c4be9af1

4 years agoSelection of highlight color for District Finder queries 69/4069/2
Reino Ruusu [Fri, 3 Apr 2020 16:40:45 +0000 (19:40 +0300)]
Selection of highlight color for District Finder queries

gitlab #85

TODO: Element size controls

Change-Id: Ifadc9f72a7efe6e7ace930b2d4c09b3133f1b9df
(cherry picked from commit 6e5f34e9a8fa2dd0c83745e25285dc4c5e0a9ce5)

4 years agoUnify names and categories of all district-related views 79/4079/2
Reino Ruusu [Fri, 27 Mar 2020 14:01:31 +0000 (16:01 +0200)]
Unify names and categories of all district-related views

gitlab #87

Change-Id: I077065132eace9d390955ef1016e86b7a063a959

4 years agoNew element selector configuration dialog 78/4078/2
Reino Ruusu [Thu, 26 Mar 2020 14:17:42 +0000 (16:17 +0200)]
New element selector configuration dialog

Includes element type selection and property selection from drop-down
menus. Also includes some refactoring of the underlying selector code.

gitlab #84

Change-Id: If5e42a7962d6d17b97a9fb6a3d207ed860858b8c

Remove block of commented-out code

gitlab #84

Change-Id: Ia75eeb9e9a2a4dc5a339244837cd6e6f01f97891

Layout adjustments in element selector dialog.

gitlab #84

Change-Id: I28de9ca5e1bc22eef607126ec75dcd3a93263188

More rigorous content validation for element selection dialog

gitlab #84

Change-Id: Iadb875ea9db3db8350095e21c39ecfad6cc6af36

Remove misplaced pop-up menu command

gitlab #84

Change-Id: I4412390556daacc4172c34018fa9d0fea65bf586

Rename element selection view in UI to "District Finder"

gitlab #84

Change-Id: I668eb468c169ccd8dfd8575daff9c1f1a0f01f2d

Manage drop-down menu contents by context in district finder dialog

gitlab #84

Also fix failure in creation of new queries.

Change-Id: I122ec005119a7efd8878b24815dc09a226e8b6d9

Fix use of static ontology variables out of context

gitlab #84

Change-Id: I94d17685f44e4bbfdaccaf9b3bfabefacb4e1c8e

Fix validation of selection by property when not used

gitlab #84

Change-Id: I6fd1b5d297ac2a07536edcd51a5f1b1099e3d06d

4 years agoGenerated code changes in DisctrictNetworkResource 77/4077/2
Reino Ruusu [Thu, 26 Mar 2020 11:33:03 +0000 (13:33 +0200)]
Generated code changes in DisctrictNetworkResource

Due to changes in f182477cd4a4b38ed51fd17dc810b8114d0fe6ca.

gitlab #80

Change-Id: I64ed99bfe569957b0adf0461b343a05e4527f2f9

4 years agoDiagram element calculateScaleRecip should never return 0 28/3928/1
jsimomaa [Fri, 31 Jan 2020 09:59:32 +0000 (11:59 +0200)]
Diagram element calculateScaleRecip should never return 0

gitlab #78

Change-Id: Ie8a71822f7b0a8d2d8a0d9720a825fc8a59cf51f
(cherry picked from commit 6b176202f7acfdbea0d23b4b1d56737cdc41a624)

4 years agoFix DNElementRemover to remove the actual component first if possible 27/3927/1
jsimomaa [Fri, 31 Jan 2020 09:58:48 +0000 (11:58 +0200)]
Fix DNElementRemover to remove the actual component first if possible

gitlab #77

Change-Id: If3f627eff8a0bda7567a313446dff4f2cfd5b634
(cherry picked from commit ba7c2c670c6c2d2c358664474607461f1bbc2d6c)

4 years agoAdd setPipeTypeIndex to Simantics/District/Import SCL-module 65/3965/2
jsimomaa [Thu, 5 Mar 2020 06:57:43 +0000 (08:57 +0200)]
Add setPipeTypeIndex to Simantics/District/Import SCL-module

gitlab #80

Change-Id: I64e68a6c76df44c024a3daa1879eeea2cb9e6817

4 years agoMake background map preference changes apply immediately 64/3964/2
jsimomaa [Thu, 5 Mar 2020 06:56:23 +0000 (08:56 +0200)]
Make background map preference changes apply immediately

gitlab #81

Change-Id: I51786e38b865ac9eb1a3abb7e47b3d4186b44098

4 years agoAdd support for setting pipeType from CSV import 62/3962/1
jsimomaa [Wed, 4 Mar 2020 08:20:23 +0000 (10:20 +0200)]
Add support for setting pipeType from CSV import

gitlab #80

Change-Id: I4a98493466629697dd535814749d35a708a24a95

4 years agoAdd support for specifying DecimalFormat format for static info 88/3888/1
jsimomaa [Thu, 20 Feb 2020 12:35:58 +0000 (14:35 +0200)]
Add support for specifying DecimalFormat format for static info

gitlab #59

Change-Id: I718671cf0d91ab402e83b7570d3fc2170b1349c2

4 years agoAdd connected components to visualisation from profiles 81/3881/2
jsimomaa [Wed, 19 Feb 2020 12:05:50 +0000 (14:05 +0200)]
Add connected components to visualisation from profiles

District profiles should all be implemented now with dynamic
visualisations

gitlab #59

Change-Id: Ie3747b37b9d5b68f8feb5182e3b3b0af4bd67d11

4 years agoMove to platform 1.35.3 with district 79/3879/2
jsimomaa [Wed, 19 Feb 2020 08:07:58 +0000 (10:07 +0200)]
Move to platform 1.35.3 with district

gitlab #79

Change-Id: Ifd9755c38451ce2ae23b68971520529de6ed72e9

4 years agoMove remaining profiles to visualisations for perf 78/3878/2
jsimomaa [Wed, 19 Feb 2020 08:00:20 +0000 (10:00 +0200)]
Move remaining profiles to visualisations for perf

* Static property information
* Dynamic symbols
* Not in simulation
* Elevation server bounding box

gitlab #59

Change-Id: Ia17e7fe59042edcd71426e91c7d8ad5f9996c7c3

4 years agoMove edge arrow rendering to a separate node forcing render on top 37/3837/1
jsimomaa [Fri, 31 Jan 2020 09:51:51 +0000 (11:51 +0200)]
Move edge arrow rendering to a separate node forcing render on top

gitlab #76

Change-Id: Ib8f99e814588756e7e320e3d9c168ab4a67a3b27
(cherry picked from commit 47a6ef4077aacf0ac5753ee568183bbed5d27411)

4 years agoSupport searching nearby vertices in network diagram 49/3749/1
jsimomaa [Sun, 26 Jan 2020 16:09:50 +0000 (18:09 +0200)]
Support searching nearby vertices in network diagram

gitlab #75

Change-Id: I53e9230fd99abb29712c46fa7214cfcd628dee83

4 years agoImprove picking to prefer vertices and with a more useful pick area 48/3748/1
Tuukka Lehtonen [Fri, 24 Jan 2020 12:52:53 +0000 (14:52 +0200)]
Improve picking to prefer vertices and with a more useful pick area

gitlab #74

Change-Id: I6577a35f99523bcf9264bd3a12d48bbfde96beb2
(cherry picked from commit 7b29ec0924722d1388606d54fc398afb5b32b8d4)

5 years agoAdd support for importing regions to district models 33/3733/1
jsimomaa [Wed, 18 Dec 2019 09:11:52 +0000 (11:11 +0200)]
Add support for importing regions to district models

gitlab #73

Change-Id: Icea73ce0f8aac0866dc0735a5756315e86e94439
(cherry picked from commit c98b9f92547d6e7d4cdf59e2f8f10b355300b7e9)

5 years agoEnable `track changes` and `split to multiple diagrams` by default 56/3656/2
Tuukka Lehtonen [Mon, 2 Dec 2019 09:03:08 +0000 (11:03 +0200)]
Enable `track changes` and `split to multiple diagrams` by default

gitlab #72

Change-Id: Ief2ad7e932c994041f72bc75302328e551d784ae

5 years agoInterim fix for orientation/location of static info on network branches 53/3653/2
Tuukka Lehtonen [Fri, 29 Nov 2019 21:41:42 +0000 (23:41 +0200)]
Interim fix for orientation/location of static info on network branches

Previously the profile style implementation would reset the edge info
direction to match the simplified edge data whenever the style result
was recalculated from the database.

Now the style just tells the static info node the
DistrictNetworkEdgeNode it is supposed to visualize and the info node
will calculate the info pos/orientation based on that during render.

This is an interim fix because the style implementation will be removed
once this visualization is moved into the district visualization toolbox
from the diagram profile implementation. At that point the visualization
also needs to be optimized to only show the information for the edges
inside the current viewbox.

gitlab #47

Change-Id: I8b8ea78378df5749cf59405d7f9fae8d9848698e

5 years agoFixed vertex hover after previous commit 51/3651/1
Tuukka Lehtonen [Fri, 29 Nov 2019 19:17:55 +0000 (21:17 +0200)]
Fixed vertex hover after previous commit

Amendment to 86d471d96d6bc11bf7629113e57c6d9a9916e608

gitlab #44

Change-Id: Id8412c69303721b619262fe7977f2805ae22dfbb

5 years agoUsability fixes for district network node hover info showing 49/3649/1
Tuukka Lehtonen [Fri, 29 Nov 2019 14:04:42 +0000 (16:04 +0200)]
Usability fixes for district network node hover info showing

Previously there was really no logic with what is shown if the cursor
was on top of multiple elements at the same time.

Now the hovering logic always prefers the closest vertex that is picked
from near the mouse cursor and only if there are no nearby vertices,
will edges be selected. Picking also takes the current view zoom into
account properly which it didn't do before.

Also includes some code cleanup.

gitlab #44

Change-Id: Ie20ae4831effcd1d4a78f0cdf45fd3fbc2c14993

5 years agoFix detailed geometry center point caluclation and direction 09/3609/1
jsimomaa [Sun, 24 Nov 2019 16:51:04 +0000 (18:51 +0200)]
Fix detailed geometry center point caluclation and direction

gitlab #70
gitlab #47

Change-Id: Icf51b2c0d87cb527fc3e12a84fd88a7be7147800
(cherry picked from commit 932a9b82b349d8e63a36df1cdc5cbb37bdd8ff80)

5 years agoDo not fail mapserver startup if destroying existing process fails 07/3607/1
jsimomaa [Sun, 24 Nov 2019 14:34:42 +0000 (16:34 +0200)]
Do not fail mapserver startup if destroying existing process fails

gitlab #71

Change-Id: I07084ee20b64c896afc1c0addc70d4c5355ed69c
(cherry picked from commit 6b3b840535b8feb1b67a7ae6bacaaa2c961a4064)

5 years agoFixed edge arrows to always be rendered above the edge 04/3604/1
Tuukka Lehtonen [Fri, 22 Nov 2019 23:48:48 +0000 (01:48 +0200)]
Fixed edge arrows to always be rendered above the edge

Optimized MidBranchEdgeSetRequest memory use by using CollectionSupport
to create a ResourceSet instead of using HashSet<Resource>.

gitlab #47

Change-Id: Ic763cb1ea8976ca3ff5c933e8de5f18aa29f6579

5 years agoUse detailed geometry in drawing info labels, symbols and picking. 92/3592/1
Reino Ruusu [Wed, 20 Nov 2019 15:20:11 +0000 (17:20 +0200)]
Use detailed geometry in drawing info labels, symbols and picking.

gitlab #70
gitlab #47

Change-Id: Ie8189751f130c47fbd1c9686eb46252efc038412
(cherry picked from commit 7ebf5a4d72468b19d55cb79c0494d0538081d2ff)

5 years agoFixed two selection/picking related bugs 83/3583/1
Tuukka Lehtonen [Wed, 20 Nov 2019 14:43:29 +0000 (16:43 +0200)]
Fixed two selection/picking related bugs

1. RTreeNode bounds calculation now always uses the detailed geometry of
   district edge nodes to calculate their bounds. This fixes picking to
   work in cases where the detailed geometry falls much outside of the
   spanning rectangle of the edge's end vertices.
2. Introduced DistrictSelectionNode that tells G2DParentNode to ignore
   its bounds instead of nullifying them entirely. This caused the edge
   nodes to fall outside the R-tree as "boundless nodes" which caused
   the most optimized R-tree based picking to fail entirely for nodes
   that are selected when RTreeNode.decompose is executed.

gitlab #68
gitlab #69

Change-Id: I119f33a04923b9b4bf06a8229cfccedc520588cb

5 years agoMerge "Fixed DynamicVisualisationContributionsParticipant to cancel hover task" into...
Tuukka Lehtonen [Wed, 20 Nov 2019 12:08:01 +0000 (12:08 +0000)]
Merge "Fixed DynamicVisualisationContributionsParticipant to cancel hover task" into release/1.35.2

5 years agoDisabled ImportTechTypeCSVHandler definition to prevent startup errors 76/3576/1
Tuukka Lehtonen [Mon, 18 Nov 2019 21:07:24 +0000 (23:07 +0200)]
Disabled ImportTechTypeCSVHandler definition to prevent startup errors

Change-Id: I8b9fa0f8c78e7195f5734cac4c99f85cd05ad8d8
(cherry picked from commit f027a73861220daf1c51c1f1cfecd0b9ce982d5d)

5 years agoFixed DynamicVisualisationContributionsParticipant to cancel hover task 75/3575/2
Tuukka Lehtonen [Wed, 20 Nov 2019 11:50:45 +0000 (13:50 +0200)]
Fixed DynamicVisualisationContributionsParticipant to cancel hover task

Previously a possible hover info update task was never cancelled
properly if the participant was removed from the context due to e.g.
disposal of the diagram editor.

gitlab #67

Change-Id: I0d98673190ddbf836d40713f9c0b9c8608076552

5 years agoFixed NPE, labels == null 73/3573/1
Tuukka Lehtonen [Wed, 20 Nov 2019 11:15:26 +0000 (13:15 +0200)]
Fixed NPE, labels == null

gitlab #44

Change-Id: Ia85281ec70b75b1a5808a80cb0f5a7c00b4317b3

5 years agoFix dynamic visualisations UI initialization 62/3562/2
jsimomaa [Sat, 16 Nov 2019 06:44:49 +0000 (08:44 +0200)]
Fix dynamic visualisations UI initialization

* Show if elements are hidden when first initializing the view

gitlab #59

Change-Id: I3156ecdfb8f2e8580885dc5c45159947100a5ff9
(cherry picked from commit 12f7720a7e4055ead86f6b2b2926fbf31c5cf37e)

5 years agoDynamic visualisations UI - check for NPE's 61/3561/1
jsimomaa [Sat, 16 Nov 2019 05:14:48 +0000 (07:14 +0200)]
Dynamic visualisations UI - check for NPE's

gitlab #59

Change-Id: I21d1ab3375e5c462bab07a6001a907ee8ae8841b
(cherry picked from commit acf514530798b148ab9f0781ce3f78c1c09da4c4)

5 years agoFix hover info text size to be readable with all display zoom settings 23/3523/2
Tuukka Lehtonen [Fri, 15 Nov 2019 05:25:19 +0000 (07:25 +0200)]
Fix hover info text size to be readable with all display zoom settings

gitlab #44

Change-Id: I004a69571a10f9313dc7244c43f1906dc7d6aabc

5 years agoFixed rendering of district hover info node to always stay inside editor 88/3488/1
Tuukka Lehtonen [Sun, 10 Nov 2019 22:28:20 +0000 (00:28 +0200)]
Fixed rendering of district hover info node to always stay inside editor

Previously hovering on top of things near the edge of the editor would
place the hover info box partially outside of the canvas. With these
changes, the info box always stays within the canvas, given that the
canvas is large enough to show the box in the first place.

gitlab #44

Change-Id: I0869358687c9ac12dcf6fb54c9d39594d7ab6241
(cherry picked from commit 900f0e33431c1e3ea7d94d73cbf4d21f533dac26)

5 years agoPrevent IndexRoot requests from crashing when network diagram is removed 82/3482/2
Tuukka Lehtonen [Thu, 7 Nov 2019 18:35:59 +0000 (20:35 +0200)]
Prevent IndexRoot requests from crashing when network diagram is removed

Use PossibleIndexRoot instead.

gitlab #65

Change-Id: I344249dc125d057c17718ad2fdfb98ef267c702b
(cherry picked from commit 320681ec7f81eccbdaf8b168ee001d0a43df31f1)

5 years agoNPE fix for district scene graph nodes 81/3481/1
Tuukka Lehtonen [Thu, 7 Nov 2019 18:35:16 +0000 (20:35 +0200)]
NPE fix for district scene graph nodes

gitlab #63

Change-Id: Ie5902a9476d1ca516fb1a5c3e0af9ddc28f7b394
(cherry picked from commit 4d0c114c0f53694180f808747b63d64fcefb0932)

5 years agoMerge "Change logging to trace for elevation server" into release/1.35.2
Tuukka Lehtonen [Thu, 7 Nov 2019 15:25:42 +0000 (15:25 +0000)]
Merge "Change logging to trace for elevation server" into release/1.35.2

5 years agoMerge "Add edge arrow contributions to visualisations" into release/1.35.2
Tuukka Lehtonen [Thu, 7 Nov 2019 15:25:38 +0000 (15:25 +0000)]
Merge "Add edge arrow contributions to visualisations" into release/1.35.2

5 years agoChange logging to trace for elevation server 74/3474/1
jsimomaa [Thu, 7 Nov 2019 12:22:15 +0000 (14:22 +0200)]
Change logging to trace for elevation server

gitlab #45

Change-Id: Iac8d0a4649620d4cad4dc8a8dc4bd26ef5dfbb0d
(cherry picked from commit c30f0393c0ba0ac5d2c5a895f250a6484e78bf0e)

5 years agoAdd edge arrow contributions to visualisations 73/3473/1
jsimomaa [Thu, 7 Nov 2019 12:21:35 +0000 (14:21 +0200)]
Add edge arrow contributions to visualisations

gitlab #59

Change-Id: Ie53f5509ba4e3545aa6858058376823af937ae58
(cherry picked from commit 314680bcb969e7436eb1d3326fec11ef71b5e420)

5 years agoImprove HoverInfoStyle performance for district network diagrams 72/3472/1
jsimomaa [Wed, 6 Nov 2019 12:22:34 +0000 (14:22 +0200)]
Improve HoverInfoStyle performance for district network diagrams

gitlab #44

Change-Id: I8c3a399153a024ca1a17cee7f9c396fb470e7f2b
(cherry picked from commit 7c1f539de88c6ca79b2ac6dc891be3f45282abe2)

5 years agoUpdates for dynamic visualisations 62/3462/1
jsimomaa [Wed, 6 Nov 2019 12:20:08 +0000 (14:20 +0200)]
Updates for dynamic visualisations

* Do not print ValueNotFoundExceptions
* Add support for resetting visualisations

gitlab #59

Change-Id: I5d54194463dae5755e433abea1a06ec81ba40a50
(cherry picked from commit 2de54d0f65ace8c56d27a5a1191e4420b96e22c2)

5 years agoPut back VertexSymbolStyle adapter that was mistakenly removed 30/3430/1
jsimomaa [Wed, 30 Oct 2019 14:33:53 +0000 (16:33 +0200)]
Put back VertexSymbolStyle adapter that was mistakenly removed

gitlab #59

Change-Id: I691cd5e82152ea41e95ca51e5d09b924217cb8f8

5 years agoDynamic visualisations interval and disable support 25/3425/1
jsimomaa [Wed, 30 Oct 2019 08:28:23 +0000 (10:28 +0200)]
Dynamic visualisations interval and disable support

gitlab #59

Change-Id: I094c96163bfbf435bed5bce21dc674a20277fe99
(cherry picked from commit b3108a7380f0492ddb40c839c223715d59bbfe9a)

5 years agoAllow product-specific customization of new network diagram creation 01/3401/1
Tuukka Lehtonen [Wed, 23 Oct 2019 21:53:27 +0000 (00:53 +0300)]
Allow product-specific customization of new network diagram creation

gitlab #64

Change-Id: I71e44be7c3f38740101b35e53b0e6e594aa2f1b8
(cherry picked from commit 11ad7d688b004970a64c2cb680fdc220c55403db)

5 years agoRemove deprecated profiles in favor of DNVisualisationStyle 94/3394/1
jsimomaa [Mon, 21 Oct 2019 10:38:37 +0000 (13:38 +0300)]
Remove deprecated profiles in favor of DNVisualisationStyle

gitlab #59

Change-Id: Id1b5e55d39241dd288c8fb8fe4ffb3a187e87e59
(cherry picked from commit 63ca3304ae8ef41b9bae9a97b8ff04adc6ad0371)

5 years agoMerge "Fix dynamic visualisations UI color bars disappearing" into release/1.35.2
Jani Simomaa [Mon, 21 Oct 2019 10:20:12 +0000 (10:20 +0000)]
Merge "Fix dynamic visualisations UI color bars disappearing" into release/1.35.2

5 years agoMerge "Fix dynamic visualisations UI unit not updating" into release/1.35.2
Jani Simomaa [Mon, 21 Oct 2019 10:20:06 +0000 (10:20 +0000)]
Merge "Fix dynamic visualisations UI unit not updating" into release/1.35.2

5 years agoFix dynamic visualisations UI color bars disappearing 84/3384/1
jsimomaa [Mon, 21 Oct 2019 10:02:44 +0000 (13:02 +0300)]
Fix dynamic visualisations UI color bars disappearing

gitlab #59
APROS-15720

Change-Id: Iacc499bbfe56136372a2554a59cde00b11cdb8c8
(cherry picked from commit d67ac09ea2c4510848bb98e64fa3b2c55c371244)

5 years agoFix dynamic visualisations UI unit not updating 83/3383/1
jsimomaa [Mon, 21 Oct 2019 09:59:42 +0000 (12:59 +0300)]
Fix dynamic visualisations UI unit not updating

gitlab #59
APROS-15720

Change-Id: I615494a5f3e791e60dc31324f7d231ea1e96967e
(cherry picked from commit 77aa80f6c69a57d6eedf939ed1235208bf75dac3)

5 years agoShow detailed geometry on further zoom distance 82/3382/1
jsimomaa [Mon, 21 Oct 2019 09:58:49 +0000 (12:58 +0300)]
Show detailed geometry on further zoom distance

gitlab #35

Change-Id: I816e552364b0c62529a7296c033379cf558df037
(cherry picked from commit 27f0f6dd22d6826ae85ea89b1916d17ca9f83c41)

5 years agoFixing UI related bugs in Dynamic Visualisations view 56/3356/2
jsimomaa [Thu, 17 Oct 2019 08:31:47 +0000 (11:31 +0300)]
Fixing UI related bugs in Dynamic Visualisations view

gitlab #59

Change-Id: I21ea68aedddab8f1f22a0946fb36c44b01d58c9a
(cherry picked from commit 9b69c365052ce52988a98fe851f6a7d931baef03)

5 years agoOptimization of district scene graph node rendering 55/3355/2
Tuukka Lehtonen [Wed, 16 Oct 2019 22:46:26 +0000 (01:46 +0300)]
Optimization of district scene graph node rendering

* Removed as many repetitive Graphics2D.getTransform calls as possible
* Cleaned up map info nodes from lower right corner of the screen to
  support hi-dpi/display zoom
* Enabled r-tree based picking for district diagrams
* Cleaner looking and more properly working map scale indicator

gitlab #63

Change-Id: Ieebbfc659ef71ba4ff3dad00664fb7b6ee5019b2
(cherry picked from commit b018055e3c5809d33161154aebdc47f733721cdb)

5 years agoDynamic Visualisations view improvements & profile refactoring 54/3354/1
jsimomaa [Wed, 16 Oct 2019 19:18:19 +0000 (22:18 +0300)]
Dynamic Visualisations view improvements & profile refactoring

gitlab #59

Change-Id: Ia25743a5853b9dcc38dde1b58d690e25bf71637b
(cherry picked from commit 6b98761b9c2e9835629d2c0aabefe92657d6d36b)

5 years agoSome tweaks to the element selection query view 20/3320/1
Reino Ruusu [Tue, 8 Oct 2019 14:10:04 +0000 (17:10 +0300)]
Some tweaks to the element selection query view

gitlab #62

* View name change to "Element selection queries"
* View marked as closeable
* Explicit context menu command for performing the query

Change-Id: I186d35c27452b804ebef8d60d4e703d4f738c4a9
(cherry picked from commit c27c9900e0ac0e6cb89c0d052f53e2eac5605aed)

5 years agoSend event for performed queries + some refactoring 18/3318/1
Reino Ruusu [Mon, 7 Oct 2019 13:14:18 +0000 (16:14 +0300)]
Send event for performed queries + some refactoring

gitlab #62

Change-Id: Ib6327b22ed2a622bfd4af05346dcb8a86419ddd1
(cherry picked from commit fc5581727a984b57dade7a627ac408ea5ad3f811)

5 years agoChange selection logic for n lowest/highest value queries 16/3316/1
Reino Ruusu [Fri, 4 Oct 2019 11:55:00 +0000 (14:55 +0300)]
Change selection logic for n lowest/highest value queries

gitlab #62

Change-Id: I2dce7f429c112fcf028edfebd110bd13a0f8ed26
(cherry picked from commit ae7a997a6776a0b3b6f94cc82b8cc93a6e82cc79)

5 years agoChange zoom level from 15 to 17 for static infos 13/3313/1
jsimomaa [Fri, 4 Oct 2019 07:54:56 +0000 (10:54 +0300)]
Change zoom level from 15 to 17 for static infos

gitlab #47

Change-Id: Ic43cd87a4f34b97d00f601db2e48280e6488ae31
(cherry picked from commit db03c6473f55b3ed34d3158376f9af267d37b22c)

5 years agoSome performance tuning on node hovering when mouse buttons are pressed 12/3312/1
jsimomaa [Wed, 2 Oct 2019 12:06:26 +0000 (15:06 +0300)]
Some performance tuning on node hovering when mouse buttons are pressed

gitlab #44

Change-Id: If7ef401979c2d606d96a7c2a3986b5c9f3b9ca46
(cherry picked from commit b3ffdf8a1d0e5bd9803c933e4b59170a019c90d9)

5 years agoFix deadlock in DistrictDiagramViewer event queuing 08/3308/1
jsimomaa [Wed, 2 Oct 2019 07:06:16 +0000 (10:06 +0300)]
Fix deadlock in DistrictDiagramViewer event queuing

gitlab #59
APROS-15657

Change-Id: I4fa598154603ed43c2a1a74d96513fbe0bf74f44
(cherry picked from commit 2d2564b511ad13107e5a9cb3466bf19e66a9d645)

5 years agoMinor UI bug fixes for dynamic visualisations 03/3303/1
jsimomaa [Mon, 30 Sep 2019 07:59:25 +0000 (10:59 +0300)]
Minor UI bug fixes for dynamic visualisations

gitlab #59

Change-Id: I21c6467b898d2d724cf180758974567120cb7702
(cherry picked from commit 8ed34578950dcf8e59f85e3ceecf0f8f264f6208)

5 years agoRemove unused profile throtting setting & assert diameter as Double 02/3302/1
jsimomaa [Mon, 30 Sep 2019 07:58:46 +0000 (10:58 +0300)]
Remove unused profile throtting setting & assert diameter as Double

gitlab #59

Change-Id: I6e3af4a268e1906be2753bbc0aa57e6c892b511d
(cherry picked from commit b6f289e20a2105cedbe103723de93d1116654ee2)

5 years agoMake defaults to work & remove apply button in dynamic visualisations 89/3289/1
jsimomaa [Thu, 26 Sep 2019 09:57:00 +0000 (12:57 +0300)]
Make defaults to work & remove apply button in dynamic visualisations

gitlab #59

Change-Id: I47a836eb0d45616f475240511031fc1361d186e6
(cherry picked from commit ae5159794b57b980f6f2d5e509e6a47843be8ca0)

5 years agoAdd support for gradients in dynamic visualisations 88/3288/1
jsimomaa [Wed, 25 Sep 2019 11:13:07 +0000 (14:13 +0300)]
Add support for gradients in dynamic visualisations

gitlab #59

Change-Id: Id0c2037168819ab78a0acf944df87fc01ca6611f
(cherry picked from commit a2c485af95024784aa9de3378759ee94b8caea2e)

5 years agoDynamicVisualisations enhancements & deprecate old profiles & settings 67/3267/1
jsimomaa [Wed, 18 Sep 2019 12:33:32 +0000 (15:33 +0300)]
DynamicVisualisations enhancements & deprecate old profiles & settings

gitlab #59

Change-Id: I98119002af7a031779688c5fb192424c4f9411a4
(cherry picked from commit 0249f20bb127e61c58db4432b8609ff0cb441480)

5 years agoSwitch district release/1.35.2 to use platform release/1.35.2 44/3244/1
Tuukka Lehtonen [Wed, 11 Sep 2019 18:51:01 +0000 (21:51 +0300)]
Switch district release/1.35.2 to use platform release/1.35.2

gitlab #60

Change-Id: I55fbadb1d5d4d64c3ced9a5e721e49abcfcfb8b4

5 years agoNecessary reverts and changes to build against release/1.35.2 platform
Tuukka Lehtonen [Tue, 10 Sep 2019 16:10:04 +0000 (19:10 +0300)]
Necessary reverts and changes to build against release/1.35.2 platform

gitlab #60

5 years agoMerge remote-tracking branch 'origin/master' into release/1.35.2
Tuukka Lehtonen [Tue, 10 Sep 2019 12:40:31 +0000 (15:40 +0300)]
Merge remote-tracking branch 'origin/master' into release/1.35.2

Change-Id: I4046dc85e90f0eb637d997e481c9d1aabe55eae2

5 years agoMerge remote-tracking branch 'origin/master' into release/1.35.2
Tuukka Lehtonen [Fri, 6 Sep 2019 08:56:11 +0000 (11:56 +0300)]
Merge remote-tracking branch 'origin/master' into release/1.35.2

Conflicts resolved:
org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportModel.java
org.simantics.district.imports.ui/src/org/simantics/district/imports/ui/CSVImportWizard.java
org.simantics.district.network.ontology/graph/DistrictNetworkProfiles.pgraph
org.simantics.district.network.ontology/src/org/simantics/district/network/ontology/DistrictNetworkResource.java
org.simantics.district.network.ui/META-INF/MANIFEST.MF
org.simantics.district.network.ui/adapters.xml
org.simantics.district.network.ui/fragment.e4xmi
org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictTransformUtil.java
org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/NetworkElementActionMenuContribution.java
org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java
org.simantics.district.network/scl/Simantics/District/Algorithm.scl
org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
org.simantics.district.network/src/org/simantics/district/network/profile/ArrowLengthStyle.java

gitlab #60

5 years agoSupport showing ticks in DynamicVisualisations 25/3225/1 release/1.40.0
jsimomaa [Fri, 6 Sep 2019 12:11:26 +0000 (15:11 +0300)]
Support showing ticks in DynamicVisualisations

gitlab #59

Change-Id: Ib89d1b0b237b68cb9169cdd5390a5d049cf0b29d

5 years agoProvide Path2D for calculating path of DistrictNetworkEdgeElement 24/3224/1
jsimomaa [Fri, 6 Sep 2019 12:07:32 +0000 (15:07 +0300)]
Provide Path2D for calculating path of DistrictNetworkEdgeElement

gitlab #61

Change-Id: I2d1195c3e1107e22ab26ef5d61c55da05cdae71b