]> 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
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

5 years agoChange route point to Vertex 68/2868/1
commit | commitdiff | tree
jsimomaa [Mon, 29 Apr 2019 14:10:37 +0000 (17:10 +0300)]
Change route point to Vertex

gitlab #42
APROS-15325

Change-Id: I29598bb700ddc9aa53674b0387f1e72b62d735e1

5 years agoMerge "Open SCL script output console on demand for context menu commands."
commit | commitdiff | tree
Tuukka Lehtonen [Wed, 24 Apr 2019 19:57:20 +0000 (19:57 +0000)]
Merge "Open SCL script output console on demand for context menu commands."

5 years agoPrevent scaling of edges as well when zoom level > 15 63/2863/2
commit | commitdiff | tree
jsimomaa [Tue, 23 Apr 2019 12:27:52 +0000 (15:27 +0300)]
Prevent scaling of edges as well when zoom level > 15

gitlab #35
APROS-15329

Change-Id: Ia3dd90a316d52209015d1bc1c61b83b11932c32d

5 years agoOpen SCL script output console on demand for context menu commands. 62/2862/1
commit | commitdiff | tree
Reino Ruusu [Tue, 23 Apr 2019 12:20:24 +0000 (15:20 +0300)]
Open SCL script output console on demand for context menu commands.

gitlab #34

Change-Id: I024b4cc70f0d2644cb527606366347e1d862ade0

5 years agoPrevent scaling of vertices in zoom levels > 15 61/2861/1
commit | commitdiff | tree
jsimomaa [Mon, 22 Apr 2019 18:07:46 +0000 (21:07 +0300)]
Prevent scaling of vertices in zoom levels > 15

gitlab #35
APROS-15329

Change-Id: I8797d241c3ce59031851e6e74c66c0f4907783b7

5 years agoDo not copy elevation to target but use existing elevation 60/2860/1
commit | commitdiff | tree
jsimomaa [Mon, 22 Apr 2019 17:56:25 +0000 (20:56 +0300)]
Do not copy elevation to target but use existing elevation

gitlab #43
APROS-15307

Change-Id: I3cbc97ec442d7dda453093b1dd370413339e5437

5 years agoAdd default mappings for right/left click & prevent edge drawing 59/2859/1
commit | commitdiff | tree
jsimomaa [Mon, 22 Apr 2019 17:55:39 +0000 (20:55 +0300)]
Add default mappings for right/left click & prevent edge drawing

immediately after created new vertex by double click

gitlab #42
APROS-15325

Change-Id: I2ca2921a86ecc9d4f2102dade9217d28553aa8fa

5 years agoBlock exceptions actually caused by pending values from console. 55/2855/1
commit | commitdiff | tree
Reino Ruusu [Wed, 17 Apr 2019 14:52:34 +0000 (17:52 +0300)]
Block exceptions actually caused by pending values from console.

MissingVariableValueExceptions are thrown by getProperty() calls when
pending values are cached for domain properties.

gitlab #44

Change-Id: I2ca32821feb020defad4e55f2dd5893e9d4083f7

5 years agoSupport copying of attributes from DN.MappedComponent 53/2853/1 release/1.38.0
commit | commitdiff | tree
jsimomaa [Fri, 12 Apr 2019 09:53:20 +0000 (12:53 +0300)]
Support copying of attributes from DN.MappedComponent

gitlab #43

Change-Id: I736cbe0454247aaaff51a553cf7a3f7778331f7f

5 years agoSupport copy and cut of dh element & create connections after 50/2850/1
commit | commitdiff | tree
jsimomaa [Thu, 11 Apr 2019 14:37:06 +0000 (17:37 +0300)]
Support copy and cut of dh element & create connections after

gitlab #43
APROS-15307

Change-Id: I9ade3a03bed1da37c1c7adea951998f611386947

5 years agoHover label profile for district elements. 48/2848/1
commit | commitdiff | tree
Reino Ruusu [Tue, 9 Apr 2019 13:13:53 +0000 (16:13 +0300)]
Hover label profile for district elements.

Also includes some improvements in edge and vertex rendering and
selection.

gitlab #44

Change-Id: I007153a4ccb0417f9c1ee6a745876d024f5e2c8d

5 years agoInitial version of dh element cut/paste (copy still WIP) 47/2847/1
commit | commitdiff | tree
jsimomaa [Mon, 8 Apr 2019 16:42:10 +0000 (19:42 +0300)]
Initial version of dh element cut/paste (copy still WIP)

gitlab #43
APROS-15307

Change-Id: Ie1652086c689416e052aed38f5e523ab16ce7b2e

5 years agoAllow starting/ending of manual network creation to vertices only 44/2844/3
commit | commitdiff | tree
jsimomaa [Mon, 8 Apr 2019 09:44:34 +0000 (12:44 +0300)]
Allow starting/ending of manual network creation to vertices only

Added possibility to create default vertex mapping types by double click

Also disallow zoom levels higher than 20

gitlab #42
APROS-15325
APROS-15346

Change-Id: Iae9ce29b88b970e0e96bb245bd748d93b9f3db7d

5 years agoElimination of compiler warnings. 43/2843/1
commit | commitdiff | tree
Reino Ruusu [Mon, 8 Apr 2019 07:45:05 +0000 (10:45 +0300)]
Elimination of compiler warnings.

Change-Id: I115eca19e5750b8a60f312a537a9355082d45220

5 years agoMerge "Make vertices smaller on map UI & CSV import performance improvements"
commit | commitdiff | tree
Jani Simomaa [Thu, 4 Apr 2019 19:05:09 +0000 (19:05 +0000)]
Merge "Make vertices smaller on map UI & CSV import performance improvements"

5 years agoMake vertices smaller on map UI & CSV import performance improvements 42/2842/2
commit | commitdiff | tree
jsimomaa [Thu, 4 Apr 2019 17:53:10 +0000 (20:53 +0300)]
Make vertices smaller on map UI & CSV import performance improvements

gitlab #41
APROS-15329

Change-Id: I593b35c1d571b9d1a7f291bd3e81c77fc39b67b3

5 years agoBetter default value for arrow length. 41/2841/1
commit | commitdiff | tree
Reino Ruusu [Thu, 4 Apr 2019 13:43:29 +0000 (16:43 +0300)]
Better default value for arrow length.

gitlab #39

Change-Id: I7fdf6a6785e958be048dd6d3e49ff7156b72fd83

5 years agoAdded PipeStruct column to CSV generator script. 38/2838/1
commit | commitdiff | tree
Reino Ruusu [Thu, 4 Apr 2019 12:39:40 +0000 (15:39 +0300)]
Added PipeStruct column to CSV generator script.

gitlab #40

Change-Id: I2016eb992246dd0c3e8a74c49b820bc48ba5ec6f

5 years agoAdd minimum span length paremeter to CSV generator script. 37/2837/1
commit | commitdiff | tree
Reino Ruusu [Wed, 3 Apr 2019 14:41:43 +0000 (17:41 +0300)]
Add minimum span length paremeter to CSV generator script.

Also set units for distance parameters.

gitlab #40

Change-Id: If5d39eccf4f93d8efd472c765ec4d8a79bffc203

5 years agoAdded DimensionDN column to CSV generator script. 36/2836/1
commit | commitdiff | tree
Reino Ruusu [Wed, 3 Apr 2019 14:40:46 +0000 (17:40 +0300)]
Added DimensionDN column to CSV generator script.

gitlab #40

Change-Id: I14717e4e1a35a17029e4dfc36715afe72f4c6d9d

5 years agoQGIS Python script for generating pipelines CVS files. 97/2797/1
commit | commitdiff | tree
Reino Ruusu [Thu, 21 Mar 2019 12:36:48 +0000 (14:36 +0200)]
QGIS Python script for generating pipelines CVS files.

gitlab #40

Change-Id: I4c6527eddbb5d61b4cac81f5bed2cfd49863c83a

5 years agoEliminate scaling of arrow widths based on dynamic edge thickness. 95/2795/1
commit | commitdiff | tree
Reino Ruusu [Thu, 21 Mar 2019 10:50:55 +0000 (12:50 +0200)]
Eliminate scaling of arrow widths based on dynamic edge thickness.

gitlab #39

Change-Id: Iafd81090cdb6a793e983f0c00d1ccafacd64913b

5 years agoMerge "Fix to zoom level handling in Map UI." into release/1.35.1
commit | commitdiff | tree
Tuukka Lehtonen [Mon, 18 Mar 2019 21:10:37 +0000 (21:10 +0000)]
Merge "Fix to zoom level handling in Map UI." into release/1.35.1

5 years agoSelect midpoint of network branches for flow velocity arrows. 85/2785/1
commit | commitdiff | tree
Reino Ruusu [Wed, 13 Mar 2019 10:38:14 +0000 (12:38 +0200)]
Select midpoint of network branches for flow velocity arrows.

gitlab #39

Change-Id: Icdfdf511d85de428f22623f0e697b51265c9e7e4

5 years agoArrow length indicators for flow magnitude 84/2784/1
commit | commitdiff | tree
Reino Ruusu [Mon, 11 Mar 2019 09:11:39 +0000 (11:11 +0200)]
Arrow length indicators for flow magnitude

gitlab #39

Change-Id: I0fa73f0025f02e115a49199ef41c82885a1bf4ca
(cherry picked from commit 0864cdbfa9df392bceb26ef3431034ebfc995bcb)

5 years agoFix to zoom level handling in Map UI. 83/2783/1
commit | commitdiff | tree
Reino Ruusu [Mon, 11 Mar 2019 18:17:17 +0000 (20:17 +0200)]
Fix to zoom level handling in Map UI.

gitlab #32

Change-Id: If91a547d85d044d2e4cc78c10ee632f4dc5845b1
(cherry picked from commit a94392a0c857026b936436fbf61853b44a2c8d42)

5 years agoSelect midpoint of network branches for flow velocity arrows. 72/2772/2
commit | commitdiff | tree
Reino Ruusu [Wed, 13 Mar 2019 10:38:14 +0000 (12:38 +0200)]
Select midpoint of network branches for flow velocity arrows.

gitlab #39

Change-Id: Icdfdf511d85de428f22623f0e697b51265c9e7e4

5 years agoArrow length indicators for flow magnitude 71/2771/1
commit | commitdiff | tree
Reino Ruusu [Mon, 11 Mar 2019 09:11:39 +0000 (11:11 +0200)]
Arrow length indicators for flow magnitude

gitlab #39

Change-Id: I0fa73f0025f02e115a49199ef41c82885a1bf4ca

5 years agoFix to zoom level handling in Map UI. 66/2766/2
commit | commitdiff | tree
Reino Ruusu [Mon, 11 Mar 2019 18:17:17 +0000 (20:17 +0200)]
Fix to zoom level handling in Map UI.

gitlab #32

Change-Id: If91a547d85d044d2e4cc78c10ee632f4dc5845b1

5 years agoMore sensible caching for connection lines. 67/2767/1
commit | commitdiff | tree
Reino Ruusu [Mon, 11 Mar 2019 07:58:01 +0000 (09:58 +0200)]
More sensible caching for connection lines.

gitlab #37

Change-Id: I8c88d8e6c77963722ebecac86834bdc4c27462e0
(cherry picked from commit ac559543846448f6523406a926fa7f1b7eaebcac)

5 years agoMore sensible caching for connection lines. 65/2765/1
commit | commitdiff | tree
Reino Ruusu [Mon, 11 Mar 2019 07:58:01 +0000 (09:58 +0200)]
More sensible caching for connection lines.

gitlab #37

Change-Id: I8c88d8e6c77963722ebecac86834bdc4c27462e0

5 years agoConnection lines for control inputs. 63/2763/2
commit | commitdiff | tree
Reino Ruusu [Thu, 7 Mar 2019 19:13:33 +0000 (21:13 +0200)]
Connection lines for control inputs.

gitlab #37

Change-Id: I9d784032ccae42e50bfa13fbdb6600601a63ab5d

5 years agoConnection lines for control inputs. 62/2762/2
commit | commitdiff | tree
Reino Ruusu [Thu, 7 Mar 2019 19:13:33 +0000 (21:13 +0200)]
Connection lines for control inputs.

gitlab #37

Change-Id: I9d784032ccae42e50bfa13fbdb6600601a63ab5d

5 years agoAdd refresh to context menu in district network breakdown view 61/2761/1
commit | commitdiff | tree
jsimomaa [Wed, 6 Mar 2019 20:09:23 +0000 (22:09 +0200)]
Add refresh to context menu in district network breakdown view

Also fixes selection of single vertex

gitlab #11

Change-Id: I3c8af80ccfda86be17dfdcede1269bfde0b16a40

5 years agoAdd edge geometry for detailed rendering in closer zoom levels 60/2760/1
commit | commitdiff | tree
jsimomaa [Wed, 6 Mar 2019 19:36:19 +0000 (21:36 +0200)]
Add edge geometry for detailed rendering in closer zoom levels

gitlab #35

Change-Id: I6930dc2b8225647b61beeee0dfa3408e8d1f70c6

5 years agoSome initial fixes for DPI in map nodes (lot's TODO still) 59/2759/1
commit | commitdiff | tree
jsimomaa [Wed, 6 Mar 2019 20:13:54 +0000 (22:13 +0200)]
Some initial fixes for DPI in map nodes (lot's TODO still)

gitlab #36

Change-Id: If7022ea127d595ea6eaa89878fce38212c81734f

5 years agoSome initial fixes for DPI in map nodes (lot's TODO still) 57/2757/1
commit | commitdiff | tree
jsimomaa [Wed, 6 Mar 2019 20:13:54 +0000 (22:13 +0200)]
Some initial fixes for DPI in map nodes (lot's TODO still)

gitlab #36

Change-Id: If7022ea127d595ea6eaa89878fce38212c81734f

5 years agoAdd refresh to context menu in district network breakdown view 55/2755/1
commit | commitdiff | tree
jsimomaa [Wed, 6 Mar 2019 20:09:23 +0000 (22:09 +0200)]
Add refresh to context menu in district network breakdown view

Also fixes selection of single vertex

gitlab #11

Change-Id: I3c8af80ccfda86be17dfdcede1269bfde0b16a40

5 years agoAdd edge geometry for detailed rendering in closer zoom levels 54/2754/1
commit | commitdiff | tree
jsimomaa [Wed, 6 Mar 2019 19:36:19 +0000 (21:36 +0200)]
Add edge geometry for detailed rendering in closer zoom levels

gitlab #35

Change-Id: I6930dc2b8225647b61beeee0dfa3408e8d1f70c6

5 years agoRemove empty submenu when no component is specified. 53/2753/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

5 years agoPresentation of component-specific actions. 52/2752/2
commit | commitdiff | tree
Reino Ruusu [Wed, 6 Mar 2019 09:45:37 +0000 (11:45 +0200)]
Presentation of component-specific actions.

gitlab #34

Change-Id: I9a88cbaf22c119dbf60a02fc67e7cc98f5d9148b
(cherry picked from commit ee7e19e97c21555c72e1e7252eb34104d8137163)

5 years agoResolve tie situations in n lowest/highest element selection. 51/2751/1
commit | commitdiff | tree
Reino Ruusu [Mon, 4 Mar 2019 15:33:03 +0000 (17:33 +0200)]
Resolve tie situations in n lowest/highest element selection.

Pick all elements that match the value of the n'th lowest/highest one.

Change-Id: I066ae39a2f7db73db93a6c3d4c9531ba4300236f
(cherry picked from commit 50306ed44f39142ec59265c7329e8e5930b9ff38)

5 years agoPresentation of component-specific actions. 47/2747/3
commit | commitdiff | tree
Reino Ruusu [Wed, 6 Mar 2019 09:45:37 +0000 (11:45 +0200)]
Presentation of component-specific actions.

gitlab #34

Change-Id: I9a88cbaf22c119dbf60a02fc67e7cc98f5d9148b

5 years agoResolve tie situations in n lowest/highest element selection. 46/2746/3
commit | commitdiff | tree
Reino Ruusu [Mon, 4 Mar 2019 15:33:03 +0000 (17:33 +0200)]
Resolve tie situations in n lowest/highest element selection.

Pick all elements that match the value of the n'th lowest/highest one.

Change-Id: I066ae39a2f7db73db93a6c3d4c9531ba4300236f

5 years agoMerge remote-tracking branch 'origin/master' into release/1.35.1 45/2745/1
commit | commitdiff | tree
Reino Ruusu [Mon, 4 Mar 2019 13:01:15 +0000 (15:01 +0200)]
Merge remote-tracking branch 'origin/master' into release/1.35.1

Change-Id: Iae0a789dae29880dd235c6c9fe46a2ae115d6009

5 years agoMerge remote-tracking branch 'origin/master' into release/1.35.1 95/2695/3
commit | commitdiff | tree
Reino Ruusu [Mon, 4 Mar 2019 12:51:38 +0000 (14:51 +0200)]
Merge remote-tracking branch 'origin/master' into release/1.35.1

Change-Id: I0b959bf912db2802ecfb35e0caa4ec6b2234829c

5 years agoMerge remote-tracking branch 'origin/release/1.37.0' into release/1.35.1 94/2694/3
commit | commitdiff | tree
Reino Ruusu [Mon, 4 Mar 2019 12:43:02 +0000 (14:43 +0200)]
Merge remote-tracking branch 'origin/release/1.37.0' into release/1.35.1

Change-Id: I6bf440ee0e00dd266e46b0f81b6922dd89b54875

next
Simantics District Modelling components.