]> gerrit.simantics Code Review - simantics/district.git/log
Code Review / simantics / district.git / log
? search:
summary | shortlog | log | commit | commitdiff | review | tree
first ⋅ prev ⋅ next
simantics/district.git
4 years agoSupport searching nearby vertices in network diagram 49/3749/1
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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...
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
jsimomaa [Fri, 6 Sep 2019 12:07:32 +0000 (15:07 +0300)]
Provide Path2D for calculating path of DistrictNetworkEdgeElement

gitlab #61

Change-Id: I2d1195c3e1107e22ab26ef5d61c55da05cdae71b

5 years agoRemove unused ProfileUpdateIntervalRead from ThrottledStyleBase 23/3223/1
commit | commitdiff | tree
jsimomaa [Fri, 6 Sep 2019 12:06:20 +0000 (15:06 +0300)]
Remove unused ProfileUpdateIntervalRead from ThrottledStyleBase

gitlab #30

Change-Id: I5c663aa5a9a45921d5f4b3a5def6ce1b50ae91fd

5 years agoRemove empty submenu when no component is specified. 11/3211/1
commit | commitdiff | tree
Reino Ruusu [Wed, 6 Mar 2019 13:41:59 +0000 (15:41 +0200)]
Remove empty submenu when no component is specified.

gitlab #34

Change-Id: I2861a8d6217e785e31852dd1f5a5b785becd79fd
(cherry picked from commit dc102769bb96829eb953cd21917b8adb42a0729c)

5 years agoAdd support for saving visualisation templates 94/3194/1
commit | commitdiff | tree
jsimomaa [Wed, 4 Sep 2019 06:37:30 +0000 (09:37 +0300)]
Add support for saving visualisation templates

TODO:
* Disabling dynamic updates
* "Gappless" color/size values from maps
* Show/Hide ticks of color bars
* Perfomance tuning

gitlab #59
APROS-15038
APROS-15527
APROS-15528

Change-Id: Idbb7284b552630ca23c8efbf3ec858c834385345

5 years agoFirst version of district visualisations 81/3181/1
commit | commitdiff | tree
jsimomaa [Mon, 2 Sep 2019 06:16:30 +0000 (09:16 +0300)]
First version of district visualisations

TODO:
* Saving of visualisation templates
* Disabling dynamic updates
* "Gappless" color/size values from maps
* Show/Hide ticks of color bars
* Perfomance tuning

gitlab #59
APROS-15038
APROS-15527
APROS-15528

Change-Id: I739d1b677351084c88820579a3a0ef3c985b8886

5 years agoPossibility to show elevation while hoovering on map 13/3113/2
commit | commitdiff | tree
jsimomaa [Mon, 19 Aug 2019 05:50:43 +0000 (08:50 +0300)]
Possibility to show elevation while hoovering on map

gitlab #45
APROS-15550

Change-Id: If9a99a32d10d33d7fc584b3554071cacae8fabfc

5 years agoMove tif folder to preferences for elevation server 69/3069/2
commit | commitdiff | tree
jsimomaa [Thu, 8 Aug 2019 08:41:35 +0000 (11:41 +0300)]
Move tif folder to preferences for elevation server

gitlab #45
APROS-15524

Change-Id: Iffbb4e318f1a3b0b868aab9d0e11211530b55c3d

5 years agoAdded a route validation command to model browser 66/3066/1
commit | commitdiff | tree
Reino Ruusu [Wed, 7 Aug 2019 10:30:05 +0000 (13:30 +0300)]
Added a route validation command to model browser

gitlab #58

Change-Id: I4af93100f4003b66f5229394674cb61312e65e64

5 years agoFix elevation bounding box profile shift & elevation transform fixes 63/3063/1
commit | commitdiff | tree
jsimomaa [Tue, 6 Aug 2019 08:27:51 +0000 (11:27 +0300)]
Fix elevation bounding box profile shift & elevation transform fixes

gitlab #45
APROS-15524

Change-Id: Ic01a79fd23df1d737a99b79c1222f5f2f0eee280

5 years agoIgnore org.simantics.district.selection/graph.tg 57/3057/1
commit | commitdiff | tree
Tuukka Lehtonen [Mon, 5 Aug 2019 05:53:54 +0000 (08:53 +0300)]
Ignore org.simantics.district.selection/graph.tg

Change-Id: Ib80aab0d4f1954e30b56cac20b179722ce602261

5 years agoAdapt to platform OpenDiagramFromConfigurationAdapter changes 56/3056/1
commit | commitdiff | tree
Tuukka Lehtonen [Mon, 5 Aug 2019 05:47:08 +0000 (08:47 +0300)]
Adapt to platform OpenDiagramFromConfigurationAdapter changes

gitlab simantics/platform#325

Change-Id: I535714d4a39620caeb49e67424b09b50b544de7a

5 years agoAdd missing plugin.xml entry to build.properties 50/3050/1
commit | commitdiff | tree
jsimomaa [Wed, 31 Jul 2019 05:34:10 +0000 (08:34 +0300)]
Add missing plugin.xml entry to build.properties

gitlab #45

Change-Id: If4cdfc56176731bfebcb3cc1ab18df7cd85502a2

5 years agoAdded a browser context for route-related actions. 45/3045/2
commit | commitdiff | tree
Reino Ruusu [Fri, 26 Jul 2019 12:26:11 +0000 (15:26 +0300)]
Added a browser context for route-related actions.

gitlab #58

Change-Id: I32760b2dd7feb15827cb234ed315a53dfcbc3a7e

5 years agoAdd a method for unpersisting individual routes into RouteService 44/3044/1
commit | commitdiff | tree
Reino Ruusu [Fri, 26 Jul 2019 12:23:17 +0000 (15:23 +0300)]
Add a method for unpersisting individual routes into RouteService

gitlab #57

Change-Id: I5d486ca7e9362a8685ebe2c04579f001339ecde3

5 years agoAdd SCL interface for District Elevation server 43/3043/1
commit | commitdiff | tree
jsimomaa [Wed, 24 Jul 2019 06:51:14 +0000 (09:51 +0300)]
Add SCL interface for District Elevation server

gitlab #45

Change-Id: Icef31a8ac3280670f2a36a5354bea8c2dd3f8af7

5 years agoRemove erroneus fix made in previous commit for district CSV import 42/3042/1
commit | commitdiff | tree
jsimomaa [Wed, 24 Jul 2019 06:50:00 +0000 (09:50 +0300)]
Remove erroneus fix made in previous commit for district CSV import

gitlab #56
APROS-15523

Change-Id: I2a3ce1e55609b55605252907817dc25267524468

5 years agoSupport peakPower & alternative elevation in district CSV import 40/3040/1
commit | commitdiff | tree
jsimomaa [Tue, 23 Jul 2019 05:01:16 +0000 (08:01 +0300)]
Support peakPower & alternative elevation in district CSV import

gitlab #56
APROS-15523

Change-Id: Ic8b2b008864a03b81aaa9adabdd6e0fab76eb30e

5 years agoShow dynamic symbols when vertices and/or edges are hidden. 39/3039/1
commit | commitdiff | tree
Reino Ruusu [Fri, 19 Jul 2019 11:24:28 +0000 (14:24 +0300)]
Show dynamic symbols when vertices and/or edges are hidden.

gitlab #27

Change-Id: Id9cda3403d1f318b7fd29dd31eeea632749328a5

5 years agoAlternative QGIS scripts for different network data models. 30/3030/2
commit | commitdiff | tree
Reino Ruusu [Thu, 18 Jul 2019 13:28:13 +0000 (16:28 +0300)]
Alternative QGIS scripts for different network data models.

gitlab #40

Change-Id: I109ee8f132975e384fed9009edb78e2350887723

5 years agoAdjustments to map diagram info label rendering 28/3028/2
commit | commitdiff | tree
Reino Ruusu [Thu, 18 Jul 2019 10:05:25 +0000 (13:05 +0300)]
Adjustments to map diagram info label rendering

* Removed white background from static info labels
* Hover info rendered at cursor location
* Info labels drawn on top of map elements

gitlab #44
gitlab #47

Change-Id: I9dda11b80cfe76bae1605ddb46f7d3ece183c719

5 years agoAdd white background for hover & static info on district network diagram 14/3014/1
commit | commitdiff | tree
Jani Simomaa [Thu, 11 Jul 2019 13:12:22 +0000 (16:12 +0300)]
Add white background for hover & static info on district network diagram

gitlab #44
gitlab #47

Change-Id: I96375c6abba3f1e9a0981b12d3055e1109bd53a3

5 years agoPrevent DistrictDiagramEditor from disposing to save load time 13/3013/1
commit | commitdiff | tree
JaniSimomaa [Thu, 11 Jul 2019 09:44:11 +0000 (12:44 +0300)]
Prevent DistrictDiagramEditor from disposing to save load time

gitlab #55

Change-Id: I389045f81545e1f056b060b4560f0df5d3e70543

5 years agoAdd functions for finding elements by DN id 10/3010/1
commit | commitdiff | tree
JaniSimomaa [Mon, 8 Jul 2019 12:08:49 +0000 (15:08 +0300)]
Add functions for finding elements by DN id

gitlab #54

Change-Id: I948de22bc07d1c1cf1120ba37754c81b49d2e29f

5 years agoAdd proper exception handling for CSV import 09/3009/1
commit | commitdiff | tree
JaniSimomaa [Mon, 8 Jul 2019 08:05:08 +0000 (11:05 +0300)]
Add proper exception handling for CSV import

gitlab #52

Change-Id: I0de534bdb48af2cca44c9d84ff9893f32cba7c09

5 years agoChangeMappingType SCL function to change district UC type for scripting 08/3008/1
commit | commitdiff | tree
JaniSimomaa [Mon, 8 Jul 2019 08:04:40 +0000 (11:04 +0300)]
ChangeMappingType SCL function to change district UC type for scripting

gitlab #53

Change-Id: I238de0d0f8f3c898a208d4645c98ad37e03abe42

5 years agoMake it possible to import CSV data via SCL & create models 46/2946/3
commit | commitdiff | tree
jsimomaa [Fri, 14 Jun 2019 09:22:59 +0000 (12:22 +0300)]
Make it possible to import CSV data via SCL & create models

gitlab #52

Change-Id: I84968442a4956f008b7b5604a258f4d60e00ffd0

5 years agoAdd CSV table view for copy/pasting consumer information before creation 35/2935/2
commit | commitdiff | tree
jsimomaa [Fri, 7 Jun 2019 07:34:01 +0000 (10:34 +0300)]
Add CSV table view for copy/pasting consumer information before creation

gitlab #51
APROS-15209

Change-Id: I5307000c29fd93292cb6c41ad527a83abc8f9f6f

5 years agoRefactoring: Move style definitions to a separate package 34/2934/1
commit | commitdiff | tree
Reino Ruusu [Thu, 6 Jun 2019 13:58:25 +0000 (16:58 +0300)]
Refactoring: Move style definitions to a separate package

Change-Id: I7ceed42bbad039bf6b6d4ec383a94012b2e3248c

5 years agoEnable static info labels for vertex elements 28/2928/1
commit | commitdiff | tree
Reino Ruusu [Thu, 6 Jun 2019 09:53:33 +0000 (12:53 +0300)]
Enable static info labels for vertex elements

gitlab #47
APROS-15309

Change-Id: If37d3256d6bed52a444573e957c47b9997abcb6a

5 years agoOntology class changes missing from previous commit 27/2927/1
commit | commitdiff | tree
Reino Ruusu [Thu, 6 Jun 2019 09:52:10 +0000 (12:52 +0300)]
Ontology class changes missing from previous commit

gitlab #45
APROS-15308

Change-Id: Id8ff3e2b4d903ee9c74647b621d0be73b13bd347

5 years agoAdd profile to show bounding boxes for elevation server 25/2925/1
commit | commitdiff | tree
jsimomaa [Wed, 5 Jun 2019 08:46:03 +0000 (11:46 +0300)]
Add profile to show bounding boxes for elevation server

gitlab #45
APROS-15308

Change-Id: I993910384a1fe7b5a740a0282ef23d9114bc3210

5 years agoAdd missing caffeine dependency to district feature for elevationserver 24/2924/1
commit | commitdiff | tree
jsimomaa [Wed, 5 Jun 2019 06:54:00 +0000 (09:54 +0300)]
Add missing caffeine dependency to district feature for elevationserver

gitlab #45
APROS-15308

Change-Id: Ia216fab91df81ac168299bf7c1c4e1ffbeb41a8c

5 years agoAdd property for changing pipe depth under ground with elev server 23/2923/1
commit | commitdiff | tree
jsimomaa [Wed, 5 Jun 2019 06:17:09 +0000 (09:17 +0300)]
Add property for changing pipe depth under ground with elev server

gitlab #45
APROS-15308

Change-Id: I5aba84a0e712716716225a17c8953e23f97cb85d

5 years agoAdd UI fragments of change vetex to point 22/2922/1
commit | commitdiff | tree
jsimomaa [Tue, 4 Jun 2019 16:54:56 +0000 (19:54 +0300)]
Add UI fragments of change vetex to point

gitlab #49

Change-Id: I501a20dd96bc79919e0a4fb311a21e17c5849aaa

5 years agoAdd property table highlight listener to open DN diagram 21/2921/1
commit | commitdiff | tree
jsimomaa [Tue, 4 Jun 2019 16:53:41 +0000 (19:53 +0300)]
Add property table highlight listener to open DN diagram

gitlab #50
APROS-15223

Change-Id: I60e2569263604288ad3d1b23f5c8204103b0b0d0

5 years agoAdd handlers for changing vertex to point and vice versa 20/2920/1
commit | commitdiff | tree
jsimomaa [Tue, 4 Jun 2019 16:52:54 +0000 (19:52 +0300)]
Add handlers for changing vertex to point and vice versa

gitlab #49

Change-Id: Iccff2b560074064834bf54314db8b10767d2d6f5

5 years agoAdd UI controls for route view to activate/deactivate route mode 19/2919/1
commit | commitdiff | tree
jsimomaa [Tue, 4 Jun 2019 16:51:22 +0000 (19:51 +0300)]
Add UI controls for route view to activate/deactivate route mode

gitlab #48
APROS-15258

Change-Id: I019b76cbdfd095e2be667e6865ae5fc48d75a738

5 years agoFix hide style 18/2918/1
commit | commitdiff | tree
jsimomaa [Tue, 4 Jun 2019 16:49:40 +0000 (19:49 +0300)]
Fix hide style

gitlab #46

Change-Id: I8b7ea75ec130938a143654a5caae6fd7cb8a79c3

5 years agoAdd missing elevation server dependency to District-feature 16/2916/1
commit | commitdiff | tree
jsimomaa [Tue, 4 Jun 2019 12:38:51 +0000 (15:38 +0300)]
Add missing elevation server dependency to District-feature

gitlab #45

Change-Id: Ib0731c539585b8c2046e33e1fbf39ad4a6a5c926

5 years agoStatic information label profile definition. 04/2904/1
commit | commitdiff | tree
Reino Ruusu [Fri, 24 May 2019 15:35:20 +0000 (18:35 +0300)]
Static information label profile definition.

gitlab #47
APROS-15309

Change-Id: I67aa5fa278304aa7f0f824cbba3762a3712c6f71

5 years agoFix district node/edge hiding profiles to work 00/2900/1 release/1.39.0
commit | commitdiff | tree
jsimomaa [Mon, 20 May 2019 07:46:17 +0000 (10:46 +0300)]
Fix district node/edge hiding profiles to work

gitlab #46
APROS-15365

Change-Id: I345d461e7f3707a4255519e71a2e1c1a903c5959

5 years agoReduction in size of hover label font to 9 pts. 95/2895/4
commit | commitdiff | tree
Reino Ruusu [Mon, 13 May 2019 09:45:00 +0000 (12:45 +0300)]
Reduction in size of hover label font to 9 pts.

gitlab #44

Change-Id: I9f05a864242623792f72fa7071ab47a5f949d8eb

5 years agoFirst version of elevation server based on GeoTIFF files 94/2894/3
commit | commitdiff | tree
jsimomaa [Mon, 13 May 2019 09:10:46 +0000 (12:10 +0300)]
First version of elevation server based on GeoTIFF files

gitlab #45
APROS-15308

Change-Id: I7aba5526bd45396967bbae8ed26e41934efef47f

5 years agoFix copy/paste of pumping station 69/2869/1
commit | commitdiff | tree
jsimomaa [Mon, 29 Apr 2019 14:11:16 +0000 (17:11 +0300)]
Fix copy/paste of pumping station

gitlab #43
APROS-15307

Change-Id: I07dfa7852146c471fe177c7322c773320fefedac

next
Simantics District Modelling components.