]> gerrit.simantics Code Review - simantics/district.git/log
simantics/district.git
5 years agoMerge "Fix to zoom level handling in Map UI." into release/1.35.1
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
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
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
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 agoMore sensible caching for connection lines. 65/2765/1
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. 62/2762/2
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
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
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
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 agoRemove empty submenu when no component is specified. 53/2753/1
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. 47/2747/3
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
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
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
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
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

5 years agoMerge remote-tracking branch 'origin/release/1.36.0' into release/1.35.1 93/2693/4
Reino Ruusu [Mon, 25 Feb 2019 10:18:57 +0000 (12:18 +0200)]
Merge remote-tracking branch 'origin/release/1.36.0' into release/1.35.1

Conflicts:
org.simantics.district.network/src/org/simantics/district/network/profile/DistrictNodeGroup.java

Change-Id: I2780355701d80fc5dc992442209f614136e3c9db

5 years agoAdd location & zoom node for network diagram - also OSM attribution 36/2736/2
jsimomaa [Thu, 28 Feb 2019 09:15:13 +0000 (11:15 +0200)]
Add location & zoom node for network diagram - also OSM attribution

gitlab #33

Change-Id: I170d79d1af403d0dde6fb5b9ec8feb3157a1c113

5 years agoRefactoring MapNode rendering & zooming to even zoom levels (0-20) 35/2735/2
jsimomaa [Thu, 28 Feb 2019 07:11:50 +0000 (09:11 +0200)]
Refactoring MapNode rendering & zooming to even zoom levels (0-20)

* With this change the map background bitmap-images are always sharp and
not blurred on e.g. zooming level 5.42 which was previously possible

gitlab #32

Change-Id: I1fd84ef25154f454efbff0b0195c447d90bd30fd

5 years agoExpose transform of NetworkDrawingParticipant 32/2732/2
jsimomaa [Tue, 26 Feb 2019 21:45:19 +0000 (23:45 +0200)]
Expose transform of NetworkDrawingParticipant

* for programmatic vertex creation

gitlab #31

Change-Id: Ia2a337fb92dab169a5b2c74f13c93a88998f4617

5 years agoSelection queries from explicit sets of elements. 79/2679/2
Reino Ruusu [Fri, 22 Feb 2019 15:11:00 +0000 (17:11 +0200)]
Selection queries from explicit sets of elements.

gitlab #28

Change-Id: Iac2f3a51b66b37b4fbe04dc1f351327231ea00c7

5 years agoOpening of diagram element query result in diagram view. 73/2673/1
Reino Ruusu [Fri, 22 Feb 2019 11:58:32 +0000 (13:58 +0200)]
Opening of diagram element query result in diagram view.

gitlab #28

Change-Id: Ibdecf9acc683bad6cd11161b50c99409581d4f46

5 years agoDisable throttling for now, as it doens't work. 71/2671/1
Reino Ruusu [Fri, 22 Feb 2019 11:23:15 +0000 (13:23 +0200)]
Disable throttling for now, as it doens't work.

Also use setSynchronous() for diagram styles, as there is no
visualization for pending results.

gitlab #30

Change-Id: I53ce85ba6d81b69f41abe26930941f2bd9d610a1

5 years agoAdded symbol rendering for edges. 63/2663/2
Reino Ruusu [Wed, 20 Feb 2019 17:46:23 +0000 (19:46 +0200)]
Added symbol rendering for edges.

gitlab #27

Change-Id: I67e49bdec2f722121dd261c755ad7722469a3bc9

5 years agoValue type of dynamic symbol function to Maybe String 62/2662/4
Reino Ruusu [Wed, 20 Feb 2019 17:38:20 +0000 (19:38 +0200)]
Value type of dynamic symbol function to Maybe String

Also add caching for symbol functions.

gitlab #27

Change-Id: I34ae22e6e1deae57bbf03ced6ba830c52ec74335

5 years agoGeneralization of mapped property accessors for other data types 61/2661/2
Reino Ruusu [Wed, 20 Feb 2019 17:28:38 +0000 (19:28 +0200)]
Generalization of mapped property accessors for other data types

gitlab #27

Change-Id: Id193ae3b4840a74710c6b86e32bfefd7e3fc3a17

5 years agoIncrease baseline size of vertices 10-fold to improve visibility. 56/2656/2
Reino Ruusu [Mon, 18 Feb 2019 16:14:53 +0000 (18:14 +0200)]
Increase baseline size of vertices 10-fold to improve visibility.

gitlab #27

Change-Id: Iace3eaab32a06312e094d92b449a2780867fee2f

5 years agoFlipped coordinate axes for network diagrams in import wizard. 55/2655/3
Reino Ruusu [Mon, 18 Feb 2019 11:10:43 +0000 (13:10 +0200)]
Flipped coordinate axes for network diagrams in import wizard.

gitlab #3

Change-Id: I36b5f67821079d91f7f75d3dc9bda79d83149c8e

5 years agoFirst version of throttled profile results - configure via proeprty view 58/2658/1
jsimomaa [Tue, 19 Feb 2019 11:25:51 +0000 (13:25 +0200)]
First version of throttled profile results - configure via proeprty view

gitlab #30

Change-Id: Ie99ee4b3b83911646072d44757570b07f20c450d

5 years agoPrevent selection of edge for route start and end points 54/2654/1
jsimomaa [Mon, 18 Feb 2019 11:05:11 +0000 (13:05 +0200)]
Prevent selection of edge for route start and end points

gitlab #29

Change-Id: I43cfc51bd587e3784d5ec253add4ce742c253103

5 years agoRefactoring of diagram element selection method to utils. 49/2649/3
Reino Ruusu [Wed, 13 Feb 2019 08:36:02 +0000 (10:36 +0200)]
Refactoring of diagram element selection method to utils.

Change-Id: I568c2b93661eb7dab33c0e1e2966abac1183abde

5 years agoUI for diagram element selection 38/2638/5
Reino Ruusu [Fri, 1 Feb 2019 15:56:17 +0000 (17:56 +0200)]
UI for diagram element selection

gitlab #28

Change-Id: Id89372d9101dc7004b9b71b8ed6769b555b7b510

5 years agoRemove dependency to org.simantics.db.testing 43/2643/1
jsimomaa [Wed, 6 Feb 2019 08:51:16 +0000 (10:51 +0200)]
Remove dependency to org.simantics.db.testing

gitlab #28

Change-Id: Ic68c18ed39ed39d626a731dadfcfe705a2ef47cf

5 years agoBug fixes to element selection query processing 33/2633/1
Reino Ruusu [Wed, 30 Jan 2019 14:33:06 +0000 (16:33 +0200)]
Bug fixes to element selection query processing

* Accept STR.Composite in addition to DIA.Diagram
* Fix error when selected element count in an NLowest or NHighest is
higher than the number of elements available

gitlab #28

TODO:
* UI for listing stored queries
* UI for defining/editing queries
* UI for executing queries

Change-Id: Ia88980863f4a64ec2c44df081596bb67417d298d

5 years agoManagement of mapped component properties in queries 32/2632/1
Reino Ruusu [Wed, 30 Jan 2019 14:20:28 +0000 (16:20 +0200)]
Management of mapped component properties in queries

gitlab #28

TODO:
* UI for listing stored queries
* UI for defining/editing queries
* UI for executing queries

Change-Id: Ie1c3892d77313c452560f7015b387825a9d34e9e

5 years agoImplementation of non-UI parts of network element queries 31/2631/5
Reino Ruusu [Wed, 30 Jan 2019 13:34:26 +0000 (15:34 +0200)]
Implementation of non-UI parts of network element queries

gitlab #28

TODO:
* Management of mapped properties for map diagram elements
* UI for listing stored queries
* UI for defining/editing queries
* UI for executing queries

Change-Id: I5de84629ed75ce1ae48cd424dc872bb3456ec62b

5 years agoMinor usability fixes for routing in district diagrams 16/2616/1
jsimomaa [Thu, 24 Jan 2019 13:59:48 +0000 (15:59 +0200)]
Minor usability fixes for routing in district diagrams

gitlab #25

Change-Id: Ie5f87133f4602898377bf8c4b279c02d4cbec281

5 years agoDynamic vertex SVG symbol generation 11/2611/1
Reino Ruusu [Wed, 23 Jan 2019 10:05:02 +0000 (12:05 +0200)]
Dynamic vertex SVG symbol generation

gitlab #27

Change-Id: I7f01f451e7affd25d2c9e6e504f8242ce39caec2

6 years agoStart routing with 't' or 'T' 86/2586/1 release/1.37.0
Tuukka Lehtonen [Thu, 27 Dec 2018 09:51:59 +0000 (11:51 +0200)]
Start routing with 't' or 'T'

gitlab #25

Change-Id: Ib6c7597d5667173635da4217076ae51759520063

6 years agoEnable routing problem UI feedback for users 85/2585/1
Tuukka Lehtonen [Thu, 27 Dec 2018 08:38:39 +0000 (10:38 +0200)]
Enable routing problem UI feedback for users

gitlab #25

Change-Id: I80f6bdb349ca44997d63882ef433813cf45c8504

6 years agoRemoved unnecessary browse context include 69/2569/1
Tuukka Lehtonen [Wed, 19 Dec 2018 10:11:29 +0000 (12:11 +0200)]
Removed unnecessary browse context include

The include broke Model Browser viewpoint by adding the standard
property browsing viewpoint to the effective model browser viewpoint.

gitlab #26

Change-Id: I0fbfd7ffaa34a50e283631d8514cdea4ceb852f4

6 years agoImproved Routes view functionality 61/2561/1 private/psaas
Tuukka Lehtonen [Tue, 18 Dec 2018 12:36:45 +0000 (14:36 +0200)]
Improved Routes view functionality

Context menu now has:
* Select Route on Diagram (actually works now)
* Discard Route
* Rename Route

Route waypoint names are resolved properly already during creation and
show address if defined.

Route rename can also be initiated with F2 from the tree.

gitlab #25

Change-Id: If5edbe63032b2a5b42a616d4c058d2ea7f3a88c1

6 years agoTrying to get map background coloring to work 59/2559/2
jsimomaa [Tue, 18 Dec 2018 06:13:00 +0000 (08:13 +0200)]
Trying to get map background coloring to work

gitlab #20

Change-Id: I6f4d3ff243784c33f8114990e27cdf83104909e3

6 years agoFix context menu for route view 57/2557/4
jsimomaa [Mon, 17 Dec 2018 10:44:50 +0000 (12:44 +0200)]
Fix context menu for route view

gitlab #25

Change-Id: I3e7af22cc0775e3b98fc7a6864c26098f8a224c4

6 years agoFixed NPE from Activator 56/2556/2
Tuukka Lehtonen [Mon, 17 Dec 2018 09:25:30 +0000 (11:25 +0200)]
Fixed NPE from Activator

gitlab #25

Change-Id: Ib4c2f6534ebdf09129f1491578f0d2df86e9b6cf

6 years agoAdd org.simantics.district.route.feature to published P2 repository 55/2555/1
Tuukka Lehtonen [Sat, 15 Dec 2018 09:27:45 +0000 (11:27 +0200)]
Add org.simantics.district.route.feature to published P2 repository

gitlab #25

Change-Id: I6605ce0784622723fb0a94200e94be7600fcc8a7

6 years agoMerge "Initial version of the district network Routes view."
Tuukka Lehtonen [Fri, 14 Dec 2018 22:13:25 +0000 (22:13 +0000)]
Merge "Initial version of the district network Routes view."

6 years agoInitial version of the district network Routes view. 54/2554/5
Tuukka Lehtonen [Fri, 14 Dec 2018 22:01:14 +0000 (00:01 +0200)]
Initial version of the district network Routes view.

The backend for the view is an OSGi service called RouteService which
defines an interface for managing routes. The backend handles database
writeback in the background. The UI only talks with the RouteService,
not the database.

Doesn't do much yet and nothing in the UI is finished yet. Just storing
initial work.

gitlab #25

Change-Id: Ifc79f7aebe943bdd5edae3a16052bf44ca3d3cbe

6 years agoMerge "Changed Network Properties selection view tab title to Input Data"
Tuukka Lehtonen [Fri, 14 Dec 2018 22:01:35 +0000 (22:01 +0000)]
Merge "Changed Network Properties selection view tab title to Input Data"

6 years agoChanged Network Properties selection view tab title to Input Data 53/2553/1
Tuukka Lehtonen [Fri, 14 Dec 2018 21:43:35 +0000 (23:43 +0200)]
Changed Network Properties selection view tab title to Input Data

gitlab #24

Change-Id: I062584e7ea52f533fe39679431cba8eec67b4f2a

6 years agoFix ChangeMappingTypeHandler to work only with selections of DN.Element 50/2550/2
jsimomaa [Thu, 13 Dec 2018 11:39:09 +0000 (13:39 +0200)]
Fix ChangeMappingTypeHandler to work only with selections of DN.Element

gitlab #22

Change-Id: If3e2e54df5980aa37a628da71c6167478c0be7b2

6 years agoAdded new functions to Simantics/District 42/2542/2
Tuukka Lehtonen [Mon, 10 Dec 2018 13:16:17 +0000 (15:16 +0200)]
Added new functions to Simantics/District

* possibleMappedComponent
* possibleDNElementMappedToComponent
* dnElementsMappedToComponents

gitlab #23

Change-Id: Ic6775beef2f6be30af655f4af243f1ee733b8842

6 years agoChange mapping of elements, not the mapping itself 27/2527/2
jsimomaa [Fri, 7 Dec 2018 06:51:47 +0000 (08:51 +0200)]
Change mapping of elements, not the mapping itself

gitlab #22

Change-Id: I93210fdb5c66469c5eb40451435745f23528313f

6 years agoTrack changes control & split mapping to multiple diagrams control 24/2524/2
jsimomaa [Wed, 5 Dec 2018 09:41:33 +0000 (11:41 +0200)]
Track changes control & split mapping to multiple diagrams control

gitlab #21

Change-Id: If516d580664ca4fa976f08cf1d4f3be1e973be2b

6 years agoUse indexRoot directly for searching vertex/edge mappings 21/2521/2
jsimomaa [Wed, 5 Dec 2018 09:04:53 +0000 (11:04 +0200)]
Use indexRoot directly for searching vertex/edge mappings

gitlab #19

Change-Id: I991bc43cd5f9654f90c7409224ecd069d216f27d

6 years agoChange listening for district elements on network-diagram 20/2520/2
jsimomaa [Wed, 5 Dec 2018 09:03:09 +0000 (11:03 +0200)]
Change listening for district elements on network-diagram

gitlab #18

Change-Id: Iccb7ac53473f8981f36d66f1f3499afd2b1d415c

6 years agoChange map background color in network diagram 23/2523/2
jsimomaa [Wed, 5 Dec 2018 09:32:00 +0000 (11:32 +0200)]
Change map background color in network diagram

gitlab #20

Change-Id: I4d81104cf61a99aeb4a02c9ade40337d253c6404

6 years agoUse EPSG code instead of full WKT for creating CRS 19/2519/1
jsimomaa [Wed, 5 Dec 2018 09:01:24 +0000 (11:01 +0200)]
Use EPSG code instead of full WKT for creating CRS

gitlab #17

Change-Id: Ida549b67167259252f3fafd43dac03d3bc1ae116

6 years agoAdded regions feature to repository release/1.35.0
Tuukka Lehtonen [Fri, 9 Nov 2018 08:52:38 +0000 (10:52 +0200)]
Added regions feature to repository

gitlab #14

(cherry picked from commit 822d56c9136c7866a3f6487493bfd11fe5022dbf)

6 years agoAdded regions feature to repository release/1.36.0
Tuukka Lehtonen [Fri, 9 Nov 2018 08:52:38 +0000 (10:52 +0200)]
Added regions feature to repository

gitlab #14

6 years agoAdded region bundles to tycho build
Tuukka Lehtonen [Fri, 9 Nov 2018 08:48:39 +0000 (10:48 +0200)]
Added region bundles to tycho build

gitlab #14

(cherry picked from commit 69925558bf014de865292cc6a008c0263f4f4715)

6 years agoAdded region bundles to tycho build
Tuukka Lehtonen [Fri, 9 Nov 2018 08:48:39 +0000 (10:48 +0200)]
Added region bundles to tycho build

gitlab #14

6 years agoFix variable exceptions for certain properties in district diagram
jsimomaa [Wed, 7 Nov 2018 09:18:54 +0000 (11:18 +0200)]
Fix variable exceptions for certain properties in district diagram

gitlab #16

Change-Id: I2fdcdeeb1c56122462862ddd1d056493842375fe

6 years agoEnabling/Disabling map painting
jsimomaa [Tue, 6 Nov 2018 08:03:04 +0000 (10:03 +0200)]
Enabling/Disabling map painting

gitlab #15

Change-Id: I034a334c4a47753342f9871ae68551ceda0b1d19

6 years agoAdd initial version of regions to source control 41/2441/1
jsimomaa [Mon, 5 Nov 2018 14:07:02 +0000 (16:07 +0200)]
Add initial version of regions to source control

gitlab #14

Change-Id: I57884758ed59938fa61ef6e4139d9771183a7e21
(cherry picked from commit 48d9ed8412b4a8dc45dcd9db351923046de7fead)

6 years agoFix variable exceptions for certain properties in district diagram 23/2423/1
jsimomaa [Wed, 7 Nov 2018 09:18:54 +0000 (11:18 +0200)]
Fix variable exceptions for certain properties in district diagram

gitlab #16

Change-Id: I2fdcdeeb1c56122462862ddd1d056493842375fe

6 years agoEnabling/Disabling map painting 21/2421/2
jsimomaa [Tue, 6 Nov 2018 08:03:04 +0000 (10:03 +0200)]
Enabling/Disabling map painting

gitlab #15

Change-Id: I034a334c4a47753342f9871ae68551ceda0b1d19

6 years agoAdd initial version of regions to source control 19/2419/3
jsimomaa [Mon, 5 Nov 2018 14:07:02 +0000 (16:07 +0200)]
Add initial version of regions to source control

gitlab #14

Change-Id: I57884758ed59938fa61ef6e4139d9771183a7e21

6 years agoFixed regressions in box selection and element color function validation 46/2346/1
Tuukka Lehtonen [Sun, 21 Oct 2018 13:39:21 +0000 (16:39 +0300)]
Fixed regressions in box selection and element color function validation

* Edge element box selection didn't work because the contained picking
  logic was not implemented properly in the edge element class.
* Element coloring brightness function validation did not set "graph"
  key for SCLContext which caused compilation to fail occasionally which
  broke the function evaluation.
* Fixed vertex selection visualization to stroke the edge of the normal
  rendered rectangular shape which is much cleaner than the old default
  selection visualization that was geometrically out of place for some
  reason.

gitlab #2

Change-Id: Ib1f5e03a1eeb6101ffe0f527c5a54ece97e1ea8e
(cherry picked from commit a4105d9cb79a428fbe3a4aa918fc6d1527f1988a)

6 years agoFixed regressions in box selection and element color function validation 45/2345/2
Tuukka Lehtonen [Sun, 21 Oct 2018 13:39:21 +0000 (16:39 +0300)]
Fixed regressions in box selection and element color function validation

* Edge element box selection didn't work because the contained picking
  logic was not implemented properly in the edge element class.
* Element coloring brightness function validation did not set "graph"
  key for SCLContext which caused compilation to fail occasionally which
  broke the function evaluation.
* Fixed vertex selection visualization to stroke the edge of the normal
  rendered rectangular shape which is much cleaner than the old default
  selection visualization that was geometrically out of place for some
  reason.

gitlab #2

Change-Id: Ib1f5e03a1eeb6101ffe0f527c5a54ece97e1ea8e

6 years agoMake more discrete colors available to support more steep functions 44/2344/1
Tuukka Lehtonen [Sun, 21 Oct 2018 07:41:19 +0000 (10:41 +0300)]
Make more discrete colors available to support more steep functions

gitlab #2

Change-Id: I45d82151557adab08c48dd858cc46f7c630d9826
(cherry picked from commit 03368dc8b2b09ef54172c8c9cc3724dc48f0d558)

6 years agoMake more discrete colors available to support more steep functions 43/2343/1
Tuukka Lehtonen [Sun, 21 Oct 2018 07:41:19 +0000 (10:41 +0300)]
Make more discrete colors available to support more steep functions

gitlab #2

Change-Id: I45d82151557adab08c48dd858cc46f7c630d9826

6 years agoFirst prototype of HSV color space based dynamic DN element coloring 42/2342/1
Tuukka Lehtonen [Sat, 20 Oct 2018 22:59:48 +0000 (01:59 +0300)]
First prototype of HSV color space based dynamic DN element coloring

Both VertexNode and EdgeNode support a new property 'dynamicColor' that
can be set to either a Color or null.

DN.Diagram has three new properties:
* Element Color Hue
* Element Color Saturation
* Element Color Brightness Function

where the first two are constants and the last one is a (Resource ->
<ReadGraph> Double) function that is expected to return a value in [0,1]
which is then used to get the final element color from the HSV gradient.
The Resource argument is the DN diagram element.

The function allows users to define any complex functions in SCLMain to
perform the evaluation for the DN element.

gitlab #2

Change-Id: Ia8dbe0df9400242670949da91e373d68cf7ff758
(cherry picked from commit 2cf7ae447c79df6240b67fd3ca4f0338bdae8c00)

6 years agoFirst prototype of HSV color space based dynamic DN element coloring 41/2341/1
Tuukka Lehtonen [Sat, 20 Oct 2018 22:59:48 +0000 (01:59 +0300)]
First prototype of HSV color space based dynamic DN element coloring

Both VertexNode and EdgeNode support a new property 'dynamicColor' that
can be set to either a Color or null.

DN.Diagram has three new properties:
* Element Color Hue
* Element Color Saturation
* Element Color Brightness Function

where the first two are constants and the last one is a (Resource ->
<ReadGraph> Double) function that is expected to return a value in [0,1]
which is then used to get the final element color from the HSV gradient.
The Resource argument is the DN diagram element.

The function allows users to define any complex functions in SCLMain to
perform the evaluation for the DN element.

gitlab #2

Change-Id: Ia8dbe0df9400242670949da91e373d68cf7ff758

6 years agoUse DatabaseJob instead of Job to prevent UI from getting stuck 38/2338/1
Tuukka Lehtonen [Fri, 19 Oct 2018 12:00:46 +0000 (15:00 +0300)]
Use DatabaseJob instead of Job to prevent UI from getting stuck

The breakdown calculation can take a long time, thus it is better to
reverse the database for that time so that the rest of the UI doesn't
start synchronously waiting for DB access.

gitlab #11

Change-Id: If4556559009ea8109b95cf6c12d7bae2243d59f3
(cherry picked from commit 15c720d419c1139942790dc12acb6936e75b1568)

6 years agoUse DatabaseJob instead of Job to prevent UI from getting stuck 37/2337/1
Tuukka Lehtonen [Fri, 19 Oct 2018 12:00:46 +0000 (15:00 +0300)]
Use DatabaseJob instead of Job to prevent UI from getting stuck

The breakdown calculation can take a long time, thus it is better to
reverse the database for that time so that the rest of the UI doesn't
start synchronously waiting for DB access.

gitlab #11

Change-Id: If4556559009ea8109b95cf6c12d7bae2243d59f3

6 years agoDisconnected subgraph analysis for district network diagrams 16/2316/1
Tuukka Lehtonen [Fri, 12 Oct 2018 06:42:40 +0000 (09:42 +0300)]
Disconnected subgraph analysis for district network diagrams

* There is a new view called District Network Breakdown that can be used
to see the different disconnected subnetworks inside each district
network diagram.
* The view allows selecting the selected subnetworks on the actual
diagram to give the user an idea where they are
* The algorithm to calculate the disconnected subnetworks comes through
OSGi services (interface SubgraphProvider) and this change has no
implementation for the provider yet. It is on the Apros side for now
because the logic contains Apros-specific analysis.
* The district network diagram can now be opened and focused at certain
elements e.g. through CTRL+R open resource dialog by entering a district
network diagram element's name and pressing enter.

gitlab #11
gitlab #13

Change-Id: I98b9adfa589026530d84e65d5db08c0670349fa2
(cherry picked from commit 37304f4caf1d4252797cbaf7b40a56e212e203b4)

6 years agoDisconnected subgraph analysis for district network diagrams 15/2315/2
Tuukka Lehtonen [Fri, 12 Oct 2018 06:42:40 +0000 (09:42 +0300)]
Disconnected subgraph analysis for district network diagrams

* There is a new view called District Network Breakdown that can be used
to see the different disconnected subnetworks inside each district
network diagram.
* The view allows selecting the selected subnetworks on the actual
diagram to give the user an idea where they are
* The algorithm to calculate the disconnected subnetworks comes through
OSGi services (interface SubgraphProvider) and this change has no
implementation for the provider yet. It is on the Apros side for now
because the logic contains Apros-specific analysis.
* The district network diagram can now be opened and focused at certain
elements e.g. through CTRL+R open resource dialog by entering a district
network diagram element's name and pressing enter.

gitlab #11
gitlab #13

Change-Id: I98b9adfa589026530d84e65d5db08c0670349fa2

6 years agoAdded Simantics/District/Algorithm SCL module 03/2303/1
Tuukka Lehtonen [Thu, 11 Oct 2018 12:05:01 +0000 (15:05 +0300)]
Added Simantics/District/Algorithm SCL module

For now it only contains functions `findDisconnectedSubnetworks`,
`reportDisconnectedSubnetworks` for finding and reporting disconnected
subgraphs within a district network diagram. This helps in finding
possible errors in models generated from this district network model.

gitlab #11

Change-Id: I848f91b3e90684085b83bfa5c559f61f4a33ad7c
(cherry picked from commit 6dec5182c23ab01df1adbdcc1276b99b8968b786)

6 years agoAdded Simantics/District/Algorithm SCL module 02/2302/3
Tuukka Lehtonen [Thu, 11 Oct 2018 12:05:01 +0000 (15:05 +0300)]
Added Simantics/District/Algorithm SCL module

For now it only contains functions `findDisconnectedSubnetworks`,
`reportDisconnectedSubnetworks` for finding and reporting disconnected
subgraphs within a district network diagram. This helps in finding
possible errors in models generated from this district network model.

gitlab #11

Change-Id: I848f91b3e90684085b83bfa5c559f61f4a33ad7c

6 years agoEnsure ITileProviders return BufferedImages with compatible ColorModel 92/2292/1
Tuukka Lehtonen [Wed, 10 Oct 2018 10:23:29 +0000 (13:23 +0300)]
Ensure ITileProviders return BufferedImages with compatible ColorModel

gitlab #12

Change-Id: Ic47ae73cfdf6d71efdf7099fd67b1e674425682c
(cherry picked from commit d3de128e6d55f9f6a1325985695b925a1056c469)

6 years agoEnsure ITileProviders return BufferedImages with compatible ColorModel 90/2290/2
Tuukka Lehtonen [Wed, 10 Oct 2018 10:23:29 +0000 (13:23 +0300)]
Ensure ITileProviders return BufferedImages with compatible ColorModel

gitlab #12

Change-Id: Ic47ae73cfdf6d71efdf7099fd67b1e674425682c

6 years agoFirst draft of vertex size adjusting district network diagram profiles 58/2258/2
Tuukka Lehtonen [Fri, 28 Sep 2018 13:33:33 +0000 (16:33 +0300)]
First draft of vertex size adjusting district network diagram profiles

* Non-scaling edge/vertex rendering is now limited to view scale range
  [1,5] which supports seems to work well for current models.
* View zooming is now limited to range [0.01, 10000].
* Vertices and edges can be separately hidden with respective profile
  entries

gitlab #2

Change-Id: If8015fc4d65db88abb8c307b14be9139a4450c0d
(cherry picked from commit 29914be09d4a237840e5c793bdb562ec83093b8d)

6 years agoFirst draft of vertex size adjusting district network diagram profiles 56/2256/2
Tuukka Lehtonen [Fri, 28 Sep 2018 13:33:33 +0000 (16:33 +0300)]
First draft of vertex size adjusting district network diagram profiles

* Non-scaling edge/vertex rendering is now limited to view scale range
  [1,5] which supports seems to work well for current models.
* View zooming is now limited to range [0.01, 10000].
* Vertices and edges can be separately hidden with respective profile
  entries

gitlab #2

Change-Id: If8015fc4d65db88abb8c307b14be9139a4450c0d

6 years agoChange platform used by default to release/1.35.0 57/2257/2
Tuukka Lehtonen [Fri, 28 Sep 2018 13:38:45 +0000 (16:38 +0300)]
Change platform used by default to release/1.35.0

gitlab #2

Change-Id: I581c0b398002bbb7e4fb4cbc50b6b81b91a199ea

6 years agoNew additions to district properties 87/2187/1
jsimomaa [Fri, 14 Sep 2018 10:38:32 +0000 (13:38 +0300)]
New additions to district properties

gitlab #10

Change-Id: I4d2e9071e1eeee98aa048edca47d4fcd7b29d08e
(cherry picked from commit 437c54d4e0501d31b5476e12a041a23a6905bffa)

6 years agoNew additions to district properties 84/2184/1
jsimomaa [Fri, 14 Sep 2018 10:38:32 +0000 (13:38 +0300)]
New additions to district properties

gitlab #10

Change-Id: I4d2e9071e1eeee98aa048edca47d4fcd7b29d08e

6 years agoMake optional to calculate elevation for edge during CSV import 66/2166/1
jsimomaa [Wed, 12 Sep 2018 17:32:15 +0000 (20:32 +0300)]
Make optional to calculate elevation for edge during CSV import

gitlab #10

Change-Id: I64141c02990cf306acbec11d05833e8ed7890471
(cherry picked from commit 46e2c804156e3bd2072ec91a801954c18cd15580)

6 years agoMake optional to calculate elevation for edge during CSV import 65/2165/1
jsimomaa [Wed, 12 Sep 2018 17:32:15 +0000 (20:32 +0300)]
Make optional to calculate elevation for edge during CSV import

gitlab #10

Change-Id: I64141c02990cf306acbec11d05833e8ed7890471

6 years agoAdded gitignore for graph.tg files and removed generated resource files 24/2124/1
Tuukka Lehtonen [Thu, 6 Sep 2018 06:50:52 +0000 (09:50 +0300)]
Added gitignore for graph.tg files and removed generated resource files

gitlab #2

Change-Id: Ibd866521c61d81d57ad33af4a20a3427a3993159
(cherry picked from commit 9dfc6df7a701cd8b91f0a55d42ae0ed93270ae49)

6 years agoAdded gitignore for graph.tg files and removed generated resource files 23/2123/2
Tuukka Lehtonen [Thu, 6 Sep 2018 06:50:52 +0000 (09:50 +0300)]
Added gitignore for graph.tg files and removed generated resource files

gitlab #2

Change-Id: Ibd866521c61d81d57ad33af4a20a3427a3993159

6 years agoAdded graph compilation to fix broken builds
Tuukka Lehtonen [Thu, 6 Sep 2018 06:43:34 +0000 (09:43 +0300)]
Added graph compilation to fix broken builds

gitlab #2

(cherry picked from commit 988dc8f42b802fea000c10b572b73c67a37971b1)

6 years agoAdded graph compilation to fix broken builds
Tuukka Lehtonen [Thu, 6 Sep 2018 06:43:34 +0000 (09:43 +0300)]
Added graph compilation to fix broken builds

gitlab #2

6 years agoFixed pgraph to compile 22/2122/1
Tuukka Lehtonen [Thu, 6 Sep 2018 05:50:05 +0000 (08:50 +0300)]
Fixed pgraph to compile

gitlab #2

Change-Id: I5d1c6dca8f0522b86c73ad782470240a41f233fd
(cherry picked from commit 279b8c6d3d3341f086e131f1f0ba834138bbe646)

6 years agoFixed pgraph to compile 21/2121/1
Tuukka Lehtonen [Thu, 6 Sep 2018 05:50:05 +0000 (08:50 +0300)]
Fixed pgraph to compile

gitlab #2

Change-Id: I5d1c6dca8f0522b86c73ad782470240a41f233fd

6 years agoAdded Edge.ThicknessProperty for generic edge-thickness styling 20/2120/1
Tuukka Lehtonen [Wed, 5 Sep 2018 21:24:28 +0000 (00:24 +0300)]
Added Edge.ThicknessProperty for generic edge-thickness styling

gitlab #2

Change-Id: I9ce4bb9274a184d3e4ae83669c2079e3720dd412
(cherry picked from commit a3b6137601545ac6e3484995d0ec6d39224bbf3f)

6 years agoAdded Edge.ThicknessProperty for generic edge-thickness styling 19/2119/1
Tuukka Lehtonen [Wed, 5 Sep 2018 21:24:28 +0000 (00:24 +0300)]
Added Edge.ThicknessProperty for generic edge-thickness styling

gitlab #2

Change-Id: I9ce4bb9274a184d3e4ae83669c2079e3720dd412

6 years agoAdded DN.Element as base type for DH diagram elements 12/2112/1
Tuukka Lehtonen [Tue, 4 Sep 2018 22:01:02 +0000 (01:01 +0300)]
Added DN.Element as base type for DH diagram elements

Removed useless part descriptor from fragment.e4xmi.

gitlab #9

Change-Id: I34c7003e4e2655f16ab02b356e90a512bce953da
(cherry picked from commit 1e6f4461465fc45d71b30535d02bbe1cd7672d4a)

6 years agoAdded DN.Element as base type for DH diagram elements 11/2111/1
Tuukka Lehtonen [Tue, 4 Sep 2018 22:01:02 +0000 (01:01 +0300)]
Added DN.Element as base type for DH diagram elements

Removed useless part descriptor from fragment.e4xmi.

gitlab #9

Change-Id: I34c7003e4e2655f16ab02b356e90a512bce953da

6 years agoAdd MappedComponent and remove HasSolverRVI 00/2100/1
jsimomaa [Sun, 2 Sep 2018 21:29:28 +0000 (00:29 +0300)]
Add MappedComponent and remove HasSolverRVI

gitlab #7

Change-Id: I53ab1801acf719a483d7d45de6eaadeb26a13527
(cherry picked from commit f2ed416a826b3d24d7bffe41563a202d1be78bda)

6 years agoAvoid duplicate validity checks when injecting layer listener 98/2098/1
Tuukka Lehtonen [Tue, 4 Sep 2018 09:16:51 +0000 (12:16 +0300)]
Avoid duplicate validity checks when injecting layer listener

gitlab #8

Change-Id: I86f31fc6a640c69be5dc9cce7784ba8903abbad6
(cherry picked from commit e1b15332f361872748ec925036add97fd243fd1c)