]>
gerrit.simantics Code Review - simantics/district.git/log
Reino Ruusu [Mon, 9 Nov 2020 10:53:12 +0000 (12:53 +0200)]
Hide "enabled" column for non-component type tech type tables
gitlab #93
Change-Id: I8d9ea8008d13d6be8e2b3cff4bf56b0a6f9198b8
(cherry picked from commit
c669b6c3089b28f55336f350a0178515208bbd51 )
Reino Ruusu [Mon, 9 Nov 2020 10:51:12 +0000 (12:51 +0200)]
Fix NPEs in tech type command handlers' canExecute()
gitlab #93
Change-Id: Ib2ef00feadb6cd98bfacecfd3b0e2055c1767114
(cherry picked from commit
b1e13119cdfa85f67fedf387cb9583898970f773 )
jsimomaa [Mon, 12 Oct 2020 07:49:38 +0000 (10:49 +0300)]
Adding new mappable attributes for vertices and edges
Remove duplicate mapping for DN.Edge.HasConductance
gitlab #102
Change-Id: Ibbdd3192fab8bf7ba43aa0ea71cb0b749263d097
(cherry picked from commit
5fa14d5ab4da2e161a75b75e324e6253ba49cbc4 )
(cherry picked from commit
782045a8c4f27b1dbdc77d620437aef28cd77b97 )
jsimomaa [Mon, 12 Oct 2020 07:16:21 +0000 (10:16 +0300)]
Adding new mappable attributes for vertices and edges
gitlab #102
Change-Id: Ieaf033fc34f28c00683f624f730ce7a7ca95470a
(cherry picked from commit
bc3098a132f1fea7f5e9b6feedf6e2ca9ff59525 )
(cherry picked from commit
ed3ef92c8120037c1b81cd2880c0ee78c6b4427c )
Reino Ruusu [Mon, 2 Nov 2020 14:27:52 +0000 (16:27 +0200)]
Add id for tech type table editor adapter
Reino Ruusu [Mon, 2 Nov 2020 14:27:23 +0000 (16:27 +0200)]
Handle tech type tables with no component type
Reino Ruusu [Mon, 12 Oct 2020 11:27:29 +0000 (14:27 +0300)]
Sorting support for tech type table columns
gitlab #104
Change-Id: Ibf4a63314fa2499ad8d6196f3373e1f9837f0efc
(cherry picked from commit
708dfb62d934f425087f983fecfea0f00c59840d )
Reino Ruusu [Mon, 12 Oct 2020 11:26:19 +0000 (14:26 +0300)]
Disable editable style from columns other than "Enabled"
gitlab #101
Change-Id: I5142a8b615881f97cf2dea24aa86485cf4b43ef8
(cherry picked from commit
dea2f95092ad8d682b356cdd39e8c1c4a0db9b2c )
Reino Ruusu [Mon, 12 Oct 2020 07:54:37 +0000 (10:54 +0300)]
Remover for tech type tables
gitlab #103
Change-Id: I839b5508e337c96b2f0d7842f77a7589acd25de3
(cherry picked from commit
779d2b145f6eb9bba150f16c8e00eb8c162189f0 )
Reino Ruusu [Fri, 9 Oct 2020 06:03:14 +0000 (09:03 +0300)]
Limit tech type code enumeration to enabled items
gitlab #101
Change-Id: Ie749bf5f7a32cabd71535b36012867d2aa04bf58
(cherry picked from commit
484707a4336644e28c35e0558bd157ca3b74366f )
Reino Ruusu [Fri, 9 Oct 2020 06:02:28 +0000 (09:02 +0300)]
Avoid exception for non-unique keys in tech type table
gitlab #93
Change-Id: I6c258b4dd11403419a7a1dd986ec449ea7602e4e
(cherry picked from commit
dcfefc75af1dbd93f8647e24a09053d2638d2f57 )
Reino Ruusu [Mon, 5 Oct 2020 12:52:51 +0000 (15:52 +0300)]
Add enable/disable feature for tech type tables
gitlab #101
Also:
- Some new SCL entry points for DB requests
- Some refactoring of tech type table data provider
- Some refactoring of TechTypeTableData request
Change-Id: I1b335b49f387e0b9b2651879279f79f40ed293f8
(cherry picked from commit
63b3e619ad5b28b382f97d5b607060365b6e1caa )
Reino Ruusu [Fri, 2 Oct 2020 05:47:21 +0000 (08:47 +0300)]
Moved compareNatural to TechTypeUtils
gitlab #93
Change-Id: I7450918d7580e92519d92e3a6e53dce9986667fb
(cherry picked from commit
57283335590a05798c49460fd63da079e9795079 )
Reino Ruusu [Fri, 25 Sep 2020 06:27:23 +0000 (09:27 +0300)]
Utilities for checking component consistency against tech type data
Reino Ruusu [Thu, 24 Sep 2020 07:53:08 +0000 (10:53 +0300)]
Fix error that hides last tech type table row.
Reino Ruusu [Wed, 23 Sep 2020 13:17:39 +0000 (16:17 +0300)]
Add UI for resetting component values
Reino Ruusu [Wed, 23 Sep 2020 11:16:38 +0000 (14:16 +0300)]
Enumerated value function for tech type table keys.
Reino Ruusu [Mon, 21 Sep 2020 15:16:07 +0000 (18:16 +0300)]
Add an SCL interface for loading tech type files
Reino Ruusu [Mon, 21 Sep 2020 13:49:32 +0000 (16:49 +0300)]
Support for new edge properties in district import wizard
Reino Ruusu [Fri, 18 Sep 2020 14:21:29 +0000 (17:21 +0300)]
Utilities for resetting map diagram element to tech type data
Reino Ruusu [Fri, 18 Sep 2020 14:20:40 +0000 (17:20 +0300)]
Trim whitespace from tech type table data
Reino Ruusu [Fri, 18 Sep 2020 13:00:16 +0000 (16:00 +0300)]
New properties for Edge elements
Reino Ruusu [Fri, 18 Sep 2020 12:59:29 +0000 (15:59 +0300)]
Connections between mapping Relations and element properties
Reino Ruusu [Fri, 18 Sep 2020 13:05:11 +0000 (16:05 +0300)]
Remove generated code from repository
Reino Ruusu [Mon, 14 Sep 2020 14:12:37 +0000 (17:12 +0300)]
Tech type table content validation
gitlab #96
Change-Id: Icbb92e366748d8de9205cd29487d03eaacb5e7a4
(cherry picked from commit
7d3e650a2d3891988e7d0ef83fcb3b283a226d09 )
Tuukka Lehtonen [Fri, 11 Sep 2020 09:00:46 +0000 (12:00 +0300)]
Amendment to
f4c1e22c
gitlab #93
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 )
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 )
Tuukka Lehtonen [Thu, 10 Sep 2020 18:47:25 +0000 (21:47 +0300)]
Use org.apache.commons.csv from platform's external dependencies
Reino Ruusu [Tue, 8 Sep 2020 14:45:29 +0000 (17:45 +0300)]
Updating of component properties when type code changes
Reino Ruusu [Mon, 7 Sep 2020 11:15:14 +0000 (14:15 +0300)]
Move tech type table-related request from UI plug-in
Reino Ruusu [Mon, 31 Aug 2020 14:57:33 +0000 (17:57 +0300)]
Editor adapter for tech type table entities
Reino Ruusu [Mon, 31 Aug 2020 13:07:03 +0000 (16:07 +0300)]
Use default charset for tech type CSV parsing
Reino Ruusu [Mon, 31 Aug 2020 13:06:06 +0000 (16:06 +0300)]
Read tech type table data from model
Reino Ruusu [Mon, 31 Aug 2020 12:58:25 +0000 (15:58 +0300)]
Ontology for tech type table persistence
Reino Ruusu [Mon, 31 Aug 2020 12:57:03 +0000 (15:57 +0300)]
Utilities for listing district component types
Reino Ruusu [Mon, 31 Aug 2020 12:48:15 +0000 (15:48 +0300)]
Support CSV import from a generic reader
jsimomaa [Wed, 12 Aug 2020 14:35:56 +0000 (17:35 +0300)]
First testing version of TechTypeTable
Tuukka Lehtonen [Tue, 28 Jul 2020 12:20:54 +0000 (15:20 +0300)]
Fixed broken icon references from District Finder UI contributions
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
(cherry picked from commit
ade944a1d12ca6b83f3ec4d87b7f97fc7d05f770 )
jsimomaa [Tue, 28 Jul 2020 10:20:34 +0000 (13:20 +0300)]
Fix wrong platform branch spec in district release/1.43.0 branch
Tuukka Lehtonen [Wed, 17 Jun 2020 19:23:45 +0000 (22:23 +0300)]
ComponentBase is in different package in later versions
Tuukka Lehtonen [Mon, 15 Jun 2020 10:49:10 +0000 (13:49 +0300)]
jsimomaa [Mon, 15 Jun 2020 09:01:09 +0000 (12:01 +0300)]
Add missing visualization trigger code
gitlab #91
Change-Id: I99e6c8f256fb4de4cc84e83599f951be8238694e
(cherry picked from commit
165a995bf446be802c4623b46706a257a5367c69 )
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
(cherry picked from commit
2430e12577de9c1f984c873d7184795bb2dd29eb )
jsimomaa [Mon, 18 May 2020 10:27:12 +0000 (13:27 +0300)]
Fix district finder search result comparison
gitlab #86
Change-Id: I1d6431c41d3d9cf300a6af47e1f493b5c4be9af1
(cherry picked from commit
733d6a84564945fefe429c5e2a9b23b62444d520 )
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 )
Reino Ruusu [Fri, 27 Mar 2020 14:01:31 +0000 (16:01 +0200)]
Unify names and categories of all district-related views
Reino Ruusu [Thu, 26 Mar 2020 14:17:42 +0000 (16:17 +0200)]
New element selector configuration dialog
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
Tuukka Lehtonen [Fri, 20 Mar 2020 13:15:21 +0000 (15:15 +0200)]
Fixed District diagram viewer to allow moving of vertices again.
The problem was caused by the default grid snap advisor which the base
DiagramViewer injects into the canvas context, which had 1.0mm snap
region. This removes the snap advisor entirely.
gitlab #82
Change-Id: Ibbced0c118801266c15e1dae50f39fdee28cf0a6
(cherry picked from commit
ff17be003806b0570ebd6f0017d27e99e31e0c24 )
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
(cherry picked from commit
b5099fa4d696dbc14180de878a2b03d5ba51be35 )
jsimomaa [Thu, 5 Mar 2020 06:56:23 +0000 (08:56 +0200)]
Make background map preference changes apply immediately
gitlab #81
Change-Id: I51786e38b865ac9eb1a3abb7e47b3d4186b44098
(cherry picked from commit
465566b944898a570ce56840e6df9a10ca6cf793 )
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
(cherry picked from commit
190aac50ce7ebdc0114140bd9d5928d228bd498c )
Tuukka Lehtonen [Sat, 29 Feb 2020 09:11:58 +0000 (11:11 +0200)]
Removed version specifiers from require-bundles
Tuukka Lehtonen [Sat, 29 Feb 2020 09:02:09 +0000 (11:02 +0200)]
Fixed district master after platform master external dep upgrade
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
(cherry picked from commit
4082549fe417eb372b215e6199ce43b8e223367d )
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
(cherry picked from commit
415a01dee406d277eabee9ab4a3780a4d056a719 )
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
(cherry picked from commit
3730466cd1e90c50c988292e107639952448d6a6 )
Tuukka Lehtonen [Tue, 18 Feb 2020 21:47:55 +0000 (23:47 +0200)]
Add support for signing published bundles
jsimomaa [Fri, 31 Jan 2020 09:59:32 +0000 (11:59 +0200)]
Diagram element calculateScaleRecip should never return 0
jsimomaa [Fri, 31 Jan 2020 09:58:48 +0000 (11:58 +0200)]
Fix DNElementRemover to remove the actual component first if possible
jsimomaa [Fri, 31 Jan 2020 09:51:51 +0000 (11:51 +0200)]
Move edge arrow rendering to a separate node forcing render on top
jsimomaa [Sun, 26 Jan 2020 16:09:50 +0000 (18:09 +0200)]
Support searching nearby vertices in network diagram
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
Tuukka Lehtonen [Tue, 21 Jan 2020 22:38:04 +0000 (00:38 +0200)]
Fix javax.inject import problem
jsimomaa [Wed, 18 Dec 2019 09:11:52 +0000 (11:11 +0200)]
Add support for importing regions to district models
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
(cherry picked from commit
385607cc1fb1269741eac9fcdb7621d47abebb45 )
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
(cherry picked from commit
7f3b0d5297006df708f9169e473448ec6f85e211 )
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
(cherry picked from commit
6218654d0a683aed2fec569dea2ecb89e395c7be )
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: I8696ff12853f0de2040db91909a1c4512fe4b2fe
(cherry picked from commit
86d471d96d6bc11bf7629113e57c6d9a9916e608 )
jsimomaa [Sun, 24 Nov 2019 16:51:04 +0000 (18:51 +0200)]
Fix detailed geometry center point caluclation and direction
jsimomaa [Sun, 24 Nov 2019 14:34:42 +0000 (16:34 +0200)]
Do not fail mapserver startup if destroying existing process fails
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
(cherry picked from commit
e9e4d5aa42316eda7f4f21577801f94fce90c0a7 )
Reino Ruusu [Wed, 20 Nov 2019 15:20:11 +0000 (17:20 +0200)]
Use detailed geometry in drawing info labels, symbols and picking.
Tuukka Lehtonen [Wed, 20 Nov 2019 14:43:29 +0000 (16:43 +0200)]
Fixed two selection/picking related bugs
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
(cherry picked from commit
f97150acbd65924d45b7ab545d3398a8b070e2b5 )
Tuukka Lehtonen [Wed, 20 Nov 2019 11:15:26 +0000 (13:15 +0200)]
Fixed NPE, labels == null
gitlab #44
Change-Id: Ia85281ec70b75b1a5808a80cb0f5a7c00b4317b3
(cherry picked from commit
25f87bcfe45d3b94d745ae3a02386cd041dd790d )
Tuukka Lehtonen [Mon, 18 Nov 2019 21:07:24 +0000 (23:07 +0200)]
Disabled ImportTechTypeCSVHandler definition to prevent startup errors
jsimomaa [Sat, 16 Nov 2019 06:44:49 +0000 (08:44 +0200)]
Fix dynamic visualisations UI initialization
jsimomaa [Sat, 16 Nov 2019 05:14:48 +0000 (07:14 +0200)]
Dynamic visualisations UI - check for NPE's
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
(cherry picked from commit
7269f2d5d32c2af2ab97c9124e42bfef37b57109 )
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
Tuukka Lehtonen [Thu, 7 Nov 2019 18:35:59 +0000 (20:35 +0200)]
Prevent IndexRoot requests from crashing when network diagram is removed
Tuukka Lehtonen [Thu, 7 Nov 2019 18:35:16 +0000 (20:35 +0200)]
NPE fix for district scene graph nodes
jsimomaa [Thu, 7 Nov 2019 12:22:15 +0000 (14:22 +0200)]
Change logging to trace for elevation server
jsimomaa [Thu, 7 Nov 2019 12:21:35 +0000 (14:21 +0200)]
Add edge arrow contributions to visualisations
jsimomaa [Wed, 6 Nov 2019 12:22:34 +0000 (14:22 +0200)]
Improve HoverInfoStyle performance for district network diagrams
jsimomaa [Wed, 6 Nov 2019 12:20:08 +0000 (14:20 +0200)]
Updates for dynamic visualisations
jsimomaa [Wed, 30 Oct 2019 14:33:53 +0000 (16:33 +0200)]
Put back VertexSymbolStyle adapter that was mistakenly removed
jsimomaa [Wed, 30 Oct 2019 08:28:23 +0000 (10:28 +0200)]
Dynamic visualisations interval and disable support
Tuukka Lehtonen [Wed, 23 Oct 2019 22:01:23 +0000 (22:01 +0000)]
Merge "Allow product-specific customization of new network diagram creation"
Tuukka Lehtonen [Wed, 23 Oct 2019 21:53:27 +0000 (00:53 +0300)]
Allow product-specific customization of new network diagram creation
jsimomaa [Mon, 21 Oct 2019 10:38:37 +0000 (13:38 +0300)]
Remove deprecated profiles in favor of DNVisualisationStyle
jsimomaa [Mon, 21 Oct 2019 10:02:44 +0000 (13:02 +0300)]
Fix dynamic visualisations UI color bars disappearing
jsimomaa [Mon, 21 Oct 2019 09:59:42 +0000 (12:59 +0300)]
Fix dynamic visualisations UI unit not updating
jsimomaa [Mon, 21 Oct 2019 09:58:49 +0000 (12:58 +0300)]
Show detailed geometry on further zoom distance
jsimomaa [Thu, 17 Oct 2019 08:31:47 +0000 (11:31 +0300)]
Fixing UI related bugs in Dynamic Visualisations view
Tuukka Lehtonen [Wed, 16 Oct 2019 22:46:26 +0000 (01:46 +0300)]
Optimization of district scene graph node rendering
jsimomaa [Wed, 16 Oct 2019 19:18:19 +0000 (22:18 +0300)]
Dynamic Visualisations view improvements & profile refactoring
Code Review / simantics / district.git / log