]> gerrit.simantics Code Review - simantics/3d.git/log
simantics/3d.git
5 years agoRevised update logic for inline components 60/3660/1
Marko Luukkainen [Tue, 3 Dec 2019 11:49:36 +0000 (13:49 +0200)]
Revised update logic for inline components

* PipingRules no longer have separate code for path legs with offsets
* Overlapping fixed length components are forced to be separate, as long
as there is available space
* Using more stable calculation for turn component orientations (reusing
path leg direction vector)
* Error messages of overlapping inline components

gitlab #14
gitlab #59

Change-Id: I85e754ffb6dab37ca7b7ae8e5f28842fbf095a11

5 years agoShowing error messages when components overlap each other 58/3658/1
Marko Luukkainen [Mon, 2 Dec 2019 12:53:07 +0000 (14:53 +0200)]
Showing error messages when components overlap each other

* Removed code that forced PipingRules to iterate whole connected
segment.
* Adjusted PipingRule excecution on editor load.
* Fixed inline coomponent updated, when the component was also path leg
end.
* Fixed variable length adjusting / removal code.

gitlab #59

Change-Id: I4e1152f2a37b9a7cc7f93f18a9cf54616c62bbfd

5 years agoConverting variable angle turn turn to fixed angle could fail. 47/3647/1
Marko Luukkainen [Fri, 29 Nov 2019 12:34:50 +0000 (14:34 +0200)]
Converting variable angle turn turn to fixed angle could fail.

Calculating rotating angle from input and output directions was using 0
- PI restricted angle calculation, where expected result was -PI - PI

gitlab #46

Change-Id: I08956dc40009c4fea17883b7a6caf8468db8bf7f

5 years agoProcessing DB changes could leave control points unsynchronized 45/3645/1
Marko Luukkainen [Fri, 29 Nov 2019 11:44:12 +0000 (13:44 +0200)]
Processing DB changes could leave control points unsynchronized

When processing DB changes, component connections could be created
before control points (especially Nozzle). This could cause a situation,
where components were connected, but control points were not.

gitlab #35

Change-Id: Ida35c3222dbc706c7cb0e481af41feeca0949809

5 years agoHandle PipeRun removals with detaching Components. 42/3642/1
Marko Luukkainen [Fri, 29 Nov 2019 10:44:52 +0000 (12:44 +0200)]
Handle PipeRun removals with detaching Components.

Some operations can move Components between PipeRuns. If we create a
PipeRun within such operation, and the undo the modification, removal of
the created PipeRun may remove Components before they are attached to
their original PipeRuns.

1. Now PipeRun removal detaches Components, so that Component structure
remains intact.
2. PipeCOntrolPoint removal work without PipeRun.
3. AbstractVTKNodeMap calls INode.remove() all removed nodes.

gitlab #35

Change-Id: I37ec56302581ab176fe630c91b3cddb301ad1210

5 years agoRemove/Split could go over PipeRun boundary and break reducers. 38/3638/1
Marko Luukkainen [Thu, 28 Nov 2019 15:49:56 +0000 (17:49 +0200)]
Remove/Split could go over PipeRun boundary and break reducers.

gitlab #33

Change-Id: Ieb76bf130b1baaed040ffff38aa950bc0461d7c9

5 years agoAllow adding adjustable length components in the middle of a pipe 37/3637/1
Marko Luukkainen [Thu, 28 Nov 2019 15:39:13 +0000 (17:39 +0200)]
Allow adding adjustable length components in the middle of a pipe

gitlab #26

Change-Id: Iafc06d7553984033a1e085866bf3f21536dd7e3c

5 years agoAllow repeated single clicks to activate property editing 36/3636/1
Reino Ruusu [Mon, 25 Nov 2019 11:51:50 +0000 (13:51 +0200)]
Allow repeated single clicks to activate property editing

gitlab #58

Change-Id: I34c98ec258b08e25cd2aa6305644437804a1cf94
(cherry picked from commit 32b0d23669bb57c4869ea4b761ae821892a14be5)

5 years agoReflection-based handling of Enum property editing. 29/3629/1
Reino Ruusu [Mon, 25 Nov 2019 11:50:14 +0000 (13:50 +0200)]
Reflection-based handling of Enum property editing.

gitlab #57

Change-Id: Ifab41fbf38d1e56b36fc561763ce9200cd18c358
(cherry picked from commit 2041d6564531fe794072ddfe345773de1cab60a3)

5 years agoAllow property tab contribution from all INodes. 28/3628/1
Reino Ruusu [Fri, 22 Nov 2019 10:40:17 +0000 (12:40 +0200)]
Allow property tab contribution from all INodes.

gitlab #56

Change-Id: If6e7bc5138f22378c700c4fb9b4104990a622023
(cherry picked from commit 488e24d71d14e60c7da3272e2428a0b23b57c87c)

5 years agoUp-to-date ontology class for Plant3D ontology 27/3627/1
Reino Ruusu [Fri, 22 Nov 2019 10:03:58 +0000 (12:03 +0200)]
Up-to-date ontology class for Plant3D ontology

Change-Id: I846a32fa0dadde3b6847dce280217dc5a29289ca
(cherry picked from commit 32d9fe9dcdb8a67a3fb422e721e3f73e18afc08c)

5 years agoAsk component rotation angle when adding components 57/3557/1
Marko Luukkainen [Mon, 18 Nov 2019 13:24:56 +0000 (15:24 +0200)]
Ask component rotation angle when adding components

gitlab #13

Change-Id: I13cbd9905fe6a0fa123375b44a88b15fe84067e7

5 years agoAdding specified equipment with nozzles did not work 56/3556/1
Marko Luukkainen [Mon, 18 Nov 2019 13:21:40 +0000 (15:21 +0200)]
Adding specified equipment with nozzles did not work

Constructor nozzle parameter was not stored...

gitlab #27

Change-Id: I4f353edaf1c6a33a6c2c6ce8b377c8b11d55b483

5 years agoMissing library URI from Equipment selection dialog parameters. 54/3554/1
Marko Luukkainen [Mon, 18 Nov 2019 11:40:11 +0000 (13:40 +0200)]
Missing library URI from Equipment selection dialog parameters.

gitlab #27

Change-Id: I306467532238c87293d1a9def905e475ec7d3c0a

5 years agoCreating equipment with predefined nozzles. 52/3552/1
Marko Luukkainen [Mon, 18 Nov 2019 11:27:16 +0000 (13:27 +0200)]
Creating equipment with predefined nozzles.

gitlab #27

Change-Id: I67d32b141c5c526d0215f5af3fd309d64962f49a

5 years agoPrevious change caused ClassCastExceptions. 33/3533/1
Marko Luukkainen [Fri, 15 Nov 2019 15:32:41 +0000 (17:32 +0200)]
Previous change caused ClassCastExceptions.

gitlab #26

Change-Id: I018a488b099be724828f636fe91e6d1e2903f3dc

5 years agoAdjust turn component radius with combo box (instead of index value) 31/3531/1
Marko Luukkainen [Fri, 15 Nov 2019 13:48:22 +0000 (15:48 +0200)]
Adjust turn component radius with combo box (instead of index value)

gitlab #43

Change-Id: I5e5c5193c73bbad93c3eaa12fc58f1bc3a0598b8

5 years agoCombo property support for annotated property tabs 29/3529/1
Marko Luukkainen [Fri, 15 Nov 2019 13:44:00 +0000 (15:44 +0200)]
Combo property support for annotated property tabs

gitlab #55

Change-Id: I4fde018ed47ccdc9f82e59bac51272ffebd8244b

5 years agoTag user modifiable length 27/3527/1
Marko Luukkainen [Fri, 15 Nov 2019 11:49:33 +0000 (13:49 +0200)]
Tag user modifiable length

With modifiable tag, we can ask for length parameter when we insert new
components

gitlab #26

Change-Id: Ic98a1b491bb8223d28bdca570af5fc792df3fe6c

5 years agoLoading VTK dlls with plug-in activator. 21/3521/1
Marko Luukkainen [Thu, 14 Nov 2019 15:38:15 +0000 (17:38 +0200)]
Loading VTK dlls with plug-in activator.

gitlab #50

Change-Id: Iae39a7d1e38e48156a532b5002b7c88edfa1d709

5 years agoEditor internal toolbar for Plant3D editor 12/3512/1
Marko Luukkainen [Tue, 12 Nov 2019 16:54:47 +0000 (18:54 +0200)]
Editor internal toolbar for Plant3D editor

gitlab #54

Change-Id: I68dece53eaad866e10d67e5920248c187a66b1ad
(cherry picked from commit 96b67feb92c117c72fb823b6fff5f89afa7ee631)

5 years agoRemoving components left orphan piperuns in the plant 07/3507/1
Marko Luukkainen [Tue, 12 Nov 2019 13:34:48 +0000 (15:34 +0200)]
Removing components left orphan piperuns in the plant

gitlab #35

Change-Id: I428a58bf4e817816f2bb02d00186b41fa40a0527
(cherry picked from commit 31fd8b586a816e12d85f361b3fe2f6ebd52e427b)

5 years agoMade plant3d_viewpoint.pgraph compatible with release/1.35.2 platform 05/3505/1
Tuukka Lehtonen [Tue, 12 Nov 2019 12:41:36 +0000 (14:41 +0200)]
Made plant3d_viewpoint.pgraph compatible with release/1.35.2 platform

gitlab #53

Change-Id: I13da3687439bf80bd185ba3dcedae0f4289ecf54

5 years agoRename of getSubPoint in PipeControlPoint in SCL 04/3504/1
Reino Ruusu [Tue, 12 Nov 2019 12:02:41 +0000 (14:02 +0200)]
Rename of getSubPoint in PipeControlPoint in SCL

Change-Id: Ib8d4728bfad6aabb84ef9cbfd999e6f5861c8c5a

5 years agoDisable outline page DEBUG option from product builds 03/3503/1
Tuukka Lehtonen [Tue, 12 Nov 2019 11:56:26 +0000 (13:56 +0200)]
Disable outline page DEBUG option from product builds

gitlab #53

Change-Id: I6d9fff240ed19ac0e5085dc2db0693cea3e32180

5 years agoUse FileLocator.toFileURL to get access to image files 02/3502/1
Marko Luukkainen [Tue, 12 Nov 2019 11:26:22 +0000 (13:26 +0200)]
Use FileLocator.toFileURL to get access to image files

gitlab #52

Change-Id: I307a0042b7131502452949d79005d24f198c4cca

5 years agoAllow PipeRun merges when diameters are the same 00/3500/1
Marko Luukkainen [Tue, 12 Nov 2019 09:31:48 +0000 (11:31 +0200)]
Allow PipeRun merges when diameters are the same

gitlab #43

Change-Id: I5f85b1abc62da4eff0790f77b42999fa4274a324

5 years agoPipeRun reverse action 97/3497/1
Marko Luukkainen [Mon, 11 Nov 2019 17:19:05 +0000 (19:19 +0200)]
PipeRun reverse action

gitlab #51

Change-Id: Ifcfbfec7f5ca964c50e23a303dc55c767b7ce877

5 years agoPipeCOntrolPoint setNext/setPrev/remove improved 96/3496/1
Marko Luukkainen [Mon, 11 Nov 2019 17:12:22 +0000 (19:12 +0200)]
PipeCOntrolPoint setNext/setPrev/remove improved

Mentioned methods can now handle size change / offset points directly.
Previous implementation could not handle two reducers connected to each
other.

gitlab #35

Change-Id: I817a4d75290b184f772965ff38c01b3e9ae61c64

5 years agoAdd back explicit loading of jawt.dll. 84/3484/1
Reino Ruusu [Fri, 8 Nov 2019 15:39:12 +0000 (17:39 +0200)]
Add back explicit loading of jawt.dll.

gitlab #50

Change-Id: Ib935f577ed121ee315509efc768489bf30038352

5 years agoReplace explicit AWT DLL loading with a class load of java.awt.Toolkit. 83/3483/1
Reino Ruusu [Fri, 8 Nov 2019 14:20:04 +0000 (16:20 +0200)]
Replace explicit AWT DLL loading with a class load of java.awt.Toolkit.

gitlab #50

Change-Id: Ib0bd5c507b2e3485264121f7fdf9a578bfef2c0a

5 years agoAdd awt.dll and jawt.dll as dependencies for VTK libraries. 75/3475/1
Reino Ruusu [Thu, 7 Nov 2019 14:57:45 +0000 (16:57 +0200)]
Add awt.dll and jawt.dll as dependencies for VTK libraries.

gitlab #50

Change-Id: Ibaa2dfddc97c7b21901ea6b147faa8fafc1d3fb6

5 years agoEclipse-BundleShape tags to binary bundle manifests. 66/3466/1
Reino Ruusu [Thu, 7 Nov 2019 11:54:47 +0000 (13:54 +0200)]
Eclipse-BundleShape tags to binary bundle manifests.

Change-Id: I0b081d6a8e3548ccb07ae00a649796f6d3571509

5 years agoAdded missing binaries from vtk feature to build.properties. 65/3465/1
Reino Ruusu [Thu, 7 Nov 2019 11:13:52 +0000 (13:13 +0200)]
Added missing binaries from vtk feature to build.properties.

Change-Id: I294d1f1c7dca5e28fe7b3bb199c0c7448219130e

5 years agoUpdates to SCL interfaces 61/3461/1
Reino Ruusu [Wed, 6 Nov 2019 13:07:58 +0000 (15:07 +0200)]
Updates to SCL interfaces

refs #28

Change-Id: I94aa6a565b16237d5a9b9f9e36f4f2f38cfa0d71

5 years agoCompiler warning elimination 60/3460/1
Reino Ruusu [Wed, 6 Nov 2019 13:07:21 +0000 (15:07 +0200)]
Compiler warning elimination

Switch Java 1.6 with 1.8
Disable Java nature in pure binary bundles

Change-Id: I47d0344ffe9c2a924f2a4a72fae6cfd478bee121

5 years agoUse IMapping<Resource,INode> in node maps. 59/3459/1
Reino Ruusu [Wed, 6 Nov 2019 12:18:57 +0000 (14:18 +0200)]
Use IMapping<Resource,INode> in node maps.

Change-Id: Ibb4441e5e4e358af9564610c58e00458ff0338de

5 years agoAccess to mapping between object and resources via P3DRootNode 58/3458/1
Reino Ruusu [Wed, 6 Nov 2019 10:53:38 +0000 (12:53 +0200)]
Access to mapping between object and resources via P3DRootNode

gitlab #48

Change-Id: I8fd2a6c0adbce3a1b6cc8e7e3055b9023de009ba

5 years agoAdd a "Properties" tab to selection view for pipeline components. 57/3457/1
Reino Ruusu [Wed, 6 Nov 2019 10:51:14 +0000 (12:51 +0200)]
Add a "Properties" tab to selection view for pipeline components.

refs #49

Change-Id: Id61d4186f8a33e33308adaf0d262130c0e6c5ddd

5 years agoCheck for null values in property manipulators 56/3456/1
Reino Ruusu [Wed, 6 Nov 2019 10:49:33 +0000 (12:49 +0200)]
Check for null values in property manipulators

Change-Id: Id075b3cdce3483c14257e0949ed898670c82b42e

5 years agoFix parallel perspective toggle to keep view direction 53/3453/1
Marko Luukkainen [Tue, 5 Nov 2019 17:06:12 +0000 (19:06 +0200)]
Fix parallel perspective toggle to keep view direction

gitlab #47

Change-Id: Ie30f8b117c085870703599ebe0a0928f6aa31e7b

5 years agoDisabling branch creation prevented connections 52/3452/1
Marko Luukkainen [Tue, 5 Nov 2019 16:35:20 +0000 (18:35 +0200)]
Disabling branch creation prevented connections

Additionally, if connected pipes are not aligned, they are connected
with turn component.

gitlab #36

Change-Id: If6040fe024187fbed464faacd93ad8b677bb6a4f

5 years agoNode listeners were removed too soon. 51/3451/1
Marko Luukkainen [Tue, 5 Nov 2019 14:28:18 +0000 (16:28 +0200)]
Node listeners were removed too soon.

Listener removal caused PipeRun splits to fail synchronization to DB.

As a precaution, now nodeAdded and nodeRemoved will synchronize both
parent and and actual node (previously only parent node was
synchronized).

gitlab #35

Change-Id: I34a105cc91b8b720a48a166288610debc10a3b84

5 years agoCalculating turn specific coordinates 50/3450/1
Marko Luukkainen [Tue, 5 Nov 2019 07:43:25 +0000 (09:43 +0200)]
Calculating turn specific coordinates

gitlab #29

Change-Id: I9586a8a2aa26a8ec9f8bb3217639c893726980da

5 years agoPipe routing could temporarily lose straight connected to start turn 49/3449/1
Marko Luukkainen [Tue, 5 Nov 2019 07:42:41 +0000 (09:42 +0200)]
Pipe routing could temporarily lose straight connected to start turn

gitlab #36

Change-Id: I8109b6d72d46a7033507a8be0e0bdf763af7ee6f

5 years agoAllow pipe routing to bypass locked variable angle routing direction 48/3448/1
Marko Luukkainen [Mon, 4 Nov 2019 17:31:38 +0000 (19:31 +0200)]
Allow pipe routing to bypass locked variable angle routing direction

gitlab #46

Change-Id: Id51a13a6011427c2e05e34ec23ae237bb356708b

5 years agoConvert variable angle turn turn to fixed angle 47/3447/1
Marko Luukkainen [Mon, 4 Nov 2019 16:38:39 +0000 (18:38 +0200)]
Convert variable angle turn turn to fixed angle

When we remove a component next to a variable angle turn, the turn must
be converted to (temporary) fixed angle component.

gitlab #46

Change-Id: I118fad68739531692a4d2e00d4d025e981369837

5 years agoFixed variable angle turns when they are not connected 43/3443/1
Marko Luukkainen [Mon, 4 Nov 2019 12:36:21 +0000 (14:36 +0200)]
Fixed variable angle turns when they are not connected

Now unconnected variable angle turns behave like fixed angle turns until
they are connected from both sides.

Additionally, added default parameter loading for geometry provides so
that they get proper initial values.

gitlab #46

Change-Id: Id7dede974fcfc69370930dba01d5a87091be671d

5 years agoTurn index validation prevents model loading 42/3442/1
Marko Luukkainen [Fri, 1 Nov 2019 15:50:32 +0000 (17:50 +0200)]
Turn index validation prevents model loading

gitlab #43

Change-Id: Id4b63712dce331dc35efb7952a89874669a574d0

5 years agoFocus action 41/3441/1
Marko Luukkainen [Fri, 1 Nov 2019 15:49:41 +0000 (17:49 +0200)]
Focus action

gitlab #45

Change-Id: Ic8439e3582c9759534a224d1aba6563707b2988b

5 years agoAllow multiple radii for turns. 40/3440/1
Marko Luukkainen [Fri, 1 Nov 2019 13:09:15 +0000 (15:09 +0200)]
Allow multiple radii for turns.

Now PipeRun turnRadius is an double array. TurnComponents contain
turnRadiusIndex, which then picks specific radius for the turn.

This change also contains minor refactoring for NodeMap implementations

gitlab #43

Change-Id: I626a641135b5eff5819ce74288366ac0d9199ab8

5 years agoDouble array properties 39/3439/1
Marko Luukkainen [Fri, 1 Nov 2019 13:04:58 +0000 (15:04 +0200)]
Double array properties

gitlab #44

Change-Id: I51188808ae8aafa47030716e839bc22497c947c7

5 years agoGeneric listener interfaces 38/3438/1
Marko Luukkainen [Fri, 1 Nov 2019 08:27:15 +0000 (10:27 +0200)]
Generic listener interfaces

gitlab #29

Change-Id: Ia23e9223d76b0d942dd0738df77fe31cb5729ff1

5 years agoUse INode instead of IG3DNode in selections 36/3436/2
Marko Luukkainen [Thu, 31 Oct 2019 15:15:52 +0000 (17:15 +0200)]
Use INode instead of IG3DNode in selections

g3d.vtk plug-in upgraded to Java 1.8.

gitlab #29

Change-Id: I2ef5f1da94b1c026b0af53029803765e68fd9b29

5 years agoMerge changes Ic491c642,Ibd66115e
Marko Luukkainen [Wed, 30 Oct 2019 14:48:48 +0000 (14:48 +0000)]
Merge changes Ic491c642,Ibd66115e

* changes:
  Refactoring of SCLUtil to allow customization
  Update to SCL intefaces of P3DUtil

5 years agoMerge "Allow Pipe Routing to be created without branch support"
Marko Luukkainen [Wed, 30 Oct 2019 14:48:30 +0000 (14:48 +0000)]
Merge "Allow Pipe Routing to be created without branch support"

5 years agoMerge "Use ListenerList with G3D nodes"
Marko Luukkainen [Wed, 30 Oct 2019 14:48:22 +0000 (14:48 +0000)]
Merge "Use ListenerList with G3D nodes"

5 years agoAllow Pipe Routing to be created without branch support 28/3428/2
Marko Luukkainen [Wed, 30 Oct 2019 14:16:14 +0000 (16:16 +0200)]
Allow Pipe Routing to be created without branch support

Additionally, re-using pipe routing for translating free ends.

gitlab #36

Change-Id: Ife8fc5ca4e5bae505bb95c488c3e2d263a29a188

5 years agoRefactoring of SCLUtil to allow customization 27/3427/1
Reino Ruusu [Wed, 30 Oct 2019 13:53:09 +0000 (15:53 +0200)]
Refactoring of SCLUtil to allow customization

Change-Id: Ic491c6424b96c53da35ac61fb1ace9239047bb3b

5 years agoUpdate to SCL intefaces of P3DUtil 26/3426/1
Reino Ruusu [Wed, 30 Oct 2019 12:29:50 +0000 (14:29 +0200)]
Update to SCL intefaces of P3DUtil

gitlab #29

Change-Id: Ibd66115eb9d3570ea2120eeb40c480cb0627b58f

5 years agoUse ListenerList with G3D nodes 22/3422/1
Marko Luukkainen [Tue, 29 Oct 2019 15:59:50 +0000 (17:59 +0200)]
Use ListenerList with G3D nodes

gitlab #42

Change-Id: I9ba6f84592c4122467608d72b45be592e259c0b2

5 years agoMerge "Use generics type variable for mapping db object."
Marko Luukkainen [Tue, 29 Oct 2019 13:42:30 +0000 (13:42 +0000)]
Merge "Use generics type variable for mapping db object."

5 years agoUse generics type variable for mapping db object. 20/3420/1
Marko Luukkainen [Tue, 29 Oct 2019 13:39:29 +0000 (15:39 +0200)]
Use generics type variable for mapping db object.

gitlab #41

Change-Id: I59d5e8bf979ed70808cba17d447c7288599b2c66

5 years agoMerge changes Ifcee2c16,Ifd0977dc
Marko Luukkainen [Tue, 29 Oct 2019 12:13:49 +0000 (12:13 +0000)]
Merge changes Ifcee2c16,Ifd0977dc

* changes:
  Allow setSelection from other components
  Prevent Tube shape failing with provided tangents.

5 years agoAllow setSelection from other components 19/3419/1
Marko Luukkainen [Tue, 29 Oct 2019 12:04:06 +0000 (14:04 +0200)]
Allow setSelection from other components

Additionally, allow other components to utilize node highlight method

gitlab #29

Change-Id: Ifcee2c1691456f389c8460b50cf1235c3750ac42

5 years agoPrevent Tube shape failing with provided tangents. 18/3418/1
Marko Luukkainen [Tue, 29 Oct 2019 12:01:58 +0000 (14:01 +0200)]
Prevent Tube shape failing with provided tangents.

gitlab #40

Change-Id: Ifd0977dc38885e5fbc6d5470dba6f16fd5a53a5b

5 years agoMerge "Updated Plant3D ontology class"
Marko Luukkainen [Fri, 25 Oct 2019 14:54:03 +0000 (14:54 +0000)]
Merge "Updated Plant3D ontology class"

5 years agoMerge "Add calls to finalizeDBLoad2 into SCLUtil method."
Marko Luukkainen [Fri, 25 Oct 2019 14:53:58 +0000 (14:53 +0000)]
Merge "Add calls to finalizeDBLoad2 into SCLUtil method."

5 years agoMerge "Equipment/Component library customization requires proper preloading."
Marko Luukkainen [Fri, 25 Oct 2019 14:53:15 +0000 (14:53 +0000)]
Merge "Equipment/Component library customization requires proper preloading."

5 years agoMerge "Adjustable length inline components"
Marko Luukkainen [Fri, 25 Oct 2019 14:53:07 +0000 (14:53 +0000)]
Merge "Adjustable length inline components"

5 years agoUpdated Plant3D ontology class 15/3415/1
Reino Ruusu [Fri, 25 Oct 2019 14:44:51 +0000 (17:44 +0300)]
Updated Plant3D ontology class

Due to ontology modification in
If023250f7762fcd7bc113fec462f285184bf9608

gitlab #29

Change-Id: I299c381f8eee85e65a6d0f70f7e2eb8860789832

5 years agoAdd calls to finalizeDBLoad2 into SCLUtil method. 14/3414/1
Reino Ruusu [Fri, 25 Oct 2019 14:42:56 +0000 (17:42 +0300)]
Add calls to finalizeDBLoad2 into SCLUtil method.

gitlab #35

Change-Id: Iec99d89eb06d3dbfc9ff9b7e5926b945db22840c

5 years agoEquipment/Component library customization requires proper preloading. 13/3413/1
Marko Luukkainen [Fri, 25 Oct 2019 14:32:58 +0000 (17:32 +0300)]
Equipment/Component library customization requires proper preloading.

Without preloaded components/control points, ObjMap is not able load the
data (causes nested read transaction)

Change-Id: I07b7a0f3500cc9b2a843441f10779316be6a4b70

5 years agoAdjustable length inline components 12/3412/1
Marko Luukkainen [Fri, 25 Oct 2019 14:31:00 +0000 (17:31 +0300)]
Adjustable length inline components

gitlab #29

Change-Id: I41122a7dcf2ad4d04441b6eb44abf5f4c9118a8a

5 years agoMerge "Equipment/Component library customization"
Marko Luukkainen [Fri, 25 Oct 2019 12:57:10 +0000 (12:57 +0000)]
Merge "Equipment/Component library customization"

5 years agoEquipment/Component library customization 10/3410/2
Marko Luukkainen [Fri, 25 Oct 2019 12:49:06 +0000 (15:49 +0300)]
Equipment/Component library customization

gitlab #29

Change-Id: If023250f7762fcd7bc113fec462f285184bf9608

5 years agoInclude org.simantics.plant3d.modeling.feature in published p2 site 09/3409/1
Tuukka Lehtonen [Fri, 25 Oct 2019 07:55:58 +0000 (10:55 +0300)]
Include org.simantics.plant3d.modeling.feature in published p2 site

gitlab #39

Change-Id: Ifeb59094e2791bb038a825fef2414c66e9322ea2

5 years agoRun piping rules for all added components when closing pipe routing 08/3408/1
Marko Luukkainen [Thu, 24 Oct 2019 14:17:02 +0000 (17:17 +0300)]
Run piping rules for all added components when closing pipe routing

This should reduce the amount of unsynchronised changes

gitlab #35

Change-Id: I5834089a3f7d0e150e46d6cb6b8f53d058ef7ec8

5 years agoData corruption on editor startup. 07/3407/1
Marko Luukkainen [Thu, 24 Oct 2019 13:30:42 +0000 (16:30 +0300)]
Data corruption on editor startup.

PipingRules were executed "silently" on editor startup. If rules changed
pipeline structure, these changes were never reflected to DB, causing
mismatch between DB and pipeline Java objects.

gitlab #35

Change-Id: I62de99c1465bbb3658e9d2a52617b7a8778523b6

5 years agoValidate plant structure on DB write to prevent corruption 06/3406/1
Marko Luukkainen [Thu, 24 Oct 2019 11:29:46 +0000 (14:29 +0300)]
Validate plant structure on DB write to prevent corruption

gitlab #35

Change-Id: Ibea2a0fa90fcc4c3a39ac2ced7b85e69f5bceaeb

5 years agoMake snap point highlight more visible 05/3405/1
Marko Luukkainen [Thu, 24 Oct 2019 10:34:31 +0000 (13:34 +0300)]
Make snap point highlight more visible

gitlab #32

Change-Id: I12052a8dcd77f30a717aca4ea110f15cc3ce8acb

5 years agoPiping rules seemed to be executed while editor was loading data 04/3404/1
Marko Luukkainen [Thu, 24 Oct 2019 10:26:52 +0000 (13:26 +0300)]
Piping rules seemed to be executed while editor was loading data

gitlab #35

Change-Id: Iff74082d21753d391017be1742db836c35075d5f

5 years agoHighlight constrain points 96/3396/1
Marko Luukkainen [Wed, 23 Oct 2019 15:52:06 +0000 (18:52 +0300)]
Highlight constrain points

gitlab #32

Change-Id: I6e2d36c9ac08040da8a46a67a85bc5a216a1cb08

5 years agoMerge "Up-to-date resource classes"
Marko Luukkainen [Wed, 23 Oct 2019 14:31:20 +0000 (14:31 +0000)]
Merge "Up-to-date resource classes"

5 years agoFilter conflicting changes (deleted + added at the same time) 95/3395/1
Marko Luukkainen [Wed, 23 Oct 2019 14:28:09 +0000 (17:28 +0300)]
Filter conflicting changes (deleted + added at the same time)

gitlab #35

Change-Id: I90278469f0052b367b326a2ff495ae00c20aa12b

5 years agoOverriding selection and hover highlights 93/3393/1
Marko Luukkainen [Wed, 23 Oct 2019 11:34:31 +0000 (14:34 +0300)]
Overriding selection and hover highlights

Additionally changed VTKSelectionItem equals to handle different Objects
/ Resources with the same vtkProp.

gitlab #29

Change-Id: I305ff007bd48660d736b1abd01ca183075ba8b88

5 years agoCustomise camera and selector action 92/3392/1
Marko Luukkainen [Wed, 23 Oct 2019 07:42:56 +0000 (10:42 +0300)]
Customise camera and selector action

gitlab #29

Change-Id: I5bc9d1511c3a3f714b38888a32861de712aa8a2e

5 years agoRemove old g3d toolbar implementation. 91/3391/1
Marko Luukkainen [Wed, 23 Oct 2019 07:41:50 +0000 (10:41 +0300)]
Remove old g3d toolbar implementation.

Current implementation is simantics.ui.toolbar

gitlab #38

Change-Id: I3ff0671f5e074d91bac5b4ef160dc7daaef092c8

5 years agoUse simantics.toolbar with Plant3D 90/3390/1
Marko Luukkainen [Tue, 22 Oct 2019 13:07:31 +0000 (16:07 +0300)]
Use simantics.toolbar with Plant3D

gitlab #38

Change-Id: Ib361bdc47ec9680dc4e6d8b264dad32a514f42f3

5 years agoArcCylinder with custom start angle 89/3389/1
Marko Luukkainen [Tue, 22 Oct 2019 11:16:41 +0000 (14:16 +0300)]
ArcCylinder with custom start angle

gitlab #10

Change-Id: Ica933203d05073499f1ab46c3f4a92041b1106d6

5 years agoSet correct transformation for vtk objects when they are created 88/3388/1
Marko Luukkainen [Mon, 21 Oct 2019 13:38:54 +0000 (16:38 +0300)]
Set correct transformation for vtk objects when they are created

gitlab #37

Change-Id: I2750cea2dde97cc86620289e42dbeff22027a2df

5 years agoPrevent too narrow angle branched during pipe routing 70/3370/1
Marko Luukkainen [Fri, 18 Oct 2019 12:51:59 +0000 (15:51 +0300)]
Prevent too narrow angle branched during pipe routing

gitlab #36

Change-Id: Iffeb64d62cae7f325054e1be21cc499ad144d3bc

5 years agoSynchronizing connected objects did not send events. 69/3369/1
Marko Luukkainen [Fri, 18 Oct 2019 12:22:20 +0000 (15:22 +0300)]
Synchronizing connected objects did not send events.

Without events, removing a component left connection relations to the
DB, which then caused problems with undo handling, and corruption of
component structure.

gitlab #35

Change-Id: I1e67df0db3fcdc71c5191411e2e93d9df18791cf

5 years agoRemoving straight next to branch point did not properly remove branch 67/3367/1
Marko Luukkainen [Fri, 18 Oct 2019 10:28:28 +0000 (13:28 +0300)]
Removing straight next to branch point did not properly remove branch

gitlab #35

Change-Id: I7d5be95dc81bda7b1d7d72f1c26c298eb368c02e

5 years agoAdapters.xml change missing from Flat Nozzle support 66/3366/1
Marko Luukkainen [Fri, 18 Oct 2019 10:23:51 +0000 (13:23 +0300)]
Adapters.xml change missing from Flat Nozzle support

gitlab #34

Change-Id: I10ab35118eff9a5ef8652f570a4308a1c6d7af8b

5 years agoUp-to-date resource classes 65/3365/1
Reino Ruusu [Fri, 18 Oct 2019 09:28:40 +0000 (12:28 +0300)]
Up-to-date resource classes

CSG and G3D got included in the recent white space clean-up.
Plant3D was not committed in the latest ontology modification in
c44f3e6.

Change-Id: I12d4b923ae264ae574595d9765cfc0e424896cc2

5 years agoFlat nozzles 60/3360/1
Marko Luukkainen [Thu, 17 Oct 2019 13:50:31 +0000 (16:50 +0300)]
Flat nozzles

gitlab #34

Change-Id: Iba887aef0a3abb9528d02c5c8a0321050700278f

5 years agoPiping Rules moved turns next nozzle when they were misaligned 59/3359/1
Marko Luukkainen [Thu, 17 Oct 2019 12:14:04 +0000 (15:14 +0300)]
Piping Rules moved turns next nozzle when they were misaligned

Cutoff range was 1.0m, turns closer than that were moved next to nozzle.

gitlab #14

Change-Id: Icfc20ab6f78aa2d70635c608deaf8354a22de802

5 years agoRemove/Split action removes pipeline components without reconnecting 58/3358/2
Marko Luukkainen [Thu, 17 Oct 2019 11:25:45 +0000 (14:25 +0300)]
Remove/Split action removes pipeline components without reconnecting

gitlab #33

Change-Id: I9bd2df03b9d4f4b8abea03c15e22dcce39fb70bb

5 years agoConstraintDetector / Snapping tool for pipeline routing 47/3347/2
Marko Luukkainen [Wed, 16 Oct 2019 15:51:50 +0000 (18:51 +0300)]
ConstraintDetector / Snapping tool for pipeline routing

gitlab #32

Change-Id: I4c5304bc481eedfe853ffbfd2b2157397c52e920