]> gerrit.simantics Code Review - simantics/platform.git/log
simantics/platform.git
6 years agoFixing URIToResource 13/1913/2
jsimomaa [Wed, 11 Jul 2018 05:19:08 +0000 (08:19 +0300)]
Fixing URIToResource

Change-Id: I67d0145fe48235eeef79212269f5d561f4899180
(cherry picked from commit 4af843556485409e1c018e58eb2409f116e4d40c)

6 years agoMerge "Fixed asynchronous recompute problems" into private/threads-testing-fixes
Jani Simomaa [Wed, 11 Jul 2018 06:43:07 +0000 (06:43 +0000)]
Merge "Fixed asynchronous recompute problems" into private/threads-testing-fixes

6 years agoFixed asynchronous recompute problems 12/1912/1
Antti Villberg [Wed, 11 Jul 2018 05:57:39 +0000 (08:57 +0300)]
Fixed asynchronous recompute problems

gitlab #5

Change-Id: Ia80fec89736dbef1f6bd44e730d6c4186921836d
(cherry picked from commit 5d26dc0201bd7fafbaafa4f74ff1a10929a14e5b)

6 years agoAdding Logger to DiagramContentRequest 10/1910/2
jsimomaa [Wed, 11 Jul 2018 05:20:26 +0000 (08:20 +0300)]
Adding Logger to DiagramContentRequest

Change-Id: I904c7ed209198d897370003b0676df6831892927

6 years agoFixes needed in components when using db threading 05/1905/1
Antti Villberg [Tue, 10 Jul 2018 09:04:49 +0000 (12:04 +0300)]
Fixes needed in components when using db threading

gitlab #5

Change-Id: Ic5aee07ad9fa59dcebb76baaf59eb2ae06c46c31

6 years agoMerge branch 'private/db-threads' into private/threads-testing
Antti Villberg [Mon, 9 Jul 2018 07:10:36 +0000 (10:10 +0300)]
Merge branch 'private/db-threads' into private/threads-testing

Change-Id: I84918b6db56d8c53a8d91ed6886741009e8b7c1b

6 years agoBlock external and excluded seeds in ConsistsOfProcess 00/1900/1
Antti Villberg [Sat, 7 Jul 2018 06:11:52 +0000 (09:11 +0300)]
Block external and excluded seeds in ConsistsOfProcess

refs #14162

Change-Id: I3d8048ee763b5e41e0b9835afcb129ad50b88025

6 years agoWork in progress
Antti Villberg [Thu, 5 Jul 2018 04:28:26 +0000 (07:28 +0300)]
Work in progress

gitlab #5
gitlab #6

Change-Id: I37da9d60fbdb476fe62dfe0f360064e924738d6f

6 years agoForce platform shutdown after some delay when workbench is closed 93/1893/2
Hannu Niemistö [Mon, 2 Jul 2018 08:24:40 +0000 (11:24 +0300)]
Force platform shutdown after some delay when workbench is closed

gitlab #37

Change-Id: I6ab788e55824dbc3b2dd656cbb6ead407e35938a

6 years agoGraph debugger: handle case where assertions does not have predicate
Hannu Niemistö [Mon, 2 Jul 2018 09:24:27 +0000 (12:24 +0300)]
Graph debugger: handle case where assertions does not have predicate

gitlab #38

Change-Id: I85b9b2c014b44bcaec7cf3117b87df1215143435

6 years agoAdded safety to release-helper.sh
Tuukka Lehtonen [Sun, 1 Jul 2018 11:03:46 +0000 (14:03 +0300)]
Added safety to release-helper.sh

Change-Id: I4505f0e6c935a94ebd4a869e39455fe6ff10b91c

6 years agoHistory data collector did not collect min/max/avg values correctly 87/1887/3
Marko Luukkainen [Thu, 28 Jun 2018 13:25:55 +0000 (16:25 +0300)]
History data collector did not collect min/max/avg values correctly

gitlab #35

Change-Id: Iabc44ba0d8fb8a0348f27df07cd4d114975c4d0d

6 years agoSCL API for GraphFile plug-in. 83/1883/2
Marko Luukkainen [Thu, 28 Jun 2018 14:40:26 +0000 (17:40 +0300)]
SCL API for GraphFile plug-in.

gitlab #34

Change-Id: I81b9d41cfa392545df629bf9e7a6197c21effa58

6 years agoModified UTF-8 decoding fixes for TG reading and indexing 80/1880/3
Tuukka Lehtonen [Tue, 26 Jun 2018 08:28:36 +0000 (11:28 +0300)]
Modified UTF-8 decoding fixes for TG reading and indexing

gitlab #33

Change-Id: Ibd4239b76d1d88fe4303bec9d7cc407d15e8505b

6 years agoInlined Prelude/maybe 78/1878/1 private/acorn-debug-tools
Tuukka Lehtonen [Thu, 21 Jun 2018 20:19:09 +0000 (23:19 +0300)]
Inlined Prelude/maybe

gitlab #31

Change-Id: I88298efc212596ad57adf468ed54b8f268050126

6 years agoAdded Prelude/maybe 75/1875/1
Tuukka Lehtonen [Thu, 21 Jun 2018 15:01:28 +0000 (18:01 +0300)]
Added Prelude/maybe

`maybe def f v` returns `def` if `v=Nothing` and `f x` if `v=Just x`.

gitlab #31

Change-Id: I3319ee8e9e4cf678aece4878c1fb2ddf33395bc4

6 years agoGeneric OpenDiagramFromComponentAdapter 71/1871/4
jsimomaa [Thu, 21 Jun 2018 06:46:10 +0000 (09:46 +0300)]
Generic OpenDiagramFromComponentAdapter

gitlab #30

Change-Id: Ib17df6e2a29642aa2e98976e4ad8df0cafd4e72e

6 years agoAdded exception safety for createHistorySamplerItem2 69/1869/1
Tuukka Lehtonen [Wed, 20 Jun 2018 14:23:38 +0000 (17:23 +0300)]
Added exception safety for createHistorySamplerItem2

gitlab #9

Change-Id: I2a5894b73a638aad3e05ee42d0b10e40d60f3270

6 years agoAsync utilities for SCL 42/1842/6
jsimomaa [Thu, 14 Jun 2018 19:31:48 +0000 (22:31 +0300)]
Async utilities for SCL

* scheduleAtFixedRate
* scheduleWithFixedDelay
* schedule

gitlab #23

Change-Id: I72ab85f4458a17a83fa4de95bc668d8fadac1d50

6 years agoAllow ExecutorWorker thread pool shutdown 65/1865/2
Tuukka Lehtonen [Wed, 20 Jun 2018 08:07:58 +0000 (11:07 +0300)]
Allow ExecutorWorker thread pool shutdown

Also made the pool spawn daemon threads to allow shutdown regardless of
whether the pool is shut down or not.

gitlab #29

Change-Id: I680e15407c0fd0586070a212d291efd44dc28f5d

6 years agoReinitialize visible diagrams after shared library migration 64/1864/5
jsimomaa [Wed, 20 Jun 2018 06:28:07 +0000 (09:28 +0300)]
Reinitialize visible diagrams after shared library migration

gitlab #28

Change-Id: Ie3f8f5c90ed98490e2f03f1c955995d30b9a3923

6 years agoPrefer methods with more parameters when resolving importJava 63/1863/1
Hannu Niemistö [Tue, 19 Jun 2018 13:24:25 +0000 (16:24 +0300)]
Prefer methods with more parameters when resolving importJava

gitlab #27

Change-Id: Idd6ec1a08f127a503c456cea45f5bda7dbf9703a

6 years agoHistorySampler.sample(HistorySamplerItem2, ...) now uses mipmapped data 57/1857/1
Tuukka Lehtonen [Mon, 18 Jun 2018 10:58:54 +0000 (13:58 +0300)]
HistorySampler.sample(HistorySamplerItem2, ...) now uses mipmapped data

Implemented selection of sampled history data source based on the
seconds/pixel (= timeWindow / maxSamples) ratio provided to the sampler.
This is one way to attempt not sampling too much data for trend views
that cannot inherently handle large amounts of data.

gitlab #9

Change-Id: I8c67068d6e832d33d4ac3adef270d31f1cb0e722

6 years agoUpper bound to ANTLR version range 55/1855/1
Hannu Niemistö [Mon, 18 Jun 2018 10:19:56 +0000 (13:19 +0300)]
Upper bound to ANTLR version range

gitlab #24

Change-Id: I23967ea9b3e4bc6960f83b6d22bd3f3a80e3b43b

6 years agoFix ANTLR package versions 52/1852/3
Hannu Niemistö [Mon, 18 Jun 2018 09:12:01 +0000 (12:12 +0300)]
Fix ANTLR package versions

gitlab #24

Change-Id: I9c9cdbe4fe3f27364f7248822942bca75a268525

6 years agoRemoved org.simantics.ltk[.antlr] bundles, exact import for antlr 51/1851/1
Hannu Niemistö [Mon, 18 Jun 2018 08:05:39 +0000 (11:05 +0300)]
Removed org.simantics.ltk[.antlr] bundles, exact import for antlr

gitlab #24

Change-Id: I582628d505edcec5565e768a42b984fdb3e096fb

6 years agoRemoved extra debug/timing prints from graph compiler 50/1850/1
Hannu Niemistö [Fri, 15 Jun 2018 13:39:07 +0000 (16:39 +0300)]
Removed extra debug/timing prints from graph compiler

gitlab #25

Change-Id: Ibeb73046154a53595acd3bb31e51551c4b5c9fe5

6 years agoRestricted version of imported ANTLR packages, compile with 3.5.2 49/1849/2
Hannu Niemistö [Fri, 15 Jun 2018 13:11:42 +0000 (16:11 +0300)]
Restricted version of imported ANTLR packages, compile with 3.5.2

gitlab #24

Change-Id: Ie5bace3044f290d400a17c2bbe97774429c86ba8

6 years agoMerge branch 'private/db-threads' of ssh://villberg@gerrit.simantics.org:29418/simant... private/db-threads
Antti Villberg [Thu, 14 Jun 2018 17:58:52 +0000 (20:58 +0300)]
Merge branch 'private/db-threads' of ssh://villberg@gerrit.simantics.org:29418/simantics/platform.git into private/db-threads

6 years agoWrite model activation information in activations VG
Tuukka Lehtonen [Thu, 14 Jun 2018 17:52:50 +0000 (20:52 +0300)]
Write model activation information in activations VG

gitlab #5

6 years agoStill working for multiple readers 41/1841/1
Antti Villberg [Thu, 14 Jun 2018 14:16:54 +0000 (17:16 +0300)]
Still working for multiple readers

gitlab #5
gitlab #6

Change-Id: Ica299d5dd091a641a7a1a18e1093602a9027dd57

6 years agoImprovements to Lucene indexing 28/1428/2
Jussi Koskela [Wed, 7 Feb 2018 11:50:07 +0000 (13:50 +0200)]
Improvements to Lucene indexing

refs #7750

Change-Id: Ie93ff3058882bc61835d25d72440031c240be494

6 years agoNew implementation of server state based on StandardNodeManager 30/1830/5
Jussi Koskela [Tue, 12 Jun 2018 11:41:51 +0000 (14:41 +0300)]
New implementation of server state based on StandardNodeManager

gitlab #20

Change-Id: I51e56095fb1e76b4c67945eead07d1e9da54eed4

6 years agoModernized release engineering instructions.
Tuukka Lehtonen [Mon, 11 Jun 2018 08:03:49 +0000 (11:03 +0300)]
Modernized release engineering instructions.

6 years agoWorked around Windows FS problems in IndexedRelationsSearcherBase 24/1824/1
Tuukka Lehtonen [Fri, 8 Jun 2018 22:35:29 +0000 (01:35 +0300)]
Worked around Windows FS problems in IndexedRelationsSearcherBase

See https://blogs.msdn.microsoft.com/oldnewthing/20120907-00/?p=6663/

gitlab #19

Change-Id: Ia12c848aa75836597121eadec05061ea23bb1240

6 years agoPrevent NPE if the path to the module source cannot be found 21/1821/2
Hannu Niemistö [Fri, 8 Jun 2018 11:10:30 +0000 (14:10 +0300)]
Prevent NPE if the path to the module source cannot be found

gitlab #18

Change-Id: Iac92cfae81f8caffa5c8dfba129e3e9868801e82

6 years agoFix for empty cancelled write transactions leaving scheduled updates 15/1815/3
Tuukka Lehtonen [Tue, 5 Jun 2018 13:52:23 +0000 (16:52 +0300)]
Fix for empty cancelled write transactions leaving scheduled updates

gitlab #15

Change-Id: I844dab6a59df56f2097a507bcd6b6d3ec75124b1

6 years agoBumped master versions to 1.35.0 20/1820/1
Tuukka Lehtonen [Fri, 8 Jun 2018 06:37:38 +0000 (09:37 +0300)]
Bumped master versions to 1.35.0

gitlab #16

Change-Id: Iafe0abeaffca3d15c35c629f7fe2eb4aaac437a5

6 years agoUse SLF4J Logger in SessionRequestManager. 13/1813/2
Tuukka Lehtonen [Thu, 31 May 2018 11:07:26 +0000 (14:07 +0300)]
Use SLF4J Logger in SessionRequestManager.

gitlab #14

Change-Id: Ia79a0fd4b895f02f98c6113cd1ca9fe95104c9d0

6 years agoMerge "Fixes to thread safety problems in SCL compiler"
Hannu Niemistö [Thu, 31 May 2018 12:25:59 +0000 (12:25 +0000)]
Merge "Fixes to thread safety problems in SCL compiler"

6 years agoFixes to thread safety problems in SCL compiler 09/1809/3
Hannu Niemistö [Tue, 29 May 2018 09:09:37 +0000 (12:09 +0300)]
Fixes to thread safety problems in SCL compiler

gitlab #12

Change-Id: I0b0aec3bb71138a5033ae2337178c86ff04f5e59

6 years agoImprovements to SCL HTTP client 08/1808/1
Jussi Koskela [Tue, 29 May 2018 07:29:45 +0000 (10:29 +0300)]
Improvements to SCL HTTP client

Add missing Proc effect to buildClient function. Function to read
content length from response. Function to read headers from response.
Option to add read / write progress callback functions.

gitlab #11

Change-Id: Iaff99e05e35a494b154d7d5b04bd936bb95b0407

6 years agoFixed ComponentCopyAdvisor to account for L0.TypeWithIdentifier properly 03/1803/1
Tuukka Lehtonen [Thu, 24 May 2018 22:29:31 +0000 (01:29 +0300)]
Fixed ComponentCopyAdvisor to account for L0.TypeWithIdentifier properly

The previous fix done for the same problem in Simantics redmine issue
7842 and commits
c912edf13bf5a91b2f6dc855f54d8728aa0a64f5,
803c42fd316859809eaeb3dc6a88b22cbf86b4b6 and
0cfc6a9b8b186ba432bc6758c089726b1471fd1f was simply wrong. Using
ModelingUtils.needsIdentifier is the most proper way to fix this.

gitlab #10

Change-Id: Id7cdc32a6596588154913fced742d751ce6ba864
(cherry picked from commit 290c3cfc8bf5a7b2cc6e8532f124512e0bf10517)

6 years agoMerge "Added another sampling method to HistorySampler"
Tuukka Lehtonen [Fri, 18 May 2018 18:45:14 +0000 (18:45 +0000)]
Merge "Added another sampling method to HistorySampler"

6 years agoAdded another sampling method to HistorySampler 93/1793/1
Tuukka Lehtonen [Fri, 18 May 2018 18:27:28 +0000 (21:27 +0300)]
Added another sampling method to HistorySampler

This intentionally doesn't replace the original history
sampling function since it might be used elsewhere.

gitlab #9

Change-Id: Ie7ea8f37f29a5a277a6678e7716e340884d30e69

6 years agoSome enhancements made by Antti for multiple readers 88/1788/3
jsimomaa [Fri, 18 May 2018 06:18:43 +0000 (09:18 +0300)]
Some enhancements made by Antti for multiple readers

gitlab #5
gitlab #6

Change-Id: Ic185e28ff85cb72783ebadf908f8b58bf523e2b1

6 years agoGraphList: List interface to linked lists in Simantics database 91/1791/1
Hannu Niemistö [Fri, 18 May 2018 09:43:12 +0000 (12:43 +0300)]
GraphList: List interface to linked lists in Simantics database

gitlab #8

Change-Id: I87a1dc12d84c7875db075dec09ad08a60d8e40d1

6 years agoMerge remote-tracking branch 'origin/master' into private/db-threads 87/1787/1
jsimomaa [Fri, 18 May 2018 06:13:10 +0000 (09:13 +0300)]
Merge remote-tracking branch 'origin/master' into private/db-threads

gitlab #5
gitlab #6

Change-Id: Ic26d1d4652cd918d1c235fc5b30e133be5b30854

6 years agoMerge "Fix column width issues on HiDPI displays. KeyTiSelection fixes."
Marko Luukkainen [Thu, 17 May 2018 11:31:58 +0000 (11:31 +0000)]
Merge "Fix column width issues on HiDPI displays. KeyTiSelection fixes."

6 years agoFix column width issues on HiDPI displays. KeyTiSelection fixes. 83/1783/1
Marko Luukkainen [Thu, 17 May 2018 11:14:53 +0000 (14:14 +0300)]
Fix column width issues on HiDPI displays. KeyTiSelection fixes.

gitlab #7

Change-Id: I03a51472f2e9d38a78e38b92617d0e9f975f6c54

6 years agoMultiple readers and variable optimization
Antti Villberg [Thu, 17 May 2018 04:37:51 +0000 (07:37 +0300)]
Multiple readers and variable optimization

gitlab #5
gitlab #6
(refs #6961)

Change-Id: Iabc5ff369cb42e8a3813519b6e5d981f538ebdff

6 years agoDeprecate duplicate functionality in SimanticsUI 78/1778/1
jsimomaa [Tue, 15 May 2018 11:32:45 +0000 (14:32 +0300)]
Deprecate duplicate functionality in SimanticsUI

gitlab #4

Change-Id: I0f4482a8c2d482e59d0e1641de65a3936a03f1eb

6 years agoFilter also history items in resource search dialog 08/1708/4
Jussi Koskela [Wed, 11 Apr 2018 10:16:01 +0000 (13:16 +0300)]
Filter also history items in resource search dialog

refs #7864

Change-Id: I5d9dac3fc1dd43c21ff4a63d9e7ecab0081c3dcb

6 years agoMerge "Support for edge widths in rendering"
Hannu Niemistö [Mon, 14 May 2018 10:20:02 +0000 (10:20 +0000)]
Merge "Support for edge widths in rendering"

6 years agoSupport for edge widths in rendering 77/1777/1
Hannu Niemistö [Mon, 14 May 2018 10:07:02 +0000 (13:07 +0300)]
Support for edge widths in rendering

Change-Id: I079ad59d7997a4a17abaf7835f7d71ce8c006085

6 years agoMerge "Fixed record constructor resolving from namespaces"
Hannu Niemistö [Mon, 14 May 2018 10:06:03 +0000 (10:06 +0000)]
Merge "Fixed record constructor resolving from namespaces"

6 years agoFixed SCLCompletionProposal.validate to allow complete matches as well 75/1775/3
Tuukka Lehtonen [Mon, 14 May 2018 07:16:45 +0000 (10:16 +0300)]
Fixed SCLCompletionProposal.validate to allow complete matches as well

This fixes a case where the SCL module editor stops showing content
proposals once they fully match with the typed word, which is really
annoying.

gitlab #3

Change-Id: I7b1119bff4cb08063a838a441a628a785344220b

6 years agoFixed record constructor resolving from namespaces 71/1771/1
Hannu Niemistö [Sun, 13 May 2018 08:34:33 +0000 (11:34 +0300)]
Fixed record constructor resolving from namespaces

Change-Id: Ib8b40c416672bcc97ec7ec24c97e1a0df08a8730

6 years agoAdded SCL functions for exporting event log contents to CSV 69/1769/4
Tuukka Lehtonen [Fri, 11 May 2018 08:57:05 +0000 (11:57 +0300)]
Added SCL functions for exporting event log contents to CSV

gitlab #2

Change-Id: I14423646d035e02f0ec6149a87d170ebb3c01bae

6 years agoMerge remote-tracking branch 'origin/master' into private/db-threads
Antti Villberg [Fri, 11 May 2018 05:17:14 +0000 (08:17 +0300)]
Merge remote-tracking branch 'origin/master' into private/db-threads

6 years agoNew solver for SCL effects inequalities 34/1734/3
Hannu Niemistö [Wed, 25 Apr 2018 13:57:31 +0000 (16:57 +0300)]
New solver for SCL effects inequalities

In particularly, solving of cyclic inequalities.

Change-Id: I5d5734e9f029bf694221db2d7fc994d16d8d607a

6 years agoNew method to Prelude: indexSet 33/1733/1
Hannu Niemistö [Wed, 25 Apr 2018 12:03:16 +0000 (15:03 +0300)]
New method to Prelude: indexSet

Change-Id: I06affe3386f014ae098c31416503fd941f3c7d36

6 years agoNew SCL syntax <<effects>> 32/1732/1
Hannu Niemistö [Wed, 25 Apr 2018 12:02:43 +0000 (15:02 +0300)]
New SCL syntax <<effects>>

Change-Id: Iec61620d424e583b854a743ccc4ac37dc8e8f56f

6 years agoFunction to read and write bytes from streams 31/1731/1
Hannu Niemistö [Mon, 23 Apr 2018 12:02:59 +0000 (15:02 +0300)]
Function to read and write bytes from streams

Change-Id: I5aa133cbdda3acaf36ed4cb0d7175a7ec1e8caff

6 years agoMerge remote-tracking branch 'origin/master' into private/db-threads
Antti Villberg [Mon, 23 Apr 2018 06:58:47 +0000 (09:58 +0300)]
Merge remote-tracking branch 'origin/master' into private/db-threads

6 years agoMerge branch 'private/db-threads' of ssh://villberg@www.simantics.org:29418/simantics...
Antti Villberg [Mon, 23 Apr 2018 06:05:49 +0000 (09:05 +0300)]
Merge branch 'private/db-threads' of ssh://villberg@www.simantics.org:29418/simantics/platform.git into private/db-threads

6 years agoCreate HTTP(s) client in SCL with certificate verification disabled 28/1728/2
Jussi Koskela [Fri, 20 Apr 2018 06:13:28 +0000 (09:13 +0300)]
Create HTTP(s) client in SCL with certificate verification disabled

Also fixed buildClient function to actually use the provided
ClientBuilder.

refs #7870

Change-Id: Ie0d7ae420fc3b96df607efacb64a8bc8384ec717

6 years agoMerge "Some SCL functions to control graphical debugger"
Tuukka Lehtonen [Thu, 19 Apr 2018 06:25:05 +0000 (09:25 +0300)]
Merge "Some SCL functions to control graphical debugger"

6 years agoSome SCL functions to control graphical debugger 24/1724/1
Hannu Niemistö [Thu, 19 Apr 2018 06:09:34 +0000 (09:09 +0300)]
Some SCL functions to control graphical debugger

Possibility to set statement filter and add resources with a function.

refs #7869

Change-Id: Ifb5cc1fb09d3120ea73302d0b1195bc00ec2949e

6 years agoTest equality of ObjectVariants using Objects.equals 09/1709/3
Jussi Koskela [Wed, 11 Apr 2018 11:14:38 +0000 (14:14 +0300)]
Test equality of ObjectVariants using Objects.equals

refs #7865

Change-Id: I331d7696662709cdabaa9808d07071b079fc853e

6 years agoSystem.currentTimeMillis to "Simantics/Misc" SCL-module 19/1719/1
jsimomaa [Tue, 17 Apr 2018 12:27:32 +0000 (15:27 +0300)]
System.currentTimeMillis to "Simantics/Misc" SCL-module

refs #7867

Change-Id: Ib7a26a7e982dca3de316cb203763a0f720a12b84

6 years agoBetter fix for ClusterTable maps going out of sync
Tuukka Lehtonen [Fri, 13 Apr 2018 21:31:15 +0000 (00:31 +0300)]
Better fix for ClusterTable maps going out of sync

ClusterSmall.toBig was not copying importance over to the constructed
ClusterBig causing importanceMap to go out of sync on the first call to
ClusterSmall.toBig.

refs #7724

Change-Id: I6e56b7f94962de3ec243a9d50775e649f930d0d2
(cherry picked from commit 980d21d8a26dddd2e57dbffdc8f320a76aa0973e)

6 years agoFixed ClusterTable cluster hash/importance map book-keeping problem
Tuukka Lehtonen [Thu, 12 Apr 2018 21:43:36 +0000 (00:43 +0300)]
Fixed ClusterTable cluster hash/importance map book-keeping problem

The main problem was that importance values should have been started
from 1 and 0 is considered an invalid importance value. This prevents
ClusterTable.replaceCluster from making mistakes in importanceMap.

refs #7724

Change-Id: Ie15a2d11bef2b8bdbcee2f5baba47633faa97826
(cherry picked from commit f59872e129c2d1b84fe322ae120fbeac22a94f88)

6 years agoMerge "Refactoring CHR handling code"
Hannu Niemistö [Thu, 12 Apr 2018 10:04:44 +0000 (13:04 +0300)]
Merge "Refactoring CHR handling code"

6 years agoRefactoring CHR handling code 12/1712/1
Hannu Niemistö [Thu, 12 Apr 2018 09:51:23 +0000 (12:51 +0300)]
Refactoring CHR handling code

refs #7866

Change-Id: If2b2a08c740c93d1a4b01830ab0e6de3c014fbec

6 years agoMerge "(refs #7866) Better error location for the NPE in compilation"
Hannu Niemistö [Thu, 12 Apr 2018 09:47:15 +0000 (12:47 +0300)]
Merge "(refs #7866) Better error location for the NPE in compilation"

6 years ago(refs #7866) Better error location for the NPE in compilation 11/1711/2
Hannu Niemistö [Thu, 12 Apr 2018 07:04:44 +0000 (10:04 +0300)]
(refs #7866) Better error location for the NPE in compilation

Change-Id: I3027ac4cd1061edefed6b46ddf1c79773d03caca

6 years agoMultiple simultaneous readers 75/1675/4
Antti Villberg [Thu, 29 Mar 2018 11:25:01 +0000 (14:25 +0300)]
Multiple simultaneous readers

Generate parts of db client query code

refs #6961

Change-Id: If2374874965c23d07a2fbe1f0075c515e1e12d5c

6 years agoMerge branch 'master' into private/db-threads
Tuukka Lehtonen [Wed, 11 Apr 2018 09:13:43 +0000 (12:13 +0300)]
Merge branch 'master' into private/db-threads

Change-Id: I76ec3b166f62c3c3aea3b267d133d5ce120d0bb8

6 years agoAllow changing DisposingPolicy max queue length 05/1705/1
Tuukka Lehtonen [Tue, 10 Apr 2018 20:48:18 +0000 (23:48 +0300)]
Allow changing DisposingPolicy max queue length

Needed to suppor preference-configurability of diagram editor background
disposal.

refs #7863

Change-Id: Ibf9f29dde2c06f5b055bfd42f989368c7573f327
(cherry picked from commit 56a44956cc6cf02ee85b7cfd55c8d3cbfb80a82f)

6 years agoUse unpack in hdf.hdf5lib 02/1702/4
meklund [Tue, 10 Apr 2018 14:12:44 +0000 (17:12 +0300)]
Use unpack in hdf.hdf5lib

Unpack helps on Linux, since otherwise libhdf5_java.so cannot find
libhdf5.so.101.

refs #7858

Change-Id: I8946d5e30b2b4c8ac98a5555f8869399b516fdca

6 years agoUpgraded HDF5 library to 1.10.2 and added linux support 95/1695/6
Tuukka Lehtonen [Sun, 8 Apr 2018 22:01:52 +0000 (01:01 +0300)]
Upgraded HDF5 library to 1.10.2 and added linux support

Amend by Miro:
Ran patchelf -set-rpath \$ORIGIN libhdf5_java.so and updated README

refs #7858

Change-Id: Ibe6d56443b8d02c4e2896adaed9b76f86e042f6e

6 years agoFixes the dpi value in SVGSalamander to 96 98/1698/2
Hannu Niemistö [Tue, 10 Apr 2018 12:24:20 +0000 (15:24 +0300)]
Fixes the dpi value in SVGSalamander to 96

If SVG file defining symbol graphics does not contain unit information,
it is converted from points to pixels using a dpi-value. The value is 96
in most cases but in some machines differs from this default. This makes
the symbol graphics scaled compared to originally drawn graphics which
is undesirable.

refs #7860

Change-Id: I1f858ec0703a6f4dba9547fed2aca0438172248b

6 years agoA utility class for recursive search in cyclic graph 97/1697/3
Hannu Niemistö [Tue, 10 Apr 2018 06:57:49 +0000 (09:57 +0300)]
A utility class for recursive search in cyclic graph

refs #7859

Change-Id: Idba80d0a6a42ab06fa774da1933ffd1d636085f1

6 years agoFixing problems in the database unit testing environment with Acorn 93/1693/1
Tuukka Lehtonen [Thu, 5 Apr 2018 06:47:03 +0000 (09:47 +0300)]
Fixing problems in the database unit testing environment with Acorn

* Removed static map from org.simantics.acorn.FileIO.
  Moved the map into a session service as org.simantics.acorn.FileCache
* Changed org.simantics.db.testing.common.Tests utilities to use Acorn
  instead of ProCore (AcornTestHandler). Did not introduce abstraction
  for this for now.

refs #7855

Conflicts:
bundles/org.simantics.acorn/src/org/simantics/acorn/FileIO.java

Change-Id: Iec42395cc71b30a4c376a44778b358e3807e6ec9
(cherry picked from commit 03fac449ec81e88669169d671bb386eb93ac060d)

6 years agoFinalizing improve startup time for fresh or rollback'd session 29/1629/5
Tuukka Lehtonen [Thu, 5 Apr 2018 13:33:58 +0000 (16:33 +0300)]
Finalizing improve startup time for fresh or rollback'd session

Finally fixed the long-sought InputStream reading bug from
TransferableGraphFileReader.InputChannel.read(ByteBuffer).

The ByteFileReader implementation expected the provided
ReadableByteChannel to always provide a full buffer of data unless EOF
was encountered and the InputChannel.read implementation was not taking
care of that.

Also added simpler utilities for reading TG's from files/InputStreams
directly using static TransferableGraphFileReader.read(File/InputStream)
methods.

PlatformUtil.readTG can now finally use TransferableGraphFileReader for
maximal performance.

refs #7835

Change-Id: I170986bf271a409f9205fad808ae029becc1d3a4

6 years agoShow imports of nonexistent modules as errors 92/1692/1
Hannu Niemistö [Thu, 5 Apr 2018 10:28:31 +0000 (13:28 +0300)]
Show imports of nonexistent modules as errors

Previously there was a separate error category IMPORT_ERROR for all
import errors that was sorted with WARNINGS. Now IMPORT_ERROR category
is also used for import failures whose reason is compilation problem in
the upstream module (although this is fatal for compilation, the problem
is not located in the current module).

refs #7857

Change-Id: Id9227a69d045b68a3e94c1562eb6d24f70d7aaa1

6 years agoStreaming serialization of values, debugger for corrupted values 91/1691/1
Hannu Niemistö [Thu, 5 Apr 2018 08:07:16 +0000 (11:07 +0300)]
Streaming serialization of values, debugger for corrupted values

refs #7856

Change-Id: If9d7bdb84c46c3b3626241f9a63e582fe0a15004

6 years agoSupport diagram profile activity store/restore in model export/import 88/1688/1
Tuukka Lehtonen [Tue, 3 Apr 2018 20:48:36 +0000 (23:48 +0300)]
Support diagram profile activity store/restore in model export/import

Diagram profile selections are stored in the "profiles" workspace
persistent virtual graph. They cannot be done in the persistent database
because we do not want the profile selections to be part of the database
version/undo history. This just doesn't fit the current way of using
diagram profiles.

The code introduced in this commit needs to be put to use in
product-specific custom export/import logic and copy/paste handlers to
take advantage of it.

refs #7854

Change-Id: Ib996144f1afa376a1563e4309fe41421ee4da529
(cherry picked from commit 95e05b3cc3208ec57118e8167a090c9b90edfaf2)

6 years agoUse synchronized hash map instead of ConcurrentHashMap in LazyModule 83/1683/1
Hannu Niemistö [Tue, 3 Apr 2018 12:15:11 +0000 (15:15 +0300)]
Use synchronized hash map instead of ConcurrentHashMap in LazyModule

refs #7826

Change-Id: I660f5f3312a7d1db49441f02d55864e36c950d74

6 years agoCleaning up some bloat from CompilePGraphs 79/1679/1
jsimomaa [Tue, 3 Apr 2018 10:11:38 +0000 (13:11 +0300)]
Cleaning up some bloat from CompilePGraphs

refs #7852

Change-Id: Ie3cfe8d7873f9c687bffca776054c626cc65497b

6 years agoRace condition fix caused deadlock, allow parallel recomputation 76/1676/1
Hannu Niemistö [Tue, 3 Apr 2018 07:52:58 +0000 (10:52 +0300)]
Race condition fix caused deadlock, allow parallel recomputation

refs #7826

Change-Id: Ib0515c2ae7d3e6d1474f991965307969a439baf7

6 years agoMultiple simultaneous readers 75/1675/1
Antti Villberg [Tue, 3 Apr 2018 07:15:13 +0000 (10:15 +0300)]
Multiple simultaneous readers

refs #6961

Change-Id: If2374874965c23d07a2fbe1f0075c515e1e12d5c

6 years agoEscape the dot in regular expression 74/1674/1
Jussi Koskela [Tue, 3 Apr 2018 06:24:31 +0000 (09:24 +0300)]
Escape the dot in regular expression

refs #7848

Change-Id: Iffbdcdc50150f24e4f6517fd8154a5a47bbf8eb0

6 years agoReset SVGNode's data hash on clean up 73/1673/1
Jussi Koskela [Tue, 3 Apr 2018 06:00:03 +0000 (09:00 +0300)]
Reset SVGNode's data hash on clean up

AnimatedSVGNode assumes that its diagram cache is initialized if data
hash is not null.

refs #7851

Change-Id: Id143816210c7905a772e2c391a32026bf838f8e6

6 years agoFail-safe import can now be disabled with a system property 72/1672/1
Tuukka Lehtonen [Mon, 2 Apr 2018 20:54:03 +0000 (23:54 +0300)]
Fail-safe import can now be disabled with a system property

Use the system property -Dorg.simantics.tg.import.failOnMissingEntities@
to disable fail-safe import by settings its value to true.

refs #7850

Change-Id: I2c29d1795ba0c04b16be1798c237651556326bd9
(cherry picked from commit f7c2f46c7c411c5c9dd3323d3cec3a4b8b6a3bbe)

6 years agoImproved subscription CSV export wizard page initial selection handling 69/1669/1
Tuukka Lehtonen [Fri, 30 Mar 2018 07:23:00 +0000 (10:23 +0300)]
Improved subscription CSV export wizard page initial selection handling

Now it supports chart/chart group/chart item selections as well to
initialize the subscription item selection.

refs #7849

Change-Id: Idbfbd979116b932f0d54958a63b01142401366a6
(cherry picked from commit b6f0f7aa4de4c172a830ef9087749e38185a8edf)

6 years agoFixed invalid comparison from AcornBackupProvider.RestoreCopyVisitor 66/1666/1
Tuukka Lehtonen [Thu, 29 Mar 2018 11:41:33 +0000 (14:41 +0300)]
Fixed invalid comparison from AcornBackupProvider.RestoreCopyVisitor

Also removed unnecessary Files.exists checks.

refs #7847

Change-Id: I67d9d5a500824a275f4412ef2ecb7c2860f7f1c7

6 years agoGenerate parts of db client query code 65/1665/1
Antti Villberg [Thu, 29 Mar 2018 11:25:01 +0000 (14:25 +0300)]
Generate parts of db client query code

refs #6961

Change-Id: I444c5b7e1357fb80e52f46b8668153a19af7c587

6 years agoRemoved redundant Files.exists/isDirectory checks 61/1661/2
Tuukka Lehtonen [Wed, 28 Mar 2018 13:01:10 +0000 (16:01 +0300)]
Removed redundant Files.exists/isDirectory checks

refs #7847

Change-Id: Id2f5936a801ece1828c13e29662c15d61b04abaa