]> 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
6 years agoDisconnected subgraph analysis for district network diagrams 16/2316/1
commit | commitdiff | tree
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 agoAdded Simantics/District/Algorithm SCL module 03/2303/1
commit | commitdiff | tree
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 agoEnsure ITileProviders return BufferedImages with compatible ColorModel 90/2290/2
commit | commitdiff | tree
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 56/2256/2
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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 agoMake optional to calculate elevation for edge during CSV import 66/2166/1
commit | commitdiff | tree
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 agoAdded gitignore for graph.tg files and removed generated resource files 23/2123/2
commit | commitdiff | tree
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
commit | commitdiff | tree
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 agoFixed pgraph to compile 21/2121/1
commit | commitdiff | tree
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 19/2119/1
commit | commitdiff | tree
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 11/2111/1
commit | commitdiff | tree
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
commit | commitdiff | tree
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
commit | commitdiff | tree
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)

6 years agoAdd address information for district import 68/2068/1
commit | commitdiff | tree
jsimomaa [Wed, 22 Aug 2018 20:51:41 +0000 (23:51 +0300)]
Add address information for district import

gitlab #5

Change-Id: I0bb9bcefa9a7da2cf858e7ee5e3873f62d5cacc5
(cherry picked from commit 6d8edd63acbd9122ce1da5a39bf42528ec5b71e3)

6 years agoSave solver module name for later use after mapping 74/1974/2
commit | commitdiff | tree
jsimomaa [Mon, 30 Jul 2018 12:39:20 +0000 (15:39 +0300)]
Save solver module name for later use after mapping

gitlab #4

Change-Id: I48e3b96eab01bd29435993ff4bf5d9f7d0076500

6 years agoStash for edge styling & import progress monitoring 71/1971/3
commit | commitdiff | tree
jsimomaa [Mon, 30 Jul 2018 07:19:22 +0000 (10:19 +0300)]
Stash for edge styling & import progress monitoring

gitlab #2

Change-Id: I6f2b2349936641c9b4405335dc81bf7dbbce401c

6 years agoEdge styling (e.g. width, color etc) 56/1956/2
commit | commitdiff | tree
jsimomaa [Fri, 27 Jul 2018 06:32:18 +0000 (09:32 +0300)]
Edge styling (e.g. width, color etc)

gitlab #2

Change-Id: I4fda3892eb614ec0d170d66c7f85709a229d7403

6 years agoAdding pkg-precompiled tileserver-mapnik to avoid npm install 55/1955/2
commit | commitdiff | tree
jsimomaa [Thu, 21 Jun 2018 11:22:51 +0000 (14:22 +0300)]
Adding pkg-precompiled tileserver-mapnik to avoid npm install

gitlab #1

Change-Id: Ia445d450b7fd1a9c59463140950270f70f2f791d

6 years agoUnzip installed maps server at install time 54/1954/2
commit | commitdiff | tree
jsimomaa [Thu, 21 Jun 2018 09:58:42 +0000 (12:58 +0300)]
Unzip installed maps server at install time

gitlab #1

Change-Id: I7de0ad8d8cbdb3e2d5f5e18503c42fe4899d5964

6 years agoPushing some (very) old changes to remote.. should have done long ago 68/1868/2
commit | commitdiff | tree
jsimomaa [Wed, 20 Jun 2018 11:47:41 +0000 (14:47 +0300)]
Pushing some (very) old changes to remote.. should have done long ago

gitlab #1

Change-Id: I3ec1b6b460d82851f9c16188d3e6d80386f90770

6 years agoAdditions to district features 67/1867/1
commit | commitdiff | tree
jsimomaa [Fri, 6 Oct 2017 05:17:52 +0000 (08:17 +0300)]
Additions to district features

Change-Id: I3362da74bce33736a730345c1b03833703696dfb

6 years agoAdded LICENSE
commit | commitdiff | tree
Tuukka Lehtonen [Thu, 14 Jun 2018 11:44:07 +0000 (14:44 +0300)]
Added LICENSE

7 years agoorg.simantics.district.network.ontology/graph.tg wants to be committed. 55/1055/2 release/1.31.0 release/1.32.0 release/1.32.1 release/1.33.0 release/1.34.0 release/1.34.1 release/1.34.2 v1.31.0
commit | commitdiff | tree
Tuukka Lehtonen [Thu, 28 Sep 2017 13:56:33 +0000 (16:56 +0300)]
org.simantics.district.network.ontology/graph.tg wants to be committed.

refs #6958

Change-Id: I58dd70df8ade421b9cdf0168443eb0ed9c494930

7 years agoRemoved useless OpenDistrictEditor E4 handler. 54/1054/1
commit | commitdiff | tree
Tuukka Lehtonen [Thu, 28 Sep 2017 13:56:03 +0000 (16:56 +0300)]
Removed useless OpenDistrictEditor E4 handler.

refs #6958

Change-Id: I945e956116e5f474de3b54432bfa98705180d154

7 years agoFixed tycho build to work 53/1053/1
commit | commitdiff | tree
Tuukka Lehtonen [Thu, 28 Sep 2017 13:55:28 +0000 (16:55 +0300)]
Fixed tycho build to work

build.properties definitions were incorrect.

refs #6958

Change-Id: I6ffb9b2b4ca95ffd1e00306f1d1ac832bbbd9b06

7 years agoTycho build draft for Simantics District components
commit | commitdiff | tree
Tuukka Lehtonen [Thu, 28 Sep 2017 13:39:48 +0000 (16:39 +0300)]
Tycho build draft for Simantics District components

refs #6958

7 years agoUpdates to Simantics district CSV import 60/660/1
commit | commitdiff | tree
jsimomaa [Thu, 29 Jun 2017 05:00:52 +0000 (08:00 +0300)]
Updates to Simantics district CSV import

refs #6958

Change-Id: I7310b62f2b456d36c11d01b8c604b4e3e60b8b2a

7 years agoAdding org.simantics.district.geotools plugin dev
commit | commitdiff | tree
jsimomaa [Tue, 13 Jun 2017 08:48:54 +0000 (11:48 +0300)]
Adding org.simantics.district.geotools plugin

Change-Id: Iacc44ac5435593c334fa208c40d79f07572c69ef

7 years agoSome cleaning and fixing of district functionalities 16/616/1
commit | commitdiff | tree
jsimomaa [Mon, 12 Jun 2017 05:31:01 +0000 (08:31 +0300)]
Some cleaning and fixing of district functionalities

Change-Id: I976cf29c0f606264749025e1998849652cd3c076

7 years agoEnhancements to district functionalities and code 15/615/1
commit | commitdiff | tree
jsimomaa [Mon, 15 May 2017 11:06:05 +0000 (14:06 +0300)]
Enhancements to district functionalities and code

Change-Id: Ia388a879d9624724a66f6ce7c7d7891e553bb172

7 years agoFinal push of district changes 69/469/1
commit | commitdiff | tree
jsimomaa [Fri, 28 Apr 2017 13:02:42 +0000 (16:02 +0300)]
Final push of district changes

refs #6958

Change-Id: I5a6429a9bde4528f2fbc402c3483c2bea7789f70

7 years agoAdding missing bin in tileserver-mapnik 01/401/1
commit | commitdiff | tree
jsimomaa [Tue, 4 Apr 2017 06:58:56 +0000 (09:58 +0300)]
Adding missing bin in tileserver-mapnik

refs #6958

Change-Id: I711cfa80c3102bb6cb52a3c5b82706fd79016b9c

7 years agoAdding missing bin folder in integrated tile server 00/400/1
commit | commitdiff | tree
jsimomaa [Tue, 4 Apr 2017 06:55:06 +0000 (09:55 +0300)]
Adding missing bin folder in integrated tile server

refs #6958

Change-Id: I598b394c67b0f32e1fa88f867dc5ee37f1eb361c

7 years agoAdding integrated tile server 99/399/1
commit | commitdiff | tree
jsimomaa [Tue, 4 Apr 2017 06:23:12 +0000 (09:23 +0300)]
Adding integrated tile server

refs #6958

Change-Id: I3e65ec92b2c7c60f95b7fd56f64a7805d1b6c5db

7 years agoSome fixes to district stuff 3 86/386/1
commit | commitdiff | tree
jsimomaa [Wed, 29 Mar 2017 16:47:59 +0000 (19:47 +0300)]
Some fixes to district stuff 3

refs #6958

Change-Id: I58d80b1c6d5b80ff8dd465305f19865c3c9db99f

7 years agoSome fixes to district stuff 85/385/2
commit | commitdiff | tree
jsimomaa [Wed, 29 Mar 2017 16:31:14 +0000 (19:31 +0300)]
Some fixes to district stuff

refs #6958

Change-Id: I55cd490238b75fede3e0b90dcf720cb28c23433f

7 years agoLots of changes to district stuff 84/384/1
commit | commitdiff | tree
jsjani [Wed, 29 Mar 2017 16:28:19 +0000 (19:28 +0300)]
Lots of changes to district stuff

refs #6958

Change-Id: Ic44eba4146630d8364cc09c765e5413e130b34df

7 years agoAdding more functionality to dialog for creating DN diagram 20/320/1
commit | commitdiff | tree
jsimomaa [Thu, 2 Feb 2017 10:43:22 +0000 (12:43 +0200)]
Adding more functionality to dialog for creating DN diagram

refs #6958

Change-Id: I5a23c319e80965da518b992ec6e321174bf72e2c

7 years agoShare some projects for Simantics District 04/304/1
commit | commitdiff | tree
jsimomaa [Wed, 1 Feb 2017 09:40:42 +0000 (11:40 +0200)]
Share some projects for Simantics District

refs #6958

Change-Id: If9cb332a4bea53da2960da9343c6939acd1c177a

7 years agoSome more added functionality to simantics district editor etc 03/303/1
commit | commitdiff | tree
jsimomaa [Wed, 1 Feb 2017 09:26:31 +0000 (11:26 +0200)]
Some more added functionality to simantics district editor etc

refs #6958

Change-Id: I92a39fffe451b11fe5fa3ab57414f9729637fce9

7 years agoAdding gitattributes with to have constant line endings
commit | commitdiff | tree
jsimomaa [Fri, 13 Jan 2017 18:11:00 +0000 (20:11 +0200)]
Adding gitattributes with to have constant line endings

refs #6958

7 years agoImplement district features to Simantics platform 67/267/1
commit | commitdiff | tree
jsimomaa [Fri, 13 Jan 2017 13:19:53 +0000 (15:19 +0200)]
Implement district features to Simantics platform

* Fix picking to pick vertex before edge
* Do not create new vertices if one already exists (need to configure
the picking threshold though)
* Add visual aids to drawing before the drawing is persisted to db

Change-Id: I7e1a59e032fcd47f75bd576c96ea3214ba172969

7 years agoImplement district features to Simantics platform
commit | commitdiff | tree
jsimomaa [Fri, 13 Jan 2017 07:48:14 +0000 (09:48 +0200)]
Implement district features to Simantics platform

refs #6958

Change-Id: I4200a696e3ddca7fafa5d2a1e3dd34aee8bac914

8 years agoAdding basic import utilities - WIP!
commit | commitdiff | tree
jsimomaa [Tue, 20 Dec 2016 15:25:07 +0000 (17:25 +0200)]
Adding basic import utilities - WIP!

8 years agoInitial commit of simantics/district
commit | commitdiff | tree
jsimomaa [Tue, 20 Dec 2016 09:29:41 +0000 (11:29 +0200)]
Initial commit of simantics/district

Simantics District Modelling components.