]> gerrit.simantics Code Review - simantics/platform.git/log
simantics/platform.git
3 years agoAdd missing ValueType for G2D.Color 42/4342/1
Marko Luukkainen [Thu, 9 Jul 2020 16:36:53 +0000 (19:36 +0300)]
Add missing ValueType for G2D.Color

gitlab #575

Change-Id: I32c0311d375365f7c42c20197c7f2f919329168e

3 years agoShapeNode with separate stroke and fill paints 41/4341/1
Marko Luukkainen [Wed, 8 Jul 2020 09:42:56 +0000 (12:42 +0300)]
ShapeNode with separate stroke and fill paints

gitlab #574

Change-Id: I49c640f925a2933b9c5f36255fad38ac54e1ad67

3 years agoMethod for manually recompling a SCL Module 37/4337/1
Marko Luukkainen [Fri, 3 Jul 2020 11:05:09 +0000 (14:05 +0300)]
Method for manually recompling a SCL Module

gitlab #571

Change-Id: I4f09857cfbce03a869551e9e52430bb61792a7ad

3 years agoSimple implementation for Issues property tab 31/4331/2
Marko Luukkainen [Tue, 30 Jun 2020 08:38:34 +0000 (11:38 +0300)]
Simple implementation for Issues property tab

gitlab #567

Change-Id: If675e438e23229347c9fe5e47748ffcb7bb8fc05

3 years agoInclude component type SCL scripts in textual ontology dump
Tuukka Lehtonen [Fri, 26 Jun 2020 20:51:11 +0000 (23:51 +0300)]
Include component type SCL scripts in textual ontology dump

Also procedural component type substructure code is now dumped into the
same __contents__ file.

refs #561

(cherry picked from commit 1987d5091a213380354e22b863c6a48119faa5ad)

3 years agoAll tgs do not reference L0.ConsistsOf and L0.HasName
Antti Villberg [Mon, 6 Apr 2020 13:49:44 +0000 (16:49 +0300)]
All tgs do not reference L0.ConsistsOf and L0.HasName

gitlab #422

Change-Id: Ie4a5bae2d1f05b6787a38e376cb827610ed975cd
(cherry picked from commit 6bd970eba63ff08a122fdf819e428adaf80cfcef)

3 years agoAllow Issues and Profiles to be used on non standard diagram viewers 27/4327/2
Marko Luukkainen [Fri, 26 Jun 2020 07:49:20 +0000 (10:49 +0300)]
Allow Issues and Profiles to be used on non standard diagram viewers

As in diagram viewers that are not based on Diagramming/Modelling
ontologies.

gitlab #564

Change-Id: Ia6f4c94f76b085e0741e62a1312b2e1fd457fe86

3 years agoListen to changes in page settings 24/4324/2
Jussi Koskela [Wed, 17 Jun 2020 12:56:45 +0000 (15:56 +0300)]
Listen to changes in page settings

Also enabled the setting of KEY_DISPLAY_PAGE hint which was for some
reason disabled.

Change-Id: I8f7136adf96e806bde5aa7c99dff8ce438ba1c80

3 years agoSynchronization can now read children for multi-instantiated composites
Tuukka Lehtonen [Wed, 17 Jun 2020 09:22:52 +0000 (12:22 +0300)]
Synchronization can now read children for multi-instantiated composites

org.simantics.structural2.Functions.structuralChildDomainChildren
getVariables implementation still relied on getPossibleType(ReadGraph),
which returns null for multi-instances. The previous similar flaw was
fixed in #259.

gitlab #562

Change-Id: I55421a32310c7a55c089637faeb3186dd43a0e4b
(cherry picked from commit e89ad0dd828fd8c628288d416590b1f8ec0194ef)

3 years agoFix stupid NPE from DiagramViewerLoadJob 01/4301/1
Tuukka Lehtonen [Mon, 8 Jun 2020 17:25:20 +0000 (20:25 +0300)]
Fix stupid NPE from DiagramViewerLoadJob

gitlab #550

Change-Id: I62acd0448f5ae8519d24f060ce0475e295b8a64a

3 years agoFixed HistoryUtil.importHistoryArchive to open file in read-only mode 00/4300/1
Tuukka Lehtonen [Mon, 8 Jun 2020 17:24:14 +0000 (20:24 +0300)]
Fixed HistoryUtil.importHistoryArchive to open file in read-only mode

gitlab #551

Change-Id: Ifc915ecc9d78db492a8cd14b37f31e6c08c9a9ba

3 years agoAvoid useless reallocation of empty TreeMaps and map iterators 80/4280/1
Tuukka Lehtonen [Thu, 4 Jun 2020 22:33:16 +0000 (01:33 +0300)]
Avoid useless reallocation of empty TreeMaps and map iterators

The problem was that when the database is doing work, MainProgram.run
runs in pretty much busy loop mode and previously it was always
allocating a new TreeMap on each round and also calling Map.entrySet()
to get construct iterators for empty TreeMaps which eventually
accumulates up to somewhat signinificant amount of memory allocated.

Possibly an even more efficient way would be to have the Map be a closed
hashing hashmap instead and then sorting the data for iteration
separately.

gitlab #548

Change-Id: Ib2208dc35b270c9d682362d45f24f1fe01bb8969
(cherry picked from commit d3f7c0196ecf58b78574d8b80e1844ecb4e223d6)

3 years agoNatTable based Graph Explorer styling fixes 93/4293/1
Marko Luukkainen [Thu, 4 Jun 2020 13:11:11 +0000 (16:11 +0300)]
NatTable based Graph Explorer styling fixes

* Do not use trim for cell content.
* Use custom font for selected and hover cells.

gitlab #547

Change-Id: I6d358f829e75a9bb0fd43efdbab9f1961e079f99

3 years agoChanged SCLTypeUtils to not log warnings for non-property relations 75/4275/1
Tuukka Lehtonen [Wed, 3 Jun 2020 09:40:35 +0000 (12:40 +0300)]
Changed SCLTypeUtils to not log warnings for non-property relations

For example procedural UCs and their substructure requests would report
tons of these all the time, which is worthless.

Also added an SCL type for MOD.ChangeInformation to avoid having to see
warnings about the SCL type of MOD.ChangeInformation not being
available:

```
WARN  [...] org.simantics.modeling.SCLTypeUtils: SCLTypeUtils.getType
cannot transform data type '{
    createdBy : String,
    createdAt : Long,
    modifiedBy : String,
    modifiedAt : Long
}' to type. Returns a as default.
```

gitlab #546

Change-Id: I30210fb3055a4d844fe6e9b07c64490a45c14ecd
(cherry picked from commit b055bfb36cca301ceed0591028d245e152c8c32d)

3 years agoContextual adapters must throw instead of returning null 52/4252/1
Tuukka Lehtonen [Mon, 1 Jun 2020 15:11:13 +0000 (18:11 +0300)]
Contextual adapters must throw instead of returning null

gitlab #540

Change-Id: I98cb667afcc6e54d41afc6c0a25051c5ee7b49b3
(cherry picked from commit 4e8f62e4f5a8da113ee576a856b18274ca2a472f)

3 years agoAdded identity-providing constructor for IconButtonStyleBase 51/4251/1
Tuukka Lehtonen [Mon, 1 Jun 2020 05:47:33 +0000 (08:47 +0300)]
Added identity-providing constructor for IconButtonStyleBase

This is needed to support proper implementation of styles inheriting
IconButtonStyleBase. Otherwise query identities of the mentioned class
fall back to getClass which does not work in general.

gitlab #544

Change-Id: I7bfea53b1ce23e644da03ada3cb027fd34a4780a
(cherry picked from commit 9588536ba156584e804329920ae85563e6ef0984)

3 years agoMerge "Set initial priority for GroupStyleProfileEntry" into release/1.43.0
Tuukka Lehtonen [Fri, 29 May 2020 13:19:54 +0000 (13:19 +0000)]
Merge "Set initial priority for GroupStyleProfileEntry" into release/1.43.0

3 years agoSet initial priority for GroupStyleProfileEntry 60/4260/1
Tuukka Lehtonen [Fri, 29 May 2020 11:39:05 +0000 (14:39 +0300)]
Set initial priority for GroupStyleProfileEntry

This ensures correct ordering of profile monitor text stacks

gitlab #543

Change-Id: Iaabc59674f6fb51bd1cb0fd77e224b8da6f9454d

3 years agoAdded system property for controlling writing of MOD.changed tags 49/4249/1
Tuukka Lehtonen [Thu, 28 May 2020 19:15:22 +0000 (22:15 +0300)]
Added system property for controlling writing of MOD.changed tags

You can set -Dorg.simantics.modeling.writeChangedTags=false to disable
writing of MOD.changed tags. The property can be set dynamically at
runtime also.

gitlab #428

Change-Id: I4867c1742b62d2a4a449d5f98a115e4ce36e0257
(cherry picked from commit 162652c6b36097f0465c0fe13bff53b1a3b3d019)

3 years agoMerge "Workaround for query cache returning Exceptions instead of throwing them"...
Tuukka Lehtonen [Thu, 28 May 2020 19:20:23 +0000 (19:20 +0000)]
Merge "Workaround for query cache returning Exceptions instead of throwing them" into release/1.43.0

3 years agoWorkaround for query cache returning Exceptions instead of throwing them 58/4258/1
Marko Luukkainen [Thu, 28 May 2020 07:30:11 +0000 (10:30 +0300)]
Workaround for query cache returning Exceptions instead of throwing them

gitlab #540

Change-Id: Ia43c3827b4ed16f02f038f4782894852b5c266d9

3 years agoBump splash screen version to 1.43.0
Tuukka Lehtonen [Wed, 27 May 2020 07:06:52 +0000 (10:06 +0300)]
Bump splash screen version to 1.43.0

3 years agoUse element transform when doing pick check 54/4254/1
Marko Luukkainen [Wed, 20 May 2020 13:47:51 +0000 (16:47 +0300)]
Use element transform when doing pick check

gitlab #537

Change-Id: I5fc0d21ce99daca3aa0db210f86382db74fba155

3 years agoMerge "Fix change comparison expressions in mapping rules" into release/1.43.0
Tuukka Lehtonen [Tue, 19 May 2020 11:16:59 +0000 (11:16 +0000)]
Merge "Fix change comparison expressions in mapping rules" into release/1.43.0

3 years agoFix change comparison expressions in mapping rules 32/4232/1
Reino Ruusu [Tue, 19 May 2020 11:01:21 +0000 (14:01 +0300)]
Fix change comparison expressions in mapping rules

gitlab #534

Change-Id: Ib82f78be739e172b77c0499f034b8180ecc9e779

3 years agoHandle all AttributeRelation properties 41/4241/1
Antti Villberg [Sun, 10 May 2020 07:26:37 +0000 (10:26 +0300)]
Handle all AttributeRelation properties

gitlab members/simupedia#128

Change-Id: I62926e825fdef2e6ccced6805cac1e13012c0d3b
(cherry picked from commit 966bc2f6571121c4c818a2e487d29bada0138d8d)

3 years agoFix GetComponentLocation to work with procedural UC instances 36/4236/1
Tuukka Lehtonen [Thu, 7 May 2020 20:32:43 +0000 (23:32 +0300)]
Fix GetComponentLocation to work with procedural UC instances

Previously it would return ComponentLocation.isInsideStructure = false
for Variables representing the insides of a procedural UC instance.

gitlab #532

Change-Id: I26ae30c8e4217e7c4cde03b884604ee59aa7e85b
(cherry picked from commit d8f1f7da4d84424402812f1aa5deed6112f4c665)

3 years agoReplace scheduleAtFixedRate with scheduleWithFixedDelay 35/4235/1
Tuukka Lehtonen [Thu, 7 May 2020 20:29:12 +0000 (23:29 +0300)]
Replace scheduleAtFixedRate with scheduleWithFixedDelay

ScheduledExecutorService.scheduleAtFixedRate tends to run enormous
amounts of runnables that would have been scheduled during a machine is
in sleep, after the machines wakes up from sleep, retroactively.

This is not good and can be avoided by using scheduleWithFixedDelay
which is usually good enough regarding the delay between executions.

gitlab #531

Change-Id: I4ac3b11f1f9236d411debb352fce610c33410659
(cherry picked from commit 00a0eae4da98b701fa38a6813b1743b754c5c99e)

3 years agoFixed CSVFormatter mind floating point inaccuracy when resampling
Tuukka Lehtonen [Wed, 29 Apr 2020 21:55:09 +0000 (00:55 +0300)]
Fixed CSVFormatter mind floating point inaccuracy when resampling

These changes prevent the resampling export mode from dropping samples
that have timestamps closer than 1e-13 sec to the last exported sample
time stamp.

gitlab #529

(cherry picked from commit 4a7923add5be874cc352faf9afd0f627794de32e)

3 years agoFixed subscription item data file searching to use groupItemId as well 30/4130/1
Tuukka Lehtonen [Tue, 28 Apr 2020 08:49:44 +0000 (11:49 +0300)]
Fixed subscription item data file searching to use groupItemId as well

This fixes problems where subscription item data CSV export used the
wrong data files to read the data related to the subscription item
because it wasn't matching the data file based on both groupItemId
(subscription item GUID name) and variable ID, which can be overlapping
if a new subscription item is created for a variable that has had a
previous subscription.

gitlab #528

Change-Id: If1ddef78e4b152cf6721f82afc21b37ec5fbb074
(cherry picked from commit b141f43453a9078e2cf77302bc43c646e72c98fe)

3 years agoUse RuntimeEnvironmentRequest2 where applicable 29/4129/1
Tuukka Lehtonen [Sun, 26 Apr 2020 20:21:09 +0000 (23:21 +0300)]
Use RuntimeEnvironmentRequest2 where applicable

This allows e.g. procedural user component substructure expressions to
use SCL functionality included by the user component's local SCL modules
instead of only having to rely on functionality included by the SCLMain
at the containing index root.

gitlab #527

Change-Id: I7bcb22910737851771f2be54aafecd7480d1c81b
(cherry picked from commit 844ae73ef4a9109b12d4d810b9d3bc5e147e298f)

3 years agoUC SCL script/procedural code editors respect L0.readOnly
Tuukka Lehtonen [Fri, 24 Apr 2020 17:34:14 +0000 (20:34 +0300)]
UC SCL script/procedural code editors respect L0.readOnly

Marking the input resource with L0.readOnly now makes the editors
consider the input immutable in the document provider.

gitlab #526

(cherry picked from commit 36e865dac0ec2db530fabc6fd9ea9841c3e812ae)

3 years agoStructuralUtils.isImmutable now takes L0.readOnly of input into account
Tuukka Lehtonen [Fri, 24 Apr 2020 17:09:02 +0000 (20:09 +0300)]
StructuralUtils.isImmutable now takes L0.readOnly of input into account

Introduced new utility method Layer0Utils.isMarkedReadOnly for easy
checking L0.readOnly value of a Resource.

gitlab #525

(cherry picked from commit 06aeb7cad707d1fed2c21c1ad9413aa97e901da7)

3 years agoUpdate target platforms with non-overriden jersey dependencies 93/4193/2
jsimomaa [Thu, 23 Apr 2020 12:32:19 +0000 (15:32 +0300)]
Update target platforms with non-overriden jersey dependencies

gitlab #486

Change-Id: Ia2b56ef42c3c78430adeffb1e1e1ecf603abdaaa

3 years agoDo not override jersey in p2.site pom.xml as release/1.43.0 is jdk8 92/4192/2
jsimomaa [Thu, 23 Apr 2020 11:16:21 +0000 (14:16 +0300)]
Do not override jersey in p2.site pom.xml as release/1.43.0 is jdk8

gitlab #486

Change-Id: If9c4759de1a034cd747e3bc6cd2bd973e11c784a

3 years agoRevert jersey and jackson back to versions that work with JDK8 68/4168/4
jsimomaa [Mon, 20 Apr 2020 10:59:49 +0000 (13:59 +0300)]
Revert jersey and jackson back to versions that work with JDK8

gitlab #486

Change-Id: Id282d9cbffa68bce9b2a436150aadc0c5c11eac1

3 years agoUpdate target platforms with jersey and jackson version change 63/4163/4
jsimomaa [Mon, 20 Apr 2020 07:29:24 +0000 (10:29 +0300)]
Update target platforms with jersey and jackson version change

gitlab #486

Change-Id: I1b3d56efddeb3d91cf172b5f25077c97f1b25c89

3 years agoMerge "Revert jersey 2.25.1 and jackson 2.8.11 back for javax.xml.bind" into release...
Jani Simomaa [Mon, 20 Apr 2020 06:52:00 +0000 (06:52 +0000)]
Merge "Revert jersey 2.25.1 and jackson 2.8.11 back for javax.xml.bind" into release/1.43.0

3 years agoRevert jersey 2.25.1 and jackson 2.8.11 back for javax.xml.bind 61/4161/1
jsimomaa [Mon, 20 Apr 2020 06:50:31 +0000 (09:50 +0300)]
Revert jersey 2.25.1 and jackson 2.8.11 back for javax.xml.bind

* Also remove jakarta from target platform until we use JDK11

gitlab #486

Change-Id: I4e2d342f5429884df79c256d1153f1275c04f1e2

3 years agoRemoved ALT+SHIFT+Q S shortcut for opening SCL Console 60/4160/1
Tuukka Lehtonen [Fri, 17 Apr 2020 22:05:13 +0000 (01:05 +0300)]
Removed ALT+SHIFT+Q S shortcut for opening SCL Console

It collides with a built-in shortcut that opens the Search view.

gitlab #521

Change-Id: Ic9aa1b2043ba013e44cade62d3fd5306a3a5f9d8

4 years agoAPIs for skipping state restoration for non-undo synchronization events 23/4123/1
Reino Ruusu [Thu, 16 Apr 2020 10:11:53 +0000 (13:11 +0300)]
APIs for skipping state restoration for non-undo synchronization events

gitlab #520

Change-Id: I50491d4b514db05b8854bcbefff58e7bb9c3b13e
(cherry picked from commit 9ecf695514f0a6faaadf3f912e7a85ccec3d8865)

4 years agoExport did not manage case differences (mode vs. Mode) 20/4120/1
Antti Villberg [Fri, 10 Apr 2020 17:18:53 +0000 (20:18 +0300)]
Export did not manage case differences (mode vs. Mode)

gitlab #452

Change-Id: I8d4d8908c2dc14ac50c0d7544f7886317689098e
(cherry picked from commit bb9e29bd1e5a056c54e04df779bfb4d76a2ff678)

4 years agoRevert "Prime SCL BindingRegistry to shave ~0.5s from startup" 15/4115/1
Tuukka Lehtonen [Tue, 7 Apr 2020 08:47:50 +0000 (08:47 +0000)]
Revert "Prime SCL BindingRegistry to shave ~0.5s from startup"

This reverts commit 8f99af83cee60676d80cf2334177ab94f82b7959.

Reason for revert: Breaks selection view and other aspects about systems using Variables

gitlab #491

Change-Id: I15003096cd13d738870278dd0c922bd9d0ed4ef5
(cherry picked from commit 91e878ce39c9db112d658b3236f29a13e12724e6)

4 years agoHandle SelectionOutline interface implementation in SCLScenegraph 71/4071/1
Marko Luukkainen [Mon, 6 Apr 2020 13:40:26 +0000 (16:40 +0300)]
Handle SelectionOutline interface implementation in SCLScenegraph

Created custom SelectionShapeNode class for outline highlights, so that
SCLScenegraph can process outline as selection.

Change-Id: Ieeaa47618a8c94f07d9b482c9a3d77044852f2ba
(cherry picked from commit 37c78d83578e57c8bb858d51591446994405b617)

4 years agoExceptions for many functional objects are broken 66/4066/1
Antti Villberg [Fri, 3 Apr 2020 12:53:16 +0000 (15:53 +0300)]
Exceptions for many functional objects are broken

gitlab #510

Change-Id: Id79a72ad4cf73a2e27351612d05721d6333d2941
(cherry picked from commit 5485802a9eee47cf47e50ef2e96da843417133e5)
(cherry picked from commit 066c758d34f60a9da4e7b2387689475de1a9cf84)

4 years agoImproved element reordering performance 65/4065/1
Jussi Koskela [Thu, 2 Apr 2020 11:01:04 +0000 (14:01 +0300)]
Improved element reordering performance

Performance was especially poor when moving element from top to bottom
as it caused changes all elements in the ordered set.

gitlab #508

Change-Id: I140bf8ad552f06477751842f6e3da9e0d294e247
(cherry picked from commit 99174cb4476954c91687ff5625227e91bdee9e67)

4 years agoFixed moving elements up/down on diagram 64/4064/1
Jussi Koskela [Thu, 2 Apr 2020 10:55:21 +0000 (13:55 +0300)]
Fixed moving elements up/down on diagram

gitlab #509

Change-Id: I47ab51cb5ff07499ed0637e9f7012ec16c5ae7a7
(cherry picked from commit 06ba87c8c0f66b8d198eaad24a98442a9d3bc581)

4 years agoFixed InvertBasicExpressionVisitor bugs with subtractions and divisions 61/4061/1
Tuukka Lehtonen [Mon, 30 Mar 2020 22:13:59 +0000 (01:13 +0300)]
Fixed InvertBasicExpressionVisitor bugs with subtractions and divisions

Minus expressions and divisions were both computed the wrong way around,
i.e. a-b as b-a and a/b as b/a.

Consolidated duplicate InvertBasicExpressionVisitor code into single
base class.

Also noticed that the basicexpression parser doesn't parse e.g. `a*5/4`
but parses `a*5 / 4` just fine. Didn't dive into these parser problems
for now. Hopefully we can retire this code entirely at some point in
favor of SCL expressions.

gitlab #505

Change-Id: I74eaeae1dbec080a10ffc43c0c321705c0b0ea86
(cherry picked from commit 1819be12c9a971df1dea5daa8190162ac1e20bb6)

4 years agoExpose proxied subject in GroupProxySymbolItem 59/4059/1
Jussi Koskela [Mon, 30 Mar 2020 12:37:18 +0000 (15:37 +0300)]
Expose proxied subject in GroupProxySymbolItem

gitlab #506

Change-Id: Ia7a3c6a10e901aba3b22d91e28b7a018ba448373
(cherry picked from commit 7e2af4ac725e0f663f0598f8c85a0896618bd237)

4 years agoAdded `possibleInvertibleExpressionReferencedTransformedProperty` 58/4058/1
Tuukka Lehtonen [Mon, 30 Mar 2020 10:05:41 +0000 (13:05 +0300)]
Added `possibleInvertibleExpressionReferencedTransformedProperty`

This allows retrieval of the gain/bias applied to direct property
references in derived properties of user components.

Also switched DatasourceAdapter to use SLF4J logging instead of
java.util logging, which should not be used anywhere.

gitlab #505

Change-Id: I753b89fa1738e378e3e1ad5eac2a44e4dba9692f
(cherry picked from commit 3ec10beaefc3da6cd0bfab715d8c743f9d40f47c)

4 years agoAdded more literal type resolution logic to claimLiteral 57/4057/1
Tuukka Lehtonen [Tue, 17 Mar 2020 15:04:43 +0000 (17:04 +0200)]
Added more literal type resolution logic to claimLiteral

If the Class of the value doesn't tell which layer0-builtin type
resource to use, try to use the Datatype provided by the binding to
resolve the builtin type resource. If that fails also, resort to the the
old fallback behavior.

gitlab #496

Change-Id: Ie55984d2812bafa84c12f0a776b0d6de7e6a905d
(cherry picked from commit d788b5fea66a6dffe1649de57bc83705e6027bc0)

4 years agoAdded Chart Preferences action to time series chart editor context menu 34/4034/1
Tuukka Lehtonen [Thu, 19 Mar 2020 23:46:45 +0000 (01:46 +0200)]
Added Chart Preferences action to time series chart editor context menu

gitlab #502

Change-Id: I901c2c4b92fb75b255aee3a123b0f5802f5c2fb3

4 years agoImproved Copy Visible Data usability in time series chart editor 33/4033/1
Tuukka Lehtonen [Thu, 19 Mar 2020 23:45:59 +0000 (01:45 +0200)]
Improved Copy Visible Data usability in time series chart editor

The action now first opens a preference dialog with only the CSV export
preferences shown which allows the user to know what settings are being
used to copy the data before actually copying, and also cancel the copy.

The preference page also shows which options are not used if resampling
is not enabled.

gitlab #501

Change-Id: If998d322f4286841c2c6bd3cbad479b8032b19ae

4 years agoFixed ProfileObserver.update race with multiple query threads 14/4014/1
Tuukka Lehtonen [Mon, 16 Mar 2020 22:03:55 +0000 (00:03 +0200)]
Fixed ProfileObserver.update race with multiple query threads

gitlab #499

Change-Id: I79fcc0c67e6ac2850e8c6949e499219b5c43cfcf
(cherry picked from commit e83110633e844749640f830e186423643e1b7cbe)

4 years agoDirect and synchronization-free access to Layer0 resource class for DB 98/3998/1
Tuukka Lehtonen [Wed, 11 Mar 2020 07:55:08 +0000 (09:55 +0200)]
Direct and synchronization-free access to Layer0 resource class for DB

Also converts plenty of legacy Logger use to slf4j Logger.

gitlab #493

Change-Id: I79fe0c8fdfef631b5b3b45aaed0e1c0008e90b40
(cherry picked from commit 6928dbc0244fbd793df6094b41bd9a1ebc00b06b)

4 years agoPrevent exceptions in procedural substructure requests 30/3930/1
Reino Ruusu [Mon, 16 Mar 2020 20:00:33 +0000 (22:00 +0200)]
Prevent exceptions in procedural substructure requests

gitlab #497

Change-Id: Iaec7ce4ac40fb07d7b91ab2d6d9f3609b10facaa
(cherry picked from commit 209d3c557147c8c2c8ae4d8500d1b9a8c5c3166d)

4 years agoFix handling of property variables with no predicate resource. 29/3929/1
Reino Ruusu [Mon, 16 Mar 2020 19:59:06 +0000 (21:59 +0200)]
Fix handling of property variables with no predicate resource.

gitlab #498

Change-Id: Iacbfdddca8d143b12950dd5166a835eefc44d270
(cherry picked from commit 23f635e618eac5952aa6fe400b81c0cb8260ff01)

4 years agoFixed StyledtextContentAdapter to overwrite existing content properly 26/3926/1
Tuukka Lehtonen [Mon, 9 Mar 2020 16:11:02 +0000 (18:11 +0200)]
Fixed StyledtextContentAdapter to overwrite existing content properly

gitlab #492

Change-Id: I58e4feb40b13f8a9c6b0619776cf496d5f21a80b
(cherry picked from commit 1f90a60db1a7b5f7d98e5d11af9c7d13e0c25d9a)

4 years agoExpose diagramHints for customization 23/3923/1
Marko Luukkainen [Tue, 10 Mar 2020 11:21:21 +0000 (13:21 +0200)]
Expose diagramHints for customization

gitlab #494

Change-Id: I7545e9ff469cc819a07b48bbdfe3e781c8455b5d
(cherry picked from commit 59504249e01a0d803c5c4fdd4ba581d8272fee18)

4 years agoConfigured release/1.43.0 branch for SDK builds
Tuukka Lehtonen [Tue, 10 Mar 2020 08:50:31 +0000 (10:50 +0200)]
Configured release/1.43.0 branch for SDK builds

4 years agoExpose bounds based line routing case calculation. 21/3921/1
Marko Luukkainen [Mon, 9 Mar 2020 16:10:49 +0000 (18:10 +0200)]
Expose bounds based line routing case calculation.

Custom shaped terminals require bounds based case calculation, without
routeToBounds set to true (causes problems in web editor)

Change-Id: Icaadca88f37a574cf2de53f56a361684bfadba62
(cherry picked from commit 161fad9a336aa19d8dde691c213016907c412b83)

4 years agoAsyncBarrier.dec runs into refcounting problem 75/3975/2
Antti Villberg [Sun, 8 Mar 2020 19:41:04 +0000 (21:41 +0200)]
AsyncBarrier.dec runs into refcounting problem

gitlab #490

Change-Id: I47b3e917a11038b444a326f03b46352d5671cbe0

4 years agoPrime SCL BindingRegistry to shave ~0.5s from startup 72/3972/2
jsimomaa [Fri, 6 Mar 2020 11:47:01 +0000 (13:47 +0200)]
Prime SCL BindingRegistry to shave ~0.5s from startup

gitlab #491

Change-Id: Ibbb04dce327697b81fdce894e10569af6b62c309

4 years agoMerge "Fixed platform ontology sync startup failure problems after installs"
Tuukka Lehtonen [Wed, 4 Mar 2020 21:54:06 +0000 (21:54 +0000)]
Merge "Fixed platform ontology sync startup failure problems after installs"

4 years agoFixed platform ontology sync startup failure problems after installs 63/3963/1
Tuukka Lehtonen [Wed, 4 Mar 2020 21:43:40 +0000 (23:43 +0200)]
Fixed platform ontology sync startup failure problems after installs

Installing a new plug-in that contains multiple ontologies that depend
transitively on each other caused startup failure due to database
requests not finding the newly installed ontology that the second
installed ontology depends on.

The solution is strategic query cache flushes before and after the
installation into immutable contexts.

Read more about it in the issue.

gitlab #464

Change-Id: I1ad28585a85ad3a31cac8e058d0c6872e894be92

4 years agoSupport fox six component Json array 16/3916/1
Marko Luukkainen [Mon, 2 Mar 2020 14:02:36 +0000 (16:02 +0200)]
Support fox six component Json array

gitlab #489

Change-Id: I01617086a1abab7a8400fe2b14456bce2647d22e
(cherry picked from commit 3bfc832da98007484d90add605f5fc0fb056f676)

4 years agoNew version of hdf.hdf5 feature required due to upgraded slf4j dep 46/3946/2
Tuukka Lehtonen [Sat, 29 Feb 2020 07:53:06 +0000 (09:53 +0200)]
New version of hdf.hdf5 feature required due to upgraded slf4j dep

Maven has cached hdf.hdf5 feature build in many places with version
1.10.2 which has a strict dependency on org.slf4j.api 1.7.25. SLF4j was
just upgraded to 1.7.30 meaning this feature no longer resolves properly
because Maven will use the old cached artifact. We need to bump the
feature version with a qualifier suffix `.b0001` to get maven to get the
fetch the new version.

gitlab #486

Change-Id: I17411c99e474dff6d121862e99ccc8f814507af4

4 years agoAdded simple instructions on IDE installation
Tuukka Lehtonen [Fri, 28 Feb 2020 23:29:02 +0000 (01:29 +0200)]
Added simple instructions on IDE installation

gitlab #486

4 years agoMirrored CBI TPD tool and eclipse collections to simantics.org 45/3945/1
Tuukka Lehtonen [Fri, 28 Feb 2020 22:53:16 +0000 (00:53 +0200)]
Mirrored CBI TPD tool and eclipse collections to simantics.org

Also added a maven pom for running the tpd to target converter from
command line at releng/org.simantics.sdk.build.targetdefinition/build.

gitlab #486

Change-Id: Ic30c685556797249c28f50936727dccb58484bd9

4 years agoRegenerate simantics.target after eclipse collections changes 44/3944/1
Tuukka Lehtonen [Fri, 28 Feb 2020 13:06:48 +0000 (15:06 +0200)]
Regenerate simantics.target after eclipse collections changes

gitlab #486

Change-Id: Ice9dc7307c1f616bb2d5bffba057d48227e76340

4 years agoFetch eclipse-collections from p2 repo to get OSGI version automatically 43/3943/5
jsimomaa [Fri, 28 Feb 2020 11:53:16 +0000 (13:53 +0200)]
Fetch eclipse-collections from p2 repo to get OSGI version automatically

gitlab #486

Change-Id: Ifc15996271c165300212368bb90b09427d24a850

4 years agoUpdate simantics.target with new external component versions 42/3942/1
jsimomaa [Fri, 28 Feb 2020 08:20:01 +0000 (10:20 +0200)]
Update simantics.target with new external component versions

gitlab #485
gitlab #486

Change-Id: I85f3deab323b09ed6b4811306df692d0fb9ab934

4 years agoMerge "Tons of dependency fixes and updates"
Jani Simomaa [Fri, 28 Feb 2020 08:02:37 +0000 (08:02 +0000)]
Merge "Tons of dependency fixes and updates"

4 years agoTons of dependency fixes and updates 37/3937/20
Tuukka Lehtonen [Thu, 27 Feb 2020 11:59:15 +0000 (13:59 +0200)]
Tons of dependency fixes and updates

* Removed unused JARs from org.simantics.scenegraph and re-exported
  org.apache.batik from there instead of including three old batik JARs
  internally to export the batik parser.
* Replaced all dependencies on org.apache.commons.collections with
  org.apache.commons.collections4
* Removed version specifiers from all org.slf4j.api and
  org.eclipse.collections.eclipse-collections* dependencies
  to avoid the need to modify them down the road with new major releases
* Explicitly specified all Jetty dependencies to be on version 9.4.24
  in an attempt to avoid OSGi (Felix) bundle wiring performance problems
  experienced by Marko in recent developments.

gitlab #485
gitlab #486

Change-Id: Id5a3d62a007fad4a45f601b4d471f061395e556b

4 years agoExport jersey internal packages for jersey-media-multipart 40/3940/1
jsimomaa [Fri, 28 Feb 2020 07:23:40 +0000 (09:23 +0200)]
Export jersey internal packages for jersey-media-multipart

gitlab #486

Change-Id: I4fb177fa365babfab7950a920784328f2976569d

4 years agoUpdate rest of external components & explicitly export javax.ws.rs* 39/3939/1
jsimomaa [Fri, 28 Feb 2020 07:00:45 +0000 (09:00 +0200)]
Update rest of external components & explicitly export javax.ws.rs*

gitlab #486

Change-Id: I858750bb69a0ebade617c72f29ee76330394954e

4 years agoUpdate rest of external components 38/3938/1
jsimomaa [Fri, 28 Feb 2020 06:19:56 +0000 (08:19 +0200)]
Update rest of external components

gitlab #486

Change-Id: I7f3bed6a5d6271fa94f1f1e7e6f3619fa7c85d02

4 years agoUpdating external component versions & add influxdb-client 36/3936/3
jsimomaa [Thu, 27 Feb 2020 11:41:56 +0000 (13:41 +0200)]
Updating external component versions & add influxdb-client

gitlab #486

Change-Id: I4348db51b082aedaf26bd8c9458f1b81cef0f512

4 years agoThread safety changes in objmap2 33/3933/1
Reino Ruusu [Mon, 24 Feb 2020 11:56:41 +0000 (13:56 +0200)]
Thread safety changes in objmap2

gitlab #483

Change-Id: I3a831732961ff7fc3ac6db3a2fdb94c2e9361d7a

4 years agoEliminate unnecessary storage of graph objects in map objects. 12/3912/1
Reino Ruusu [Tue, 25 Feb 2020 16:32:21 +0000 (18:32 +0200)]
Eliminate unnecessary storage of graph objects in map objects.

gitlab #482

Change-Id: Id600bda6892857a376cd169219636dc0300763d4

4 years agoFlush listener registrations before garbage collecting queries/listeners 11/3911/1
Tuukka Lehtonen [Tue, 25 Feb 2020 22:24:19 +0000 (00:24 +0200)]
Flush listener registrations before garbage collecting queries/listeners

gitlab #481

Change-Id: I5aa5c3ef420faebba4a2c347cd999035bada675f

4 years agoFinish exception handling in AdapterRegistry2 15/3915/1
jsimomaa [Tue, 25 Feb 2020 13:26:33 +0000 (15:26 +0200)]
Finish exception handling in AdapterRegistry2

gitlab #480

Change-Id: I339986806570a4373456e4fb92a7b7712f531f7b
(cherry picked from commit 8eea274269dd791b7ef95ca03bf891654e0c4ffc)

4 years agoSeparate TextNode handling for SCLSceneGraph 14/3914/1
Marko Luukkainen [Mon, 24 Feb 2020 17:49:46 +0000 (19:49 +0200)]
Separate TextNode handling for SCLSceneGraph

gitlab #476

Change-Id: Ib50bf50f7b6b39573fceae8ff1cc87f7ef203885
(cherry picked from commit fc7afa94bb7704fedf0dd2f3da7923d6aa732ea3)

4 years agoMerge "Add line bounds to highlight bounds to get actual bounds."
Marko Luukkainen [Tue, 25 Feb 2020 08:59:35 +0000 (08:59 +0000)]
Merge "Add line bounds to highlight bounds to get actual bounds."

4 years agoMerge "Temporarily added debug logging to MipMapBufferedImage for debugging"
Tuukka Lehtonen [Mon, 24 Feb 2020 23:05:02 +0000 (23:05 +0000)]
Merge "Temporarily added debug logging to MipMapBufferedImage for debugging"

4 years agoTemporarily added debug logging to MipMapBufferedImage for debugging 05/3905/1
Tuukka Lehtonen [Mon, 24 Feb 2020 23:02:32 +0000 (01:02 +0200)]
Temporarily added debug logging to MipMapBufferedImage for debugging

gitlab #477

Change-Id: I553d4f7ed99c0b48cf1fe386669ae46d6ca68de2

4 years agoAdd line bounds to highlight bounds to get actual bounds. 13/3913/1
Marko Luukkainen [Mon, 24 Feb 2020 12:58:14 +0000 (14:58 +0200)]
Add line bounds to highlight bounds to get actual bounds.

This fixes text clipping with italic font

gitlab #475

Change-Id: I7223d6b7e960f28c61644ba7bc608b46530a58a1
(cherry picked from commit 5d435de8ba4147560a795f8873d234a0489050b2)

4 years agoRemove single quotes from font-family value 52/3852/1
Marko Luukkainen [Mon, 24 Feb 2020 08:43:36 +0000 (10:43 +0200)]
Remove single quotes from font-family value

gitlab #474

Change-Id: Ic63ff4a33739835f809e9a87dc8f31a3d375346d
(cherry picked from commit 738c0625bf766316b39aa7c9884a47d3711d548c)

4 years agoStop using pack200 because it has been deprecated and removed
Tuukka Lehtonen [Sun, 23 Feb 2020 01:04:56 +0000 (03:04 +0200)]
Stop using pack200 because it has been deprecated and removed

Deprecated in Java 11 https://openjdk.java.net/jeps/336 and removed
in Java 14 https://openjdk.java.net/jeps/367.

The main problem for us now is that the packed JARs don't get
signed when using maven-jarsigner-plugin, while the unpacked
ones do. Simplest solution is to let go of pack200 already.

gitlab #468

Change-Id: I2f6769802cfa51f9d2fd410a125831849f7d484f

4 years agoWhitespace support in directory names for publish.sh
Tuukka Lehtonen [Sat, 22 Feb 2020 23:44:27 +0000 (01:44 +0200)]
Whitespace support in directory names for publish.sh

gitlab #468

Change-Id: I875cf2537633b9d987020935941946df2dd117fb

4 years agoRegenerate P2 repository metadata after signing
Tuukka Lehtonen [Sat, 22 Feb 2020 22:51:04 +0000 (00:51 +0200)]
Regenerate P2 repository metadata after signing

Otherwise te checksums in artifacts.xml will be invalid builds are doomed.

gitlab #468

Change-Id: I4eddd4d0a9ef19e37bfc9a26a5e5c94c486e0bda

4 years agoFixed signing problems with directories containing whitespace
Tuukka Lehtonen [Sat, 22 Feb 2020 18:15:11 +0000 (20:15 +0200)]
Fixed signing problems with directories containing whitespace

gitlab #468

Change-Id: Iec62b603024dd362a9e69676bb5fdf0617d1b966

4 years agoSupport signing of platform external dependencies and SDK
Tuukka Lehtonen [Sat, 22 Feb 2020 16:30:28 +0000 (18:30 +0200)]
Support signing of platform external dependencies and SDK

Swiched to Tycho 1.5.0 and removed broken category.xml files
that broke the build with Tycho 1.5.0 compared to 1.0.0.

gitlab #468

Change-Id: Idab1eb2d4ce2b2e5b7b4cccc1fd5d18217e5e83a

4 years agoSimantics integration STS 87/3887/5
Antti Villberg [Thu, 20 Feb 2020 09:20:46 +0000 (11:20 +0200)]
Simantics integration STS

gitlab #472

Change-Id: Ic65e158b277f7a1a9b4ce788f95f4dec5ab89ac4

4 years agoAllow customizing TextElement default vertical alignment 50/3850/1
Marko Luukkainen [Fri, 21 Feb 2020 09:12:37 +0000 (11:12 +0200)]
Allow customizing TextElement default vertical alignment

gitlab #471

Change-Id: I05ead92b16fe172672231bbc9a2ac0f7da5b9da6
(cherry picked from commit e14a9fd13c79c0c3ca1d5af56727d80f8940f437)

4 years agoUse slf4j logging in ModelledView 97/3897/2
Tuukka Lehtonen [Thu, 20 Feb 2020 21:55:15 +0000 (23:55 +0200)]
Use slf4j logging in ModelledView

gitlab #473

Change-Id: I6b0bbbb4a8fe375ee0ad434d3e8f42c1c235f3e8

4 years agoImproved shared library structure dump to take more types into account 96/3896/1
Tuukka Lehtonen [Thu, 20 Feb 2020 19:31:08 +0000 (21:31 +0200)]
Improved shared library structure dump to take more types into account

Added support for:
* L0.SCLScript
* GF.File

This also removes dumping of the .pgraph file from the shared library
exporter because the contents of the generated .pgraph file have never
been complete, nor stable enough to actually give out any information on
what has changed and how. The system gives no diffs out on what most
usually changes, i.e. SCL modules, scripts, SVG files and other similar
textual data.

gitlab #452

Change-Id: Id35b8b6d339398ba89aca3e10aff7aeb4c610242

4 years agoMerge "Fixed Path2D creation to work with overlapping RoutePoints"
Tuukka Lehtonen [Thu, 20 Feb 2020 11:35:13 +0000 (11:35 +0000)]
Merge "Fixed Path2D creation to work with overlapping RoutePoints"

4 years agoAdded alternative constructor for inputting text scaling factor 48/3848/1
Marko Luukkainen [Thu, 20 Feb 2020 09:17:37 +0000 (11:17 +0200)]
Added alternative constructor for inputting text scaling factor

gitlab #471

Change-Id: Ie1a394e41f4807bc99e0de3cef891730fa27be8e
(cherry picked from commit 01d6a043fc7513dd93853f4fc2a7b326aee1f832)

4 years agoSupport for creating shared ontology dump to git 82/3882/5
Antti Villberg [Wed, 19 Feb 2020 12:28:24 +0000 (14:28 +0200)]
Support for creating shared ontology dump to git

More generic implementation

gitlab #452

Change-Id: Icaeb7d33386b037f48c5154b1fe8777b04f3b38d