]> gerrit.simantics Code Review - simantics/3d.git/log
simantics/3d.git
4 years agoFix component add with overlapping setting 16/3116/1
Marko Luukkainen [Mon, 19 Aug 2019 11:05:00 +0000 (14:05 +0300)]
Fix component add with overlapping setting

gitlab #26

Change-Id: Ib510633edd933d0def918e0af996cb6f56986876

4 years agoSafe SCL cast for Java objects 14/3114/2
Marko Luukkainen [Mon, 19 Aug 2019 06:08:46 +0000 (09:08 +0300)]
Safe SCL cast for Java objects

gitlab #28

Change-Id: I7e8fa4b9bfc6bf3803c8dbfb5c65eb2d631a968b

4 years agoAdditional SCL Bindings to G3D and Plant3D classes 11/3111/1
Marko Luukkainen [Fri, 16 Aug 2019 12:43:24 +0000 (15:43 +0300)]
Additional SCL Bindings to G3D and Plant3D classes

gitlab #28

Change-Id: I1f3b29cd84ac60a16c58736ddae31792393a08ec

4 years agoSCL bindings to some G3D and Plant3D Java classes 10/3110/1
Marko Luukkainen [Thu, 15 Aug 2019 14:01:36 +0000 (17:01 +0300)]
SCL bindings to some G3D and Plant3D Java classes

gitlab #28

Change-Id: Ide08db8b186645096e50739c6e49d65b2585d627

4 years agoFirst version of fixed nozzle positions 07/3107/1
Marko Luukkainen [Thu, 15 Aug 2019 09:16:39 +0000 (12:16 +0300)]
First version of fixed nozzle positions

Fixed nozzles are not added to equipment automatically.

gitlab #27

Change-Id: I675bee1132131fd9033f9054ea654c33ab60ffc6

4 years agoFix NPE in branch point synchronization 06/3106/1
Marko Luukkainen [Thu, 15 Aug 2019 07:10:47 +0000 (10:10 +0300)]
Fix NPE in branch point synchronization

gitlab #24

Change-Id: Ibd0641bde997d1ddb454c1b596aec04b583a4807

4 years agoSimplified free ended variable length component update 04/3104/1
Marko Luukkainen [Wed, 14 Aug 2019 15:19:00 +0000 (18:19 +0300)]
Simplified free ended variable length component update

* Previous code was combined with route pipe action, which did not take
account spaced reserved by previous turn component.
* The update code caused undo/redo synchronization issues, since it
altered intended position of the control point

gitlab #24
gitlab #26

Change-Id: I89c7bbc608e7900f0b18b33ce1e390c5469cf0bd

4 years agoMore precise position selection for add component action 03/3103/1
Marko Luukkainen [Wed, 14 Aug 2019 10:42:15 +0000 (13:42 +0300)]
More precise position selection for add component action

When we are adding variable length component or the component where we
are inserting is variable length, we can shorten the variable length
component based on user input.

gitlab #26

Change-Id: I0ec9d3ff86497b109aa8a8320fb6476db897afd5

4 years agoAdd component did not work properly for nozzles. 99/3099/1
Marko Luukkainen [Tue, 13 Aug 2019 15:49:37 +0000 (18:49 +0300)]
Add component did not work properly for nozzles.

gitlab #25

Change-Id: Ib176f957a256a396d59d096d8d8246fe334d9756

4 years agoShow components in connected order in outline with debug mode 98/3098/1
Marko Luukkainen [Tue, 13 Aug 2019 15:45:24 +0000 (18:45 +0300)]
Show components in connected order in outline with debug mode

gitlab #19

Change-Id: I9a82db4e4a91ea3fb2b3279431c3867e6b0ddd57

4 years agoAdditional fix to control point synchronization 97/3097/1
Marko Luukkainen [Tue, 13 Aug 2019 15:29:02 +0000 (18:29 +0300)]
Additional fix to control point synchronization

gitlab #24

Change-Id: Id0fdaceeafc95495ad7ae7365f44214903b47bea

4 years agoClear removed objects from mapping cache 96/3096/1
Marko Luukkainen [Tue, 13 Aug 2019 13:52:55 +0000 (16:52 +0300)]
Clear removed objects from mapping cache

* Using undo/redo caused mapping cache to return already removed
objects, which caused bookkeeping issues.
* PipeControlPoints structure is now more resilient to random order of
graph side changes.

gitlab #24

Change-Id: Ia3e00f116bb86be3ef4472a646058842d1c28c27

4 years agoMark undo pints when committing changes to the graph 93/3093/2
Marko Luukkainen [Mon, 12 Aug 2019 10:03:28 +0000 (13:03 +0300)]
Mark undo pints when committing changes to the graph

gitlab #24

Change-Id: I7f3a3a7501acf93b5ffc6e0a92e00fbe5ba38827

4 years agoSupport for fixed turn components 92/3092/1
Marko Luukkainen [Mon, 12 Aug 2019 09:26:46 +0000 (12:26 +0300)]
Support for fixed turn components

gitlab #23

Change-Id: Idfee9d27e1209748199446734f94988e0f7d0e71

4 years agoHiDPI fixes 87/3087/1
Marko Luukkainen [Fri, 9 Aug 2019 14:27:58 +0000 (17:27 +0300)]
HiDPI fixes

gitlab #22

Change-Id: Ib6589309b5b1d9ce3d9f1f369803b262df04ae76

4 years agoImplemented mouse wheel zoom in camera and selector action 78/3078/1
Marko Luukkainen [Thu, 8 Aug 2019 12:30:23 +0000 (15:30 +0300)]
Implemented mouse wheel zoom in camera and selector action

* Previously mouse wheel zoom was done in native interactor, which
bypassed InteractiveVtkComposite render listener mechanism

gitlab #21

Change-Id: Ia22d34617dd9ef741b338b52343fb85e7b43d406

4 years agoVarious fixes to vtk swt components 68/3068/1
Marko Luukkainen [Wed, 7 Aug 2019 15:15:12 +0000 (18:15 +0300)]
Various fixes to vtk swt components

* Delete objects to prevent memory leaks
* Added additional logic to SWT->AWT event conversion

gitlab #22

Change-Id: I2ad4b61171cb7a97475196a9a3afc3130771f04c

4 years agoUsing SWT thread with Plant3d 67/3067/5
Marko Luukkainen [Wed, 7 Aug 2019 14:46:11 +0000 (17:46 +0300)]
Using SWT thread with Plant3d

gitlab #21

Change-Id: I15483236ec95a4e41622c71db182e0a2d6bbaaac

4 years agoInclude CSG modelling with Plant3D 65/3065/1
Marko Luukkainen [Tue, 6 Aug 2019 09:46:44 +0000 (12:46 +0300)]
Include CSG modelling with Plant3D

gitlab #20

Change-Id: I2e2da1579d4982abfe08c9548f9f335ba3353110

4 years agoOutline view is able to show control points with debugging mode 64/3064/1
Marko Luukkainen [Tue, 6 Aug 2019 09:40:35 +0000 (12:40 +0300)]
Outline view is able to show control points with debugging mode

gitlab #19

Change-Id: Ice5ba0c5a8d14c33fe8283e6d1d52cf3e09496da

4 years agoFix cap typing. 61/3061/1
Marko Luukkainen [Mon, 5 Aug 2019 13:26:38 +0000 (16:26 +0300)]
Fix cap typing.

Additionally, fixed a NPE when user clicks empty space in component
selection dialog.

gitlab #18

Change-Id: If30d7f51bcaeadf2f6643055e656817f36a3a432

4 years agoDisable in-line translate for variable length components 60/3060/1
Marko Luukkainen [Mon, 5 Aug 2019 13:18:09 +0000 (16:18 +0300)]
Disable in-line translate for variable length components

gitlab #17

Change-Id: I587c5f1af80db32e237adf628bf70d446d432781

4 years agoSupport for reversible in-line components 59/3059/1
Marko Luukkainen [Mon, 5 Aug 2019 12:32:55 +0000 (15:32 +0300)]
Support for reversible in-line components

gitlab #13

Change-Id: I2348320a5bba2b8d86b7a0bcc118d85f81023186

4 years agoTranslate action for inline components 58/3058/1
Marko Luukkainen [Mon, 5 Aug 2019 11:29:58 +0000 (14:29 +0300)]
Translate action for inline components

gitlab #14

Change-Id: I4f051a585288130479049490337c0c46c1803c3f

4 years agoIAdaptable interface / Class is parameterised 33/3033/1
Marko Luukkainen [Thu, 18 Jul 2019 14:55:34 +0000 (17:55 +0300)]
IAdaptable interface / Class is parameterised

gitlab #16

Change-Id: I4f8c25790d3d0dc39726efda82abe8734552e0d1

4 years agoCheck parameter inputs in geometry providers. 32/3032/1
Marko Luukkainen [Thu, 18 Jul 2019 14:50:36 +0000 (17:50 +0300)]
Check parameter inputs in geometry providers.

gitlab #15

Change-Id: Ib891e910c7a78d1d4f9e6ff8ca1bad137e3ff95d

4 years agoUse path leg end point check for offset legs 31/3031/1
Marko Luukkainen [Thu, 18 Jul 2019 14:47:22 +0000 (17:47 +0300)]
Use path leg end point check for offset legs

gitlab #14

Change-Id: Ibd35af89a21e2c6bf188b740f68c685e12f6c39e

4 years agoHandle variable length components on offset path leg 29/3029/1
Marko Luukkainen [Thu, 18 Jul 2019 13:14:09 +0000 (16:14 +0300)]
Handle variable length components on offset path leg

* Offset path leg update may now insert a straight, if there is
available space
* Inline component update could add and remove control points without
updating update struct.
* Removing pipe control point had cyclic dependency to itself (through
component)

gitlab #12

Change-Id: I27e9385cda3077dd1f3e16f7bfbd0015352d98fd

4 years agoUse a bit darker grey color for elbows 27/3027/1
Marko Luukkainen [Wed, 17 Jul 2019 16:03:20 +0000 (19:03 +0300)]
Use a bit darker grey color for elbows

gitlab #10

Change-Id: I40fce24e14ebceb7a74fe88c52381bce725757d6

4 years agoChanged inline component update to take account required space 26/3026/1
Marko Luukkainen [Wed, 17 Jul 2019 16:02:06 +0000 (19:02 +0300)]
Changed inline component update to take account required space

gitlab #14

Change-Id: Ia0085d15647c666fd2a6802a9490a7f8e3f3d95b

4 years agoRotating eccentric reducer did not update elbows on the same leg 25/3025/1
Marko Luukkainen [Wed, 17 Jul 2019 09:03:26 +0000 (12:03 +0300)]
Rotating eccentric reducer did not update elbows on the same leg

gitlab #12

Change-Id: I81392a1c6d2644f6b7d7c5c336a9e870582380be

4 years agoPrevent editing null values 24/3024/1
Marko Luukkainen [Wed, 17 Jul 2019 09:01:48 +0000 (12:01 +0300)]
Prevent editing null values

* This is a temporary solution for Inline components that do not support
rotation

gitlab #13

Change-Id: Ibd948a2537a63c9775726a5b5bbe6a6d06c5f505

4 years agoFixed path leg direction vector calculation 23/3023/1
Marko Luukkainen [Tue, 16 Jul 2019 17:34:13 +0000 (20:34 +0300)]
Fixed path leg direction vector calculation

* Calculated direction was opposite to the actual direction

gitlab #12

Change-Id: I8ea135f3cec5a0d80e42c9a2d9ecb626fb4f11a5

4 years agoSupport for inline component rotations 22/3022/1
Marko Luukkainen [Tue, 16 Jul 2019 16:25:00 +0000 (19:25 +0300)]
Support for inline component rotations

* P3D.RotateComponent tag
* P3D.HasRotationAngle property relation
* PipeControlPoint rotate flag
* InlineComponent get/set RotationAngle methods
* Gate Valve inline component for testing the feature

gitlab #13

Change-Id: I2a1fb87a5de312d2870189b0e81791feeec1f652

4 years agoSupport for fillets and chamfers 21/3021/1
Marko Luukkainen [Tue, 16 Jul 2019 16:07:54 +0000 (19:07 +0300)]
Support for fillets and chamfers

gitlab #9

Change-Id: I69c0ec1c538d9eb2dfa83c8f88bf6a0faa881fb8

4 years agoTurn component calculation with offset vector fixed 20/3020/1
Marko Luukkainen [Tue, 16 Jul 2019 12:28:11 +0000 (15:28 +0300)]
Turn component calculation with offset vector fixed

gitlab #12

Change-Id: Iac7b2676a2f189db135f81fe24420912f994bf9b

4 years agoAdded support for eccentric reducers 19/3019/1
Marko Luukkainen [Tue, 16 Jul 2019 10:50:28 +0000 (13:50 +0300)]
Added support for eccentric reducers

* Various fixes to PipingRules
* At the moment, offset calculation is hard-coded. (Introduced component
calculated offset, but that has not been tested)
* AddComponentAction is able to place components in proper location
after reducer
* Reducer uses custom mesh

gitlab #12
gitlab #10

Change-Id: I62fdd4df5acc9e8e02823d36b738b48f70f56ac4

4 years agoChanged Check Valve to point flow (pipeline definition) direction 18/3018/1
Marko Luukkainen [Tue, 16 Jul 2019 10:39:34 +0000 (13:39 +0300)]
Changed Check Valve to point flow (pipeline definition) direction

gitlab #11

Change-Id: I018782d579a0a5159dd1e412860fe461a2503ce1

4 years agoCreated Mesh API for Plant3D objects 17/3017/1
Marko Luukkainen [Mon, 15 Jul 2019 13:28:38 +0000 (16:28 +0300)]
Created Mesh API for Plant3D objects

* Replaced OCCT-based geometries for Straight and Elbow.
* MeshActor is able to bypass mesh normals to VTK

gitlab #10

Change-Id: Ib201d29802921df35a5fa88da922e8265b54df7c

4 years agoFix PNG loading 16/3016/1
Marko Luukkainen [Fri, 12 Jul 2019 12:34:39 +0000 (15:34 +0300)]
Fix PNG loading

* Added vtkIOImage to native libraries

gitlab #2

Change-Id: I80e7133eeacee4d260985afca6a8a80a52087d2f

4 years agoUpdated OpenCASCADE to 7.3.0 07/3007/4
Marko Luukkainen [Fri, 5 Jul 2019 14:17:19 +0000 (17:17 +0300)]
Updated OpenCASCADE to 7.3.0

There are some unresolved issues with:
* Handle_Geom_Geometry casting (added untested downcast() methods)
* Handle_StepData_StepModel cannot be found (disabled STEP export)

Tested the change with Plant3D and CSG. HorizontalTank geometry required
some changes.

Change-Id: I3fd4038572e9d63e2fa0f85000a8c050add9cfe1

4 years agoCreate vtkPolyData without MeshActor instance 06/3006/1
Marko Luukkainen [Thu, 4 Jul 2019 15:13:41 +0000 (18:13 +0300)]
Create vtkPolyData without MeshActor instance

gitlab #8

Change-Id: I3b8d7fa1d56d134a7cbbf4b71cf5543340999fd6

4 years agoSupport for capped tube 05/3005/1
Marko Luukkainen [Thu, 4 Jul 2019 15:09:53 +0000 (18:09 +0300)]
Support for capped tube

Also, added possibility to change length wise resolution of ArcCylinder

gitlab #7

Change-Id: I61600b0d07dda44ac9a692138927116cf491af1f

5 years agoProjection matrices following OpenGL spec 08/2908/1
Marko Luukkainen [Mon, 27 May 2019 16:23:51 +0000 (19:23 +0300)]
Projection matrices following OpenGL spec

gitlab #6

Change-Id: Ia2fe79cb6beaeba65e51de1c5830427533441aed

5 years agoAdjustments to picking and camera orientation on focus command 06/2906/1
Marko Luukkainen [Mon, 27 May 2019 07:54:40 +0000 (10:54 +0300)]
Adjustments to picking and camera orientation on focus command

gitlab #5

Change-Id: If199287d5ef83f5d1ad410c8175cc4af67b1e50a

5 years agoAdd split point actor to deletables to prevent memory leak 05/2905/1
Marko Luukkainen [Mon, 27 May 2019 07:51:19 +0000 (10:51 +0300)]
Add split point actor to deletables to prevent memory leak

gitlab #4

Change-Id: I17c5a5286874eb7cad7fb24a77607f0f5da32c15

5 years agoRevised native library loading for VTK 98/2898/1 release/1.39.0
Marko Luukkainen [Mon, 13 May 2019 12:06:48 +0000 (15:06 +0300)]
Revised native library loading for VTK

gitlab #2

Change-Id: If910a60f83ae69d3df81575262a69ac7ce2791c8

5 years agoVTK.Rendering plug-in + win64 fragment 97/2897/1
Marko Luukkainen [Mon, 13 May 2019 12:06:02 +0000 (15:06 +0300)]
VTK.Rendering plug-in + win64 fragment

VTK.Rendering allows SWT-based VTK view, without AWT tread.

gitlab #2

Change-Id: Ida8a60eb56c012ea96be874888d0e72559e76204

5 years agoRefactoring small features to common classes 79/2879/1
Marko Luukkainen [Mon, 6 May 2019 10:48:39 +0000 (13:48 +0300)]
Refactoring small features to common classes

ContextMenuListener - hook awt mouse event for context menu
AxesDisplay - Axes widget to lower left corner of the 3d view

gitlab #3

Change-Id: I8c92f8debfa958f0fc0103d66e37b79e05d81d17

5 years agovtk 8.2.0 API changes 78/2878/1
Marko Luukkainen [Mon, 6 May 2019 10:16:16 +0000 (13:16 +0300)]
vtk 8.2.0 API changes

gitlab #2

Change-Id: Ie4041b690cae32cd4f0615233cf03edc013282fc

5 years agovtk 8.2.0 77/2877/1
Marko Luukkainen [Mon, 6 May 2019 10:10:13 +0000 (13:10 +0300)]
vtk 8.2.0

gitlab #2

Change-Id: Id7553b80dfcc12dc2a81b0d05d17ae9f13bb3b7f

5 years agoRemove vtk 5.8 76/2876/1
Marko Luukkainen [Mon, 6 May 2019 09:53:14 +0000 (12:53 +0300)]
Remove vtk 5.8

gitlab #2

Change-Id: Ia80292b929a50038dddfb590e20b36a88d8bfcc9

5 years agoMesh API to use Tuple3d instead of Vector3d 46/2846/1 release/1.38.0
Marko Luukkainen [Mon, 8 Apr 2019 15:48:28 +0000 (18:48 +0300)]
Mesh API to use Tuple3d instead of Vector3d

Added ArcCylinder for creating cylinder shapes bend on an arc of circle

Change-Id: I09713df59e7cbf0d6805f055a039af46d57934d6

5 years agoGitignores 40/2840/1
Marko Luukkainen [Thu, 4 Apr 2019 13:38:03 +0000 (16:38 +0300)]
Gitignores

Change-Id: Ib9ae67ebaf10777693b45c8e0b1be9ea157914cb

5 years agoSome api and build changes 39/2839/1
Marko Luukkainen [Thu, 4 Apr 2019 13:37:43 +0000 (16:37 +0300)]
Some api and build changes

Change-Id: I85b1ffae0255398050dd45d847fe03e26828972c

5 years agoMerge "Publish Plant3D feature"
Marko Luukkainen [Thu, 4 Apr 2019 13:00:40 +0000 (13:00 +0000)]
Merge "Publish Plant3D feature"

5 years agoPublish Plant3D feature 32/2832/1
Marko Luukkainen [Thu, 4 Apr 2019 12:55:24 +0000 (15:55 +0300)]
Publish Plant3D feature

Change-Id: If41206e5e25a27b027e4fb260d9ed43b1cbdf951

5 years agoChanged SimanticsUI use to Simantics private/psaas release/1.37.0
Tuukka Lehtonen [Fri, 7 Dec 2018 11:31:48 +0000 (13:31 +0200)]
Changed SimanticsUI use to Simantics

gitlab #1

(cherry picked from commit cda637e8caba5a58f2cc5ec0a435070f628fb2fb)

5 years agoAdded LICENSE release/1.35.0 release/1.35.1
Tuukka Lehtonen [Thu, 14 Jun 2018 11:43:41 +0000 (14:43 +0300)]
Added LICENSE

6 years agoIncluded old javax.vecmath 1.5.2 to org.simantics.g3d.feature release/1.33.0 release/1.34.0 release/1.34.1 release/1.34.2
Tuukka Lehtonen [Wed, 14 Feb 2018 22:36:53 +0000 (00:36 +0200)]
Included old javax.vecmath 1.5.2 to org.simantics.g3d.feature

The library is used as is without modifications under the
terms of the "CLASSPATH" EXCEPTION TO THE GPL so it is OK
to include it here in this otherwise EPL'ed software.

6 years agoInclude old 64-bit versions of org.jcae.opencascade and vtk bundles
Tuukka Lehtonen [Fri, 29 Sep 2017 19:01:38 +0000 (22:01 +0300)]
Include old 64-bit versions of org.jcae.opencascade and vtk bundles

Import all the pieces in the repository to keep everything needed for building
in one place for now.

Removed excluded-from-build objmap code from org.simantics.g3d which
failed to compile with Tycho and is no longer needed anyway.

For now I We might want to consider throwing windows 32-bit support out of the window.

6 years agoReplaced dependency on gnu.trove2 with gnu.trove3.
Tuukka Lehtonen [Fri, 29 Sep 2017 12:56:21 +0000 (15:56 +0300)]
Replaced dependency on gnu.trove2 with gnu.trove3.

6 years agoStub of a Tycho build for G3D feature.
Tuukka Lehtonen [Fri, 29 Sep 2017 11:33:15 +0000 (14:33 +0300)]
Stub of a Tycho build for G3D feature.

Still need to get the dependencies in here or
into another git repository for building them
as well. Also, the code needs to be rid org
javax.vecmath.

7 years agoAdding exact INode type as generic parameter to NodeMap interface 17/417/1
Marko Luukkainen [Tue, 18 Apr 2017 10:46:51 +0000 (13:46 +0300)]
Adding exact INode type as generic parameter to NodeMap interface

fixes #7143

Change-Id: Ieaca3070bf9c27bfbbb2252f7e7e1a99c3aee846

7 years agoRecomplied G3D ontologies and updated AnntotatedPropertyTabContrubutor
luukkainen [Thu, 8 Dec 2016 14:52:18 +0000 (14:52 +0000)]
Recomplied G3D ontologies and updated AnntotatedPropertyTabContrubutor

refs #6862

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@33408 ac1ea38d-2e2b-0410-8846-a27921b304fc

7 years agorefs #6656
jsimomaa [Wed, 24 Aug 2016 12:19:16 +0000 (12:19 +0000)]
refs #6656

Use InvocationTargetException.getCause() in cases where a new exception is constructed to be thrown

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@33144 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged branches/simantics-1.22 r32605 to trunk on 2016-03-23 from 1.22.0 release.
lehtonen [Wed, 23 Mar 2016 10:53:42 +0000 (10:53 +0000)]
Merged branches/simantics-1.22 r32605 to trunk on 2016-03-23 from 1.22.0 release.

refs #6393

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@32606 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged branches/simantics-1.22 r32594 to trunk on 2016-03-18 from 1.22.0 release.
lehtonen [Fri, 18 Mar 2016 13:47:16 +0000 (13:47 +0000)]
Merged branches/simantics-1.22 r32594 to trunk on 2016-03-18 from 1.22.0 release.

refs #6384

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@32596 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoSwitched all Simantics plug-ins to require JavaSE-1.8 and to be compiled as 1.8 code.
lehtonen [Sat, 9 Jan 2016 13:09:21 +0000 (13:09 +0000)]
Switched all Simantics plug-ins to require JavaSE-1.8 and to be compiled as 1.8 code.

At the same time, fixed any non-compiling pieces of code that resulted from the switch.

refs #6240

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@32238 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoReintegrated remaining changes from branches/e4 to trunk on 2016-01-01 for Simantics...
lehtonen [Fri, 1 Jan 2016 16:40:36 +0000 (16:40 +0000)]
Reintegrated remaining changes from branches/e4 to trunk on 2016-01-01 for Simantics 1.21.

refs #3537

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@32195 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@r32150:32189 to branches/e4 on 2016-01-01 for e4 branch. e4
lehtonen [Fri, 1 Jan 2016 13:16:22 +0000 (13:16 +0000)]
Merged trunk@r32150:32189 to branches/e4 on 2016-01-01 for e4 branch.

refs #3537

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/e4@32192 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@r32097:32150 to branches/e4 on 2015-12-23 for e4 branch.
lehtonen [Wed, 23 Dec 2015 09:23:46 +0000 (09:23 +0000)]
Merged trunk@r32097:32150 to branches/e4 on 2015-12-23 for e4 branch.

refs #6221
refs #3537

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/e4@32153 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@r32088:32097 to branches/e4 on 2015-12-10 for e4 branch.
lehtonen [Thu, 10 Dec 2015 15:27:12 +0000 (15:27 +0000)]
Merged trunk@r32088:32097 to branches/e4 on 2015-12-10 for e4 branch.

refs #3537

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/e4@32098 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@r31921:32088 to branches/e4 on 2015-12-03 for e4 branch.
lehtonen [Thu, 3 Dec 2015 14:02:13 +0000 (14:02 +0000)]
Merged trunk@r31921:32088 to branches/e4 on 2015-12-03 for e4 branch.

refs #3537

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/e4@32089 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoPass OCCT triangulation errors
luukkainen [Wed, 11 Nov 2015 10:35:40 +0000 (10:35 +0000)]
Pass OCCT triangulation errors

fixes #6141

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@32035 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk r31793:31921 to branches/e4.
lehtonen [Sat, 31 Oct 2015 13:42:45 +0000 (13:42 +0000)]
Merged trunk r31793:31921 to branches/e4.

refs #3537

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/e4@31923 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agofixes #6054
luukkainen [Wed, 28 Oct 2015 12:23:19 +0000 (12:23 +0000)]
fixes #6054

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@31881 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged trunk@r31687 - r31793 to branches/e4 on 2015-10-08 for e4 release.
lehtonen [Thu, 8 Oct 2015 12:51:39 +0000 (12:51 +0000)]
Merged trunk@r31687 - r31793 to branches/e4 on 2015-10-08 for e4 release.

refs #3537

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/e4@31795 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMerged range r31619-31687 from all simantics module trunks to e4 branches.
lehtonen [Mon, 14 Sep 2015 08:33:13 +0000 (08:33 +0000)]
Merged range r31619-31687 from all simantics module trunks to e4 branches.

refs #3537

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/e4@31688 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoSimantics e4 branch started from trunk@r31618 to branches/e4 on 2015-08-21.
lehtonen [Fri, 21 Aug 2015 12:23:12 +0000 (12:23 +0000)]
Simantics e4 branch started from trunk@r31618 to branches/e4 on 2015-08-21.

refs #3537

git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/e4@31620 ac1ea38d-2e2b-0410-8846-a27921b304fc

10 years agoFixed/ignored unnecessary warnings.
lehtonen [Fri, 3 Jan 2014 09:03:11 +0000 (09:03 +0000)]
Fixed/ignored unnecessary warnings.
refs #3552

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@28588 ac1ea38d-2e2b-0410-8846-a27921b304fc

10 years agoOrderedSet support (graph mappings)
luukkainen [Wed, 4 Dec 2013 06:18:08 +0000 (06:18 +0000)]
OrderedSet support (graph mappings)
Code cleanup.

fixes #4578

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@28462 ac1ea38d-2e2b-0410-8846-a27921b304fc

10 years agoJava object to ordered set mapping
luukkainen [Tue, 24 Sep 2013 12:47:29 +0000 (12:47 +0000)]
Java object to ordered set mapping

fixes #4439

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@27883 ac1ea38d-2e2b-0410-8846-a27921b304fc

10 years agoCopyrights
luukkainen [Fri, 5 Jul 2013 11:13:28 +0000 (11:13 +0000)]
Copyrights

refs #4378

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@27694 ac1ea38d-2e2b-0410-8846-a27921b304fc

10 years agoAlpha-version of jME-bindings for g3d.
luukkainen [Fri, 5 Jul 2013 11:10:43 +0000 (11:10 +0000)]
Alpha-version of jME-bindings for g3d.

refs #4378

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@27693 ac1ea38d-2e2b-0410-8846-a27921b304fc

10 years agoShare project "org.simantics.opencascade.jme" into "https://www.simantics.org/svn...
luukkainen [Fri, 5 Jul 2013 11:09:48 +0000 (11:09 +0000)]
Share project "org.simantics.opencascade.jme" into "https://www.simantics.org/svn/simantics"
Share project "org.simantics.g3d.jme" into "https://www.simantics.org/svn/simantics"

refs #4378

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@27692 ac1ea38d-2e2b-0410-8846-a27921b304fc

10 years agoCopyrights
luukkainen [Fri, 5 Jul 2013 10:47:22 +0000 (10:47 +0000)]
Copyrights

refs #4378

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@27690 ac1ea38d-2e2b-0410-8846-a27921b304fc

10 years ago3D framework (Simca 2012)
luukkainen [Fri, 5 Jul 2013 10:39:33 +0000 (10:39 +0000)]
3D framework (Simca 2012)

refs #4378

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@27689 ac1ea38d-2e2b-0410-8846-a27921b304fc

10 years agoShare project "org.simantics.g3d.csg.ontology" into "https://www.simantics.org/svn...
luukkainen [Fri, 5 Jul 2013 10:37:36 +0000 (10:37 +0000)]
Share project "org.simantics.g3d.csg.ontology" into "https://www.simantics.org/svn/simantics"
Share project "org.simantics.opencascade" into "https://www.simantics.org/svn/simantics"
Share project "org.simantics.opencascade.vtk" into "https://www.simantics.org/svn/simantics"
Share project "org.simantics.g3d.ontology" into "https://www.simantics.org/svn/simantics"
Share project "org.simantics.objmap2" into "https://www.simantics.org/svn/simantics"
Share project "org.simantics.g3d.vtk" into "https://www.simantics.org/svn/simantics"
Share project "org.simantics.g3d" into "https://www.simantics.org/svn/simantics"
Share project "org.simantics.g3d.csg" into "https://www.simantics.org/svn/simantics"

refs #4378

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@27688 ac1ea38d-2e2b-0410-8846-a27921b304fc

10 years agoRemoving ancient 3d framework
luukkainen [Fri, 5 Jul 2013 10:28:57 +0000 (10:28 +0000)]
Removing ancient 3d framework

refs #4378

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@27687 ac1ea38d-2e2b-0410-8846-a27921b304fc

12 years agoNaming fixes.
lehtonen [Fri, 16 Sep 2011 10:25:09 +0000 (10:25 +0000)]
Naming fixes.

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22287 ac1ea38d-2e2b-0410-8846-a27921b304fc

12 years agoRenaming plug-ins.
lehtonen [Fri, 16 Sep 2011 10:14:16 +0000 (10:14 +0000)]
Renaming plug-ins.

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22285 ac1ea38d-2e2b-0410-8846-a27921b304fc

12 years agogit-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22284 ac1ea38d-2e2b...
lehtonen [Fri, 16 Sep 2011 10:05:47 +0000 (10:05 +0000)]
git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22284 ac1ea38d-2e2b-0410-8846-a27921b304fc

12 years agogit-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22283 ac1ea38d-2e2b...
lehtonen [Fri, 16 Sep 2011 10:05:35 +0000 (10:05 +0000)]
git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22283 ac1ea38d-2e2b-0410-8846-a27921b304fc

12 years agogit-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22282 ac1ea38d-2e2b...
lehtonen [Fri, 16 Sep 2011 10:05:28 +0000 (10:05 +0000)]
git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22282 ac1ea38d-2e2b-0410-8846-a27921b304fc

12 years agogit-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22281 ac1ea38d-2e2b...
lehtonen [Fri, 16 Sep 2011 10:05:24 +0000 (10:05 +0000)]
git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22281 ac1ea38d-2e2b-0410-8846-a27921b304fc

12 years agogit-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22280 ac1ea38d-2e2b...
lehtonen [Fri, 16 Sep 2011 10:05:18 +0000 (10:05 +0000)]
git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22280 ac1ea38d-2e2b-0410-8846-a27921b304fc

12 years agogit-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22279 ac1ea38d-2e2b...
lehtonen [Fri, 16 Sep 2011 10:05:10 +0000 (10:05 +0000)]
git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22279 ac1ea38d-2e2b-0410-8846-a27921b304fc

12 years agogit-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22274 ac1ea38d-2e2b...
lehtonen [Fri, 16 Sep 2011 08:19:50 +0000 (08:19 +0000)]
git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22274 ac1ea38d-2e2b-0410-8846-a27921b304fc

12 years agoNew 3d/trunk from branches/dev
lehtonen [Fri, 16 Sep 2011 07:36:26 +0000 (07:36 +0000)]
New 3d/trunk from branches/dev

git-svn-id: https://www.simantics.org/svn/simantics/3d/trunk@22266 ac1ea38d-2e2b-0410-8846-a27921b304fc