Compare commits

..

980 Commits

Author SHA1 Message Date
wmayer 244b3aef36 + use correct function to get resource directory 2015-04-05 19:25:02 +02:00
wmayer d54457e9b3 + fix version number in script 2015-04-01 10:40:30 +02:00
Bernd Hahnebach d8bbbc1d1d Fem: fix: system() is evaluated instead of calling it 2015-03-24 12:53:46 +01:00
wmayer b82a28cd89 + re-enable check for active window for spaceball events 2015-03-23 19:56:07 +01:00
blobfish 99b87881c2 Part: ModelRefine: catch bspline isEqual exception 2015-03-23 17:46:04 +01:00
Sebastian Hoogen be823acda2 fix locale handling
unset LC_ALL in MainGui like it was done in MainCmd in f32caef40c
2015-03-21 23:40:27 +01:00
wmayer f376ce1310 + make 0.15 release branch 2015-03-20 14:37:11 +01:00
wmayer 4e41e535ff + fix for MacOSX when changing anti-aliasing setting 2015-03-16 23:40:27 +01:00
Przemo Firszt 91e3d30e5b FEM: Replace fem console prints with a function
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-03-16 18:42:02 +00:00
Przemo Firszt 5ed9e816a0 FEM: Show error if results file is missing
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
2015-03-16 18:42:02 +00:00
Bernd Hahnebach 5b6360684d Fem: units in CalculiX file: mm and N 2015-03-16 07:29:34 +01:00
wmayer a0892a9c56 + show message when changing anti-aliasing 2015-03-15 20:02:21 +01:00
wmayer e0dab757be Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-03-15 18:53:29 +01:00
wmayer 0950b33014 + issue #0002007: Base::Rotation::get/setYawPitchRoll uses wrong euler convention 2015-03-15 18:53:03 +01:00
Yorik van Havre 0f7ef76d56 Draft: added shoogens fix IRW test 2015-03-15 14:42:36 -03:00
wmayer b007bd19e4 + improve abaqus exporter 2015-03-15 14:53:22 +01:00
wmayer 5d159f5cf3 + fix crash in export to abaqus 2015-03-15 02:08:55 +01:00
DeepSOIC 08f7afb0e4 PartDesign: fix wrong sketch pad (#1854)
Fixes the issue where, when a sketch is cloned, and selected for
padding, the clone gets padded instead of the sketch.
It also allows padding of a sketch that is already used by anything
else, except for PartDesign features.
+ the same fix for PartDesign Revolution.
2015-03-14 14:18:34 +01:00
wmayer e85935c4e3 + add Spacemouse pro wireless 2015-03-14 13:40:57 +01:00
getitzack 878b670d52 Update GuiApplicationNativeEventAwareWin32.cpp
Added "3dconnexion space mouse wireless" support for windows. Added 3dconnexion vendor ID, product ID, and extended the strcut tag_VirtualKeys.
2015-03-14 13:39:26 +01:00
Yorik van Havre 95ed267150 Updated offline documentation (final) 2015-03-13 17:30:42 +01:00
Bernd Hahnebach 9a6b729694 Fem: typo in thickness property of FemAnalysis class 2015-03-13 10:09:43 -03:00
wood-galaxy 10aa881f72 fix #1991 : display message for dxf library missing
at the import of importDXF and open, insert and export functions.
Also the message allow user to enabled FreeCAD to download the library.
2015-03-12 15:22:47 -03:00
wmayer 0063b80937 + fixes #0002001: Crash inserting Raytracing Template when in Image View 2015-03-12 12:45:37 +01:00
wmayer bafe8d4b14 + set Const attribute to some methods of FemMesh 2015-03-12 10:42:23 +01:00
Sebastian Hoogen 1676c032b9 properly cast to unsigned before the shift 2015-03-11 21:43:04 +01:00
Sebastian Hoogen 850ca3ac54 trivial bugfix in Draft DXF export
wrong namespace for Part.OCCError
2015-03-11 21:35:30 +01:00
wmayer 4a5a4e9af2 + fixes #0001970: Spaceball 5000 USB no longer works in Windows 7 in 0.15 dev versions 2015-03-11 12:44:38 +01:00
wmayer 9ba57683d5 + method to get Eigensystem of mesh data 2015-03-10 22:47:46 +01:00
wmayer cc7c1d1f44 + fix assert failure in FemMesh 2015-03-10 12:44:22 +01:00
wmayer bfce8c7991 + anti-aliasing for preview of 3d view 2015-03-08 23:10:13 +01:00
wmayer 6958972a52 set cache context when off-screen rendering 2015-03-08 19:12:31 +01:00
Yorik van Havre f3922e5411 Minor fixes in offline doc scripts 2015-03-08 01:02:12 -03:00
Yorik van Havre 0f562ed09b Updated offline documentation files from current wiki 2015-03-08 01:01:29 -03:00
Yorik van Havre 0009e58291 Merged crowdin translations 2015-03-07 15:17:58 -03:00
Yorik van Havre e170a08192 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-03-07 14:32:08 -03:00
Yorik van Havre 720bce762b Updated version number in qt doc script 2015-03-07 14:31:51 -03:00
Bernd Hahnebach 89a6e67e35 Fem: ContraintForce: units are no longer printed on widget 2015-03-06 17:03:35 +01:00
Bernd Hahnebach 4a8e1a58b0 Fem: Fix in CalculiX file if not supported shapes are used for constraints 2015-03-06 17:03:22 +01:00
Bernd Hahnebach baba11610a FEM: add comments to CalculiX input file 2015-03-05 22:31:04 +01:00
Eivind Kvedalen 3743008cda - Self-reference bug
- Refactoring/clean-up of code
- Dependency tracking of aliased cells
- Various resolution errors
- Rewriting of ranges when columns/rows are inserted/removed
- References to aliases keep their units.
2015-03-04 22:18:20 +01:00
wmayer 1b7c0e2a51 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-03-01 11:39:02 +01:00
wmayer f970c97d2f + fixes #0001984: Set CMakeLists *not* to build the useless Assembly module by default 2015-03-01 11:38:38 +01:00
Yorik van Havre 21211aeff2 Draft: Fixed translation of snap bar 2015-02-28 16:45:04 -03:00
Stefan Tröger d5ee7a6efe implement correct vertex normals
- use mesh vertices uv value to get correct normals from face
- remove unused normal and shading options for parts
2015-02-28 15:09:38 +01:00
wmayer d29d62b4ab + fix linker error with MSVC 2012 2015-02-28 12:42:27 +01:00
wmayer bebca4e54c Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-02-27 23:28:04 +01:00
wmayer b24f25d874 + in Fem constraint force dialog handle empty Direction 2015-02-27 23:27:08 +01:00
Yorik van Havre 8d8eba6dac Updated ts files from source 2015-02-27 18:56:51 -03:00
Yorik van Havre 8d98921dd7 Updated translations from crowdin 2015-02-27 18:46:03 -03:00
Yorik van Havre 84de2cd5c8 Small fixes in updateTranslations script 2015-02-27 18:38:25 -03:00
Yorik van Havre 9e67696fd5 Material: Added missing units 2015-02-27 13:31:13 -03:00
wmayer 2a4d29d0ac + use undo/redo for Fem constraint force dialog 2015-02-27 11:21:05 +01:00
Bernd Hahnebach d44d0fbda3 Fem Workaround for choosing material data 2015-02-26 23:26:11 +01:00
Bernd Hahnebach fb908f6f82 make main material cards to work correctly with FemWB 2015-02-26 21:25:59 +01:00
Bernd Hahnebach b42ea802b5 Fem make CalculiX Inputfile editable befor run CalculiX 2015-02-26 09:56:58 -03:00
Bernd Hahnebach d5d6b08980 Standard CalculiX Material added 2015-02-26 09:56:58 -03:00
Sebastian Hoogen 75ced60a58 + fixes #0001966: edges in Shape2DView extend beyond endpoint 2015-02-25 18:45:40 -03:00
Yorik van Havre 67d303ae85 Arch: removed old debug message 2015-02-25 18:44:45 -03:00
wmayer f69b38dcde + fix doc string of Part.makeLoft 2015-02-25 21:36:40 +01:00
Sebastian Hoogen ed80eb6c35 enter rubberband after moved by dragIgnoredDistance
issue #1149
2015-02-24 23:51:11 +01:00
Bernd Hahnebach a6dd8870ab Fix Fem Find Calculix binary (if installed) on Linux 2015-02-24 17:12:50 +01:00
Bernd Hahnebach 38eaf76dea Fix Fem DirectionVector of the ForceObject 2015-02-24 17:12:34 +01:00
Bernd Hahnebach 08a5a89847 Fix Fem we do not have initial stresses 2015-02-24 17:12:14 +01:00
Sebastian Hoogen a77106a58f adapt importCSG to makeFace property and change in importDXF
in commit 06a689eff2
2015-02-24 16:36:25 +01:00
Yorik van Havre 627e32aa2c Arch: misc bugfixes in IFC export 2015-02-23 19:34:29 -03:00
wmayer 007f939731 + check for correct OCC version 2015-02-23 16:05:17 +01:00
Yorik van Havre 2fdb1aeeff Draft: do not show Draft Tray toolbar when importing only the Draft module 2015-02-22 21:29:34 -03:00
Yorik van Havre fac9d35efa Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-02-22 14:53:45 -03:00
Yorik van Havre ff7deabf56 Reformatted README & added more links 2015-02-22 14:53:30 -03:00
wmayer b5b54c59f1 + fix for OCC 6.3 2015-02-22 18:41:18 +01:00
wmayer e8fafa1691 Merge commit '7fa991944298e3723641891cc49424a552b42804' 2015-02-22 18:28:15 +01:00
Peter Lama 119d55be4c Integrate script for making a relocatable OS X app 2015-02-22 18:23:10 +01:00
wmayer f47df84705 + change doc string of Vector.projectPointToLine 2015-02-22 18:14:45 +01:00
Peter Lama 7fa9919442 Add python bin dir as hint for finding PySide tools
(On OS X and Windows)

This should handle most situations
2015-02-21 20:08:56 -08:00
wmayer f2d8fc91ec + issue #0001970: Spaceball 5000 USB no longer works in Windows 7 in 0.15 dev versions 2015-02-21 18:46:06 +01:00
wmayer 153e988237 + make argument of multiFuse const reference 2015-02-21 12:48:12 +01:00
Sebastian Hoogen c2ce8f5eba add TopoShape::multiFuse method
to fuse multiple shapes at once.
2015-02-21 12:35:21 +01:00
Sebastian Hoogen acfafc0b2b Use multiple tool shapes for MultiFuse Feature
issue #1971
2015-02-21 12:35:20 +01:00
wmayer 312f63e43e + edit command for meshes to display components 2015-02-20 22:28:37 +01:00
wmayer 18f1cf7821 + fix issue with bad default value of natural direction 2015-02-20 14:40:03 +01:00
wmayer a869033925 + add slots for undo/redo to Python document observer 2015-02-18 21:36:47 +01:00
wmayer 22b63a7653 + fix ambiguous shortcuts 2015-02-18 13:07:42 +01:00
wmayer 78171d59fd + fixes #0001972: FreeCAD crashes when using keyboard shortcut H to constrain a line 2015-02-18 12:50:16 +01:00
DeepSOIC aeabffeed8 Sketcher: bugfix in updating constraints after external geometry delete 2015-02-17 12:27:32 +01:00
DeepSOIC 13406a4daf Sketch:Validation: swap endpoints for reversed + constraint orientation locking controls
Added buttons to port sketches to CCW-emulation Sketcher.

Bonus =) : Added constraint orientation lock/unlock buttons (affects
point-wise modes of tangent and perpendicular constraints so far)
2015-02-17 12:27:32 +01:00
DeepSOIC 0767cd35f8 Sketcher: fix reversed geometry and rotated arcs
Fixes a bug where an arc, ellipse, or arc-of-ellipse, being reversed in
XY plane, behaved badly in sketcher (see forum thread "Sketch: how to
handle reversed external arcs?"
http://forum.freecadweb.org/viewtopic.php?f=10&t=9130 ).
Also fixes a problem with rotated arcs (see forum thread "Rotating Arc
in Sketcher"
http://forum.freecadweb.org/viewtopic.php?f=22&t=9145#p74262 ).

This is done by adding an emulation flag to a few methods in
Part::GeomXXX, which makes the shape to pretend being non-reversed
(CCW). This causes endpoints of reversed arcs of circles lineked as
external geometry to swap, causing broken sketches sometimes.
2015-02-17 12:27:31 +01:00
Abdullah Tahiri 0b081876e5 Ellipse: External geometry rotated fix
This commit solves the problem that a ellipse appears rotated when added as external geometry, if the face having the
elliptical shape has a direction vector in the -z axis.

This solves the problem. However, the issue with CW and CCW shapes in the sketcher shall be further investigated in order
to arrive to a general acceptable solution.
2015-02-17 12:27:31 +01:00
Eivind Kvedalen c3af4232a4 Spreadsheet: getProperty does not return 0 when property is not found, but throws an exception. Handle this instead. 2015-02-17 11:47:56 +01:00
Eivind Kvedalen 4ab13b9fea Spreadsheet: Remove empty set from documentObjectToCellMap. 2015-02-17 11:47:11 +01:00
Eivind Kvedalen 43e777c7e5 Spreadsheet: docDeps property was not properly maintained, resulting in spurious links to other objects. 2015-02-17 11:46:12 +01:00
Eivind Kvedalen 2621c22409 Spreadsheet: Don't return error message when custom attribute is not found. 2015-02-17 11:45:30 +01:00
Eivind Kvedalen 1b43ca109b Spreadsheet: Consistently use App::Document::Label as reference for document names when tracking dependencies. 2015-02-17 11:44:55 +01:00
Eivind Kvedalen 1f94a15869 Fixed crash when setting/resetting bold/italic/underline on empty cells. 2015-02-17 11:44:21 +01:00
Yorik van Havre 423e700e8a Arch: fixed support of 2D entities in IFC importer 2015-02-16 12:20:29 -02:00
Yorik van Havre 9b4b46f1d0 Arch: small fix in DAE importer 2015-02-15 23:41:46 -02:00
Yorik van Havre 0bb651da4d Updated translation files 2015-02-14 12:16:39 -02:00
Yorik van Havre 7bbdb0a333 Spreadsheet: Added translation file 2015-02-14 12:15:01 -02:00
Yorik van Havre 0b0f6cf215 Spreadsheet: Added back old python spreadsheet code for archiving purposes 2015-02-14 12:03:22 -02:00
wmayer be2bb52796 + open transaction when duplicating selection 2015-02-13 23:12:51 +01:00
wmayer 74e169dc11 + open transaction when pasting clipboard into document 2015-02-13 23:01:41 +01:00
wmayer d89d1808b7 + fixes #0001945: selection out of sync with viewer 2015-02-13 22:26:04 +01:00
wmayer f54da66bd3 + remove unused variable 2015-02-13 22:13:38 +01:00
Eivind Kvedalen d153fb2dbd + Fixed merge of cells to retain value in upper left cell+ Replaced std::map::at() with iterators and find. Removed some superfluous calls to std::map::find()
+ Visual Studio fixes
+ Fixed return values
+ Removed unused variables
2015-02-13 21:53:59 +01:00
Eivind Kvedalen 383ffa6e15 Initial implementation of Spreadsheet module (C++ version) by Eivind Kvedalen.
Various fixes for Windows by
Peter Lama <peterldev94@gmail.com>
Werner Mayer <wmayer@users.sourceforge.net>
2015-02-13 21:53:58 +01:00
Eivind Kvedalen 8ec6b3493d Added Quantity::operator>(...). 2015-02-13 21:53:58 +01:00
Eivind Kvedalen 75dab66916 Added InterpreterSingleton::getValue(...) function. 2015-02-13 21:53:57 +01:00
Eivind Kvedalen 524e982b5e Added tracking of external documents to dependency tracking code. 2015-02-13 21:53:57 +01:00
Eivind Kvedalen e70b859395 Made Property::encodeAttribute static. 2015-02-13 21:53:56 +01:00
Yorik van Havre 5a9d79ac94 Draft: Fixed DXF imorter for non-GUI operation - fixes #1961 2015-02-13 16:49:29 -02:00
Yorik van Havre 40f0927705 Arch: Adapted IFC importer for new IfcOpenShell6
Squashed following commits:
* Arch: Adapted IFC importer for IfcOpenShell6
* Arch: further fixes for ifcopenshell6 compatibility
* Arch: IFC importer now converts to/from  meters for better compatibility with IfcOpenShell
* Arch: further fixes with ifcopenshell6
* Arch: precision adjustments in IFC exporter
* Arch: small fix in makeRoof
2015-02-13 16:41:34 -02:00
Yorik van Havre 6202476061 Draft: made new DXF libraries dialogs translatable 2015-02-13 16:01:16 -02:00
wood-galaxy c516b2456e Draft : Show dialog if DXF libraries not found/not downloadable 2015-02-13 15:31:50 -02:00
wmayer e551c4ef28 + write out material information for x3d format 2015-02-13 17:26:49 +01:00
Sebastian Hoogen 192a32d8d1 refuse to change the placement of PartDesign::Feature Objects
in OpenSCAD/Explode Group command
2015-02-13 00:40:27 +01:00
Yorik van Havre cd5783ac2e Draft: fixed importSVG - fixes #1964 2015-02-12 11:57:39 -02:00
wmayer c61a382a73 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-02-12 14:07:10 +01:00
Sebastian Hoogen cd771f65c6 meshing was removed from StlTransfer
with OCCT CR0025357 issue #1906
2015-02-12 13:46:14 +01:00
Yorik van Havre 4bb365f9b6 Draft: Small fix in DXF importer - fixes #1961 2015-02-12 13:46:14 +01:00
Yorik van Havre f99b6cf534 Fixed typo 2015-02-12 13:46:13 +01:00
Yorik van Havre f278c297fd Drawing: reset the default template to the classic one 2015-02-12 13:46:13 +01:00
Yorik van Havre fe3bb2c5e8 Draft: Small fix in DXF importer - fixes #1961 2015-02-11 16:08:34 -02:00
Yorik van Havre 02efe58818 Fixed typo 2015-02-11 15:50:18 -02:00
Yorik van Havre ff269ef60a Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-02-11 11:25:09 -02:00
wmayer 750e44128d Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-02-11 09:50:41 +01:00
Yorik van Havre 9f40bf1da9 Drawing: reset the default template to the classic one 2015-02-10 14:05:14 -02:00
Sebastian Hoogen 12407a1057 disable conversion of BSplines to circles in SVG drawing output
partly revert 0a31bebaed
2015-02-10 15:45:34 +01:00
Yorik van Havre b67405e16e Fixed typo in text 2015-02-10 11:52:49 -02:00
Yorik van Havre 7b34d02c4c Draft: re-added Draft-Drawing tool to DraftWB 2015-02-09 12:26:41 -02:00
Johannes Obermayr 4ef4369d09 Mod/Complete: Check for modules at runtime.This fixes runtime errors if e. g. TestGui isn't installed due to -DBUILD_TEST=OFF ... 2015-02-08 16:37:14 +01:00
Johannes Obermayr b63c5d0e04 Mod/Complete: Check for modules at runtime.
This fixes runtime errors if e. g. TestGui isn't installed due to -DBUILD_TEST=OFF ...
2015-02-08 16:24:04 +01:00
Sebastian Hoogen faac8c36ba add encoding parameter to .as_std_string()
to handle PyUnicode Objects. Usually ASCII for object names and Utf-8
for file names and console output.
issue #995
2015-02-08 15:37:00 +01:00
Sebastian Hoogen 8ee81e0516 set the max. segments in BSpline approximation to 50
in Draft and Drawing WBs
2015-02-08 15:14:32 +01:00
Sebastian Hoogen 8ec87dbdf2 rename python classes for shapes and
implememnt __getstate__ and __setstate__ to enable pickling
issue #1948
2015-02-04 17:07:29 +01:00
wmayer 79173e37cd + correct usage of SoPolygonOffset 2015-02-02 14:18:16 +01:00
wmayer 65c56d0bd6 +support to write/read colors to/from OFF file 2015-02-02 09:59:02 +01:00
wmayer c2d0857ddc + fix possible crash in DocumentItem 2015-02-01 12:09:37 +01:00
wmayer f19fe1f8ed + improve loading SVG files in debug mode 2015-02-01 11:14:00 +01:00
wmayer e788741631 + fixes #0001938: addObject() maximum recursion depth exceeded Error 2015-01-31 17:26:03 +01:00
Yorik van Havre dc623f2646 Fixed a typo 2015-01-27 13:57:49 -02:00
Yorik van Havre 8628a6e0e0 Draft: small fix in SVG generation 2015-01-26 17:38:30 -02:00
Yorik van Havre 2ef086a028 Cosmetic fix in crowdin script 2015-01-26 16:26:28 -02:00
Yorik van Havre d8146a0cf8 Updated ts files 2015-01-26 16:23:48 -02:00
Yorik van Havre 6ffc0e177a Drawing: small fix in DraftView command 2015-01-26 16:00:13 -02:00
Yorik van Havre 0da2e4c45a Disabled internal pivy building by default on non-windows platforms - fixes #1335 2015-01-25 12:17:36 -02:00
wmayer 97987db462 + fix problems on unit tests, open transaction when creating distance object, layout warning, ... 2015-01-25 14:04:33 +01:00
wmayer 2cff92a73e + fixes #0001776: Illegal character when opening project 2015-01-25 12:36:24 +01:00
wmayer 683e342cff + fix linker error with MSVC 2015-01-25 12:22:04 +01:00
Sebastian Hoogen 5a9484f06c round the drawing view projection direction
before calculating the necessary view rotation to anticipate the
rounding that happens on saving and reloading the file. fixes #1909
2015-01-24 23:37:38 +01:00
Sebastian Hoogen f32caef40c respect locale environment except for LC_NUMERIC
fixes #1852
2015-01-24 19:52:25 +01:00
wmayer be38772631 + fixes #0001482 2015-01-24 16:32:21 +01:00
wmayer ed46ec272f + slight fix in file filter 2015-01-24 16:31:49 +01:00
wmayer 39aa178b13 + fixes #0001925: Preferences not kept well 2015-01-23 19:41:31 +01:00
wmayer c066183f4b + fix layout of document settings panel 2015-01-23 18:23:01 +01:00
Yorik van Havre 9b345d8264 Arch: Corrected some texts 2015-01-23 12:45:11 -02:00
Yorik van Havre 801906ce51 Added utility script to manage crowdin stuff 2015-01-23 00:00:47 -02:00
Yorik van Havre 06a689eff2 Draft: Added warning dialog against heavy DXF import operations - fixes #1685 2015-01-22 12:21:15 -02:00
Yorik van Havre 378deaf7a3 Fixed small naming error - fixes #1883 2015-01-20 21:23:34 -02:00
Sebastian Hoogen d059520046 Use splines in dxf drawing output 2015-01-20 20:08:40 -02:00
Yorik van Havre cb0fc8cd8e Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-20 20:04:54 -02:00
Yorik van Havre 645d176a13 Added preference setting to set default Author & License - fixes #1883
* added fields in Prefereces->Default->Document
* new documents take the values of those fields
2015-01-20 20:01:14 -02:00
wmayer 2c7d8a2358 + fixes #0001928: The export CAD dialog in PartGui always adds an extension to the filename 2015-01-20 21:38:38 +01:00
Sebastian Hoogen c05f7762f8 import dxf splines as Draft BezCurve if applicable
fixes 1743
2015-01-20 20:07:25 +01:00
Sebastian Hoogen 17a85e4352 Set offset mode for extrusion draft 2015-01-20 11:30:13 +01:00
Sebastian Hoogen 9c698201e2 handle Draft Ellipse arcs 2015-01-20 11:28:17 +01:00
Sebastian Hoogen 2509e59b51 catch non-orthogonal transformation matrix
bugfix for f045df1ef3
2015-01-20 11:26:39 +01:00
wmayer 85214a4359 + fix problem with values > 1000 in quantity spinbox 2015-01-19 21:59:51 +01:00
Yorik van Havre a91fcc681c Draft: Improvements to Trimex tool - fixes #1598
* Autotrim 2 intersecting draft lines, wires or arcs
* Don't snap if CTRL is not pressed
* Allow to trim/extend against itself
2015-01-19 13:49:33 -02:00
wmayer ca0fb1480e + fix gcc build failure 2015-01-19 11:42:45 +01:00
wmayer 3c754da0cb + improve QuantitySpinBox 2015-01-19 00:36:07 +01:00
Yorik van Havre 3887080274 Wait before deleting __objs__ (Werner can you check if its Ok? Thanks) 2015-01-18 15:42:28 -02:00
Yorik van Havre 767d7b442a Draft: fixed leftovers from last commit 2015-01-18 13:44:56 -02:00
Yorik van Havre 044c1c0ef1 Draft: More robust method to write DXF arcs 2015-01-18 13:42:17 -02:00
wmayer 86882eec6a + Handle PyCXX exception in Command::invoke 2015-01-17 16:36:19 +01:00
Yorik van Havre 8fbe631046 Draft: Fixed svg export view box - fixes #1810 2015-01-17 12:51:09 -02:00
wood-galaxy 1de729d6e9 + fixes #0001923: Fix typo for a string within the Arch wokbench 2015-01-17 11:41:22 +01:00
wmayer 1f44226882 + copy DiffuseColor property when creating simple copy 2015-01-16 23:31:07 +01:00
wmayer f5c363db9d + fixes #0001922: occ exception during python shell.makeHalfSpace 2015-01-16 23:11:07 +01:00
Yorik van Havre 79458a83d0 Draft: minor fix in up/downgrade 2015-01-16 19:57:39 -02:00
Yorik van Havre 62b0498e6f Draft: Added a recompute() at the end of Upgrade and Downgrade 2015-01-16 18:05:02 -02:00
Yorik van Havre 90540deb29 Arch: Removed Create from Scratch option from presets - fixes #1835 2015-01-16 17:34:24 -02:00
Yorik van Havre f0ce2e6be6 Moved Draft-Drawing tool to the Drawing WB (renamed Draft View) 2015-01-16 17:16:39 -02:00
Sebastian Hoogen 0aabd2d5ec importDXF: bugfix for handling weights in splines 2015-01-16 18:22:42 +01:00
Sebastian Hoogen c90c2441d2 importDXF: provide polygon fallback for splines
with invalid multiplicities
2015-01-16 15:10:31 -02:00
Sebastian Hoogen ad54783016 improve DXF spline import 2015-01-16 15:10:31 -02:00
Yorik van Havre 9de492592d Draft: SVG linestyles are now settable in preferences - fixes #1773 2015-01-15 17:58:52 -02:00
Yorik van Havre 06e78d70c9 Draft: Upgrade tool now supports sketches with circles or ellipses - fixes #1881 2015-01-15 17:15:27 -02:00
wood-galaxy f72c802f5d Arch CutPlane : Fix some strings to be translatable 2015-01-15 10:27:49 -02:00
wood-galaxy 73c342e05c Arch Roof : Improvement on gable case 2015-01-15 10:26:43 -02:00
wood-galaxy 16564430a1 Arch Roof : Add units in column header. 2015-01-15 10:26:43 -02:00
wmayer ee4436b2c0 + add toShape() to Part.Point, allow to pass Part.Point in Part.Vertex 2015-01-15 11:39:53 +01:00
wmayer 17099d0545 + fixes #0001916: Cannot cancel angle constraint dialogue in sketcher 2015-01-15 00:36:44 +01:00
wmayer cbf0bb0aac + change copyright notice 2015-01-15 00:36:27 +01:00
Sebastian Hoogen f045df1ef3 avoid using transformGeometry in importSVG 2015-01-14 11:56:45 -02:00
Yorik van Havre ae3fafea6c Updated base translation files for crowdin 2015-01-13 20:00:09 -02:00
Yorik van Havre 7a710279ad Draft: Fixed continued dimension - fixes #1891 2015-01-13 19:07:05 -02:00
wmayer fa4f8b0735 + do not throw exception from inside signal handler to get useful stack trace for segmentation faults 2015-01-13 22:01:59 +01:00
wmayer 7c789a1bf7 + allow to suppress verbose mode of XMLReader 2015-01-13 21:57:18 +01:00
wmayer 395d5249d4 + minor change 2015-01-13 21:54:54 +01:00
wmayer 477099bbfe + remove useless stuff from Init files 2015-01-13 16:19:19 +01:00
Yorik van Havre 7d0dc068e4 Draft: Allow to draw lines by length & angle - fixes #1383
* Added a Length property to Draft line objects
* Added length & angle parameters to the line drawing tool
2015-01-13 12:10:52 -02:00
wmayer 5289967304 + fixes #0001482: v0.14 Mirrored objects parent the original object 2015-01-13 00:03:20 +01:00
wmayer bdfaaee833 + fixes #0001869: Clones displayed in wrong view mode 2015-01-12 19:36:04 +01:00
wmayer eb9b6acdd6 + re-enable reading/writing grid size 2015-01-12 16:29:31 +01:00
wmayer 3f03e954da + fixes #0001914: A4_Landscape_ISO7200 2015-01-12 11:27:30 +01:00
Richard Crozier 65092be5f3 Correct spelling of FEM Netgen Mesh 'Fineness' parameter 2015-01-12 11:12:30 +01:00
wmayer c6fe925dfd + fixes #0001856: Add standard set of blank ISO drawing template sizes 2015-01-12 01:56:14 +01:00
wmayer c9a70c7f03 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-12 01:44:13 +01:00
wmayer b437dfd9da + fixes #0001912: Drawing Workbench Not Displaying Views of Cylindrical Parts. 2015-01-12 01:43:48 +01:00
Yorik van Havre 4cf15ae696 Draft: implemented new, more robust version of sortEdges - fixes #1911 2015-01-11 22:09:29 -02:00
wmayer e16305cb83 + fixes #0001791: Counterbores do not follow when hole is moved 2015-01-12 00:55:56 +01:00
wmayer 351b9d7425 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-11 22:15:48 +01:00
wmayer a672630756 + fixes #0001905: Group-ordering of orphaned children not working as expected 2015-01-11 22:15:18 +01:00
Yorik van Havre af65c413d1 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-11 15:55:32 -02:00
Yorik van Havre 74856e5fbf Draft: Dimensions ExtLines property can now be negative - fixes #1677 2015-01-11 15:55:19 -02:00
wmayer 0b904e674b + support Bezier curves for SVG output 2015-01-11 16:02:27 +01:00
wmayer 82edb4b50a + fixes #0001662: IGES does not export correctly 2015-01-11 12:14:41 +01:00
wmayer 0a31bebaed + fixes #0001898: Drawing workbench draws cylinder in orthographic projection wrong 2015-01-11 01:46:31 +01:00
wmayer 9cb8471fa2 + fixes #0001856: Add standard set of blank ISO drawing template sizes 2015-01-10 22:21:20 +01:00
wmayer 2e91cd1000 + add new templates from triplus 2015-01-10 22:19:46 +01:00
wmayer 3210d0d2a0 + issue #0001856: Add standard set of blank ISO drawing template sizes 2015-01-10 19:09:58 +01:00
wmayer f1e9966084 + fixes #0001054: Show name of feature when it reports a warning 2015-01-10 16:37:49 +01:00
wmayer 0954adf784 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-10 15:15:42 +01:00
wmayer 6a3437e28e + fixes #0000692: Sketcher: Add angle constraint for arcs 2015-01-10 15:15:18 +01:00
Sebastian Hoogen ff8ad03aa3 bugfix in dxf output of arc
regression created by 099ece5c00
2015-01-10 12:09:00 -02:00
Sebastian Hoogen 9ce08e7596 make the Qt::ISODate workaround obvious
by including the intended implmentation
2015-01-10 12:09:00 -02:00
Sebastian Hoogen fe4ab358e5 issue #1450 2015-01-10 12:09:00 -02:00
wmayer 2bff32d704 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-10 12:17:57 +01:00
wmayer 32546115b7 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-10 01:23:09 +01:00
Yorik van Havre 183a0f066b Draft: Fixed typo - fixes #1907 2015-01-09 20:46:07 -02:00
Yorik van Havre 02eecc4fd7 Draft: small bug in Draft GUI - fixes #1908 2015-01-09 20:43:33 -02:00
wmayer 396e9c93b7 + fixes #0001553: printing drawing full size (1:1) prints wrong size 2015-01-09 21:15:27 +01:00
Yorik van Havre fa12868df9 Fixed gnome app file - fixes #1754 2015-01-09 13:28:36 -02:00
wmayer ddfb525c87 + fixes #0000932: Unexpected scaling of a printed Drawing From FreeCAD but not always from exported SVG 2015-01-09 14:00:18 +01:00
wmayer c5b2609974 + select number of quantity spinbox when value is set in property editor 2015-01-07 22:05:00 +01:00
wmayer 311ba87b6c + issue #0000932: Unexpected scaling of a printed Drawing From FreeCAD but not always from exported SVG 2015-01-07 19:35:52 +01:00
wmayer f24e216db4 + fixes #0001652: Proper support of units for all geometric primitives 2015-01-07 15:31:07 +01:00
wmayer be2e191681 + fixes #0001669: Part operation with parts in groups splits again when moved back into group 2015-01-07 11:02:52 +01:00
wmayer 80db2a3bd9 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-06 18:39:00 +01:00
wmayer 010fc6f307 + fixes #0001721: PartDesign Pad 'Up to face' face selection in the 3D view not working 2015-01-06 18:38:33 +01:00
wood galaxy 641c295d44 Arch : Added mid-point to Frame Basepoint - fixes #1892 2015-01-06 13:44:44 -02:00
wmayer fb19ea5089 + fixes #0001870: Revolution and Groove in Part-Design do not hide the sketch and parent-feature for some geometries 2015-01-06 15:00:24 +01:00
wmayer 053f76086b + fix one more missing va_end 2015-01-06 12:06:12 +01:00
Julien Nabet b325bcea3d Fix some cppcheck reports:
- (error) va_list '<var>' was opened but not closed by va_end()
- (style) Same expression on both sides of '||'
- (style) Same expression on both sides of '!='
2015-01-06 11:37:44 +01:00
wmayer 67ca966c98 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-05 23:04:48 +01:00
Michael Georg Hansen be919bb6b3 Use the FreeCAD's working directory as initial directory for FileChooser. 2015-01-05 23:01:52 +01:00
Yorik van Havre bde130821d Draft: Finished ellipse support - fixes #1788 2015-01-05 19:23:02 -02:00
wmayer 296c07142a + fixes #0001896: Selection View widget don't display latin characters for label. 2015-01-05 21:46:51 +01:00
wmayer 489f2451fa + fix a couple of issues in selection view 2015-01-05 19:48:43 +01:00
wmayer 55d124255e + fixes #0001851: Qt Assistant loads Error 404 2015-01-05 18:02:15 +01:00
wmayer 71efef4761 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-05 16:29:06 +01:00
wmayer ee86871bed + fixes #0000763: Bad IGS import 2015-01-05 16:28:40 +01:00
wood galaxy 03183527b2 Draft : fix some utf8 decode
Impacted Lines : 688,2061,2972
2015-01-05 13:13:45 -02:00
wood galaxy 2db39c3d71 Arch : Fix some utf8 decode 2015-01-05 13:13:45 -02:00
wood galaxy 95c0fe3a84 Arch : Internal object name are in English.
Arch objets Label could be translated.
2015-01-05 13:13:45 -02:00
wood galaxy 5657eed566 Arch: Fixed building label 2015-01-05 13:13:45 -02:00
wmayer ab24e9df6a + Implement repr() method of Python binding for ParameterGrp 2015-01-05 13:45:46 +01:00
Sebastian Hoogen be447e64b5 revise drawing dxf ellipse export 2015-01-05 12:26:51 +01:00
Sebastian Hoogen 099ece5c00 determine the angles of an arc only by the axis and paramter range 2015-01-05 12:26:50 +01:00
wmayer 5ecf5b2ef6 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-05 11:21:06 +01:00
Stefan Tröger 7895134432 + Assign the correct context id to the new render action so that correct VBOs are used 2015-01-05 11:20:28 +01:00
Yorik van Havre 9ee08a97ea Draft: fixed #1664 again 2015-01-04 20:38:47 -02:00
wmayer b2e32abe7e + fixes #0001705: Download manager does not follow redirect (HTTP status 302) 2015-01-04 23:15:58 +01:00
Yorik van Havre 9141d28826 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-04 15:34:12 -02:00
Yorik van Havre 47f172bfa2 Arch: Fixed window label 2015-01-04 15:33:54 -02:00
wmayer 25b78f9026 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-04 18:15:59 +01:00
wmayer c3102b69bc + issue #0001705: Download manager does not follow redirect (HTTP status 302) 2015-01-04 18:15:20 +01:00
Yorik van Havre a7b3b85aa1 Arch: Fixed the task panel of Windows - fixes #1835 2015-01-04 15:00:31 -02:00
wmayer 0d1fc35b20 + add try/catch block to notify() method 2015-01-04 13:26:34 +01:00
wmayer d3bc389765 + exception handling if moving sketch fails 2015-01-04 13:02:11 +01:00
wmayer 4cfc2a1a08 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-03 22:39:45 +01:00
wmayer 6c187572c7 + fix undo/redo issues with ortho views 2015-01-03 22:39:07 +01:00
Yorik van Havre 9b9526e4cc Arch: fixed behaviour of clones of windows - fixes #1841 2015-01-03 15:40:02 -02:00
Yorik van Havre 3db987d9b7 Draft: Added a Fuse property to Array objects - fixes #1768 2015-01-03 14:47:29 -02:00
wmayer d8e0df9e97 + fixes #0001678: Visibility property is ignored on drawing sheets 2015-01-03 17:09:17 +01:00
wmayer e7963472b0 + close drawing view when deleting page object 2015-01-03 14:23:17 +01:00
wmayer 3614a08911 + fixes #0001698: All drawing pages are opened automatically when opening a project file 2015-01-03 13:45:12 +01:00
wmayer c47eea61fa + return point/facet indices as unsigned long in Python 2015-01-03 11:24:57 +01:00
Yorik van Havre 77882051fa Draft: Made initial Face mode dependent on fill mode pref setting - fixes #1812 2015-01-02 19:53:39 -02:00
wmayer 08828e5dc0 + fixes #0001225: Allow User to Rotate Arc Radius Constraint Text and Leader 2015-01-02 21:26:03 +01:00
Yorik van Havre fe994efa66 Draft: Fixed import of DXF splines - fixes #1743 2015-01-02 17:05:27 -02:00
Yorik van Havre 12afbc9ed5 Arch: trivial bugfix 2015-01-02 16:49:31 -02:00
Yorik van Havre 1dd069ec7f Raytracing: added transparency to lux feature - fixes #1771 2015-01-02 16:48:35 -02:00
wmayer 393d64d53c + fixes #0000498: 'Measure Distance' tool sometimes renders distances inside of solid objects 2015-01-02 14:57:14 +01:00
wmayer 26666a1fda + minor optimization 2015-01-02 12:26:29 +01:00
DeepSOIC c4fb8fc8ae Sketcher: AngleViaPoint: revert from OCC angle precalculation
Returning back to the slow temporary-sketch-based
calculateAngleViaPoint, because OCC-based version was incompatible with
always-CCW sketcher geometry. More info in "Sketch: how to handle
reversed external arcs?" forum thread
http://forum.freecadweb.org/viewtopic.php?f=10&t=9130&sid=1b994fa1236db5ac2371eeb9a53de23f
2015-01-02 11:48:34 +01:00
DeepSOIC 93d00b2dab Sketcher: validateConstraint update
Refactor validateConstraint and add angle-via-point and snell's law
support there.
2015-01-02 11:48:33 +01:00
DeepSOIC 684036fae8 Sketcher Ellipse: code cleanup
deleting redundant overloaded functions involving arc-of-ellipse, a few
todo comments, not implemented methods, System(constraintlist)
constructor.
2015-01-02 11:48:33 +01:00
DeepSOIC ab7d980de0 Sketcher: solver rebranding - renamed directory
Sketcher: solver rebranding - updated references

cleanup

Sketcher: GCS: remove unused NAN and INF
2015-01-02 11:48:32 +01:00
DeepSOIC 9cc2ff7944 Sketcher Constraints: small code refactor
Unifying first checks in grad().
2015-01-02 11:48:32 +01:00
DeepSOIC 8660d9a914 Sketcher Ellipse: porting to DeriVector2
Sketcher Ellipse: porting tangent-line to DeriVector2

Replacing a ton of unreadable, sage generated math code with
easy-to-manage C++ code.

Sketcher Ellipse: porting internal align-t to DeriVector2

Sketcher Ellipse: small math refactor; const members

Moving the repeating code computing deriv+value of major radius to a
method of GCS::Ellipse.
Marking several methods of DeriVector2 as const member functions.

Sketcher Ellipse: porting arc angle rules to DeriVector2

Just porting.
Probably a complete remake of the concept is worth... Angles can be
calculated explicitly, there's no need to load the solver. I see no
benefits whatsoever on using the solver to keep track of angle values.

Sketcher Ellipse: porting equality to DeriVector2
2015-01-02 11:48:31 +01:00
DeepSOIC 43e8b30846 OpticConstraints: Adding Snell's law
Fix AngleViaPoint to support new derivative calculation technique.

OpticConstraints: Adding Snell's law. Fix AngleViaPoint to support new derivative calculation technique.

Snell's law constraint added to GCS, but not yet exposed and cannot be
tested.
Since the way CalculateNormal() returns derivatives had changed,
AngleViaPoint constraint needed modifications. Nothing serious.

OpticConstraints: SnellsLaw progress

Addable through python. Fix math. Some quick-and-dirty visual stuff to
get rid of hangs and to see the constraint in action.

OpticConstraints: SnellsLaw: flipping logic fix

OpticConstraints: SnellsLaw progress

Added toolbar button. Allowed editing a datum by doubleclick. New error
message approach during constraint creation.

OpticConstraints: SnellsLaw

OpticConstraints: SnellsLaw: list label improvement

OpticConstraints: SnellsLaw: fix after rebase

OpticConstraints: SnellsLaw: expose helper constraints

Snell's law internally is made of three constraints: point-on-object,
coincident and the Snell's sin/sin. They were all buried under one UI
constraint. Exposing them allows to construct reflection and
birefringence on the point (attempting to do so used to result in
redundant constraints and was often not functional at all).
This commit breaks compatibility with older files.

OpticConstraints: SnellsLaw: small refactor of math

Placing the duplicated code of error and gradient calculation into a
private method.

OpticConstraints: SnellsLaw: fix datum edit unit

OpticConstraints: SnellsLaw: fix datum edit bug

After previous fix, the dimensionless value was not accepted (the
constraint's value did not change, the changes were ignored).
2015-01-02 11:48:31 +01:00
DeepSOIC 68ec9e44f8 OpticConstraints: SnellsLaw: icon 2015-01-02 11:48:30 +01:00
DeepSOIC 397e37ad1c GCS: fundamental changes to simplify derivatives
GCS::Vector2D was morphed into a DeriVector2, a derivative-aware vector.
A bunch of vector math methods were added that implicitly calculate
respective derivatives. Now, there is no need to calculate the partials
- most is done implicitly.
2015-01-02 11:48:30 +01:00
DeepSOIC 3838bddcdb AngleViaPoint Constraint
AngleViaPoint: fixes in UI routines + new messages

Goofed undo message in tangency via point is fixed.
Forgotten updateActive, clearSelection have been added.
New more informative error messages for tangent constraint.

AngleViaPoint: using it instead of via line tangency

* replaced the helper construction line for ellipse-to-ellipse and
similar tangency with a point. Using tangent-via-point there
* deleted tangency via line for point-to-point on
(cherry picked from commit 9e3fa8c8de0f49c0ef3c978e015eb905358dbdd9)

AngleViaPoint: internal/external tangency locking

*Added automatic tangency type lockdown for all new constraints (only
for point-wise tangency).
Tangency type is stored in the constraint datum field, as an angle value
shifted by Pi/2 (to be able to treat 0.0 as undefined type).
Added ability to switch the tangency by setting datum value from python
(can be abused by passing arbitrary angle).
Further simplified the tangency related code in Sketch.cpp.

AngleViaPoint: added license to Geo.cpp

AngleViaPoint: renames in Constraints.cpp/.h

Changed some names to increase self-explanatoryness:
bool "remapped" renamed to "pvecChangedFlag"
"ReconstructEverything()" renamed to "ReconstructGeomPointers()"

AngleViaPoint: renames in Constraints.cpp/.h

Changed some names to increase self-explanatoryness:
bool "remapped" renamed to "pvecChangedFlag"
"ReconstructEverything()" renamed to "ReconstructGeomPointers()"

AngleViaPoint: using for endpoint perpendicularity

+ direction lockdown, just as with tangency.
+ quite a lot of old code is gone because of that

AngleViaPoint: perp-ty UI routine made similar to tangent

(Git has made a very messy diff.)
The changes are:
* Perpendicularity-via-point (3-element selection) support added.
* Endpoint-to-curve and endpoint-to-endpoint supports all shape
combinations.
* a bit of code cleanup and clarifications.

AngleViaPoint: placement of perpendicular icon in 3d view

AngleViaPoint: fix: allow setDatum of perpendicular constraint

AngleViaPoint: fix: centers of ellipses are not endpoints

isSimpleVertex used to return false for centers of ellipses and arcs of
ellipses, which made them being accepted for point-to-point tangency.
Should be fixed forever, mo more changes are expected to be necessary
for new types of geometry.

AngleViaPoint: precalc with OCC (work in progress)

Work in progress (not yet working).
Using OCC's tangent to replace implementation of
SketchObject::calculateAngleViaPoint.

AngleViaPoint: fix math: normal now points inwards, where it was intended initially and goofed up.

AngleViaPoint: adding comments to the code

AngleViaPoint: using GeomCurve::closestParameterToBasicCurve for angle precalculation

AngleViaPoint: Py method: changeConstraintsLocking

changeConstraintsLocking(True) - locks/re-locks all lockable
tangency/perpendicularity constraints of the sketch (applicable to
existing sketches).
changeConstraintsLocking(False) - removes locking information from
lockable constraints

AngleViaPoint: final SketchObject::calculateAngleViaPoint

Now, finally, using OCC functionality (thanks Abdullah!), without
composing temporary Sketch object.
2015-01-02 11:48:29 +01:00
DeepSOIC 9f821e06b5 Sketcher: Responsivity tweaks and AngleViaPoint Constraint
Solver iteration limit independent of system size (reduces hangs when
solver fails to converge).
Repaint() instead of update() to force render for every movePoint.

Sketcher: New Constraint AngleViaPoint

* Adding generic CalculateNormal() method
* Reconfiguration of GCS geometry classes: adding a base class "Curve",
that has a pure virtual function CalculateNormal().
* Initial inplementation of the new function.
* adding Vector2D class (I wanted to reuse the existing, but got wierd
compile errors, so implemented a new one... TODO.)
* Adding redirection support into GCS shapes. Adding a Copy method to
GCS::Curve.
* Automatic point-on-object
* Angle precalculation: when AngleViaPoint is added, angle is properly calculated based on
existing geometry.
* Added tangency-via-point using one.
* Implemented placement of tangency-via-point icon in 3d view. Also
affected is the placement of point-on-object icon (since it is very
similar code, it is now shared with tangency-via-point)
* Placement and moving of angle datum
Functions: calculateAngleViaPoint, isPointOnCurve,
calculateConstraintError exposed to python
* Endpoint tangency: All endpoint-to-endpoint and endpoint-to-curve tangency now works
through AngleViaPoint constraint and obsolete code clean up (most procedures
addConstraintTangentXXX2YYY)
2015-01-02 11:48:28 +01:00
Abdullah Tahiri ec03fb541f Part: Extension of Geometry::Curve
Part: Extension of Geometry::Curve to wrap more functions of OCC

Apart from:
    bool tangent(double u, gp_Dir&) const;
that was already implemented, now it also implements:
    Base::Vector3d pointAtParameter(double u) const;
    Base::Vector3d firstDerivativeAtParameter(double u) const;
    Base::Vector3d secondDerivativeAtParameter(double u) const;
    bool normal(double u, gp_Dir& dir) const;
    bool closestParameter(Base::Vector3d point, double &u);

i.e. apart from giving the tangent vector for a given curve at parameter value u,
it also gives:
   - The point cartesian coordinates of the curve point at parameter value u
   - The vector of the first derivative at parameter value u
   - The vector of the second derivative at parameter value u
   - The normal vector to the curve at parameter value u
   - The parameter value of a curve closest ot a given point

Code cleanup: Changing Trim functionality of Ellipse to use OCC calculations

Part Curve functions extension: closestParameterToBasicCurve

It provides the parameter of the curve closest to a given point. If the curve is a Trimmed curve, the parameter of the basic underlaying curve closest to the point is provided.
2015-01-02 11:48:28 +01:00
Sebastian Hoogen a8dd528c1a Build python Qt resource files at compile time
fixes #1888
2015-01-02 11:14:07 +01:00
Yorik van Havre f3af41e4cc Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2015-01-01 19:06:26 -02:00
Yorik van Havre 051b38b1c1 Arch: temporarily disabled custom subvolume in windows 2015-01-01 19:06:11 -02:00
Yorik van Havre 60b648b053 Arch: Equipments now take the diffuse color of their base object on creation 2015-01-01 19:06:00 -02:00
wmayer f545455466 + fixes #0001889: Crash when undoing move of base object of a part fillet 2015-01-01 21:05:19 +01:00
Yorik van Havre 2680395ede Draft: adapt icon sizes from preferences settings - fixes #1783 2014-12-31 21:23:24 -02:00
Yorik van Havre 845849fa91 Arch: implemented reading & writing of Ifc properties in IFC files 2014-12-31 18:35:39 -02:00
Yorik van Havre 244373779d Arch: Fixed IFC import bug - fixes #1887 2014-12-31 15:21:41 -02:00
Yorik van Havre 3f607d73a4 Arch: Fixed Arch example - fixes #1789 2014-12-31 14:42:22 -02:00
Yorik van Havre cb5a807990 Arch: Added a MoveWithHost property to all Arch objects which specifies if they must be moved/rotated together with their parent - fixes #1820 2014-12-31 14:04:23 -02:00
Yorik van Havre 1f9ecfa509 Draft: Better error messages when trying to convert a bspline to a sketch 2014-12-31 13:17:25 -02:00
wmayer ca5062cbfe + fixes #0001885: Unhandled exception when trying to enter edit-mode for objects while drawing view is active 2014-12-31 14:08:03 +01:00
wmayer 4d618955b3 + fixes #0001884: Crash when double-clicking on Clip element with drawing page closed 2014-12-31 13:15:33 +01:00
wmayer b2f8a4ed2a + fixes #0001723: Display errormessage in tree in tooltip 2014-12-30 22:44:29 +01:00
wmayer 2c53bd1e9a + fixes #0001670: Orthographic projection: scale/position is empty when unchecking 'Auto scale/position' 2014-12-30 19:14:07 +01:00
wmayer c231866b8d + fixes #0001746: Part Fillet and Chamfer do not show correct length/radius when editing old items 2014-12-30 17:20:32 +01:00
wmayer ff09f0524d + fixes #0001656: Vertical/horizontal distance constraint confuses for a line or two points 2014-12-30 15:20:29 +01:00
wmayer fba0ef0671 + fixes #0001657: Sketcher: First digit can not be deleted when editing grid size 2014-12-30 14:18:02 +01:00
wmayer 7aa91ecee3 + fixes #0001760: FC fails to load a *.FCStd file if the filename lacks the *.FCStd file extension 2014-12-30 00:31:39 +01:00
wmayer 72f947433c Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-12-29 22:28:52 +01:00
wmayer f51daa88e0 + fixes #0001819: Getter Methods for Data inside a sketch 2014-12-29 22:28:12 +01:00
Yorik van Havre 2f78c021db Arch: Fixed encodings in Survey - fixes #1825 2014-12-29 18:54:33 -02:00
Yorik van Havre 638fa8ba75 Draft: Changed working plane button text to Auto - fixes #1879 2014-12-29 17:54:04 -02:00
wmayer 84aad261fc + fixes #0001876: replace helpful text in task tab with an info button 2014-12-29 18:49:17 +01:00
wmayer d83c02387c + fix constraint evaluation function 2014-12-29 15:17:04 +01:00
Peter Lama 32dd867a30 Fix duplicate 'optimized' when using new libpack
When using a CLbundler libpack, PYTHON_LIBRARY has both optimized and debug
libs, but it doesn't when using an old libpack, which was the reason for
commit f5a4e680
2014-12-28 19:04:31 -08:00
wmayer 6a1cb47e30 + fixes #0001616: crash when selecting 'Edit Sketch' 2014-12-29 01:13:03 +01:00
wmayer 51c017ae24 + fixes #0001877: associate a grayed out icon with Freecad's backup files (fcstd1) 2014-12-28 23:54:08 +01:00
wmayer e329cb5c3a + fixes #0001878: model refine exception 2014-12-28 18:10:02 +01:00
wmayer 7d8b1f30c3 + fixes #0001720: Freecad crash when handling invalid sketches 2014-12-28 17:10:54 +01:00
wmayer 6a211b9dbe + fixes #0001060: Editing sketch crashes FreeCAD 2014-12-27 22:47:21 +01:00
wmayer 16a8965038 + do not long apply changes in mesh settings on existing mesh objects 2014-12-27 18:32:18 +01:00
wmayer 7149cce90f + fixes #0000957: Sketch view problem when go to edit 2014-12-27 17:50:37 +01:00
wmayer b172e069a1 + fix conversion from Qi image to Inventor when image uses a color table 2014-12-27 13:51:36 +01:00
wmayer 6a9252744d + fixes #0000976: Usability: default Material drop-down is not the active material type 2014-12-27 00:56:46 +01:00
wmayer 93e5668967 + make undo/redo accessible from drawing view 2014-12-26 22:46:02 +01:00
wmayer 9290274e1c + fixes #0000711: fileted borders not projected on 2D drawing + deleted views still showing 2014-12-26 22:24:45 +01:00
wmayer d060cdf400 + revert changes for issue 1873 2014-12-26 00:08:26 +01:00
wmayer 272cb566e9 + fix minor issue in toggle construction command 2014-12-25 23:13:01 +01:00
wmayer 29d50dbc01 + improve whitespace 2014-12-25 23:10:42 +01:00
wmayer e8802adcbe + fixes #0001838: When In Sketcher Make It Difficult To Mistakenly Delete A Feature 2014-12-25 22:43:09 +01:00
wmayer a6b8bd6815 + improve whitespace, fix warnings 2014-12-25 09:48:23 +01:00
wmayer 33bc596fd8 + fixes #0001873: Error working with getSelectionEx()[0].SubObjects 2014-12-23 22:04:34 +01:00
Yorik van Havre 11a4025c4b Arch: Fixed Ifc explorer to work with recent ifcopenshell 2014-12-23 17:34:56 -02:00
Sebastian Hoogen d0126061c8 DRAWEXE export: minor bugfix 2014-12-23 15:58:17 +01:00
Sebastian Hoogen ca3ad00da8 SVG export: minor improvements and bugfixes
export Names as "id" attributes and Lables to "title" elements.
avoid duplicate path names in SVG export
handle faces with holes in SVG export
sort the edges in given wires using fixWire()
2014-12-23 15:57:57 +01:00
wmayer 2db457b74a Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-12-23 15:32:37 +01:00
wmayer 3fa8a1ed2b + fixes #0001874: Scripted constraints not evaluated correctly 2014-12-23 15:32:03 +01:00
Yorik van Havre da5504eebb Draft: Fixed autoconversion of bsplines to circles in DXF export 2014-12-23 12:13:25 -02:00
wmayer c918ef7e40 + fix whitespaces in Python module 2014-12-22 12:54:09 +01:00
wmayer 491ea2b52a + use QApplication instead of qApp 2014-12-22 12:30:44 +01:00
wmayer 5478c0fdfe + fixes #0001872: HAVE_CONFIG_H regression 2014-12-22 10:24:26 +01:00
wmayer a5bbabdc3e Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-12-22 03:07:53 +01:00
wmayer 5aefd2d346 + fixes #0001859: Unable to select PNG files for icons for macros in Tools-Customize 2014-12-22 03:07:26 +01:00
wmayer 366e974b7f + fixes #0001864: Support Command-D and Command-. on Mac OSX 2014-12-21 14:56:56 +01:00
wmayer 02cc02eaee + fix build failure 2014-12-21 11:21:32 +01:00
Abdullah Tahiri 75377ebfd3 Part Module New Feature: Hyperbola & ArcOfHyperbola
- Completed Hyperbola c++ implementation and python wrapper
- Created ArOfHyperbola c++ and python wrapper implementation
2014-12-21 00:54:07 +01:00
Abdullah Tahiri 6997cc9991 Part Module New Feature: Parabola & ArcOfParabola
- Completed Parabola c++ implementation and python wrapper implementation
- Created ArOfParabola c++ and python wrapper implementation
2014-12-21 00:51:24 +01:00
Sebastian Hoogen 2b01506c65 reapply changes from 6f907c3b
avoiding to wrongly attribute the follwoing commit message to jobermayr

Thew previous commit detects the OCC/OCE version by parsing Standard_Version.hxx
using a REGEX. The result is saved as OCC_VERSION_STRING. The comparsion
VERSION_LESS requires cmake version >= 2.8.0
2014-12-20 22:41:31 +01:00
Johannes Obermayr f050733132 Fix OCE / OCC version detection. 2014-12-20 22:41:31 +01:00
Michael Georg Hansen 8effb87566 Prevent pages and views from being put into the drawing sheet. 2014-12-20 22:18:43 +01:00
Michael Georg Hansen ec4ed868b6 Remove leftover debug output and use named parameters. 2014-12-20 22:18:22 +01:00
Michael Georg Hansen fe1d67fd65 Simplify access to projection properties.
Directly access the properties where possible.
2014-12-20 22:17:46 +01:00
Michael Georg Hansen 1816f88575 Reuse projection settings from an existing view when creating new draft views.
Select a draft object and a view on a drawing page, then the view created for
the draft object will have the same projection settings as the selected view.
2014-12-20 22:17:08 +01:00
Michael Georg Hansen ef24aaa3ce Reuse projection settings from an existing view when creating new part views.
Select a part and a view on a drawing page, then the view created for the part
will have the same projection settings as the selected view.
2014-12-20 22:16:41 +01:00
wmayer 6af1186d27 + remove Makefile.am, remove some leftovers, avoid including unneeded headers in GCS.cpp 2014-12-20 14:06:54 +01:00
wmayer d486f3351d + fix pow() ambiguity 2014-12-20 14:01:23 +01:00
Abdullah Tahiri 501c40f0e6 Sketcher: Ellipse implementation enhancements
- ArcOfEllipse enhancement: Tangency ArcOfEllipse to ArcOfEllipse or ArcOfCircle by selecting end/starting points...
- Minor bug corrections (Thanks DeepSOIC)
- ExposeInternalGeometry python command
- DeleteUnusedInternalGeometry python command
- On deletion of an Ellipse/ArcOfEllipse all further unconstrained internal geometry is also deleted.
- This cleans up the code by eliminating code repetition in the creation methods.
- Major bug fix for autoconstraints for ellipse and arc of ellipse creation (for both creation methods)
- Major bug fix Start and Endpoint constraints of an arc of ellipse where not taking into account that Sketcher arcs are always CCW, so they have to be exchanged if we convert a CW arc into a CCW arc.

Sketcher: General bug fix: Tangency wrongly suggested

What?
=====
- On creation of a shape autoconstraints are suggested.
- Tangent autoconstraint was suggested even with lines perpendicular to the tangency direction

Reproduce
=========
- Make a circle on the origin and move the mouse along the X axis, it will suggest a tangency that is impossible
- Click on the axis and no circle will be created

Solution
========
- The SeekConstraint now can use the parameter dir to give a direction that is substantially perpendicular to the expected tangency, so that
if an object having a direction (a line) is hit, a tangency will not be suggested if within around 6 degrees of being parallel.
- Additionally, if such a line is an X,Y axis of the sketch, tangency will only be suggested if the direction is within 6 degrees of being perpendicular (i.e. it is almost tangent already while sketching).
- This difference is due to the fact that an X or Y axis can not "move" to meet the object under creation, whereas a line can.
2014-12-20 12:33:37 +01:00
Mark A. Taff 80120a6bac Ellipse implementation: Several bug fixes
I. Fix minor bug where wrong b was used to create ellipse internal geometry.

Tweak the internal geometry code a bit and reformat it so it isn't so wide.
Also begin debugging constraint conflicts on small circular ellipses.

There seem to be two issues currently in major/minor internal geometry lines:
  1) Sometimes minorLength > majorLength due to round-tripping doubles, and
  2) Constraint conflicts when majorLength > minorLength by an epsilon on the order of 1e-6

(cherry picked from commit 5c3e20af1a95c860112289dcdda54ea99778bc3a)

II. When testing for a valid ellipse, also ensure that the mangled major axis length > the mangled axis length.

This additional condition ensures that major and minor axis constraints don't conflict in the case of small
(nearly) circular ellipses.

The is still a potential bug in the solver when the major length is just slightly larger than the minor, but this fix
makes it nigh impossible to reproduce.
(cherry picked from commit 7e274bc32d9aa1a12ab52bfa33ed80353540b062)

III. Code clean up

Remove redundant 3d vectors.

(cherry picked from commit c656d5165c8bae8f101a2b46af6b12348d06cefe)
2014-12-20 12:33:37 +01:00
Abdullah Tahiri c8d7f70dba Sketcher: Ellipse implementation: Art by Jim 2014-12-20 12:33:36 +01:00
DeepSOIC fc7f1791d2 Fix intern. geom. placement for ellipse arc a<b
(cherry picked from commit 896372cbae2d5667f72f6ee9e628eea482846156)
2014-12-20 12:33:36 +01:00
Abdullah Tahiri 83edcf4c86 Sketcher: Ellipse : Integration of all conics under a single toolbar space 2014-12-20 12:33:35 +01:00
Abdullah Tahiri ba2c2d36e0 Sketcher: Ellipse implementation Art by Jim
- Art for setting all conics under a single icon
- Art for ellipse for 3 points creation method
2014-12-20 12:33:35 +01:00
Mark A. Taff bccb9466cc Implement two construction methods for ellipses:
--Center, major radius, minor radius
  --Periapsis, apoapsis, minor radius

Artist: We need an icon for periapsis, apoapsis, minor radius method.
(cherry picked from commit f0a4339621b0bf901754af14c3cd36c95ca55966)
2014-12-20 12:33:35 +01:00
Abdullah Tahiri 901bbbed57 Sketcher: Various Ellipse enhancements
- Autoconstraints for Ellipse
- Conversion of a Part.Arc of an Ellipse to Sketcher.
2014-12-20 12:33:34 +01:00
Sebastian Hoogen dc5c64703a support for ellipses and elliptical arcs in flattened SVG output
(cherry picked from commit 59eabdbcb043f3d462c3e9ed0ba21cfe65b7aae6)
2014-12-20 12:33:34 +01:00
Abdullah Tahiri f5df65c4c4 Sketcher: Ellipse enhancement: All internal geometry is shown on creation
Elements that have internal geometry are created with the internal geometry on creation.

It has been under discussion for a long time. Ulrich was in favour (asked for it several times).
DeepSOIC implemented the focus because he hated the poor dragging of the ellipse when empty.
2014-12-20 12:33:33 +01:00
DeepSOIC 9d135bdc4e Sketcher: Ellipse enhancement: Negative focus on creation to improve dragging
Focus2 is thrown in automatically for ellipse arcs

(cherry picked from commit 1ab814e6b07fd946dbb2910cc1bfb8588c61afb8)
2014-12-20 12:33:33 +01:00
Abdullah Tahiri d0362fa4a2 Sketcher Ellipse and ArcOfEllipse: Extra features and bug fixes
- Visual representation of equality constraint: Separate circle and arcofcircle implementation from ellipse and arcofellipse implementation
- Fix for Alignment constraint: Now it allows to assign a second element, one by one
- Box selection for ArcOfEllipses
  Fixes the bug that vertex far away got selected due to lack of sync between the selection and draw loops.
2014-12-20 12:33:32 +01:00
DeepSOIC f24b589d67 Sketcher Ellipse bug fix:
- Fix placement of equality symbols at ellipses and arcs of ellipses
2014-12-20 12:33:32 +01:00
Abdullah Tahiri a067a7c25a Sketcher Ellipse and ArcOfEllipse: Extra features and bug fixes
- Minor changes to alignment constraint selection to avoid to create objects just for simple calculations
- Equality constraint of Ellipse, ArcOfEllipse and combinations of those elements
- Bugfix for internalalignment creation of major and minor of ellipse and extension to arcofellipse
- Trim support for ellipses
- Solver threshold for rank calculation set at 1e-13.
- Trim support for arc of ellipse
- Ellipses and ArcOfEllipses as external geometry
- Validate Sketch now supports arcs of ellipse
- Tangents of Ellipse or ArcOfEllipse to any of ArcOfcircle, circle and Ellipse (using construction elements)
- Perpendicularity constraint
- Bug fix: Show/hide internal geometry not working for external geometry
- Visualization of Internal alignment constraints when selecting in the constraint widget
- Equality for ellipses and arc of ellipses
2014-12-20 12:33:31 +01:00
DeepSOIC 21354e9a8b Sketcher Ellipse bug fixes:
- Fix of internal geometry creation
- Fix swapped negative and positive ends of major radius line on creation
- Removing the fudge factor (no longer needed)
- Fix to restore internal alignment - autodecide on constraint creation which point of the line is closer to the position
2014-12-20 12:33:30 +01:00
Abdullah Tahiri fb0d830560 Sketcher Ellipse and ArcOfEllipse: Major bug fixes
- Change mode so that focus1 is not a point, but two doubles so that visual model and solver model match in number of points.
- Solver fix to deal with reduced constraint partials accuracy (threshold for matrix rank calculation tweak)
- Changes suggested by logari81
2014-12-20 12:33:30 +01:00
DeepSOIC e423c308af Sketcher Ellipse bug fix: Jump back on mouseup when shrinked 2014-12-20 12:33:29 +01:00
Abdullah Tahiri a458c3e6d2 Sketcher New Feature: Ellipse support
- Ellipse introduction button via (center,majaxis extreme, a point in edge), ellipse is always CCW so that Z axis goes in the positive direction of the sketch
- Backwards compatibility with files of previous versions of ellipse not defining a phi angle
- Art by Jim (all the icons you see and the XPMs shown on creation of an ellipse)
- Element Widget support for ellipses
- Box selection for ellipses
- Point on Ellipse constraint based on the gardener's method based on Ulrich's function proposal (radcan simplified, i.e. with simplify_radical sage function)
- Tangent: Ellipse to Line based on DeepSOIC's geometric formulation (radcan simplified)

Sketcher New Feature: Internal Alignment Constraint
- The element to which internal alignment is applied has to be selected last.
- All other elements are added in the order of priority, taking into account existing elements
- Art by Jim (beautiful icons).

Sketcher New Feature: Tool to show/hide/restore the internal geometry of an element
- New functionality for show/hide internal geometry:
  toggles between hiding all unused internal geometry elements and showing all internal geometry.
  The restore function is implicit to the showing all internal geometry

Sketcher New Feature: Arc of Ellipse support
- Part::Geometry + Python implementation
- ArcOfEllipse creation method
- Art by Jim (all the icons you see and the XPMs shown on creation of arc of ellipse elements)
- Sketcher Element widget for ArcOfEllipse.

Bug fix: Select elements associated to constraints works now for foci internal alignment constraints
2014-12-20 12:33:29 +01:00
Abdullah Tahiri 6eec2e9851 Ellipse implementation: Art by Jim
- it also includes a shell script equivalent to the UpdateResources.bat for those who use linux
2014-12-20 12:31:27 +01:00
wmayer b24acb3201 + fix package failure 2014-12-19 18:53:23 +01:00
wmayer c64224d945 + set SMESH include dir when using libpack 2014-12-19 13:32:30 +01:00
wmayer 08171f474a + revert PyCXX removal 2014-12-19 11:31:05 +01:00
Richard M. Shaw a8d24be3b3 Update CMake config to work with smesh 6.5.3.1.
New fork of standalone smesh is available here:
https://github.com/tpaviot/smesh
2014-12-19 11:23:38 +01:00
Peter Lama 662d72b4a3 Remove cmake requirement for fortran
Commit b253a148 removed the need for a fortran compiler, but cmake
was still requiring one
2014-12-18 20:14:18 -08:00
wmayer d8722070b8 + extend State attribute of document object 2014-12-17 18:20:30 +01:00
wmayer c1823efe38 + fix build failure 2014-12-16 17:06:05 +01:00
wmayer 977fa48b77 + handle std::exception in Document::slotChangedObject 2014-12-16 15:06:40 +01:00
wmayer 5aac822c71 + issue #0001038: Improve and show List properties in Tree View 2014-12-16 14:31:36 +01:00
wmayer f37a752975 + fixes #0001848: Radius of circle given in degrees 2014-12-16 12:10:15 +01:00
wmayer 171a8cf85a + fixes #0001857: Broken start page in Ukrainian language 2014-12-16 10:20:29 +01:00
wmayer 6e5118c9c8 + fixes #0001038: Improve and show List properties in Tree View 2014-12-15 23:54:55 +01:00
wmayer 78f07f8731 + fixes #0001790: Crash on undo/redo with a selection 2014-12-14 00:06:08 +01:00
wmayer ff7e33b95d + reimplement copyObject based on merge document 2014-12-13 21:43:20 +01:00
wmayer 157ab9508e Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-12-13 19:35:53 +01:00
wmayer f9986e54e4 + get full dependency when copying an object 2014-12-13 19:35:28 +01:00
Yorik van Havre 0ea52029cd Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-12-13 13:37:19 -02:00
Yorik van Havre 7e86d94a48 Material: Added mk2's material cards 2014-12-13 13:36:51 -02:00
Yorik van Havre 4f3b1e2595 Drawing: added new set of empty templates - issue 1856 2014-12-13 13:30:15 -02:00
wmayer 69edf4b6c9 + merge project on app level 2014-12-13 16:15:21 +01:00
Yorik van Havre b2df659699 Fixed small error in concrete material 2014-12-12 14:56:27 -02:00
J.L. Cercos-Pita f58807168d Removed autotools makefile template 2014-12-12 14:49:58 -02:00
J.L. Cercos-Pita 5a23e77385 Fixed the module copy path 2014-12-12 14:49:58 -02:00
J.L. Cercos-Pita fc7c75ba84 Regenrated the branch (rebase failed) 2014-12-12 14:49:58 -02:00
Yorik van Havre 94187a6872 Draft: small fix in Draft.py 2014-12-12 14:38:07 -02:00
wmayer 7801fbef3a + fixes #0001849: Enable Spin Boxes support for Pad, Fillet and Chamfer 2014-12-11 18:25:30 +01:00
wmayer 5665302521 + implement PrefQuantitySpinBox 2014-12-11 14:23:32 +01:00
wmayer ae3755cf01 + utc time with timezone 2014-12-10 15:39:45 +01:00
Sebastian Hoogen 7a8492fddc use ISO 8601 timestamps including timezone
for creation and last changed properties
2014-12-10 12:52:06 +01:00
Sebastian Hoogen fc14611c93 use 4 spaces to indent XML output 2014-12-10 01:33:51 +01:00
wmayer d4a5249b4b + when creating picture check whether pbuffer is supported 2014-12-09 14:18:44 +01:00
wmayer 5da5be2eea + fix crash in spnav settings dialog while changing language, improve whitespaces 2014-12-09 13:44:25 +01:00
wood galaxy 6aa91b3622 Ready for merge : fix issues #1618 and #1607
Implement getSubVolume to cut wall with roof.
Now Roof is not hidden when removing it to a wall.
2014-12-08 12:23:01 -02:00
wood galaxy 341782ec54 Implement Overhang 2014-12-08 12:23:01 -02:00
wood galaxy 1876f36611 Fix bug if user enter thickness = 0 2014-12-08 12:23:01 -02:00
wood galaxy 715b5d7fe9 Add a new Arch Roof Builder 2014-12-08 12:23:01 -02:00
wmayer c02590c666 + support of merging projects on App level 2014-12-07 00:38:53 +01:00
wmayer 2608d0aaf2 + 0001849: Enable Spin Boxes support for Pad, Fillet and Chamfer 2014-12-07 00:38:02 +01:00
wmayer ec4a496866 + when checking for custom toolbars do not auto-create sub-groups in user parameters 2014-12-06 14:46:08 +01:00
Sebastian Hoogen c931bee01d list multiple branches in version info
in case last commit is a octopus merge
2014-12-06 13:54:50 +01:00
Sebastian Hoogen 8a93916331 calculate the revision number from reference commit 2014-12-06 13:54:49 +01:00
Sebastian Hoogen 54cfed03ba split the revision information
to a number for those commits common with the blessed master and a number for
those ahead of the current master

choose the url from available remotes
remove ssh username
accept ssh://[...].sf.net as origin
2014-12-06 13:54:48 +01:00
wmayer 2347d677dd + support global custom toolbars 2014-12-06 13:21:36 +01:00
jriegel 9a07c3ad9e fix in reading results from Calculix 2014-12-06 13:10:09 +01:00
wmayer 4964628291 + check if file handle is valid in FileInfo::isFile 2014-12-04 16:44:22 +01:00
wmayer 6872b2c393 + fixes #0001736: Parts with multiple colors are displayed in a single bad color after hiding 2014-12-04 14:36:43 +01:00
wmayer 0db3326e68 + fixes #0001845: The Project Utility drops the diffuse colors 2014-12-04 01:23:41 +01:00
Yorik van Havre a6563fb03a Draft: Fixed polygon center snap 2014-12-03 11:16:08 -02:00
wmayer c6f1132664 + degree symbol is not 7-bit ASCII, use utf-8 2014-12-03 10:26:15 +01:00
wmayer 3de3aa49d3 + make sure to use valid compression level 2014-12-02 23:02:04 +01:00
wmayer 52dc0dda47 + allow to modify placement via sub-attributes 2014-12-02 19:19:23 +01:00
wmayer 351ad4f6c7 + fixes #0001363: VRML export can produce corrupt files 2014-12-02 15:40:36 +01:00
wmayer f5a4e68068 + revert regression with mixing Python debug and release libs 2014-12-02 11:29:28 +01:00
wmayer 640c9cbf8b + fixes #0001361: StartPage scripts and resources are installed twice 2014-12-01 15:57:23 +01:00
wmayer dd3412b159 + improve whitespaces 2014-12-01 11:36:33 +01:00
wmayer 73859191f3 + exposing onBeforeChange to Python 2014-12-01 10:58:25 +01:00
jriegel 9c2f8d785d Merge branch 'refs/heads/review-CL-Bundler' 2014-11-29 20:08:06 +01:00
jriegel 38fc7ba604 Merge branch 'refs/heads/master' into review-CL-Bundler 2014-11-29 15:43:19 +01:00
wmayer 2896372a75 + fix mesh unit tests 2014-11-29 15:17:58 +01:00
Michael Georg Hansen 55884f373c Print an error message if PySideTools are not found. 2014-11-28 10:55:30 -02:00
wmayer c04c513b41 + fix typo, consistent icon name 2014-11-26 14:36:11 +01:00
Abdullah Tahiri fe3beb89fd Sketcher Enhancement: Merge sketches : Art by Jim 2014-11-26 14:23:46 +01:00
Abdullah Tahiri 0f72bc68ba Sketcher Enhancement: Merge sketches
- It copies the geometry and associated constraints of a plurality of sketches into a new sketch
- The functionality is accessible from outside sketch edit mode, directly from the menu Sketch
2014-11-26 14:23:14 +01:00
wmayer e3e2667252 + remove some more autotools files 2014-11-26 13:03:59 +01:00
Sebastian Hoogen debca91e98 remove support for automake 2014-11-26 10:26:30 +01:00
wmayer c9ab183bf4 + set DBL_MAX as maximum for units 2014-11-24 14:30:50 +01:00
Sebastian Hoogen 428b47d74a importOpenSCAD: support for projection(cut=true) 2014-11-23 19:26:28 -02:00
Sebastian Hoogen c8934c06a8 enhancements in exportDRAWEXE.py
simplify float formatting
support for Part::Thickness in exportDRAWEXE.py
support for Draft::Ellipse in exportDRAWEXE.py
support for Annotations
2014-11-23 19:24:34 -02:00
Yorik van Havre 58a84d2748 Arch: small fix in sectionplane - fixes #1836 2014-11-23 19:23:13 -02:00
wmayer 3c61d41dbf + fix bug in mesh bounding box, fix clang warning 2014-11-23 10:55:36 +01:00
jriegel 7d30060c4e fix in destruction of the application 2014-11-22 16:41:22 +01:00
jriegel 81ef381b66 fix for VC9 2014-11-22 14:34:05 +01:00
jriegel 10ff1e579d fix bug on highlighting invisibel nodes 2014-11-22 13:51:31 +01:00
jriegel 1bc6df8eac Merge branch 'refs/heads/master' into review-CL-Bundler
Conflicts:
	src/3rdParty/salomesmesh/CMakeLists.txt
2014-11-22 13:51:04 +01:00
jriegel 6483c66cba small fix for VS 2013 2014-11-22 12:46:10 +01:00
wood galaxy c5f2e9e56b Add PointOnObject constraints to 2-pane window 2014-11-21 23:11:29 -02:00
wood galaxy af89ebc803 add preview CutVolume in Arch CutPlane 2014-11-21 23:03:53 -02:00
wood galaxy 5f261fb636 make compatible with Part typed object
tool make a Part Cut object when object are not Arch typed.
the cutVolume is now Red and 75 transparence
2014-11-21 23:03:53 -02:00
wmayer d354e21ce5 + prepare for netgen 5.x support 2014-11-20 16:30:10 +01:00
wmayer 6bdf0b4b76 + minor fix 2014-11-19 22:56:29 +01:00
wmayer be7f583aa0 + fix issues on 64-bit Linux/MacOSX systems 2014-11-19 15:32:35 +01:00
wmayer b11acfd165 + handle unicode strings in class PythonWrapper 2014-11-19 11:18:18 +01:00
WandererFan 7a201f9b74 Work around for Mantis issue 0954 on Helix Primitive
To be removed after OCC helix bug corrected.
2014-11-17 17:45:34 -05:00
wmayer 3904d0a8ee + fixes #0001830: Gui.export() cannot handle long filenames 2014-11-17 21:11:28 +01:00
wmayer 3d03e208d9 + fixes #0001829: DlgPrimitives replaces non ASCII charaters in objects Labels by ? 2014-11-17 20:36:22 +01:00
wood galaxy e070a717a5 improvement to Cut Plane
Move cut plane on itw own.
Add ArchCutPlan to CmakeList
Add task panel
Add choice between side of the face
2014-11-17 15:44:11 +01:00
DeepSOIC 86a1757c20 Sketcher: Slot: proper tangent constraints
Endpoint-to-endpoint tangency is applied now instead of
tangency+coincident.
Fixes issue #0001828 ( http://freecadweb.org/tracker/view.php?id=0001828
)
2014-11-16 23:14:41 +01:00
wmayer 62de0655d7 + fix inconsistency problem after undo/redo 2014-11-16 19:13:06 +01:00
wmayer 2ead6f9bcf + whitespace improvement 2014-11-16 19:12:34 +01:00
wmayer 7a307cdab3 + fix crash when dragging a point adter undoing the deletion of a line 2014-11-16 19:11:31 +01:00
wmayer 4e2cbaf045 + fix saving problem with file names containing an apostrophe 2014-11-15 22:45:56 +01:00
jriegel 7499f77f08 ignore in src build directory 2014-11-15 21:18:52 +01:00
jriegel 6f907c3b48 some fixes in build with CL-Bundler 2014-11-15 21:18:22 +01:00
wmayer a622d14c2d + port to CMake 3.0 2014-11-15 18:48:58 +01:00
wmayer fc903d93df + support adding circles as external geometry not lying on the sketch plane 2014-11-15 14:31:24 +01:00
jriegel 8c1b1aa86b Port to VC12 2014-11-15 14:07:02 +01:00
jriegel f2d990d9ca fix some warnings in cMake 2014-11-15 13:22:48 +01:00
jriegel f4fc7e88fa Merge remote-tracking branch 'refs/remotes/peterl94-github/new-libpack' into review-CL-Bundler 2014-11-15 13:07:23 +01:00
Peter Lama f13f5dc520 Add support for CLbundler created LibPack
* New 'UseLibPack' cmake file sets CMAKE_PREFIX_PATH so that find_package
  can be used for most packages.
* Mimic fc_wrap_cpp defined in other 'UseLibPack' files. Some file
  dependencies did not get set correctly otherwise.
* OCE 0.16 does not have Standard_ctype.hxx
* shfolder.h can't be used with Win SDK 7.0
2014-11-14 08:01:09 -08:00
Yorik van Havre 18c0b3ba69 Arch: small optimization in archframe code 2014-11-13 19:30:02 -02:00
wood galaxy 1ce87b2ecf make BasePoint compatible with Frame without BasePoint 2014-11-13 19:26:11 -02:00
wood galaxy 659add8ba3 Add BasePoint Property to Arch Frame
BasePoint allow user to change by wich vertex of the profil the frame
passe of.
2014-11-13 19:26:11 -02:00
wood galaxy f7830b8da3 Make cutComponent working 2014-11-12 15:36:16 -02:00
wood galaxy b17f401c5c Add arch cutComponent feature 2014-11-12 15:36:16 -02:00
Yorik van Havre c07d2ad91b Draft - small (provisory) encoding fix - fixes #1825 2014-11-11 20:11:31 -02:00
wmayer 730ad0fbea + support anti-aliasing in offscreen renderer 2014-11-10 14:10:38 +01:00
Yorik van Havre 04c1530b09 Draft: trimex extrusions now sets the solid property of the extruded object to True 2014-11-10 09:44:38 -02:00
Yorik van Havre 039cacbfde Arch: fixed encoding problem in Survey tool - fixes #1821 2014-11-09 17:27:37 -02:00
wmayer d30eb39a1e + fixes #0001808: Double Clicking Sketcher PolyLine Causing Crash 2014-11-09 17:59:54 +01:00
wmayer efe414e4c2 + fix transparency problem, support antialiasing, background color issue 2014-11-08 23:06:53 +01:00
wmayer 99caf6d015 + support of arbitrary background colors in snapshot function 2014-11-08 18:23:41 +01:00
wmayer e753af2fd7 + fix possible scaling problem of datum label 2014-11-08 15:55:47 +01:00
wmayer 97696aadfa + fix gradient background issue when creating snapshot, remove superfluous signal from FileOptionsDialog 2014-11-08 14:50:27 +01:00
wmayer bedd2b15a7 + fix copying Python resource files to destination on Windows 2014-11-08 11:08:58 +01:00
wmayer 951f440e15 + fix build failure on Windows 2014-11-07 19:59:17 +01:00
Yorik van Havre a18a8e105a Cleaned up the dependencies in debian control file
* Added python-tools
* Replaced opencascade with oce (opencascade not in debian repos anymore)
* Updated some obsolete package names
2014-11-07 09:34:28 -02:00
Sebastian Hoogen 9426f5d4cf OpenSCAD rc file is now compiled at build time 2014-11-06 23:31:24 -02:00
wmayer 82ed56a3a9 + fix bug in SoQTQuarterAdaptor::processSoEvent 2014-11-06 19:14:14 +01:00
Stefan Tröger 69f4bbb2ef fixes #0001781: Reimplement arrow keys for 3d view
- including minor formating fixes
2014-11-06 18:56:51 +01:00
wmayer 4a28b93521 + workaround for cropped images with Coin4 2014-11-06 16:49:50 +01:00
WandererFan ba97d17b2a Fix #0001722 Left-handed helix with an angle>0 produces 1 too many turns 2014-11-06 10:49:02 -02:00
Yorik van Havre a88038c7a0 fixed binary path in FindPysideTools cmake file - fixes #1796 2014-11-05 20:07:53 -02:00
Yorik van Havre 75deaa658f Arch and Draft rc files are now compiled at build time - issue #1796 2014-11-05 20:07:53 -02:00
blobfish 8d8c727ac5 Part: ModelRefine: Fix for avoid edges of edgeFuse not working 2014-11-05 14:54:38 +01:00
Jan Rheinländer 46ec224b04 Part: ModelRefine: Test files 2014-11-05 14:54:37 +01:00
blobfish 37e0750cd2 Part: ModelRefine: adding bspline support 2014-11-05 14:54:36 +01:00
blobfish 0a94a9b78c Part: ModelRefine: Add FixMissingSeam 2014-11-05 14:54:36 +01:00
blobfish 1b9773299a Part: ModelRefine: fix for missing tolerances. 2014-11-05 14:54:35 +01:00
Jan Rheinländer 7d359a4618 Part: ModelRefine: Enhancement for cylindrical faces 2014-11-05 14:54:34 +01:00
wmayer fa3a2a0d3a + fix various rendering problems 2014-11-04 18:56:05 +01:00
wmayer 3507e301c2 + improve plane fit 2014-11-04 15:03:25 +01:00
wmayer 5c84e47422 + fixes #0001816: parseQuantity returns garbage 2014-11-04 14:51:19 +01:00
wmayer d66fc092e1 + better exception handling in Part module 2014-11-04 11:03:51 +01:00
wmayer a7157ce6a9 + add new render type to 3d viewer 2014-11-03 23:09:38 +01:00
wmayer 980b17ca86 + improve error handling in plane fit 2014-11-03 18:20:55 +01:00
WandererFan fc6d57f8b3 Fix #1787 Draft.PathArray align
Correct handling of Euler angle calculations.
2014-11-03 10:24:23 -02:00
Yorik van Havre 2836f4cb99 Arch: Provisorily implemented workaround for utf8 paths and ifcopenshell - issue #1795 2014-11-02 15:47:29 -02:00
wmayer ae09625140 + expose function to Python to check for invalid mesh points 2014-10-31 15:57:28 +01:00
wmayer 267ca0813a + fixes #0001798: Support general ellipsoid with three radii 2014-10-30 18:02:18 +01:00
wmayer 1f450972d2 + change between AP203 and AP214 schemes 2014-10-30 13:07:25 +01:00
wmayer 92ebfab47a + customize STEP header 2014-10-30 11:48:33 +01:00
Peter Lama f9e6efac2e Fix building FreeCAD with PCL
PCLConfig also calls find_package for boost, but with different
components
2014-10-29 21:36:01 -07:00
wmayer 76906d20a0 + customize IGES header 2014-10-29 16:39:33 +01:00
wmayer b6df4a490e + header for IGES files (disabled) 2014-10-29 12:29:48 +01:00
wmayer c67f326174 + split STEP and IGES settings into separate pages, handle Brep mode of IGES format 2014-10-28 19:27:23 +01:00
wmayer 9256de8c1a + fixes #0001665: Allow setting higher value for number of backup files 2014-10-28 18:15:51 +01:00
wmayer 822e45c4f7 + fixes #0001806: Wrong object name shown in App::PropertyLink Properties in the property editor 2014-10-27 17:05:27 +01:00
wmayer 429e55d744 + make sure to set unique labels for newly created documents 2014-10-27 13:11:50 +01:00
wmayer a239e7b194 + fixes #0001797: Fix focus problem with Quarter based viewer 2014-10-27 11:36:33 +01:00
wmayer 30d38e6749 + fix bug in Python binding of Quarter viewer 2014-10-24 19:29:35 +02:00
wmayer f119e740c8 + port cache context handling 2014-10-22 15:26:22 +02:00
wmayer 621aebdbef + change API of GLPainter 2014-10-22 14:48:38 +02:00
wmayer 8fb596221f + fixes #0001794: new defined as a macro sometimes conflicts with boost 2014-10-22 12:39:43 +02:00
wmayer 61ec6e2924 + fix problem with disappearing content of image view 2014-10-22 10:59:17 +02:00
wmayer 28d1bf5ed9 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-10-21 21:41:28 +02:00
wmayer 7602b8f20c + make help system more flexible 2014-10-21 21:41:07 +02:00
wmayer 6b98223c07 + remove useless statement 2014-10-21 21:40:25 +02:00
wmayer d98f883a7e + formatting message 2014-10-20 21:43:35 +02:00
Sebastian Hoogen da4c4aacbe Output Mac OS version (or Windows 8) on splashscreen 2014-10-19 20:02:10 +02:00
wmayer 4259a9391b + save last used export/import filter 2014-10-19 19:42:50 +02:00
wmayer 5ddb891bd3 + fix Python binding of 3d viewer 2014-10-19 18:59:05 +02:00
wmayer ab66d0a45f + fix more Quarter port issues 2014-10-19 17:49:31 +02:00
wmayer 5912342e3f + support of home path with non-ASCII chars 2014-10-19 17:27:02 +02:00
wmayer eb89cb422c + harmonize API 2014-10-19 14:28:39 +02:00
wmayer f233a50a00 + harmonize API 2014-10-19 14:25:51 +02:00
wmayer 21eae7f900 + port Sandbox module to Quarter 2014-10-19 12:16:33 +02:00
Yorik van Havre bd1bbff874 Draft: Disabled automatic DXF library download - fixes #1785
Note for existing users: Can be reenabled in menu Edit > Preferences >
Import-Export > DXF > Automatic update
2014-10-18 10:21:26 -03:00
wmayer dd392efeb1 + fixes #0001735: Ellipsoids visibility problems 2014-10-16 19:36:54 +02:00
wmayer 84bd9a4a88 + fixes #0001779: memory leak 2014-10-16 18:57:53 +02:00
Sebastian Hoogen bce3de5b5d move exportDRAWEXE.py to Sandbox WB 2014-10-15 15:53:52 +02:00
Sebastian Hoogen 31c39e222a fixes #1706 rename anaglyph stereo mode red/cyan 2014-10-15 15:53:18 +02:00
Sebastian Hoogen 81d4b94902 issue #1788 SVG output of trimmed curves 2014-10-15 15:52:59 +02:00
wmayer ea967caecc + fix build failure 2014-10-15 15:45:40 +02:00
wmayer 7422f073ea + share GL widgets when creating further 3d views of a document 2014-10-15 12:04:06 +02:00
Sebastian Hoogen 8711bdd78f issue #1573 remove unavailable headers 2014-10-14 18:46:24 +02:00
Abdullah Tahiri ca1eba6107 Sketcher: Element Widget enhancement: Support for external geometry
Python naming used is "ExternalEdge" for consistency with the name appearing in the status bar when selecting that object.

As discussed:
http://forum.freecadweb.org/viewtopic.php?f=10&t=6861&sid=bd9ad10357f8a7de146c4fbd2d53c23b&start=90
2014-10-14 18:33:21 +02:00
wmayer a96f390097 + fix build problems with Python & MacOSX 2014-10-13 22:02:57 +02:00
Sebastian Hoogen a53a239f2f issue #1027 use unicode filepaths 2014-10-11 13:32:06 +02:00
Sebastian Hoogen 05af9207a3 use Icons for Refine and Increase tolerance features 2014-10-11 13:09:33 +02:00
Sebastian Hoogen f1283cf24c fixes #1782 remove unused precsion parameters
from gp_Trsf::SetValues
2014-10-11 13:03:02 +02:00
Sebastian Hoogen eb598ffd16 fixes #1740 quote pov-ray binary on windows
this fixes a bug introduced by 3523741e96
it restores the double quotes for the shell and uses single quotes for the
python string.
2014-10-11 12:56:38 +02:00
wmayer 980d1eb0eb + fix expressions 2014-10-10 19:01:34 +02:00
wmayer 71154f5f25 + fix issues with force constraint 2014-10-10 17:42:33 +02:00
wmayer 96e286a060 + fix anti-aliasing issue 2014-10-10 16:58:02 +02:00
wmayer 39f2132029 + fix whitespaces 2014-10-10 15:48:31 +02:00
wmayer 4a3838fa44 + fix stack overflow error 2014-10-10 15:47:20 +02:00
Yorik van Havre daedcf4f1c Draft: Adapted Draft module for python3 compatibility - issue #995 2014-10-05 19:40:14 -03:00
Yorik van Havre 8d2e08ffa0 Little fixes to allow pycxx to compile with python3 2014-10-05 17:31:17 -03:00
Yorik van Havre 3c091ac69a Draft: prevented possible deletion of draft wire during edit - fixes #1680 2014-10-05 17:30:18 -03:00
Sebastian Hoogen f2367c6c19 bugfix in unit parser
partly revert to 810fadab23
and change python string handling to "et" method
2014-10-05 14:44:04 -03:00
Yorik van Havre 9671d9658b Arch: Fixed axis object - fixes #1605 2014-10-05 13:09:08 -03:00
Jose Luis Cercos-Pita 4de77a921a Set PySide to all ambiguous QtGui and QtCore calls 2014-10-04 11:42:34 -03:00
Yorik van Havre 537e759142 Draft: Added DraftGeomUtils.pocket2d(shape,float)
Returns a list of wires obtained by offsetting the wires of the given
shape by the given amount (outer wire inside, inner wires outside) and
resolving intersections
2014-10-03 17:35:40 -03:00
wmayer 05de6c103f + add missing header to Tools2D.h 2014-10-02 11:40:39 +02:00
Yorik van Havre 3540634c34 Start: Set version info text color to white - fixes #1772 2014-10-01 19:27:50 -03:00
wmayer f02da38566 + fix Qt help problems 2014-10-01 17:16:43 +02:00
Stefan Tröger 3cbfb0a5c7 Prevent QPainter buffer swap
As the QGraphicsScene overlay does not work for all cards/drivers we disable the possible buffer swap of the qpainter, as this could be a potential source of the flickering. If the painter swaps buffers and we do it again the user will see first the correct picture (first swap) and then something uninitalized (second swap)
2014-09-29 10:11:29 +02:00
Stefan Tröger 4e63e11df6 Make stereo modes work again
Be aware that stereo rendering based on SoRenderManager does not allow background colors as the opengl buffers are cleared before rendering. As FreeCAD draws the background before the standart coin rendering the background gets erased again.
2014-09-29 10:11:28 +02:00
wmayer ac010de9c9 + fix minor bug when adding coincidence constraint 2014-09-28 15:06:02 +02:00
Yorik van Havre 463b5d4a7e Draft: display coordinates using the current locale's decimal separator - fixes #1741 2014-09-27 16:23:59 -03:00
Sebastian Hoogen e820a32653 issue #1701 2014-09-27 13:07:30 -03:00
wmayer f0bf3cb6ab + Proper handling of sketch plane parallel to view direction 2014-09-27 15:53:21 +02:00
Yorik van Havre f87bd2ac35 Patched PyCXX 6.2.5 with original FreeCAD changes made in 6.2.0 2014-09-24 18:19:26 -03:00
Yorik van Havre 69c4b37fe6 Fixed relativepaths in PyCXX 2014-09-24 18:19:25 -03:00
Yorik van Havre ad3908cca6 Upgraded PyCXX to version 6.2.5 2014-09-24 18:19:25 -03:00
Yorik van Havre 16e8b0ee3f Draft: Reverting provisorily to the old version of DraftGeomUtils.sortEdges 2014-09-24 18:13:55 -03:00
Yorik van Havre f0c59e4cc2 Arch: fixed string encoding in Space object 2014-09-24 18:13:18 -03:00
wmayer e88b712ff9 + fix typos 2014-09-24 22:06:13 +02:00
wmayer 6e92028ca6 + add option to disable automatic fit to view when loading data file 2014-09-24 18:49:19 +02:00
wmayer 23a58fedf7 + fix warnings with clang 2014-09-24 18:00:46 +02:00
wmayer 032c893183 + fix warnings with clang 2014-09-24 17:46:04 +02:00
wmayer 5201223da4 + fix warnings with clang 2014-09-24 16:00:10 +02:00
wmayer 003c2bf77d + fix warnings with clang 2014-09-24 15:55:36 +02:00
wmayer dfd2eb3327 + fixes #0001762: Update 'About FreeCAD' Screen 2014-09-23 19:31:37 +02:00
wmayer c20e83e0d6 + set fix precision for FPS counter 2014-09-23 18:19:35 +02:00
wmayer 3ff7d569c8 + fix build error 2014-09-23 12:51:31 +02:00
Stefan Tröger 71e0793493 fix framerate rendering 2014-09-23 10:11:12 +02:00
Stefan Tröger deda49b098 fix qt moc warnings 2014-09-23 10:11:12 +02:00
Stefan Tröger 42ae8a6246 fix backlight issue 2014-09-23 10:11:12 +02:00
Stefan Tröger cc5c9f6031 ensure that the glwidget is returned 2014-09-23 10:11:12 +02:00
Stefan Tröger d02d966b9c fix rotation center after view all 2014-09-23 10:11:12 +02:00
Stefan Tröger ad1bfc32fb fix reported bugs
- compile on windows
- fix cursors
2014-09-23 10:11:12 +02:00
Stefan Tröger b18ebc9064 Port QuarterWidget to QGraphicsView
Derive from QGraphicsView instead of QGLWidget to allow to add widgets as overlay over the 3d scene later on.
2014-09-23 10:11:12 +02:00
Stefan Tröger cf167ec60a add View3DInventorViewer python interface
As quarter is not wrapped by SWIG we need to expose our own python interface class.
This is a start with the most important functions to access the render and event
manager. Furthermore all extra functions available next to the swig wrapper functions
are exposed. Everything else can be added when needed.
2014-09-23 10:11:12 +02:00
Stefan Tröger eb7f1bf3e5 Adopt mouse selection to quarter widget
Quarter Widget soes not allow to switch of multisampling on the fly, therefore we need to use glgraphicsitem instead of direct opengl xor rendering for mouse selection
2014-09-23 10:11:11 +02:00
Stefan Tröger 72cab0c002 Adaption of FreeCAD to QuarterWidget
-removes all soqtviewer references
-create a quarter adaptor class which implements missing functionality
-adopts freecad code to make use of SoRenderManager and changed View3DInventorViewer  interface
2014-09-23 10:11:11 +02:00
Stefan Tröger e1265c874d add default quarter files 2014-09-23 10:11:11 +02:00
Yorik van Havre e08788eca9 Arch: Extended role property to all Arch objects - fixes #1577 2014-09-21 15:12:06 -03:00
Yorik van Havre 4f5f9be38c Spreadsheet - added a recompute() - fixes #1761 2014-09-21 14:40:01 -03:00
Sebastian Hoogen 856418a2e5 use the commit time (in UTC) in version information
as it is more meaningfull than the author time
2014-09-20 21:54:41 +02:00
wmayer eae8f22ee5 + add lost s 2014-09-20 18:01:40 +02:00
wmayer 26e01e0900 + build with Qt < 4.7 and OCC < 6.5 2014-09-20 17:49:29 +02:00
Sebastian Hoogen 6a89b33816 fixes #1745 Encode Annotation Text using latin1
for Coin Versions <= 3
2014-09-20 16:26:59 +02:00
Sebastian Hoogen 6ad50db01b fixes #1744 Use unicode in Unit system 2014-09-20 08:58:06 +02:00
Yorik van Havre 810fadab23 Fixed bug introduced by last commit 2014-09-19 13:13:34 -03:00
Sebastian Hoogen e54297313b fixes #1755: don't translate toolbar names
in InitGui.py of Arch and Spreadsheet
2014-09-19 10:35:00 -03:00
jriegel 6561b99347 Merge branch 'refs/heads/Rift' 2014-09-19 11:08:00 +02:00
jriegel 3d00535d57 FreeCAD-VR: Small fix for older compilers 2014-09-19 11:03:35 +02:00
Yorik van Havre fbeb7beba3 Fixed label of document - fixes #453 2014-09-18 20:17:50 -03:00
Yorik van Havre 328bdcf636 Draft: small fix in trackers - fixes #1757 2014-09-18 19:39:37 -03:00
Yorik van Havre 6e5fbc74a8 Added base translation file for the Web WB - issue #453 2014-09-18 12:24:16 -03:00
Yorik van Havre 0f559a7184 Draft: Fixed rotation UI unit - fixes #1664 2014-09-18 11:18:15 -03:00
Yorik van Havre f796cacf65 Draft: Grid now checks preferences settings when redrawn - fixes #1671 2014-09-18 11:09:43 -03:00
Abdullah Tahiri 749abc5ed7 Sketcher fixes: Symmetry arrows properly scaled, fixed icon in constraint taskbar list contextual menu 2014-09-18 16:01:34 +02:00
jriegel a81308ab57 FreeCAD-VR: Small cleanups 2014-09-18 10:25:28 +02:00
Yorik van Havre 524e5cbe32 Arch: Added sill height option to creation dialog - fixes #1609 2014-09-17 20:24:35 -03:00
Yorik van Havre 552c0b3af3 Arch: fixed window movements - fixes #1597 2014-09-17 19:39:54 -03:00
Yorik van Havre 7f90948712 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-09-17 14:20:07 -03:00
Yorik van Havre e7cc192650 Draft: provisorily fixed error in sortEdges 2014-09-17 14:19:42 -03:00
jriegel 719c6e9425 FreeCAD-VR: fix Z direction 2014-09-17 19:13:48 +02:00
jriegel b5c2554378 FreeCAD-VR: Proper light handling 2014-09-17 18:55:51 +02:00
Abdullah Tahiri 02cb12db52 Sketcher enhancement: Constraint icons visible over lines 2014-09-17 18:49:40 +02:00
Abdullah Tahiri d562e1a389 Sketcher Art enhancement: New Symmetric constraint icon by Jim
There is more space in between the > < symbols now, so it is more clear as it overlaps less.

Thanks Jim!
2014-09-17 18:49:16 +02:00
Abdullah Tahiri 0adfa0a7ed Sketcher Bug fix: Arrows for symmetry constraint are back
The arrows were there in the code, but at a certain point, code was written to set the this->imgHeight value programatically, based on
whether it had text or not. As symmetry constraint does not have text the variable failed to initialize. Being zero, it did not pass
the ASSERT in the render function, so it was not rendered.

This includes Werner's fix for improver cast of a SoRayPickAction to SoGLRenderAction:
SbVec2s vp_size = static_cast<SoGLRenderAction*>(action)->getViewportRegion().getWindowSize();
to
SbVec2s vp_size = SoViewportRegionElement::get(state).getWindowSize();

At least sometimes tt is a SoRayPickAction because:

When you move with the mouse over the sketcher (when in edit mode) you enter the method ViewProviderSketch::mouseMove.
Inside there the method getPointOnRay is called to get a picked point underneath the cursor. Inside the latter method
an instance of SoRayPickAction is created to traverse the scene graph. After a long cascade of function calls you
finally enter SoDatumLabel::generatePrimitives(SoAction*).
2014-09-17 18:48:54 +02:00
Abdullah Tahiri fdb7de1dda Sketcher visualization enhancement: Do not group sketcher symmetry icons.
Do not add a symmetry constraint icon to a group of icons, so that it lies on the line or point providing the symmetry (symmetry axis/point),
as it is more clear to the user which line this is.
2014-09-17 18:48:36 +02:00
Abdullah Tahiri 95c512d9a1 Sketcher feature enhancement: Symmetry constraint perpendicular to axis of symmetry
Solves Mantis ticket: http://www.freecadweb.org/tracker/view.php?id=1623
Unrelated minor fix: remove unused variable
2014-09-17 18:48:15 +02:00
jriegel 9a19baa8f5 FreeCAD-VR: Positional light and fix in camera positioning 2014-09-17 18:35:11 +02:00
Yorik van Havre 6e9d2e9b21 Draft: Added progress bar to dxf library download - fixes #1644 2014-09-17 13:30:51 -03:00
Abdullah Tahiri da2df00eea Sketcher visualization: Increase readability of redundant constraint solver message
Color changed to "OrangeRed" to improve readability.
2014-09-17 16:43:51 +02:00
Abdullah Tahiri 5f2670dbcf Sketcher Redundant/Conflicting art by Jim 2014-09-17 16:43:51 +02:00
Abdullah Tahiri 34cc7c3136 Sketcher new feature: Select Conflict and Redundant Constraints
Based (and solves) Mantis ticket:
http://www.freecadweb.org/tracker/view.php?id=1643

The ticket refers only to redundant, and ask for deletion.

Two commands are created, one for redundant constraints and other for conflicting constraints.

As usually removing one constraint of the "at least one" is sufficient, the implementation selects the constraints (but does not delete them).

The user therefore easily identify the constraints involved and decide to delete them.

This implementation takes into account the edit->Actsketch that ViewProvidedSketch creates for solving, as it is this instance the one that generates the messages in the Sketcher Taskbar.

No buttons in the toolbar by default (can be added by the user), but an hyperlink in the solver messages which triggers the selection of the appropriate command (conflicting or redundant).
2014-09-17 16:43:50 +02:00
Abdullah Tahiri bdbf5140f9 Sketcher new feature: Selects the elements associated with the selected constraint(s)
Ex 1: User selects constraints from the list => right click => select "select elements" from the contextual menu => The elements (edges,vertex) involved in the constraint(s) are selected.

Ex 2: User selects (a) constraint(s) => Clicks button in toolbar (if included by the user) => The elements (edges,vertex) involved in the constraint(s) are selected.

Intended as visual aid to see which elements are being affected by a constraint.

Requested by Jim on thread:
http://forum.freecadweb.org/viewtopic.php?f=19&t=6875&start=10

Solving another Mantis ticket I can not find now.
2014-09-17 16:43:49 +02:00
jriegel 4c7fb2d0f0 FreeCAD-VR: Upright position and remembering render window position 2014-09-17 15:01:28 +02:00
jriegel 1c741b6e0d FreeCAD-VR: Remove Tabs and add orientation for viewer position 2014-09-17 13:49:44 +02:00
Sebastian Hoogen d537fc9b53 try to use Execptions in Draft module 2014-09-17 12:52:36 +02:00
Sebastian Hoogen 333e6e3155 use exceptions in OpenSCAD module
derive OpenSCADError from FreeCADError if possible
2014-09-17 11:59:49 +02:00
Sebastian Hoogen 57db95a1c3 issue #1701 removed further except: statements 2014-09-17 11:57:32 +02:00
Sebastian Hoogen ed66ada1cf issue #1700 replace PyExc_Exception 2014-09-17 11:15:57 +02:00
Sebastian Hoogen 1b1d8010a6 removed catch (...) in Drawing
which discarded type information when rethrowing base type
2014-09-17 11:15:56 +02:00
Sebastian Hoogen 5e51a6cdf7 fixes #0001422: Subclass Exception
inherit Base.FreeCADError form RuntimeError
inherit Part.OCCError from Base.FreeCADError
inherit OCCDomainError from Part.OCCError
inherit OCCRangeError from Part.OCCError
inherit OCCConstructionError from OCCDomainError
inherit OCCDimensionError from OCCDomainError
Added PY_CATCH_OCC macro
replace PyExc_Exception
use FreeCADError in makeWireString
catch exception in BSplineCurve.increasedegree
2014-09-17 11:15:56 +02:00
Yorik van Havre f1dffbb90e Arch: Hide/show windows together with their parents - fixes #1733 2014-09-16 20:03:50 -03:00
Yorik van Havre 9f7956b17e Web: Added an Open Link In External Browser context menu option - fixes #1017 2014-09-16 14:16:44 -03:00
jriegel 0d6ccb7654 FreeCAD-VR: Some fixes 2014-09-16 18:14:42 +02:00
Yorik van Havre 302fcde1e0 Startpage now checks for new versions - issue #1017
After loading, the startpage now checks for
http://www.freecadweb.org/version.php and compares
with current version, and displays a message accordingly.
2014-09-16 12:58:07 -03:00
Yorik van Havre b0c66cf6f7 Draft: fixed typo 2014-09-16 11:26:47 -03:00
Abdullah Tahiri 4aa71db3c8 Sketcher Element Widget enhancement: Auto-switch to Edge (first valid type)
Feature requested by nahshon.
- In auto-switch to edge mode, actually switch to first valid type, which is always
edge, except for a point. It reduces the amount of clicks when dealing with points.
- Correction of a typo.
2014-09-16 10:12:53 +02:00
Yorik van Havre a4f208c8ac Draft: replaced DraftGeomUtils.sortEdges with better version from pkoning2 - fixes #1691 2014-09-15 17:30:37 -03:00
Yorik van Havre 78f34666b2 Draft: Added a button to Dimension UI to select existing edges - fixes #1636 2014-09-15 17:05:44 -03:00
Yorik van Havre 4b59ef1586 Draft: fixed sticky fonts - fixes #1725 2014-09-15 16:43:14 -03:00
Yorik van Havre 0446f60277 Draft: fixing bugs in previous commit 2014-09-15 15:56:07 -03:00
Sebastian Hoogen 1100d2d0bd move encoding strings for coin to function 2014-09-15 15:45:44 -03:00
jriegel 2a4626d27a FreeCAD-VR: Render the FreeCAD scene graph 2014-09-15 19:50:55 +02:00
Yorik van Havre 96eccd44ae Draft: upgrade tool now converts single-linear-edge objects into Draft lines 2014-09-15 12:51:26 -03:00
jriegel 0d2ce7073a FreeCAD-VR: Separating FreeCAD and Coin/Rift stuff 2014-09-15 17:14:44 +02:00
jriegel 069da65528 FreeCAD-VR: some fixes on FrameBuffer rendering portion 2014-09-15 16:27:40 +02:00
wmayer 470a414241 + fixes #0001715: Mefisto Mesh Fails since translated by f2c 2014-09-14 18:26:12 +02:00
jriegel 66a58c40ad FreeCAD-VR: Some fixes... 2014-09-14 14:57:07 +02:00
jriegel 250426f792 FreeCAD-VR: Handling the safety warning 2014-09-14 13:54:02 +02:00
Sebastian Hoogen 5d406144aa use utf-8 for coin4 and latin1 for coin3 2014-09-14 11:08:55 +02:00
Yorik van Havre a0e461a925 Arch: minor bugfix 2014-09-13 18:23:35 -03:00
jriegel ad2406a763 FreeCAD-VR: First succesfull render on the Rift! 2014-09-13 20:03:57 +02:00
Yorik van Havre 8b25a40cbf Arch: equipments now choose type (Part or Mesh) on creation based on the base object 2014-09-13 13:54:47 -03:00
Yorik van Havre ce0f2452c8 Mis upgrades for the selection window - fixes #1737
* Added a search box that searches through object labels
* Added a context menu to selected items
* Allow to double-click an item to isolate
2014-09-13 12:02:45 -03:00
jriegel c0152eeb68 FreeCAD-VR: command integration 2014-09-13 10:18:52 +02:00
jriegel 537d7edfd8 porting the offscreen rendering version to SDK 4.2 2014-09-12 20:15:04 +02:00
jriegel 6ee9466c12 Make a new Build option for building VR support and make FindRift using the 64bit libs 2014-09-12 20:14:15 +02:00
jriegel 6c170bce18 Merge branch 'refs/heads/master' into jriegel/Rift 2014-09-12 12:27:55 +02:00
Yorik van Havre 7318a1d443 Arch: minor improvements in panel 2014-09-11 19:27:33 -03:00
Yorik van Havre 9af4df3ce5 Draft: minor fix in Shapestring 2014-09-10 15:56:50 -03:00
wmayer d1fb7fa839 + do not add units to translation 2014-09-10 10:35:49 +02:00
Yorik van Havre 93e01c16b6 Draft: Fixed copying of Draft points 2014-09-05 17:48:30 -03:00
Yorik van Havre a723ec4b81 Draft: Allow sticky fonts in ShapeString 2014-09-04 15:57:59 -03:00
wmayer 3d6ba6c5d6 + fixes #0001726: Dialog for saving document should indicate documentname 2014-09-03 14:45:19 +02:00
wmayer 2f4ce2bbc0 + Add StackWalker to get log messages on crashes (MSVC only) 2014-09-03 11:48:34 +02:00
Yorik van Havre 620a4dde93 Arch: small fix to Remove tool 2014-09-02 23:04:44 -03:00
wmayer 8f54360226 + minor fix 2014-09-02 17:43:25 +02:00
Sebastian Hoogen a81a307346 issue #1700 replace raise Exception() 2014-09-01 22:47:05 +02:00
wmayer e5a54d0791 + fixes #0001714: FreeCAD 0.14 Stable crashes when importing a step model 2014-09-01 19:11:46 +02:00
Sebastian Hoogen 2c38c7d31a exportDRAWEXE: support Part::Plane and ::Ellipse 2014-09-01 11:09:58 +02:00
Sebastian Hoogen 256d844801 python property Continuity of GeometrySurface 2014-09-01 11:04:38 +02:00
Yorik van Havre f647f25490 Arch: optimizations in IFC import + furniture objects can be included in spaces 2014-08-31 23:30:02 -03:00
Yorik van Havre 850d0b5e82 Added Gui.showDownloads() py function to show the download manager, and allow to click https links in webgui browser 2014-08-31 16:51:51 -03:00
Yorik van Havre c60d39c4e7 Arch: fixed import IFC again (better this time) 2014-08-31 15:03:58 -03:00
Jose Luis Cercos-Pita ed0c6ebd7d Plot: Fixed PyQt imported in the resources loading 2014-08-31 18:37:26 +02:00
Yorik van Havre dddc278cc5 Arch: fixed bug in importIFC 2014-08-31 13:29:15 -03:00
wmayer f2319de49d + do not abort if user.cfg or system.cfg is empty 2014-08-31 16:10:45 +02:00
wmayer ce528d1c4a + fixes #0001719: Show current shortcuts (S) in menus and hover text. 2014-08-31 14:28:33 +02:00
Yorik van Havre 80e80fef83 Arch: allow for equipment objects to be part shapes 2014-08-30 19:17:30 -03:00
wmayer 7c89591ff6 + allow to load PartDesign even if PySide is not found, suppress MinGW warnings 2014-08-30 23:26:29 +02:00
Yorik van Havre cef2c1bc8c Arch: Added Equipment tool
The purpose of this tool is to handle standalone objects such as
furniture or sanitary equipment in a building. It is mesh-based,
and accepts either a mesh or a part shape as its base object.
2014-08-29 19:16:28 -03:00
Yorik van Havre 67b54f8052 Draft: clones now correctly adopt the diffuse color of their base object - fixes #1704 2014-08-28 16:30:34 -03:00
Yorik van Havre 6ff67ee5c3 Draft: grid size is now settable in preferences 2014-08-28 16:00:08 -03:00
Yorik van Havre 16ede0e55c Draft: fixes in DXF exporter - fixes #1590, #1653
* Fixed arc directions
* Turned max spline segment length preference option into a float
* Fixed ellipses export
2014-08-28 13:32:45 -03:00
wmayer a1fab61ed6 + minor fix of output format 2014-08-28 15:47:09 +02:00
wmayer 89d07313a5 + do not try to use framebuffer objects when it's not supported on the system 2014-08-28 15:35:17 +02:00
wmayer d10469ed72 + restore FREECAD_BUILD_DEBIAN to fix PPA failures 2014-08-28 13:07:09 +02:00
wmayer 5c269996b8 + restore lost changes, improve whitspaces, suppress useless MSVC warnings 2014-08-28 12:37:42 +02:00
wmayer f4e7a2e2a0 + silent pcl check, output formatting 2014-08-28 10:58:53 +02:00
wmayer 90e3b58950 + set pcl components for LibPacks 2014-08-28 10:41:59 +02:00
wmayer fd821fb7b4 + do pcl components checks 2014-08-28 01:51:58 +02:00
wmayer a579bdce72 + fix for pcl 1.6 2014-08-28 00:02:58 +02:00
jriegel eb734eb6f4 Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/review-NewLibPack 2014-08-27 22:25:35 +02:00
jriegel f260a0f219 fix Win64 bug in FileInfo 2014-08-27 22:22:29 +02:00
jriegel 889e7bbdce Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/Rift 2014-08-27 17:48:59 +02:00
jriegel e2b93c4c80 Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/review-NewLibPack 2014-08-27 16:43:48 +02:00
jriegel 5bdfe81488 Destinquish old and new OpenCV 2014-08-27 16:42:50 +02:00
jriegel c1f0f70b88 Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/review-NewLibPack
Conflicts:
	src/3rdParty/salomesmesh/CMakeLists.txt
2014-08-27 15:39:00 +02:00
wmayer 346e5c6a77 + fix more compiler warnings 2014-08-27 13:26:44 +02:00
wmayer cc775f9254 + fix -Wnull-conversion, -Woverloaded-virtual, -Wlogical-not-parentheses, -Wsometimes-uninitialized 2014-08-26 19:14:13 +02:00
Simon Pasquet 55cf9ddeaa Customized keyboard shortcuts now accept up to 4 keys 2014-08-26 10:31:54 -03:00
wmayer d974d6897b + fixes #0001713: Allow Part.Arc to be used as Sketcher geometry 2014-08-26 13:09:37 +02:00
jriegel 58a7be992b Intergrate Werners PCL Triangulation patch and upgrade it to PCL 1.7 2014-08-26 10:28:37 +02:00
jriegel 7183cda616 Merge remote-tracking branch 'refs/remotes/origin/wmayer/pcl-testing' into jriegel/NewWinBuild
Conflicts:
	src/Mod/Points/App/CMakeLists.txt
	src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp
2014-08-26 08:42:47 +02:00
jriegel e4383e8f24 Test import for Ply via PCL in Points 2014-08-25 23:27:17 +02:00
jriegel 4d19ec20fb Add OpenCV again and test command 2014-08-25 23:16:54 +02:00
jriegel e16f8a5b45 Add switch for compile with and without PCL 2014-08-25 23:16:34 +02:00
wmayer 97514d1806 + fix for word size of OS 2014-08-25 15:25:09 +02:00
wmayer f28f83bf91 + Show word size info of OS 2014-08-25 11:41:13 +02:00
Itai Nahshon e9ea1e2727 Fix automatic creation of tangent constriants.
a. Use scale to calculate max distance
b. Consider only circle/arc that actually touch the newly created line
c. Use of arc angles correctly
d. Find nearest touch point (not nearest center)
e. some optimization
2014-08-24 19:07:31 +02:00
Itai Nahshon 6eeaae57b8 Sketcher: Ignore small mouse moves after selection.
Switch to drag mode only after cursor moved 3 pixels.
2014-08-24 19:07:16 +02:00
wmayer 3c8a00dfec + fixes #0001703: Spreadsheet PropertyController 2014-08-23 14:38:30 +02:00
Ian Rees 0eec1d8e49 Updated CxImage README 2014-08-22 21:37:20 +02:00
wmayer 1f2cd53bf7 + fix localization problems in PropertyConstraintListItem, + improve whitespaces 2014-08-22 21:32:19 +02:00
Ian Rees 539e2d2f33 Added a quick README to src/3rdParty/CxImage 2014-08-22 15:51:58 +12:00
wmayer 763eb132cf + respect placement in VRML and Inventor objects 2014-08-21 21:46:03 +02:00
jriegel 492a39c19a simplify Mefisto project without Fortran part... 2014-08-21 18:34:21 +02:00
jriegel 1aed444318 define for PCL usage for older LibPacks 2014-08-21 18:17:20 +02:00
wmayer 833bd4e77b Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-08-21 18:16:42 +02:00
wmayer c1c25f1a5c + add GL test stuff into Sandbox module 2014-08-21 18:15:43 +02:00
jriegel d65a4e4ed7 some type clearification 2014-08-21 17:59:33 +02:00
Yorik van Havre 317206ac59 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-08-21 12:38:18 -03:00
wmayer 811fb3be24 + port RegExp utility to Qt4 2014-08-21 17:32:30 +02:00
wmayer 1b4fb56cdc + fix DrawingView::onRelabel() to accept any page names 2014-08-21 17:26:52 +02:00
Yorik van Havre 806c857c6f Draft: removed unnecessary latin1 decode operations 2014-08-21 11:44:28 -03:00
Abdullah Tahiri 7cc5167623 Sketcher properties feature enhancement: Separated sublist for unnamed datum constraints 2014-08-21 14:11:51 +02:00
wmayer e814d997e5 + fix trim mesh with plane 2014-08-21 13:26:35 +02:00
wmayer d0a200303b + suppress annoying warnings with MSVC for SMESH sources 2014-08-20 15:31:33 +02:00
Michael G. Hansen 9419259ff6 1659: 3dconnexion space navigator moves view even when FreeCAD is not the active application
Check whether the freecad window is active before relaying the space navigator events.
2014-08-19 15:46:52 +02:00
Michael G. Hansen 808d2e93bf Fix typo. 2014-08-19 15:26:58 +02:00
Michael G. Hansen dd7bd833c6 Fix bug 1643: Projections are always added to the first drawing page 2014-08-19 15:07:02 +02:00
wmayer e9100c7ddb + fix build failure on Windows, remove unused headers, whitespace improvements 2014-08-19 14:02:16 +02:00
Abdullah Tahiri a9fef8412f New feature: Edit Sketch datum constraints from data Property view
This feature shows in the data properties associated to a TreeView element,
the datum constraints, i.e. those with an associated value.
2014-08-19 13:23:15 +02:00
jriegel 0e53a593db cleaning up CMake file and some comments 2014-08-18 22:42:23 +02:00
jriegel b253a14818 move MEFISTO to inline c file instead of fortran... 2014-08-18 22:32:10 +02:00
Sebastian Hoogen e2f54c793c improvements to exportDRAWEXE
load only MODELING module instead of ALL
show TypeId of unsupported Objects
use angel of revolution for cones
improve sweep output
support for point, vertex, Part and Draft Polygon
cache object names to reuse them in DRAWEXE
do not expode spine which are allready edges
don't try to make faces from arcs (if this failed in FreeCAD allready)

use rounded floats if they safe digits

Sometimes the floats seems to be rounded to twelve decimal
places. we round them if it allows so safe digigts.
round angles
2014-08-18 14:45:42 -03:00
Sebastian Hoogen 3c7c04cafe bugfix in Draft.ViewProiderPoint
remove access to nonexistant property
2014-08-18 14:45:42 -03:00
Sebastian Hoogen 5ecf0cb40b Reverse the projection direction of DXF exports 2014-08-18 14:45:42 -03:00
wmayer 7110c55c33 + fixes #0001689: Show name of the drawing page in the tab of the drawing 2014-08-18 14:44:28 +02:00
wmayer 8943ef58b2 + fixes #0001696: Quantity.getValueAs('rad') touches the Property 2014-08-18 13:30:14 +02:00
Sebastian Hoogen 3198c42397 flush stdout after reseting the console color 2014-08-18 13:11:16 +02:00
wmayer 967566acf1 + improve OCC version macro, fix build failure with MinGW, fix build failure with Coin2 2014-08-18 11:34:02 +02:00
Yorik van Havre 5e82febd0a Enhanced a bit the document icon in tree view 2014-08-17 18:49:49 -03:00
Yorik van Havre 14292c11cd Draft: Objects drawn on an existing face will no longer take it as support unless the face was already selected 2014-08-17 18:09:44 -03:00
jriegel ee64f54765 OCL tests 2014-08-17 20:15:12 +02:00
wmayer 75fa3d4067 + prepare property editor for items with unknown number of children 2014-08-17 18:36:27 +02:00
Yorik van Havre f0eee59283 Draft: Fixed small regression in Draft2Sketch 2014-08-16 19:40:35 -03:00
Bernd Hahnebach 6436b29034 Arch: fix in new ifc-importer 2014-08-16 12:37:06 -03:00
wmayer 6556bc776a + fixes #0001689: Show name of the drawing page in the tab of the drawing 2014-08-16 15:08:55 +02:00
wmayer 8808b82371 + fixes #0001690: sketch.getPoint crashes FreeCAD if the point does not exist 2014-08-16 14:41:30 +02:00
wmayer 92cb03bca1 + code cleanup 2014-08-16 14:15:46 +02:00
Yorik van Havre b33d8f6244 Draft - Allow to export Drawing pages to DXF - fixes #1686
* Uses DXF algos of the Drawing module instead of the Draft dxf library
* Uses a DXF template with the same name as the SVG template, if existing
* Only Draft, Arch, Part and Annotation views are currently supported
* Drawing module's projectToDXF() now returns only a fragment instead of a full DXF file
2014-08-15 18:14:17 -03:00
wmayer 4dc12740e8 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-08-15 14:37:25 +02:00
Sebastian Hoogen 4ba56b5c29 fixes #0001684: Sweep ignores the list of subshapes 2014-08-15 14:35:59 +02:00
Yorik van Havre 7665e34a3a Draft: Fixed wrong preferences text 2014-08-14 19:51:31 -03:00
Johannes Reinhardt 941f7dae00 Use new curve discretization 2014-08-14 23:28:50 +02:00
Johannes Reinhardt 8189dddec1 Revert "Arch: Turned jreinhardt's fix to webGL into an option"
This reverts commit 90f2fc2034.

Conflicts:
	src/Mod/Arch/Arch_rc.py
	src/Mod/Arch/Resources/ui/archprefs-import.ui
2014-08-14 23:28:50 +02:00
wmayer 7eaa4fff74 + Support Quasi methods in discretize() 2014-08-14 19:11:51 +02:00
Yorik van Havre 7369fbd154 Draft: clearer preference text for dimension style setting 2014-08-14 11:57:17 -03:00
wmayer ee2e7fc3fa + Give example for discretize() matching the shape type 2014-08-14 11:38:39 +02:00
wmayer 9ed61f107b + support First and Last keywords in discretize 2014-08-14 11:16:54 +02:00
jriegel 976511154c Remove all hardcoded INT types out of PyCXX to make X64 warning free 2014-08-14 09:13:53 +02:00
wmayer 3d2a2b06f0 + fix and improve discretize() method 2014-08-13 23:33:27 +02:00
Yorik van Havre d0288deabb Arch: small bugfixes in Drawing projection stuff 2014-08-13 16:21:08 -03:00
jriegel fea803c2fb Changes for LibPack 10.x 2014-08-13 21:05:40 +02:00
jriegel 551a095176 comenting out use of Qt internal API only on Windows 2014-08-13 21:05:13 +02:00
jriegel 95923c3afc remove Standard_String.hxx, no longer needed 2014-08-13 21:04:27 +02:00
jriegel 7767f0e6c7 Fix for VC11, should be backwards compatible 2014-08-13 21:01:27 +02:00
jriegel 4f5e1e3b8b fix using Release lib in Debug 2014-08-13 21:00:50 +02:00
jriegel 6303650cc1 Use default eigen in Approximation... 2014-08-13 21:00:15 +02:00
jriegel b5431d57e0 Change std::make_pairs to C++11 standard without template arguments 2014-08-13 20:59:29 +02:00
wmayer fedbd2fc2e + Check for valid document in link properties 2014-08-13 17:47:50 +02:00
wmayer ed4f7dcd35 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-08-13 12:49:37 +02:00
wmayer 7939027c98 + fixes #0001682: Crash after updating editable texts in drawing 2014-08-13 12:49:09 +02:00
Yorik van Havre a9b5970512 Arch: Misc improvements to section planes 2014-08-13 00:28:27 -03:00
Sebastian Hoogen 92382edbc9 bugfixes and feature enhancements in exportDRAWEXE
bugfix to Loft in exportDRAWEXE
added Extrusion
ability to clean shapes from teselation before export
support for Fillet in exportDRAWEXE
name shapes with restore command
remove trailing dot from decimals
include version information in output
allow to test if a suboject is supported
explode sections of loft and sweep and edges for fillet
2014-08-12 18:17:07 +02:00
wmayer e21972be9b + fix cmake configure failure 2014-08-12 17:03:01 +02:00
Sebastian Hoogen 1f162dec2d link against TKAdvTools only if OCCT < 6.7.3 2014-08-12 08:10:54 +02:00
wmayer fcb2714d0d + on document load set camera setting of the MDI views 2014-08-12 00:07:16 +02:00
wmayer 4ad43e60b0 + fixes #0001667: 'Save file' disabled when viewing a drawing 2014-08-11 22:59:16 +02:00
wmayer 29f3f0cfc2 + do not apply corrupted transformation (NaN) from SoCenterballManip 2014-08-11 14:56:30 +02:00
wmayer b8df4593c9 + change selectNumber() to check against the locale signs 2014-08-11 11:07:24 +02:00
wmayer 17e2737062 + fix regression in selectNumber(), + little performance boost, fix whitespaces 2014-08-11 10:46:43 +02:00
jriegel 915ea8a609 New parser c-files 2014-08-10 19:17:40 +02:00
jriegel 1b4190b047 Merge branch 'refs/heads/negative_sign_problem-2' 2014-08-10 19:12:39 +02:00
jriegel 601d7f3c03 remove double parameter functions from quantity parser 2014-08-10 19:10:14 +02:00
wmayer 5a33d95526 + Add macro to test and get OCC version 2014-08-10 18:52:28 +02:00
Yorik van Havre a05bf739c5 Draft: Fixed Offset tool - fixes #1634, #1635 2014-08-09 13:41:52 -03:00
Ian Rees 3a96bb60fe Sketcher: Don't change preselection during box selection 2014-08-09 07:34:04 +02:00
Yorik van Havre 3f236d042a Arch: minor bugfixes 2014-08-08 19:07:26 -03:00
Yorik van Havre 8a24f0fe6f Draft: Setting the WorkingPlane from a quad face now also takes its x and y directions 2014-08-08 13:48:30 -03:00
Abdullah Tahiri 37d5012647 Sketcher Elements widget - New feature -
- Remembers how the user left the "Auto switch to Edge" and the "Extended Name" checkboxes
and restores the values on next use of the Sketcher WB.
2014-08-08 18:32:54 +02:00
Yorik van Havre b64f283ce8 Draft: Removed leftovers from the macros menu 2014-08-08 11:21:37 -03:00
wmayer 854596aaa0 minor fixes in gear panel 2014-08-08 13:21:06 +02:00
Aglef Kaiser 420e71afbb Involute gear script extended for internal gears 2014-08-08 12:10:38 +02:00
Yorik van Havre 6b5b1a7443 Raytracing: Using names instead of labels in exported files - fixes #1663 2014-08-07 22:24:57 -03:00
Yorik van Havre 7778988faa Drawing: Allow to select the page in which to create a view feature - fixes #1668 2014-08-07 22:00:31 -03:00
wmayer 28490532f5 + fix dir2qrc script to keep alphabetical order of file names, update Sketcher.qrc 2014-08-07 20:29:31 +02:00
Abdullah Tahiri e2db94facd updated icons for sketcher
- Selection icons added.
- Art by Jim
- Clean up sketcher xpm small icons: Only constraint icons seem to be necessary
2014-08-07 19:49:51 +02:00
Abdullah Tahiri b5002dc6fe changes in sketcher
- Varios minor bug fixes.
- Added the other commands to the toolbar.
- Bug fix: missing AbortCommand().
- Mode Auto-switch to edge (Sponssi mode) has selection combo disabled to avoid interferring with this mode.
However, if auto-switch checkbox is unchecked (Jim-Abdullah mode), the combo is enabled and selection of
element type can be effected via the combo with the mouse.

In any case "z" shortcut iterates round robin the "valid types" of the preselected (hovered) element.
2014-08-07 19:49:51 +02:00
wmayer 09b8b25144 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-08-07 19:47:11 +02:00
wmayer 1cd2dab81f + rename duplicate class name 2014-08-07 18:41:54 +02:00
Yorik van Havre 3c0c72e4c0 Draft: removed macros menu - fixes #490
The macros menu code is on http://www.freecadweb.org/wiki/index.php?title=Macro_MacroMenu
2014-08-07 11:07:22 -03:00
Yorik van Havre dc3ebfb502 Fix in Drawing page object - fixes #1540
* Changing the editable texts updates the page automatically
* Added a doc.recompute() after creating a new page
2014-08-07 10:39:33 -03:00
Yorik van Havre e0bdc07c4d Fixed output of ViewObject attribute in console mode 2014-08-07 10:38:41 -03:00
Yorik van Havre c66de2f8cb Draft: fix in SelectGroup tool - fixes #1568 2014-08-06 19:55:26 -03:00
Yorik van Havre dbed1e35e5 Draft: small fix in Array object 2014-08-06 19:33:55 -03:00
wmayer bd64ce3bb7 + implement save() function in PointKernel, fix icon issue in mesh workbench 2014-08-06 17:39:15 +02:00
wmayer 0c2d201396 + fix security issue (do not run uncontrolled format string) 2014-08-06 10:16:06 +02:00
Yorik van Havre 46583f2960 Used Gui.addModule() instead of import in Draft & Arch 2014-08-05 19:38:40 -03:00
Yorik van Havre 81e983b6ac Exposed doCommand (Gui version) to python - fixes #1564 2014-08-05 19:28:36 -03:00
Yorik van Havre 6dd35078a2 Draft: issue message if an object cannot be moved or rotated - fixes #1642 2014-08-05 18:28:26 -03:00
Yorik van Havre 234af5b27f Arch: improvements in Space object
* Better text control
* Text position editable with Draft Edit
* Additional properties such as finish types
2014-08-05 16:19:39 -03:00
wmayer be3299a46d code review: move transaction to outside from loop, fix several bugs, fix whitespaces 2014-08-05 00:35:03 +02:00
wmayer 1011dd4175 Squashed commit of the following:
commit 695becbbfff961b13e3edb5a4e1e4487bc53b4bb
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Aug 4 15:24:33 2014 +0200

    - Making combo disable state.
    - Updating Art (Thanks Jim!)

commit d5391d40ace450fa2e65fe2b4ab8029ad37cacf8
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Fri Aug 1 00:40:15 2014 +0200

    - Adaptation of code to Workbench's new Template structure.
    - Minor adaptation of new ViewProvideSketch code to new constraint code (only in code extensions needed for element Widget)

commit ecdec20afa33c9a950e6054e80e4aa9c72aad8b6
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jul 31 15:31:38 2014 +0200

    Fix so that when applying a coincident constraint to a plurality of points,
    if one constraint on a couple of points exists, no new coincident constraint is
    added to this couple.

    Fixes: http://forum.freecadweb.org/viewtopic.php?f=3&t=6890

commit 32ef59d76e6c63356f5d36598ca11eb47c2e52af
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jul 31 14:13:58 2014 +0200

    Add some placeholder art for icons to avoid having a cross icon and annoying icon not found messages.

commit ccb60a3a7e71a0eb8ad5d896542314a98ef314a8
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Jul 28 20:15:29 2014 +0200

    - Fixed Length Constraint accelerator (D) to SHIFT+D to avoid colision with other higher level FreeCAD accelerator assignment.
    - Selection Accelerators now toggle on shortcut execution, and act when no other element is selected (fixed bug)

    TODO: Art+Toolbar

commit 791358d046e8eeb03fa00272f5627c75254c48eb
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Jul 28 15:12:07 2014 +0200

    Fixing shortcut system:
    - Take shortcuts automatically from CommandManager.
    - Fixed two shortcuts in CommandConstraints (Point on Object - O and
    Parallel Constraint - P to SHIFT+O and SHIFT+P to avoid collision with other constraints)
    - Fixed shortcuts in CommandConstraintAccel to non-already-existing combinations
    - Fixed Sketcher Menu to show accelerators

commit 12d366406a45038ce1a4f725a98e4f570475084b
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Jul 28 11:53:37 2014 +0200

    Implemented SHIFT multiple selection functionality in listwidget.

commit 0606ea7dfe38fdf8924f65f14382f1b327145c80
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Jul 28 11:02:02 2014 +0200

    Added Sketcher Accelerators for:
    - Selection of H Axis
    - V Axis
    - Origin

    Main TODO: Shortcuts and Shift in list widget implementation

commit 297464807fc56fbcf31efadff9625fc05bb20c41
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Wed Jul 23 11:37:21 2014 +0200

    Implementation of:
    - Switch on 'Z' instead of 'Shift'
    - Checkbox to select whether element internal name (e.g. Edge10) should be presented on list or not (Sponssi requested)
    - Checkbox to force going back to "Edge" type on change from one element to the next (Sponssi requested)

commit c8764b116acdcfdc7ef7658dc6009fb8db807906
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Wed Jul 23 07:57:11 2014 +0200

    TaskSketcher Elements:
    - Store Vertex within elements for optimization (reduce loops searching for vertex in every function call)
    - Added the accelerators described below + Toggle Construction as context menu commands
    - Fixed bug (Thanks sponssi!): After some element has been preselected from the list and the cursor moved to the drawing area,
    the preselection doesn't seem to be resetted in the widget or whereever it is handled.
    Tapping shift still swaps the preselection between the points of the previously selected element.
    The left mouse button has to be clicked in the draw area to get rid of this.
    http://forum.freecadweb.org/viewtopic.php?f=10&t=6861&sid=7eea4adc7ecf4cebd561b357601866a2&start=20
    - Extended naming of elements, to facilitate writing python code (as requested by sponssi).
    - Minor modifications (creation of utility fuctions, code readibility, ...)

    Sketcher Workbench:
    - First effort to add a toolbar with the accelerators.

    Sketcher Accelerators: (Perform actions on existing elements, as opposed to Geometry Creation, not restricted to applying constraints)
    - Close Shape : of selected edges (i.e. lines and arcs)
    - Connect : selected edges (connect endpoint edge with starting point of next edge according to selection order)
    - Select Constraints : associated with currently selected edges

commit 1dc18204a4e2e38f71d729a7692383f50a7d4654
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Sat Jul 12 16:06:48 2014 +0200

    New alternative implementation of the Sketch Element List.

    This version comprises:
    - Identification via icon of type of geometric element (Point, Arc, Line, Circle) and
      Type of selection (Edge, Starting Point, End Point, Center Point)
    - Corrected a bug where upon selection from the combobox, the icons were not updated (Thanks Jim!)
    - Implementation of jump to next valid type of last preselected element (aka fast-forward) for all the types.

commit 4d472ef796362405c3982355f86489fa92cbfe6d
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jun 26 17:15:51 2014 +0200

    Feature request by jmaustpc
    - When an object does not have an element, lets put a different icon.
    - Currently the constraint lock icon is used until availability of a new one.

commit 6d15478f6533ff3805520a8ca36d1c41908cb0af
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jun 26 14:54:23 2014 +0200

    Bug fix (preselection not disappearing on changing element without the element Type).

commit e33043e17781fcf6399257696f115f68ab4580ec
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jun 26 14:39:20 2014 +0200

    New nicer icons by jmaustpc. They look much nicer :-)

commit 2ce2d6ff1ad2d81b0b1e30ffcbe9f2cc445f2e5b
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Thu Jun 26 14:37:21 2014 +0200

    Fast-Forward functionality:
    - If an element not having "midpoint" is preselected, then on pressing SHIFT the
    Type will jump from EndPoint to Line skipping midpoint.
    - This is intended as a productivity feature, as most sketch elements usually are lines

commit 1865d06d06582a49da10ddc123133807a4593060
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Wed Jun 25 15:47:22 2014 +0200

    Bug fix (thanks jmaustpc)
    - Preselection is maintained even though the geometric element does not have the "Type".
    - Fix involves calling for remove preselection in TaskSketcherElement
    - Implementing the response to the message RmvPreselection in ViewProviderSketch

commit 14e21da4b4ed0e9a2b3e846a4e51f6745d5e0ab7
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Mon Jun 23 14:25:35 2014 +0200

    Fix Bug with null pointer (thanks jmaustpc!)
    Clean up code

commit 0d99eb633f1bca45d4e7bb22c57bd4892767a390
Author: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date:   Wed Jun 11 16:32:48 2014 +0200

    New widget for the Taskbar of the Sketcher WB.

    The objectives of this widget are:
    1. Allow editing of sketches when they have (partially) overlapping lines of any type
       (construction/external/normal).
    2. Allow the construction of sketches using the keyboard (less mouse intensive)

    The widget works as follows:
    1. A QListWidget presents a list of elements, element is here a geometric element
    formed Types edges, starting points, end points and midpoints (e.g. circles, arcs)
    2. On hovering/Entering one item in the list, it is preselected for easy identification.
    3. The selection can be switched from one type to another using the SHIFT key
    (press and release) in a round-robin fashion (or you can select it using the droplist)
    4. Selection of different types is possible (e.g. two points and a line).
    5. The contextual menu accessible by right click allow to apply a constraint to the
    selection.
    6. The constraints in the contextual menu have shortcuts, so you can actually use the
    shortcut directly from the QListWidget.

    Additional features introduced to other parts during development...
    - New color introduced for Types that are selected and preselected at the same time
    - Edges is a SoLineSet. You can not apply many So modifiers (width,offset) to parts of a SoLineSet.
    An edge part of a SoLineSet that is drawn after another one, covers it unless it is closer to the
    camera. The system of manual offsets already in place for points has been extended to properly
    handle (i.e. show) overlapping lines part of a SoLineSet.
2014-08-05 00:35:02 +02:00
Yorik van Havre 62e9b60816 Added a couple of missing units in MKS schema 2014-08-04 19:16:10 -03:00
Yorik van Havre f5f6cb1adf Arch: Enhanced Space tool - fixes #1610 2014-08-04 18:24:20 -03:00
Yorik van Havre a7d1b80fc3 Draft: Fixed offset in SelectPlane tool - fixes #1606 2014-08-04 13:53:38 -03:00
Yorik van Havre a601434c27 Draft: adapted Draft2Sketch tool for macro recording - fixes #1661 2014-08-04 12:37:59 -03:00
Yorik van Havre e41996c9db Draft: default Z to 1 in Scale tool - fixes #1660 2014-08-04 12:01:44 -03:00
Yorik van Havre caf02318b5 Arch: Included some utility functions into Arch module
* makeCompoundFromSelected: creates a compound object from selected subobjects
* cleanArchSplitter: cleans the splitters on imported Arch objects
* rebuildArchShape: tries to rebuild a solid from the faces of an invalid shape
2014-08-04 11:11:11 -03:00
jriegel 36a0641edd App and Base Compiles with new LibPack 2014-08-03 22:56:52 +02:00
Johan K 83a5f1547f Adding selectNumber handling of locale, this wont work with groupseparators 2014-08-03 22:31:57 +02:00
jriegel ec2198107b move build specifier in own cMake group 2014-08-03 20:53:19 +02:00
jriegel c24a5161fc New LibPack 10 for Win 64 2014-08-03 20:37:06 +02:00
Yorik van Havre c7bfaf2ed7 Arch: small bugfixes and optimisations 2014-08-03 15:14:33 -03:00
Johan K 5cfdabb45a Adding changes 2014-08-03 20:13:05 +02:00
jriegel b32b227733 clean up number scanner in Units 2014-08-03 17:24:42 +02:00
jriegel 1da5543657 fix swedish minus simbol 2014-08-03 16:01:21 +02:00
wmayer ced08b0416 + fix memory leak 2014-08-02 18:26:23 +02:00
wmayer 578fbbefa4 + fix bug when releasing button after dragging point or curve 2014-08-02 17:52:12 +02:00
Ian Rees c836dab53d Removed some debugging stuff that was accidentally pushed earlier 2014-08-02 20:04:56 +12:00
Yorik van Havre 2d8963de03 Arch: Added scaling in IFC importer 2014-08-01 21:44:46 -03:00
Yorik van Havre a548203ca9 Arch: removed obsolete IFC preference options 2014-08-01 21:34:49 -03:00
Yorik van Havre 3b86494afb Arch: fixed bug in wall extrusions 2014-08-01 21:28:32 -03:00
Yorik van Havre bf101bbfcb Draft: Array objects now have an IntervalAxis property to build helicoidal compounds 2014-08-01 20:57:53 -03:00
Yorik van Havre fec636b835 Arch: Introduced new IFC importer/exporter
* The new IFC importer uses excusively the newest ifcopenshell.py module
* Renamed old importer to importIFClegacy.py
* Included the now deprecated ifcReader and ifcWriter modules into importIFClegacy
* The new IFC importer falls back on the older one if the ifcopenshell module is not found
2014-08-01 18:39:10 -03:00
wmayer 7a3ddd5bae + fix author note, fix various crashes, improve mesh selection stuff 2014-08-01 16:39:59 +02:00
wmayer 4032a88c2d Revert "remove TKAdvTools"
This reverts commit 6843d6ad5d.
2014-08-01 15:07:27 +02:00
Yorik van Havre f0d5564747 Draft: DXF lib is now pulled from its specific branch 2014-07-31 11:26:17 -03:00
wmayer 406d32aebb + Replace InputField with QuantitySpinBox 2014-07-31 15:14:27 +02:00
wmayer 609422f08a More detailed error message when xerces fails to read in parameters 2014-07-31 10:58:48 +02:00
Yorik van Havre d946499e4d Draft: diverted current dxfLibrary download folder 2014-07-30 23:54:14 -03:00
wmayer e327662d28 0001638: Not possible to draw anything. 2014-07-30 18:21:53 +02:00
wmayer 7294271c0c + Allow to get clean copy of a shape from Python 2014-07-30 12:21:22 +02:00
wmayer a252471625 + fix author notes, fix memory leak, fix build failure under Windows 2014-07-30 10:05:13 +02:00
wmayer 6ca580456b Squashed commit of the following:
commit 8853bf442b6e1a98699fa90fca5eb30b3f6d3a5e
Author: Ian Rees <ian.rees@gmail.com>
Date:   Tue Jul 29 15:46:59 2014 +1200

    Refactoring and small fix in constraint icon bounding boxes

commit c03e4c13d8fd657e18e3c78d16bbdef209f8c779
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Jul 28 15:41:15 2014 +1200

    Implemented picking of individual constraints from combined icons

commit 254aaab450fe6646bee7542c532c454af91b6597
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Jul 28 13:04:18 2014 +1200

    Added bounding boxes for combined constraint icons

commit 4f0738ec30220fbf1abdea14dd121d0a134e5dfd
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sat Jul 26 18:53:33 2014 +1200

    Added screenCoordsOfPath() to View3DInventorViewer

commit 14e2dc7b4aa79db97cbacd2c848728a66276d644
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sun Jul 20 14:24:27 2014 +1200

    Bit of code to make constraint icon text rendering nicer.

    This won't be useful unless the font changes, but wanted to add it while
    I was thinking about it.

commit 8020d2d62214d71875cbae101d5ac5e96d998201
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sun Jul 20 13:54:51 2014 +1200

    Fixed an off-by-one in ViewProviderSketch::combineConstratintIcons

    Bug resulted in icons occasionally not being combined into groups,
    when they should've been.

commit 20d92a3ccc1f795be1cb86f6f92045518dc8eb81
Author: Ian Rees <ian.rees@gmail.com>
Date:   Tue Jul 15 19:38:20 2014 +1200

    Fixed a bug that was introduced two commits ago.

commit 69e1ea848e3bc3c8c372c539f30a7b4d2a563aa2
Author: Ian Rees <ian.rees@gmail.com>
Date:   Tue Jul 15 15:33:30 2014 +1200

    Fixed dumb copy-and-paste error

commit a998b75a905cc31e1f4f49869e81ecaef5858b69
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sun Jul 13 18:39:22 2014 +1200

    Fixed crash reported by sponssi

    More info at http://forum.freecadweb.org/viewtopic.php?f=10&t=6965&p=56590

commit 27b7b804790dda5164c7ef0b9418f6c160228859
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Jul 10 13:32:16 2014 +1200

    Cleaning up my git repo for FreeCAD.

    This branch now has just the Sketcher icon fixes, plus a few random comment edits.
2014-07-30 10:05:12 +02:00
Yorik van Havre b74c96dcc4 Draft + Arch: fixes when working without the GUI 2014-07-29 22:20:06 -03:00
wmayer 580c541005 + Add class CoordinateSystem and use it to compute placement of plane from fit 2014-07-29 23:01:29 +02:00
wmayer 65c974ed2d Squashed commit of the following:
commit 6e78052d325eadcb212a6d50c6cd09cc29ac7870
Author: Johan K <johankristensen@gmail.com>
Date:   Tue Jul 29 14:52:08 2014 +0200

    Adding missing file RegularPolygon.py

commit 416396283032a31a1ea307df23d33ecfccf37935
Author: Johan K <johankristensen@gmail.com>
Date:   Mon Jul 28 22:51:28 2014 +0200

    Replaced sketcher implementation of RegularPolygons with a Python script version.
2014-07-29 17:26:28 +02:00
Ian Rees c10ddae02f Bugs in mouse panning when viewport is "portrait" orientation 2014-07-29 12:58:39 +02:00
wmayer 290bc13c74 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-07-29 11:37:32 +02:00
wmayer c54311123b + Add method getEditorMode() to see if a property is hidden or read-only in the property editor 2014-07-29 11:36:42 +02:00
Yorik van Havre 19135f9586 Draft: small bug fix in DXF importer 2014-07-28 19:47:40 -03:00
wmayer dc7ccc41af + remove crude workaround as this seems to work now 2014-07-28 18:43:11 +02:00
wmayer 2e6c54eedf + improve the plane fit from REEN module 2014-07-28 16:39:34 +02:00
Ian Rees 1a2fe206ca Turned off HIDE_UNDOC_RELATIONS in Doxygen 2014-07-28 17:15:55 +12:00
wmayer a1da4bb4fb + fixes #0001619: Python script generating 3D model works in V0.13, error in V0.14 2014-07-27 14:08:31 +02:00
wmayer d163316e63 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-07-27 11:00:36 +02:00
Johan K 7fadaa0a55 Added more regular polygons to the sketcher gui 2014-07-27 00:25:40 +02:00
Johan K 4528b31d6e Added more regular polygons to the sketcher gui 2014-07-27 00:08:49 +02:00
Yorik van Havre d5469ba3fc Arch: misc bugfixes 2014-07-26 16:37:06 -03:00
wmayer 6b1e6a66ad + Make destructor virtual for classes with virtual methods (based on DevJohan's patch) 2014-07-26 19:17:12 +02:00
wmayer 4dee80f4e1 + support to create faces from vertices with shape builder 2014-07-25 13:35:10 +02:00
wmayer f0eb27f710 + let user decide to use equality constraint or independent radii 2014-07-24 19:09:41 +02:00
wmayer 996af8d808 + fixes #0001633: Allow adding radius constraints to several circles at once. 2014-07-24 13:32:47 +02:00
Sebastian Hoogen 65793d22e8 recognize OCCT -dev and -beta versions
as such in version string
2014-07-24 10:31:50 +02:00
Sebastian Hoogen 3859963b44 fix to placement problem in exportCSG.py 2014-07-24 10:31:50 +02:00
wmayer ecbda2772e + fixes #0001628: Fixed A4 Drawing Template 2014-07-23 13:56:16 +02:00
wmayer 841b4fab1b + fixes #0001630: IGES-Export in [mm] turns to [Inches] 2014-07-23 13:49:16 +02:00
wmayer dfea0206ca + fix doc string 2014-07-22 14:49:25 +02:00
wmayer c693916fb1 + support units in hole panel 2014-07-22 14:47:37 +02:00
wmayer cb5e72974c + support units in hole panel 2014-07-22 14:47:09 +02:00
wmayer 57cdb8aed5 + support units in draft panel 2014-07-22 14:44:20 +02:00
wmayer 3585403ee2 + support units in polar pattern panel 2014-07-22 14:39:23 +02:00
wmayer 67b85ff8c3 + support units in revolve panel 2014-07-22 14:30:30 +02:00
wmayer 4b644b2821 + support units in groove panel 2014-07-22 14:23:10 +02:00
wmayer ea6c5407d9 + support units in pocket panel 2014-07-22 14:13:45 +02:00
wmayer a5e27444d0 + minor issue solved with message label of linear pattern panel 2014-07-22 11:08:43 +02:00
wmayer 107a7f50dc + fix bug in chamfer/fillet when aborting command 2014-07-22 11:02:45 +02:00
wmayer d2cbd6817f + fixes 0001563: Add units to Linear Pattern in PartDesign 2014-07-22 10:39:44 +02:00
wmayer b5b929cf58 + fix focus issue with QuantitySpinBox and InputField 2014-07-21 18:28:46 +02:00
wmayer 5ba337a36d + add QuantitySpinBox to widget plugin 2014-07-21 15:30:38 +02:00
wmayer 2da263ae95 + proper handling of group separator in InputField and QuantitySpinBox 2014-07-21 15:03:45 +02:00
wmayer 81310c906b Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-07-20 19:15:42 +02:00
wmayer 3fb066c13e + add missing headers 2014-07-20 19:15:10 +02:00
Yorik van Havre a0bb761d8e Arch: added panel to cmakelist 2014-07-20 13:32:06 -03:00
Yorik van Havre 4414da2256 Arch: Updated preferences page for panels 2014-07-20 13:28:43 -03:00
Yorik van Havre 6c8c69df02 Arch: small fix in panel 2014-07-20 13:19:51 -03:00
Yorik van Havre 14ee127dc7 Arch: Further work on panel 2014-07-20 13:17:36 -03:00
Yorik van Havre a452e6cf61 Arch: Starting Panel tool 2014-07-20 13:17:36 -03:00
Yorik van Havre 8c7f69d913 Transferred import-export related preference pages to a separate group 2014-07-20 12:58:15 -03:00
wmayer d403851313 + add QuantitySpinBox 2014-07-20 17:47:09 +02:00
wmayer 86a69f830e Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-07-20 17:45:54 +02:00
Yorik van Havre d44e4d324b Arch: moved ifc-related functions to importIFC 2014-07-20 12:00:47 -03:00
Sebastian Hoogen f7193ca646 Adapt SMESH to new OCCT NCollection templates 2014-07-19 12:26:29 +02:00
Sebastian Hoogen 6843d6ad5d remove TKAdvTools 2014-07-19 12:26:29 +02:00
wmayer 4ae0d4db53 + do not allow negative numbers in fillet and chamfer panel 2014-07-18 15:23:36 +02:00
wmayer 80cc2e4710 + Replace OCC_HEX_VERSION with OCC_VERSION_HEX 2014-07-18 14:51:54 +02:00
wmayer c4bd838c55 + fix broken copyright notice 2014-07-18 12:40:21 +02:00
Ian Rees 22278b7826 This branch adds a mouse cursor to the 'Measure Distance' tool. 2014-07-18 12:33:57 +02:00
Sebastian Hoogen a0454af685 remove all references to BRepMesh 2014-07-18 10:43:16 +02:00
Yorik van Havre eea27448e9 Arch: Fixed bugs when working without GUI 2014-07-17 19:58:22 -03:00
wmayer 0fda229597 + add missing files to install target of Sketcher module 2014-07-17 12:26:52 +02:00
jriegel f30e86bc4b Integrating Rift Libs in build 2014-07-16 23:08:32 +02:00
wmayer c6af002ab5 + fixes #0001614: Provide proper Error Message for corrupt xml files 2014-07-16 19:12:19 +02:00
wmayer a5c8529b53 + use XMLString::release to free memory 2014-07-16 19:11:17 +02:00
wmayer b316991220 + fix mesh trimming 2014-07-16 18:21:30 +02:00
wmayer 7120279ec0 + fixes #0001617: typo in importCSG.py 2014-07-16 15:11:45 +02:00
wmayer f4d8b0ff54 + fix mesh triming 2014-07-16 13:57:14 +02:00
Yorik van Havre 7f387eabc1 Arch: General improvements
* Removed roundings in exported objects
* Added toggleIfcBrepFlag command to force export as BREP
* Prepared Arch objects for Materials and custom IFC attributes
* Supported latest developement version of IfcOpenShell
* Cleanup of IFC exporter
* Export of Arch Sites as IfcSite
* Export of Groups as IfcGroup
2014-07-15 15:13:30 -03:00
wmayer d456cd21f9 + fixes #0001499: Mesh trim loses some triangles 2014-07-15 18:42:42 +02:00
wmayer b8772df79c + Mesh trim loses some triangles 2014-07-15 13:31:15 +02:00
Ian Rees 172fb583d8 Forgot to add this to the last commit... 2014-07-15 11:41:11 +02:00
Ian Rees d21d3125e7 Have cmake set doxygen to use dot if it's available.
Also a minor typos
2014-07-15 11:41:10 +02:00
wmayer a9d1979270 + include missing header file 2014-07-15 10:27:02 +02:00
Yorik van Havre bd6a5cea8d Bumped version to 0.15 and added a temporary new splash 2014-07-14 20:04:21 -03:00
Yorik van Havre 7a612c66fa Spreadsheet: Added setitem and getitem methods 2014-07-14 19:13:18 -03:00
wmayer 8aec46fbaf + support comparison with double in quantity number protocol 2014-07-14 17:17:41 +02:00
Yorik van Havre 1fd7bd98a4 Draft: Array tool now prints commands in the python console 2014-07-13 12:32:32 -03:00
Sebastian Hoogen 51b3a4c945 importSVG: recognize relative scaling in viewBox attribute 2014-07-13 11:37:36 +02:00
Sebastian Hoogen 7bc3f70b8d remove unused meshing paramters for exportCSG
releated to 382e055e9b
2014-07-13 11:37:35 +02:00
Sebastian Hoogen c1f5582da8 support for Part::Loft in exportDRAWEXE 2014-07-13 11:37:34 +02:00
Sebastian Hoogen 2b1656e6b0 renable DRAWEXE exporter
This reverts commit 4c48bdf216.
2014-07-13 11:37:34 +02:00
Michael Ang db54a748b1 automatically find the OpenSCAD binary on Mac OS X 2014-07-13 11:37:33 +02:00
wmayer af4aa69d35 + fix crash when trying to edit broken revolve object 2014-07-13 11:34:36 +02:00
Jose Luis Cercos-Pita c90c4e1749 Added spreadsheets to the hydrostatics tool 2014-07-13 11:09:00 +02:00
Jose Luis Cercos-Pita 5f49a00b01 Fixed worng variable 2014-07-13 11:09:00 +02:00
Jose Luis Cercos-Pita e1b387a104 Changed the spreadsheet label 2014-07-13 11:08:59 +02:00
Jose Luis Cercos-Pita 48afaa5750 Added spreadsheets to the transversal areas tool 2014-07-13 11:08:58 +02:00
Jose Luis Cercos-Pita 3194d478f3 Fixed box generation for small draft values 2014-07-13 11:08:58 +02:00
Jose Luis Cercos-Pita aa1c957eb9 Fixed bad integer usage 2014-07-13 11:08:57 +02:00
Jose Luis Cercos-Pita cf01937d1c Added units mangement to the hydrostatics tool 2014-07-13 11:08:56 +02:00
Jose Luis Cercos-Pita 1ab919ef7e Corrected the angle bounds 2014-07-13 11:08:56 +02:00
Jose Luis Cercos-Pita 9a12a16cc4 Added units mangement to the transversal areas tool 2014-07-13 11:08:55 +02:00
Jose Luis Cercos-Pita 39769e887a Added helpers for mass, time and angle units 2014-07-13 11:08:54 +02:00
Jose Luis Cercos-Pita 1ce24c879f Added units mangement to the outline drawing tool 2014-07-13 11:08:53 +02:00
Jose Luis Cercos-Pita 978030a678 Moved to InputField widget in ship creation 2014-07-13 11:08:52 +02:00
wmayer d7fafdb2b6 + split create/edit sketch command into two commands 2014-07-13 10:17:50 +02:00
wmayer da708faa5e + support compounds of wires or faces for extrusion with tapered angle 2014-07-12 17:44:33 +02:00
wmayer 4ae29bc2e3 + implement solve() in Python API of SketchObject 2014-07-12 17:13:05 +02:00
wmayer 8f7966ed37 + fix override/restore cursor issue with task panel 2014-07-12 17:00:00 +02:00
wmayer f91c64aba9 + fix crash when trying to edit broken revolve object 2014-07-12 16:13:13 +02:00
Yorik van Havre 72166ceabe Draft - updated DXF importer
* Updated the importer to v1.38 (several fixes from the Blender branch)
* Enabled export of Bezier curves
2014-07-11 18:34:28 -03:00
Yorik van Havre cbcbba24d2 Draft: Further fix in text encodings 2014-07-11 17:41:26 -03:00
wmayer 3cfab20586 + simplify basic VRML export of mesh kernel, + allow to export mesh with texture via Python 2014-07-11 19:34:14 +02:00
wmayer 750a04d400 Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-07-11 19:28:25 +02:00
wmayer ec6f6ac128 + simplify basic VRML export of mesh kernel, + allow to export mesh with texture via Python 2014-07-11 19:27:48 +02:00
Yorik van Havre 88471d390f Draft - fixed some text encodings in dimensions 2014-07-11 11:54:33 -03:00
Yorik van Havre 8188bd5385 Draft: Fixed escape() bug in Draft GUI 2014-07-07 12:07:53 -03:00
wmayer 5b348b0dcf Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code 2014-07-07 13:57:17 +02:00
wmayer 0a986ddca6 + give more information when assigning wrong type to quantity property 2014-07-07 13:56:23 +02:00
Yorik van Havre 1be778a53d Spreadsheet: Fix to prevent unwanted characters in spreadsheet cells 2014-07-06 18:50:40 -03:00
wmayer 3d87d88616 + fix Part.makeTube 2014-07-05 15:48:50 +02:00
Yorik van Havre 56ea36d94f updated version number in makedist script 2014-07-04 20:33:08 -03:00
Yorik van Havre 1124a57514 Draft: fix in angular dimension 2014-07-01 22:30:36 -03:00
wmayer 02976cc80a Move pcl stuff to Reen module 2012-05-26 19:12:42 +02:00
wmayer 4ca65678bd Playing with pcl library 2012-05-26 14:52:04 +02:00
2338 changed files with 655735 additions and 302797 deletions
+1 -1
View File
@@ -14,7 +14,6 @@ cmake_install.cmake
*~
CMakeFiles/
*qrc.depends
qrc_*.cpp
ui_*.h
moc_*.cpp
Makefile
@@ -27,3 +26,4 @@ install_manifest.txt
/lib/
/Mod/
/ZERO_CHECK.dir/
/build/
+217 -226
View File
@@ -1,25 +1,30 @@
project(FreeCAD_trunk)
set(FREECAD_VERSION "0.13")
set(FREECAD_VERSION "0.15")
set(PACKAGE_NAME "FreeCAD")
set(PACKAGE_VERSION_MAJOR "0")
set(PACKAGE_VERSION_MINOR "12")
set(PACKAGE_VERSION_PATCH "2237")
set(PACKAGE_VERSION_MINOR "15")
set(PACKAGE_VERSION_PATCH "4664")
set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
# added in cmake 3.0
if(POLICY CMP0050)
cmake_policy(SET CMP0050 OLD)
endif(POLICY CMP0050)
endif(COMMAND cmake_policy)
# include local modules
include(AddFileDependencies)
include(cMake/FreeCadMacros.cmake)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
#if(CMAKE_CFG_INTDIR STREQUAL .)
# No Debug/Release output paths
set(DEBUG_MAIN_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
@@ -45,9 +50,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
# Needed for salomesmesh
ENABLE_LANGUAGE(Fortran)
include(cMake/ConfigureChecks.cmake)
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
add_definitions(-DHAVE_CONFIG_H)
@@ -113,181 +115,200 @@ endif(MSVC)
# ==============================================================================
# == All the options for the build process ============
OPTION(FREECAD_BUILD_GUI "Build FreeCAD Gui. Otherwise you have only the command line and the Python import module." ON)
OPTION(BUILD_GUI "Build FreeCAD Gui. Otherwise you have only the command line and the Python import module." ON)
OPTION(FREECAD_MAINTAINERS_BUILD "Build FreeCAD for Maintainers, with Docu and 3rd party libs. On Windows the Installer is build." OFF)
OPTION(FREECAD_USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF)
OPTION(FREECAD_USE_EXTERNAL_PIVY "Use system installed python-pivy instead of the bundled." OFF)
OPTION(FREECAD_USE_EXTERNAL_SMESH "Use system installed smesh instead of the bundled." OFF)
OPTION(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF)
OPTION(FREECAD_BUILD_CAM "Build the FreeCAD CAM module and the needed libs, be aware, unfinished code!" OFF)
OPTION(FREECAD_BUILD_FEM "Build the FreeCAD FEM module, be aware, unfinished code!" ON)
OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
OPTION(FREECAD_BUILD_TEMPLATE "Build the FreeCAD template module which is only for testing purposes" OFF)
OPTION(FREECAD_BUILD_ARCH "Build the FreeCAD Architecture module" ON)
OPTION(FREECAD_BUILD_ASSEMBLY "Build the FreeCAD Assembly module" ON)
OPTION(FREECAD_BUILD_COMPLETE "Build the FreeCAD complete module" ON)
OPTION(FREECAD_BUILD_DRAFT "Build the FreeCAD draft module" ON)
OPTION(FREECAD_BUILD_DRAWING "Build the FreeCAD drawing module" ON)
OPTION(FREECAD_BUILD_IDF "Build the FreeCAD idf module" ON)
OPTION(FREECAD_BUILD_IMAGE "Build the FreeCAD image module" ON)
OPTION(FREECAD_BUILD_IMPORT "Build the FreeCAD import module" ON)
OPTION(FREECAD_BUILD_INSPECTION "Build the FreeCAD inspection module" ON)
OPTION(FREECAD_BUILD_JTREADER "Build the FreeCAD jt reader module" OFF)
OPTION(FREECAD_BUILD_MATERIAL "Build the FreeCAD material module" ON)
OPTION(FREECAD_BUILD_MESH "Build the FreeCAD mesh module" ON)
OPTION(FREECAD_BUILD_MESH_PART "Build the FreeCAD mesh part module" ON)
OPTION(FREECAD_BUILD_OPENSCAD "Build the FreeCAD openscad module" ON)
OPTION(FREECAD_BUILD_PART "Build the FreeCAD part module" ON)
OPTION(FREECAD_BUILD_PART_DESIGN "Build the FreeCAD part design module" ON)
OPTION(FREECAD_BUILD_PLOT "Build the FreeCAD plot module" ON)
OPTION(FREECAD_BUILD_POINTS "Build the FreeCAD points module" ON)
OPTION(FREECAD_BUILD_RAYTRACING "Build the FreeCAD ray tracing module" ON)
OPTION(FREECAD_BUILD_REVERSEENGINEERING "Build the FreeCAD reverse engineering module" ON)
OPTION(FREECAD_BUILD_ROBOT "Build the FreeCAD robot module" ON)
OPTION(FREECAD_BUILD_SHIP "Build the FreeCAD ship module" ON)
OPTION(FREECAD_BUILD_SKETCHER "Build the FreeCAD sketcher module" ON)
OPTION(FREECAD_BUILD_SPREADSHEET "Build the FreeCAD spreadsheet module" ON)
OPTION(FREECAD_BUILD_START "Build the FreeCAD start module" ON)
OPTION(FREECAD_BUILD_TEST "Build the FreeCAD test module" ON)
OPTION(FREECAD_BUILD_WEB "Build the FreeCAD web module" ON)
if(APPLE)
OPTION(FREECAD_CREATE_MAC_APP "Create app bundle on install" OFF)
if(FREECAD_CREATE_MAC_APP)
install(
DIRECTORY ${CMAKE_SOURCE_DIR}/src/MacAppBundle/FreeCAD.app
DESTINATION ${CMAKE_INSTALL_PREFIX}
)
set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/FreeCAD.app/Contents)
SET(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
endif(FREECAD_CREATE_MAC_APP)
endif(APPLE)
OPTION(BUILD_CAM "Build the FreeCAD CAM module and the needed libs, be aware, unfinished code!" OFF)
OPTION(BUILD_FEM "Build the FreeCAD FEM module, be aware, unfinished code!" ON)
OPTION(BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
OPTION(BUILD_TEMPLATE "Build the FreeCAD template module which is only for testing purposes" OFF)
OPTION(BUILD_ARCH "Build the FreeCAD Architecture module" ON)
OPTION(BUILD_ASSEMBLY "Build the FreeCAD Assembly module" OFF)
OPTION(BUILD_COMPLETE "Build the FreeCAD complete module" ON)
OPTION(BUILD_DRAFT "Build the FreeCAD draft module" ON)
OPTION(BUILD_DRAWING "Build the FreeCAD drawing module" ON)
OPTION(BUILD_IDF "Build the FreeCAD idf module" ON)
OPTION(BUILD_IMAGE "Build the FreeCAD image module" ON)
OPTION(BUILD_IMPORT "Build the FreeCAD import module" ON)
OPTION(BUILD_INSPECTION "Build the FreeCAD inspection module" ON)
OPTION(BUILD_JTREADER "Build the FreeCAD jt reader module" OFF)
OPTION(BUILD_MATERIAL "Build the FreeCAD material module" ON)
OPTION(BUILD_MESH "Build the FreeCAD mesh module" ON)
OPTION(BUILD_MESH_PART "Build the FreeCAD mesh part module" ON)
OPTION(BUILD_OPENSCAD "Build the FreeCAD openscad module" ON)
OPTION(BUILD_PART "Build the FreeCAD part module" ON)
OPTION(BUILD_PART_DESIGN "Build the FreeCAD part design module" ON)
OPTION(BUILD_PLOT "Build the FreeCAD plot module" ON)
OPTION(BUILD_POINTS "Build the FreeCAD points module" ON)
OPTION(BUILD_RAYTRACING "Build the FreeCAD ray tracing module" ON)
OPTION(BUILD_REVERSEENGINEERING "Build the FreeCAD reverse engineering module" ON)
OPTION(BUILD_ROBOT "Build the FreeCAD robot module" ON)
OPTION(BUILD_SHIP "Build the FreeCAD ship module" ON)
OPTION(BUILD_SKETCHER "Build the FreeCAD sketcher module" ON)
OPTION(BUILD_SPREADSHEET "Build the FreeCAD spreadsheet module" ON)
OPTION(BUILD_START "Build the FreeCAD start module" ON)
OPTION(BUILD_TEST "Build the FreeCAD test module" ON)
OPTION(BUILD_WEB "Build the FreeCAD web module" ON)
OPTION(BUILD_VR "Build the FreeCAD Oculus Rift support (need Oculus SDK 4.x or higher)" OFF)
if(MSVC)
OPTION(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON)
OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" OFF)
OPTION(FREECAD_BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON)
OPTION(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON)
else(MSVC)
set(FREECAD_USE_3DCONNEXION OFF)
OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" ON)
OPTION(FREECAD_BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" OFF)
OPTION(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" OFF)
OPTION(FREECAD_USE_PCL "Build the features that use PCL libs" OFF)
OPTION(FREECAD_USE_EXTERNAL_PIVY "Use system installed python-pivy instead of the bundled." ON)
endif(MSVC)
# if this is set override some options
if (FREECAD_BUILD_DEBIAN)
set(FREECAD_USE_EXTERNAL_ZIPIOS ON)
set(FREECAD_USE_EXTERNAL_PIVY ON)
# A Debian package for SMESH doesn't exist
#set(FREECAD_USE_EXTERNAL_SMESH ON)
endif (FREECAD_BUILD_DEBIAN)
# ==============================================================================
#inter-module dependencies
#took these from Mod/Complete/App/AppComplete.cpp. appears to be working.
if(FREECAD_BUILD_COMPLETE)
set(FREECAD_BUILD_MESH ON)
set(FREECAD_BUILD_POINTS ON)
set(FREECAD_BUILD_DRAWING ON)
set(FREECAD_BUILD_RAYTRACING ON)
set(FREECAD_BUILD_PART_DESIGN ON)
set(FREECAD_BUILD_IMAGE ON)
set(FREECAD_BUILD_DRAFT ON)
endif(FREECAD_BUILD_COMPLETE)
if(BUILD_COMPLETE)
set(BUILD_MESH ON)
set(BUILD_POINTS ON)
set(BUILD_DRAWING ON)
set(BUILD_RAYTRACING ON)
set(BUILD_PART_DESIGN ON)
set(BUILD_IMAGE ON)
set(BUILD_DRAFT ON)
endif(BUILD_COMPLETE)
#inferred from .py files. appears to be working.
if(FREECAD_BUILD_ARCH)
set(FREECAD_BUILD_PART ON)
set(FREECAD_BUILD_MESH ON)
set(FREECAD_BUILD_DRAFT ON)
endif(FREECAD_BUILD_ARCH)
if(BUILD_ARCH)
set(BUILD_PART ON)
set(BUILD_MESH ON)
set(BUILD_DRAFT ON)
endif(BUILD_ARCH)
#inferred from .py files. appears to be working.
if(FREECAD_BUILD_OPENSCAD)
set(FREECAD_BUILD_MESH_PART ON)
set(FREECAD_BUILD_DRAFT ON)
endif(FREECAD_BUILD_OPENSCAD)
if(BUILD_OPENSCAD)
set(BUILD_MESH_PART ON)
set(BUILD_DRAFT ON)
endif(BUILD_OPENSCAD)
#inferred from cmakelists.txt. appears to be working.
if(FREECAD_BUILD_INSPECTION)
set(FREECAD_BUILD_MESH ON)
set(FREECAD_BUILD_POINTS ON)
set(FREECAD_BUILD_PART ON)
endif(FREECAD_BUILD_INSPECTION)
if(BUILD_INSPECTION)
set(BUILD_MESH ON)
set(BUILD_POINTS ON)
set(BUILD_PART ON)
endif(BUILD_INSPECTION)
#inferred from .py files. appears to be working.
if(FREECAD_BUILD_SHIP)
set(FREECAD_BUILD_PART ON)
set(FREECAD_BUILD_PLOT ON)
set(FREECAD_BUILD_IMAGE ON)
endif(FREECAD_BUILD_SHIP)
if(BUILD_SHIP)
set(BUILD_PART ON)
set(BUILD_PLOT ON)
set(BUILD_IMAGE ON)
endif(BUILD_SHIP)
#inferred from .py files. appears to be working.
if(FREECAD_BUILD_SPREADSHEET)
set(FREECAD_BUILD_DRAFT ON)
endif(FREECAD_BUILD_SPREADSHEET)
if(BUILD_SPREADSHEET)
set(BUILD_DRAFT ON)
endif(BUILD_SPREADSHEET)
#this has been tested. appears to be working.
if(FREECAD_BUILD_DRAFT)
set(FREECAD_BUILD_SKETCHER ON)
endif(FREECAD_BUILD_DRAFT)
if(BUILD_DRAFT)
set(BUILD_SKETCHER ON)
endif(BUILD_DRAFT)
#inferred from cmakelists.txt. appears to be working.
if(FREECAD_BUILD_PART_DESIGN)
set(FREECAD_BUILD_SKETCHER ON)
endif(FREECAD_BUILD_PART_DESIGN)
if(BUILD_PART_DESIGN)
set(BUILD_SKETCHER ON)
endif(BUILD_PART_DESIGN)
#inferred from cmakelists.txt. appears to be working.
if(FREECAD_BUILD_REVERSEENGINEERING)
set(FREECAD_BUILD_PART ON)
set(FREECAD_BUILD_MESH ON)
endif(FREECAD_BUILD_REVERSEENGINEERING)
if(BUILD_REVERSEENGINEERING)
set(BUILD_PART ON)
set(BUILD_MESH ON)
endif(BUILD_REVERSEENGINEERING)
#inferred from cmakelists.txt. appears to be working.
if(FREECAD_BUILD_MESH_PART)
set(FREECAD_BUILD_PART ON)
set(FREECAD_BUILD_MESH ON)
set(FREECAD_BUILD_SMESH ON)
endif(FREECAD_BUILD_MESH_PART)
if(BUILD_MESH_PART)
set(BUILD_PART ON)
set(BUILD_MESH ON)
set(BUILD_SMESH ON)
endif(BUILD_MESH_PART)
#inferred from cmakelists.txt. build errors. obsolete?
if(FREECAD_BUILD_CAM)
set(FREECAD_BUILD_PART ON)
set(FREECAD_BUILD_MESH ON)
endif(FREECAD_BUILD_CAM)
if(BUILD_CAM)
set(BUILD_PART ON)
set(BUILD_MESH ON)
endif(BUILD_CAM)
#inferred from cmakelists.txt. appears to be working.
if(FREECAD_BUILD_RAYTRACING)
set(FREECAD_BUILD_PART ON)
endif(FREECAD_BUILD_RAYTRACING)
if(BUILD_RAYTRACING)
set(BUILD_PART ON)
endif(BUILD_RAYTRACING)
#inferred from cmakelists.txt. appears to be working.
if(FREECAD_BUILD_DRAWING)
set(FREECAD_BUILD_PART ON)
endif(FREECAD_BUILD_DRAWING)
if(BUILD_DRAWING)
set(BUILD_PART ON)
endif(BUILD_DRAWING)
#inferred from cmakelists.txt. appears to be working.
if(FREECAD_BUILD_ROBOT)
set(FREECAD_BUILD_PART ON)
endif(FREECAD_BUILD_ROBOT)
if(BUILD_ROBOT)
set(BUILD_PART ON)
endif(BUILD_ROBOT)
#inferred from cmakelists.txt. appears to be working.
if(FREECAD_BUILD_SKETCHER)
set(FREECAD_BUILD_PART ON)
endif(FREECAD_BUILD_SKETCHER)
if(BUILD_SKETCHER)
set(BUILD_PART ON)
endif(BUILD_SKETCHER)
#inferred from .py files. built, but not sure how to test.
if(FREECAD_BUILD_IDF)
set(FREECAD_BUILD_PART ON)
endif(FREECAD_BUILD_IDF)
if(BUILD_IDF)
set(BUILD_PART ON)
endif(BUILD_IDF)
#inferred from cmakelists.txt. built, but not sure how to test.
if(FREECAD_BUILD_IMPORT)
set(FREECAD_BUILD_PART ON)
endif(FREECAD_BUILD_IMPORT)
if(BUILD_IMPORT)
set(BUILD_PART ON)
endif(BUILD_IMPORT)
#inferred from cmakelists.txt. appears to be working.
if(FREECAD_BUILD_FEM)
set(FREECAD_BUILD_PART ON)
set(FREECAD_BUILD_SMESH ON)
endif(FREECAD_BUILD_FEM)
if(BUILD_FEM)
set(BUILD_PART ON)
set(BUILD_SMESH ON)
endif(BUILD_FEM)
#inferred from cmakelists.txt. appears to be working.
if(FREECAD_BUILD_SANDBOX)
set(FREECAD_BUILD_PART ON)
set(FREECAD_BUILD_MESH ON)
endif(FREECAD_BUILD_SANDBOX)
if(BUILD_SANDBOX)
set(BUILD_PART ON)
set(BUILD_MESH ON)
endif(BUILD_SANDBOX)
#inferred from header includes. not tested.
if(FREECAD_BUILD_JTREADER)
set(FREECAD_BUILD_MESH ON)
endif(FREECAD_BUILD_JTREADER)
if(BUILD_JTREADER)
set(BUILD_MESH ON)
endif(BUILD_JTREADER)
#leaving test module for someone else.
#image has none. as far as I can tell.
@@ -309,16 +330,23 @@ if(FREECAD_LIBPACK_USE)
find_file(FREECAD_LIBPACK_CHECKFILE7X boost_program_options-vc90-mt-gd-1_39.lib ${FREECAD_LIBPACK_DIR}/lib )
find_file(FREECAD_LIBPACK_CHECKFILE8X boost_program_options-vc90-mt-gd-1_48.lib ${FREECAD_LIBPACK_DIR}/lib )
find_file(FREECAD_LIBPACK_CHECKFILE9X boost_program_options-vc90-mt-gd-1_54.lib ${FREECAD_LIBPACK_DIR}/lib )
find_file(FREECAD_LIBPACK_CHECKFILE10X boost_program_options-vc110-mt-1_55.lib ${FREECAD_LIBPACK_DIR}/lib )
find_file(FREECAD_LIBPACK_CHECKCUSTOM boost_program_options-vc90-mt-gd-1_41.lib ${FREECAD_LIBPACK_DIR}/lib )
find_file(FREECAD_LIBPACK_CHECKFILE_CLBUNDLER MANIFEST.db ${FREECAD_LIBPACK_DIR})
# don't show them in the GUI
set(FREECAD_LIBPACK_CHECKFILE6X "${FREECAD_LIBPACK_CHECKFILE6X}" CACHE INTERNAL "Find libpack")
set(FREECAD_LIBPACK_CHECKFILE7X "${FREECAD_LIBPACK_CHECKFILE7X}" CACHE INTERNAL "Find libpack")
set(FREECAD_LIBPACK_CHECKFILE8X "${FREECAD_LIBPACK_CHECKFILE8X}" CACHE INTERNAL "Find libpack")
set(FREECAD_LIBPACK_CHECKFILE9X "${FREECAD_LIBPACK_CHECKFILE9X}" CACHE INTERNAL "Find libpack")
set(FREECAD_LIBPACK_CHECKFILE10X "${FREECAD_LIBPACK_CHECKFILE10X}" CACHE INTERNAL "Find libpack")
set(FREECAD_LIBPACK_CHECKCUSTOM "${FREECAD_LIBPACK_CHECKCUSTOM}" CACHE INTERNAL "Find libpack")
set(FREECAD_LIBPACK_CHECKFILE_CLBUNDLER "${FREECAD_LIBPACK_CHECKFILE_CLBUNDLER}" CACHE INTERNAL "Find libpack")
IF(FREECAD_LIBPACK_CHECKFILE6X)
IF(FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
set(FREECAD_LIBPACK_VERSION "CLbundler" CACHE STRING "Displays if the libpack has been found" FORCE)
include(cMake/UseLibPackCLbundler.cmake)
ELSEIF(FREECAD_LIBPACK_CHECKFILE6X)
set(FREECAD_LIBPACK_VERSION "6.x" CACHE STRING "Displays if the libpack has been found" FORCE)
include(cMake/UseLibPack6x.cmake)
ELSEIF(FREECAD_LIBPACK_CHECKFILE7X)
@@ -335,18 +363,21 @@ if(FREECAD_LIBPACK_USE)
set(FREECAD_USE_EXTERNAL_PIVY ON CACHE BOOL "Switch off local pivy" FORCE)
set(FREECAD_LIBPACK_PYSIDEUIC_REL "${FREECAD_LIBPACK_DIR}/pyside-tools/Lib/site-packages")
file(GLOB FREECAD_LIBPACK_PIVY_COIN "${FREECAD_LIBPACK_DIR}/pivy/*.*")
file(GLOB FREECAD_LIBPACK_PIVY_SOQT "${FREECAD_LIBPACK_DIR}/pivy/gui/*.*")
file(GLOB FREECAD_LIBPACK_SHIBOKEN "${FREECAD_LIBPACK_DIR}/shiboken-1.2.1/lib/site-packages/*.pyd")
file(GLOB FREECAD_LIBPACK_PYSIDE "${FREECAD_LIBPACK_DIR}/pyside/lib/site-packages/PySide/*.py*")
file(GLOB_RECURSE FREECAD_LIBPACK_PYSIDEUIC RELATIVE "${FREECAD_LIBPACK_PYSIDEUIC_REL}" "${FREECAD_LIBPACK_PYSIDEUIC_REL}/pysideuic/*.py")
file(GLOB FREECAD_LIBPACK_PYTHON "${FREECAD_LIBPACK_DIR}/bin/*.py*")
ELSEIF(FREECAD_LIBPACK_CHECKFILE10X)
set(FREECAD_LIBPACK_VERSION "10.x" CACHE STRING "Displays if the libpack has been found" FORCE)
include(cMake/UseLibPack10x.cmake)
set(SWIG_EXECUTABLE ${FREECAD_LIBPACK_DIR}/tools/swigwin-3.0.2/swig.exe CACHE STRING "Swig" FORCE)
ELSEIF(FREECAD_LIBPACK_CHECKCUSTOM)
set(FREECAD_LIBPACK_VERSION "Custom" CACHE STRING "Displays if the libpack has been found" FORCE)
include(cMake/UseLibPackCustom.cmake)
ELSE(FREECAD_LIBPACK_CHECKFILE6X)
ELSE(FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
set(FREECAD_LIBPACK_VERSION "NOTFOUND" CACHE STRING "Displays if the libpack has been found" FORCE)
message(SEND_ERROR "Could not find libpack in specified location:" ${FREECAD_LIBPACK_DIR})
ENDIF(FREECAD_LIBPACK_CHECKFILE6X)
ENDIF(FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
# -------------------------------- PyCXX --------------------------------
@@ -360,8 +391,19 @@ if(FREECAD_LIBPACK_USE)
MESSAGE("SWIG was not found, build no SWIG binding for pivy")
ENDIF(NOT SWIG_FOUND)
else(FREECAD_LIBPACK_USE)
# -------------------------------- Shiboken/PySide ------------------------
find_package(PySideTools REQUIRED) # Pyside utilities (pyside-uic & pyside-rcc)
# -------------------------------- Salome SMESH --------------------------
if(NOT FREECAD_USE_EXTERNAL_SMESH)
set(SMESH_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc)
endif()
endif(FREECAD_LIBPACK_USE)
if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
# ================================================================================
# == for other OSes search the packages ==========================================
@@ -383,7 +425,12 @@ else(FREECAD_LIBPACK_USE)
MESSAGE("Python not found, install python!")
ENDIF(NOT PYTHONLIBS_FOUND)
# -------------------------------- pcl ----------------------------------
#PCL needs to be found before boost because the PCLConfig also calls find_package(Boost ...),
#but with different components
if(FREECAD_USE_PCL)
find_package(PCL REQUIRED COMPONENTS common kdtree features surface io)
endif(FREECAD_USE_PCL)
# -------------------------------- Boost --------------------------------
@@ -407,96 +454,29 @@ else(FREECAD_LIBPACK_USE)
# -------------------------------- OpenCasCade --------------------------------
#first, look for OpenCASCADE Community Edition (OCE)
#if OCE is installed in a nonstandard location, add -DOCE_DIR=/path/to/dir/containing/OCEConfig.cmake
# when configuring with cmake, i.e. cmake .. -DOCE_DIR=/usr/share/cmake
if(NOT DEFINED OCE_DIR)
if(UNIX)
set(OCE_DIR "/usr/local/share/cmake/")
elseif(WIN32)
set(OCE_DIR "c:/OCE-0.4.0/share/cmake")
endif()
endif()
find_package (OCE QUIET)
if(${OCE_FOUND})
message("-- OpenCASCADE Community Edition has been found.")
add_definitions (-DHAVE_CONFIG_H)
#lib list copied from FreeCAD's FindOpenCasCade.cmake
set(OCC_LIBRARIES
TKFillet
TKMesh
TKernel
TKG2d
TKG3d
TKMath
TKIGES
TKSTL
TKShHealing
TKXSBase
TKBool
TKBO
TKBRep
TKTopAlgo
TKGeomAlgo
TKGeomBase
TKOffset
TKPrim
TKSTEP
TKSTEPBase
TKSTEPAttr
TKHLR
TKFeat
)
#lib list copied from FreeCAD's FindOpenCasCade.cmake
set(OCC_OCAF_LIBRARIES
TKCAF
TKXCAF
TKLCAF
TKXDESTEP
TKXDEIGES
TKMeshVS
TKAdvTools
)
set(OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS})
set(OCC_FOUND ${OCE_FOUND})
else() #look for OpenCASCADE
find_package(OpenCasCade)
if(NOT OCC_FOUND)
message("Neither OpenCASCADE Community Edition nor OpenCasCade were found: will not build CAD modules!")
else()
message("-- OpenCASCADE include directory: ${OCC_INCLUDE_PATH}")
message("-- OpenCASCADE shared libraries directory: ${OCC_LIB_PATH}")
endif()
endif()
find_package(OpenCasCade)
# -------------------------------- Salome SMESH --------------------------
# Salome SMESH sources are under src/3rdParty now
IF(OCC_FOUND)
set(SMESH_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc)
set(SMESH_LIBRARIES
StdMeshers
#MEFISTO2
SMESH
DriverUNV
SMESHDS
DriverSTL
DriverDAT
Driver
SMDS
)
if(NOT FREECAD_USE_EXTERNAL_SMESH)
set(SMESH_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc)
else()
find_package(SMESH)
if(NOT SMESH_FOUND)
message(ERROR "SMESH was not found.")
endif()
include_directories(${SMESH_INCLUDE_DIR})
endif()
set(SMESH_FOUND TRUE)
ENDIF(OCC_FOUND)
#find_package(SMESH)
#IF(NOT SMESH_FOUND)
# MESSAGE("Salome SMESH was not found!")
#ENDIF(NOT SMESH_FOUND)
# -------------------------------- Netgen --------------------------------
if (FREECAD_BUILD_FEM_NETGEN)
if (BUILD_FEM_NETGEN)
find_package(NETGEN)
endif(FREECAD_BUILD_FEM_NETGEN)
endif(BUILD_FEM_NETGEN)
# -------------------------------- OpenCV --------------------------------
@@ -526,12 +506,12 @@ else(FREECAD_LIBPACK_USE)
SET(QT_MIN_VERSION 4.5.0)
set(QT_USE_QTNETWORK TRUE)
set(QT_USE_QTXML TRUE)
if(FREECAD_BUILD_GUI)
if(BUILD_GUI)
set(QT_USE_QTOPENGL TRUE)
set(QT_USE_QTSVG TRUE)
set(QT_USE_QTUITOOLS TRUE)
set(QT_USE_QTWEBKIT TRUE)
endif(FREECAD_BUILD_GUI)
endif(BUILD_GUI)
find_package(Qt4 REQUIRED)
include(${QT_USE_FILE})
@@ -560,7 +540,11 @@ else(FREECAD_LIBPACK_USE)
foreach(it ${moc_files})
get_filename_component(it ${it} ABSOLUTE)
QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)
QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}")
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_MOC_EXECUTABLE}
ARGS ${moc_options} ${it} -o ${outfile}
MAIN_DEPENDENCY ${it}
)
set(${outfiles} ${${outfiles}} ${outfile})
add_file_dependencies(${it} ${outfile})
endforeach(it)
@@ -577,7 +561,7 @@ else(FREECAD_LIBPACK_USE)
#---------------------------------------------------
if(FREECAD_BUILD_GUI)
if(BUILD_GUI)
# -------------------------------- OpenGL --------------------------------
find_package(OpenGL)
@@ -593,7 +577,6 @@ else(FREECAD_LIBPACK_USE)
# -------------------------------- Coin3D --------------------------------
find_package(Coin3D REQUIRED)
find_package(SoQt REQUIRED)
# ------------------------------ Spaceball -------------------------------
@@ -610,23 +593,28 @@ else(FREECAD_LIBPACK_USE)
SET(PYTHON_BASENAME -python2.7) # for PySide
find_package(Shiboken REQUIRED)
find_package(PySide REQUIRED)
find_package(PySideTools REQUIRED) # Pyside utilities (pyside-uic & pyside-rcc)
# ------------------------------ Matplotlib ------------------------------
find_package(Matplotlib)
IF(MATPLOTLIB_FOUND)
message("-- matplotlib-${MATPLOTLIB_VERSION} has been found.")
message(STATUS "-- matplotlib-${MATPLOTLIB_VERSION} has been found.")
ELSE(MATPLOTLIB_FOUND)
message("matplotlib not found, Plot module will not available until matplotlib is installed!")
message("-- matplotlib not found, Plot module won't be available!")
ENDIF(MATPLOTLIB_FOUND)
# ------------------------------------------------------------------------
endif(FREECAD_BUILD_GUI)
endif(BUILD_GUI)
endif(FREECAD_LIBPACK_USE)
endif(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
if(BUILD_VR)
find_package(Rift)
endif(BUILD_VR)
# copy build convenient files for M$
if(WIN32)
@@ -637,7 +625,6 @@ if(WIN32)
endif(WIN32)
include(cMake/FreeCadMacros.cmake)
# ================================================================================
@@ -660,9 +647,9 @@ ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
IF(MSVC)
# set default compiler settings
SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHa")
SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFC_DEBUG")
SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFC_DEBUG /Zm128")
# set default libs
SET (CMAKE_C_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib SHFolder.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib ")
SET (CMAKE_C_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib SHFolder.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib winmm.lib comsupp.lib Ws2_32.lib dbghelp.lib ")
set (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}")
# set linker flag /nodefaultlib
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB")
@@ -684,8 +671,13 @@ ELSE(MSVC)
MESSAGE(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
ENDIF(MSVC)
IF(MINGW)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthreads")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthreads")
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=12477
# Actually '-Wno-inline-dllimport' should work to suppress warnings of the form:
# inline function 'foo' is declared as dllimport: attribute ignored
# But it doesn't work with MinGW gcc 4.5.0 while using '-Wno-attributes' seems to
# do the trick.
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthreads -Wno-attributes")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthreads -Wno-attributes")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mthreads -Wl,--export-all-symbols")
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -mthreads -Wl,--export-all-symbols")
# http://stackoverflow.com/questions/8375310/warning-auto-importing-has-been-activated-without-enable-auto-import-specifie
@@ -729,10 +721,10 @@ if(FREECAD_MAINTAINERS_BUILD AND NOT WIN32)
set(PKG_ARCH amd64)
ENDIF( CMAKE_SIZEOF_VOID_P EQUAL 4 )
set(CPACK_DEBIAN_PACKAGE_SECTION "science")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python, oce | opencascade, libqtgui4, libcoin60, libsoqt4-20, libxerces-c3.1, zlib1g, libboost-dev, libeigen2-dev")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python, oce | opencascade, libqtgui4, libcoin60, libxerces-c3.1, zlib1g, libboost-dev, libeigen2-dev")
set(CPACK_PACKAGE_CONTACT "<root@localhost>")
set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}_${PKG_ARCH}")
if(WIN32)
set(CPACK_GENERATOR "ZIP")
set(CPACK_SOURCE_GENERATOR "ZIP")
@@ -820,4 +812,3 @@ if(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
endif(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
-39
View File
@@ -1,39 +0,0 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS=data src
EXTRA_DIST = \
cMake/ConfigureChecks.cmake \
cMake/FindCoin3D.cmake \
cMake/FindCoin3DDoc.cmake \
cMake/FindEigen2.cmake \
cMake/FindEigen3.cmake \
cMake/FindF2C.cmake \
cMake/FindODE.cmake \
cMake/FindOpenCasCade.cmake \
cMake/FindOpenCV.cmake \
cMake/FindSoQt.cmake \
cMake/FindSpnav.cmake \
cMake/FindXercesC.cmake \
cMake/FreeCadMacros.cmake \
cMake/UseLibPack6x.cmake \
cMake/UseLibPack7x.cmake \
cMake/UseLibPackCustom.cmake \
config.h.cmake \
CMakeLists.txt \
autogen.sh \
BuildAll.bat \
build.sh \
ChangeLog.txt \
copying.lib \
README.Linux \
README.Win32
debian-package:
$(top_srcdir)/package/makedebian.sh
if HAVE_DOXYGEN
devdoc:
doxygen $(top_builddir)/src/Doc/BuildDevDoc.cfg
endif
+47 -37
View File
@@ -1,60 +1,70 @@
FreeCAD
=======
FreeCAD is a general purpose feature-based, parametric 3D modeler for CAD, MCAD,
CAx, CAE and PLM, aimed directly at mechanical engineering and product design but
also fits a wider range of uses in engineering, such as architecture or other engineering
specialties. It is 100% Open Source (LGPL2+ license) and extremely modular, allowing
for very advanced extension and customization.
FreeCAD is a general purpose feature-based, parametric 3D modeler for
CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering
and product design but also fits a wider range of uses in engineering,
such as architecture or other engineering specialties. It is 100% Open
Source (LGPL2+ license) and extremely modular, allowing for very
advanced extension and customization.
FreeCAD is based on OpenCasCade, a powerful geometry kernel, features an Open Inventor-compliant
3D scene representation model provided by the Coin 3D library, and a broad Python API.
The interface is built with Qt. FreeCAD runs exactly the same way on Windows, Mac OSX, BSD and
Linux platforms.
FreeCAD is based on OpenCasCade, a powerful geometry kernel, features an
Open Inventor-compliant 3D scene representation model provided by the
Coin 3D library, and a broad Python API. The interface is built with Qt.
FreeCAD runs exactly the same way on Windows, Mac OSX, BSD and Linux
platforms.
Home page: http://www.freecadweb.org
Documentation wiki: http://www.freecadweb.org/wiki/
Forum: http://forum.freecadweb.org/
Bug tracker: http://www.freecadweb.org/tracker/
Git repository: http://sourceforge.net/p/free-cad/code/ci/master/tree/
Home page: http://www.freecadweb.org
Documentation wiki: http://www.freecadweb.org/wiki/
Forum: http://forum.freecadweb.org/
Bug tracker: http://www.freecadweb.org/tracker/
Git repository: http://sourceforge.net/p/free-cad/code/ci/master/tree/
Installing
==========
Precompiled (installable) packages are usually available to you from several sources and are
described on the FreeCAD download page: http://www.freecadweb.org/wiki/index.php?title=Download
Precompiled (installable) packages are usually available to you from
several sources and are described on the FreeCAD download page:
http://www.freecadweb.org/wiki/index.php?title=Download
Compiling
=========
Compiling FreeCAD requires to install several heavyweight libraries and their development
files such as OpenCasCADe, Coin and Qt, listed in the pages below. Once this is done,
FreeCAD can be simply compiled with cMake. On windows, these libraries are bundled and
offeredby the FreeCAD team in a convenience package, on Linux they are usually found
in your distribution's repositories and on Mac OSX and other platforms you will usually
need to compile them yourself.
Note that autotools build system can still be used but will be obsoleted soon.
Compiling FreeCAD requires to install several libraries and their
development files such as OpenCasCADe, Coin and Qt, listed in the
pages below. Once this is done, FreeCAD can be simply compiled with
cMake. On windows, these libraries are bundled and offered by the
FreeCAD team in a convenience package, on Linux they are usually found
in your distribution's repositories and on Mac OSX and other platforms
you will usually need to compile them yourself.
The pages below contain up-to-date build instructions:
For Linux: http://www.freecadweb.org/wiki/index.php?title=CompileOnUnix
For windows: http://www.freecadweb.org/wiki/index.php?title=CompileOnWindows
For Mac OSX: http://www.freecadweb.org/wiki/index.php?title=CompileOnMac
For Linux: http://www.freecadweb.org/wiki/?title=CompileOnUnix
For Windows: http://www.freecadweb.org/wiki/?title=CompileOnWindows
For Mac OSX: http://www.freecadweb.org/wiki/?title=CompileOnMac
For Cygwin: http://www.freecadweb.org/wiki/?title=CompileOnCygwin
For MinGW: http://www.freecadweb.org/wiki/?title=CompileOnMinGW
In this folder you will also find additional README files, specific for each platform.
Usage & Getting help
====================
Usage
=====
The FreeCAD documentation wiki contains a lot of documentation on
general FreeCAD usage, python scripting, and development. The following
pages might help you to get started:
Getting started: http://www.freecadweb.org/wiki/?title=Getting_started
Features list: http://www.freecadweb.org/wiki/?title=Features_list
Frequent questions: http://www.freecadweb.org/wiki/?title=FAQ
Workbenches: http://www.freecadweb.org/wiki/?title=Workbench_Concept
Scripting: http://www.freecadweb.org/wiki/?title=Power_users_hub
Development: http://www.freecadweb.org/wiki/?title=Developer_hub
The FreeCAD forum at http://forum.freecadweb.org is also a great place
to find help and solve specific problems that you might encounter when
learning to use FreeCAD.
The FreeCAD documentation wiki contains sections for each category of users, and a manual,
which is a compilation of the most useful articles of the wiki:
For users: General FreeCAD usage: http://www.freecadweb.org/wiki/index.php?title=User_hub
For power-users: Python scripting: http://www.freecadweb.org/wiki/index.php?title=Power_users_hub
For developers: C++ FreeCAD development: http://www.freecadweb.org/wiki/index.php?title=Developer_hub
The FreeCAD manual: http://www.freecadweb.org/wiki/index.php?title=Online_Help_Toc
-503
View File
@@ -1,503 +0,0 @@
dnl @synopsis AC_CXX_HAVE_STL
dnl
dnl If the compiler supports the Standard Template Library, define HAVE_STL.
dnl
dnl @version $Id: acinclude.m4,v 1.2 2006/02/24 00:09:19 wmayer Exp $
dnl @author Luc Maisonobe
dnl
AC_DEFUN([AC_CXX_HAVE_STL],
[AC_CACHE_CHECK(whether the compiler supports Standard Template Library,
ac_cv_cxx_have_stl,
[AC_REQUIRE([AC_CXX_NAMESPACES])
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <list>
#include <deque>
#ifdef HAVE_NAMESPACES
using namespace std;
#endif],[list<int> x; x.push_back(5);
list<int>::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;],
ac_cv_cxx_have_stl=yes, ac_cv_cxx_have_stl=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_have_stl" = yes; then
AC_DEFINE(HAVE_STL,,[define if the compiler supports Standard Template Library])
fi
])
dnl @synopsis AC_CXX_HAVE_STD
dnl
dnl If the compiler supports ISO C++ standard library (i.e., can include the
dnl files iostream, map, iomanip and cmath}), define HAVE_STD.
dnl
dnl @version $Id: acinclude.m4,v 1.2 2006/02/24 00:09:19 wmayer Exp $
dnl @author Luc Maisonobe
dnl
AC_DEFUN([AC_CXX_HAVE_STD],
[AC_CACHE_CHECK(whether the compiler supports ISO C++ standard library,
ac_cv_cxx_have_std,
[AC_REQUIRE([AC_CXX_NAMESPACES])
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <iostream>
#include <map>
#include <iomanip>
#include <cmath>
#ifdef HAVE_NAMESPACES
using namespace std;
#endif],[return 0;],
ac_cv_cxx_have_std=yes, ac_cv_cxx_have_std=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_have_std" = yes; then
AC_DEFINE(HAVE_STD,,[define if the compiler supports ISO C++ standard library])
fi
])
dnl @synopsis AC_CXX_NAMESPACES
dnl
dnl If the compiler can prevent names clashes using namespaces, define
dnl HAVE_NAMESPACES.
dnl
dnl @version $Id: acinclude.m4,v 1.2 2006/02/24 00:09:19 wmayer Exp $
dnl @author Luc Maisonobe
dnl
AC_DEFUN([AC_CXX_NAMESPACES],
[AC_CACHE_CHECK(whether the compiler implements namespaces,
ac_cv_cxx_namespaces,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}],
[using namespace Outer::Inner; return i;],
ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_namespaces" = yes; then
AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces])
fi
])
dnl @synopsis AC_CXX_HAVE_SSTREAM
dnl
dnl If sstream (part of Standard C++ Library) exists
dnl define HAVE_SSTREAM.
dnl
dnl @version ac_cxx_have_std.m4 Tue Mar 28 18:20:26 CEST 2000
dnl @author Thomas Sondergaard thomass@deltadata.dk
dnl
AC_DEFUN([AC_CXX_HAVE_SSTREAM],
[AC_CACHE_CHECK(for sstream,
ac_cv_cxx_have_sstream,
[AC_REQUIRE([AC_CXX_NAMESPACES])
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <sstream>
#ifdef HAVE_NAMESPACES
using namespace std;
#endif],[return 0;],
ac_cv_cxx_have_sstream=yes, ac_cv_cxx_have_sstream=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_have_sstream" = yes; then
AC_DEFINE(HAVE_SSTREAM,1,[define if the compiler supports sstream])
fi
])
dnl @synopsis AC_CXX_HAVE_STD_IOSTREAM
dnl
dnl If std iostream (part of Standard C++ Library) exists
dnl define HAVE_STD_IOSTREAM.
dnl
dnl @version ac_cxx_have_std.m4 Tue Mar 28 18:20:26 CEST 2000
dnl @author Thomas Sondergaard thomass@deltadata.dk
dnl
AC_DEFUN([AC_CXX_HAVE_STD_IOSTREAM],
[AC_CACHE_CHECK(for std iostream,
ac_cv_cxx_have_std_iostream,
[AC_REQUIRE([AC_CXX_NAMESPACES])
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([
#include <sstream>
#include <streambuf>
#include <ios>
#ifdef HAVE_NAMESPACES
using namespace std;
#endif
],[return 0;],
ac_cv_cxx_have_std_iostream=yes, ac_cv_cxx_have_std_iostream=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_have_std_iostream" = yes; then
AC_DEFINE(HAVE_STD_IOSTREAM,,[define if the compiler has std compliant iostream library])
fi
])
dnl @synopsis FREECAD_AC_HAVE_QT(MINIMUM_VERSION)
dnl
dnl @summary Search for Trolltech's Qt GUI framework.
dnl
dnl Checks for the Qt4 library and its tools uic, moc and rcc.
dnl
dnl The following variables are exported:
dnl
dnl QT_DIR
dnl QT_CXXFLAGS
dnl QT_LIBS
dnl QT_MOC
dnl QT_UIC
dnl QT_RCC
dnl
AC_DEFUN([FREECAD_AC_HAVE_QT],
[
AC_ARG_WITH([qt4-dir],
AC_HELP_STRING([--with-qt4-dir=DIR], [give prefix location of Qt4]),
[fc_qt4_dir="$withval"],
[fc_qt4_dir="/usr/share/qt4"])
AC_ARG_WITH([qt4-include],
AC_HELP_STRING([--with-qt4-include=DIR], [give include prefix of Qt4]),
[fc_qt4_include="$withval"],
[fc_qt4_include="$fc_qt4_dir/include"])
AC_ARG_WITH([qt4-lib],
AC_HELP_STRING([--with-qt4-lib=DIR], [give library path to Qt4]),
[fc_qt4_lib="$withval"],
[fc_qt4_lib="$fc_qt4_dir/lib"])
AC_ARG_WITH([qt4-bin],
AC_HELP_STRING([--with-qt4-bin=DIR], [give path to Qt4 utilities (moc, uic, rcc)]),
[fc_qt4_bin="$withval"],
[fc_qt4_bin="$fc_qt4_dir/bin"])
AC_ARG_WITH([qt4-framework],
AC_HELP_STRING([--with-qt4-framework],
[give prefix path to the Qt4 framework on Mac OS X]),
[fc_qt4_frm="$withval"],
[fc_qt4_frm=""])
AC_MSG_CHECKING(for host)
AC_MSG_RESULT($host_os)
case $host_os in
mingw32*)
fc_qt4_lib_core="-L$fc_qt4_lib -lQtCore"
QT_LIBS="-L$fc_qt4_lib -lopengl32 -lglu32 -lgdi32 -luser32 -lmingw32 -mthreads -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-s -Wl,-s -Wl,-subsystem,windows"
QT_CXXFLAGS="-I$fc_qt4_include -I$fc_qt4_include/QtCore -I$fc_qt4_include/QtGui -I$fc_qt4_include/QtOpenGL -I$fc_qt4_include/QtSvg -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN -frtti -fexceptions"
;;
darwin*)
AC_PATH_XTRA
if test -d $fc_qt4_frm/QtCore.framework; then
ac_save_ldflags_fw=$LDFLAGS
LDFLAGS="$LDFLAGS -F$fc_qt4_frm -framework QtCore"
AC_CACHE_CHECK(
[whether Qt is installed as framework],
ac_cv_have_qt_framework,
[AC_TRY_LINK([#include <QtCore/qglobal.h>
#include <stdio.h>],
[printf("%s\n", qVersion());],
[ac_cv_have_qt_framework=yes],
[ac_cv_have_qt_framework=no])
])
LDFLAGS=$ac_save_ldflags_fw
else
ac_cv_have_qt_framework=no
fi
if test "$ac_cv_have_qt_framework" = yes; then
# Qt as framework installed
fc_qt4_lib_core="-Wl,-F$fc_qt4_frm -Wl,-framework,QtCore"
QT_LIBS="-Wl,-F$fc_qt4_frm"
#QT_LIBS="$QT_LIBS -Wl,-framework,Qt3Support"
QT_LIBS="$QT_LIBS -Wl,-framework,QtGui"
QT_LIBS="$QT_LIBS -Wl,-framework,QtOpenGL"
QT_LIBS="$QT_LIBS -Wl,-framework,QtCore"
QT_LIBS="$QT_LIBS -Wl,-framework,QtNetwork"
QT_LIBS="$QT_LIBS -Wl,-framework,QtXml"
QT_LIBS="$QT_LIBS -Wl,-framework,QtSql"
QT_LIBS="$QT_LIBS -Wl,-framework,QtSvg"
# Separated libs
QT4_CORE_LIBS="-Wl,-F$fc_qt4_frm -Wl,-framework,QtCore"
QT_CXXFLAGS="-F$fc_qt4_frm -I$fc_qt4_frm/Qt3Support.framework/Headers"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtGui.framework/Headers"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtCore.framework/Headers"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtOpenGL.framework/Headers"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtNetwork.framework/Headers"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtSvg.framework/Headers"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtXml.framework/Headers"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtUiTools.framework/Headers"
# Separated flags
QT4_CORE_CXXFLAGS="-F$fc_qt4_frm -I$fc_qt4_frm/QtCore.framework/Headers"
# QtUiTools doesn't seem to be available as framework
#QT_CXXFLAGS="$QT_CXXFLAGS -I/usr/include/QtUiTools"
# QtWebKit check
fc_ac_save_cppflags=$CPPFLAGS
CPPFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtWebKit.framework/Headers"
AC_MSG_CHECKING([whether QtWebKit is available])
AC_TRY_COMPILE([#include <QWebView>], [],
[
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtWebKit.framework/Headers"
QT_LIBS="$QT_LIBS -Wl,-framework,QtWebKit"
AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no))
CPPFLAGS=$fc_ac_save_cppflags
else
# Qt not as framework installed
fc_qt4_lib_core="-L$fc_qt4_lib -lQtCore"
QT_LIBS="-L$fc_qt4_lib -lQtCore -lQtGui -lQt3Support -lQtNetwork -lQtOpenGL -lQtSvg -lQtXml"
QT_CXXFLAGS="-I$fc_qt4_include -I$fc_qt4_include/Qt3Support"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtGui"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtCore"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtOpenGL"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtNetwork"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtSvg"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtXml"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtUiTools"
# Separated flags and libs
QT4_CORE_CXXFLAGS="-I$fc_qt4_include -I$fc_qt4_include/QtCore"
QT4_CORE_LIBS="-L$fc_qt4_lib -lQtCore"
# QtWebKit check
fc_ac_save_cppflags=$CPPFLAGS
CPPFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtWebKit"
AC_MSG_CHECKING([whether QtWebKit is available])
AC_TRY_COMPILE([#include <QWebView>], [],
[
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtWebKit"
QT_LIBS="$QT_LIBS -lQtWebKit"
AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no))
CPPFLAGS=$fc_ac_save_cppflags
fi
;;
*) # UNIX/Linux based
AC_PATH_XTRA
fc_qt4_lib_core="-L$fc_qt4_lib -lQtCore"
QT_LIBS="-L$fc_qt4_lib -lQtCore -lQtGui -lQt3Support -lQtNetwork -lQtOpenGL -lQtSvg -lQtXml $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
QT_CXXFLAGS="-I$fc_qt4_include -I$fc_qt4_include/Qt3Support"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtGui"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtCore"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtOpenGL"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtNetwork"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtSvg"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtXml"
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtUiTools $X_CFLAGS"
# QtWebKit check
fc_ac_save_cppflags=$CPPFLAGS
CPPFLAGS="-I$fc_qt4_include -I$fc_qt4_include/QtWebKit"
AC_MSG_CHECKING([whether QtWebKit is available])
AC_TRY_LINK([#include <QWebView>], [],
[
QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtWebKit"
QT_LIBS="$QT_LIBS -lQtWebKit"
AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no))
CPPFLAGS=$fc_ac_save_cppflags
#QT4_CXXFLAGS="-I$fc_qt4_include"
#QT4_LIBS="-L$fc_qt4_lib $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
# Separated flags and libs
QT4_CORE_CXXFLAGS="-I$fc_qt4_include -I$fc_qt4_include/QtCore"
QT4_CORE_LIBS="-L$fc_qt4_lib -lQtCore"
#QT4_GUI_CXXFLAGS="-I$fc_qt4_include/QtGui"
#QT4_GUI_LIBS="-lQtGui"
#QT4_NETWORK_CFLAGS="-I$fc_qt4_include/QtNetwork"
#QT4_NETWORK_LIBS="-lQtNetwork"
#QT4_XML_CFLAGS="-I$fc_qt4_include/QtXml"
#QT4_XML_LIBS="-lQtXml"
;;
esac
min_qt_version=ifelse([$1], ,4.0.0, $1)
AC_MSG_CHECKING(for Qt >= $min_qt_version)
QT_MOC="$fc_qt4_bin/moc"
QT_UIC="$fc_qt4_bin/uic"
QT_RCC="$fc_qt4_bin/rcc"
# Now we check whether we can actually build a Qt app.
cat > myqt.h << EOF
#include <QObject>
class Test : public QObject
{
Q_OBJECT
public:
Test() {}
~Test() {}
public slots:
void receive() {}
signals:
void send();
};
EOF
cat > myqt.cpp << EOF
#include "myqt.h"
#include <QCoreApplication>
#include <QByteArray>
#include <QGlobalStatic>
#include <QStringList>
#include <stdio.h>
#include <stdlib.h>
int main( int argc, char **argv )
{
QCoreApplication app( argc, argv );
Test t;
QObject::connect( &t, SIGNAL(send()), &t, SLOT(receive()) );
// major, minor, patch
QString version = "$min_qt_version";
QStringList numbers = version.split('.');
int shift[[3]] = {16,8,0};
int minversion = 0, i = 0;
for (QStringList::ConstIterator it = numbers.begin(); it != numbers.end(); ++it, ++i) {
bool ok;
int val = (*it).toInt(&ok);
if (ok) {
minversion = minversion + (val << shift[[i]]);
}
}
exit(QT_VERSION < minversion);
}
EOF
bnv_try_1="$QT_MOC myqt.h -o moc_myqt.cpp"
AC_TRY_EVAL(bnv_try_1)
if test x"$ac_status" != x0; then
AC_MSG_ERROR([Cannot find Qt meta object compiler (moc), bye...])
fi
bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_myqt.o moc_myqt.cpp"
AC_TRY_EVAL(bnv_try_2)
if test x"$ac_status" != x0; then
AC_MSG_ERROR([Failed to compile source file created by Qt meta object compiler (moc), bye...])
fi
bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o myqt.o myqt.cpp"
AC_TRY_EVAL(bnv_try_3)
if test x"$ac_status" != x0; then
AC_MSG_ERROR([Failed to compile Qt test app, bye...])
fi
# Make sure not to link against X11 libs so that configure succeeds whithout xserver started
bnv_try_4="$CXX myqt.o moc_myqt.o $fc_qt4_lib_core $LIBS -o myqt"
AC_TRY_EVAL(bnv_try_4)
if test x"$ac_status" != x0; then
AC_MSG_ERROR([Failed to link with Qt, bye...])
fi
AS_IF([AM_RUN_LOG([./myqt])],
[AC_MSG_RESULT(yes)],
[AC_MSG_ERROR([Version of Qt4 found but < $min_qt_version])
])
rm -f moc_myqt.cpp myqt.h myqt.cpp myqt.o myqt moc_myqt.o
if test -d $fc_qt4_dir; then
QT_DIR="$fc_qt4_dir"
else
QT_DIR=""
fi
AC_SUBST(QT_DIR)
AC_SUBST(QT_CXXFLAGS)
AC_SUBST(QT_LIBS)
AC_SUBST(QT4_CORE_CXXFLAGS)
AC_SUBST(QT4_CORE_LIBS)
AC_SUBST(QT_UIC)
AC_SUBST(QT_MOC)
AC_SUBST(QT_RCC)
])
dnl @synopsis FREECAD_AC_HAVE_BOOST
dnl
dnl @summary Search for boost header and library files.
dnl
dnl
AC_DEFUN([FREECAD_AC_HAVE_BOOST],
[
AC_MSG_CHECKING(for boost)
AC_ARG_WITH(boost-include,
AC_HELP_STRING([--with-boost-include=DIR], [Path to the boost header files]),
[fc_boost_incs=$withval], [fc_boost_incs=/usr/include])
AC_ARG_WITH(boost-lib,
AC_HELP_STRING([--with-boost-lib=DIR], [Path to the boost library files]),
[fc_boost_libs=$withval], [fc_boost_libs=/usr/lib])
fc_boost_ac_save_cppflags=$CPPFLAGS
fc_boost_ac_save_ldflags=$LDFLAGS
fc_boost_ac_save_libs=$LIBS
CPPFLAGS="$CPPFLAGS -I$fc_boost_incs"
LDFLAGS="$LDFLAGS -L$fc_boost_libs"
LIBS="-lboost_program_options-mt"
AC_TRY_LINK([#include <boost/program_options.hpp>],
[namespace po = boost::program_options;
po::options_description generic("Generic options");
generic.add_options()
("version,v", "print version string")
("help", "produce help message");
],
[AC_MSG_RESULT(yes)],
[AC_MSG_ERROR(failed)])
AC_MSG_CHECKING(for boost >= 1.35.0)
cat > boost.cpp << EOF
#include <boost/version.hpp>
#include <cstdio>
#include <cstdlib>
int main(int argc, char **argv)
{
exit(BOOST_VERSION >= 103500);
}
EOF
# Depending on boost version decide if boost_system is required
boost_try="$CXX boost.cpp $CPPFLAGS -o boost"
AC_TRY_EVAL(boost_try)
if test x"$ac_status" != x0; then
AC_MSG_ERROR([Failed to get version of boost, bye...])
fi
AS_IF([AM_RUN_LOG([./boost])],
[ac_cv_boost_system=no],
[ac_cv_boost_system=yes
])
AC_MSG_RESULT($ac_cv_boost_system)
rm -f boost.cpp boost
BOOST_FILESYSTEM_LIB="-lboost_filesystem-mt"
BOOST_PROGOPTIONS_LIB="-lboost_program_options-mt"
BOOST_SIGNALS_LIB="-lboost_signals-mt"
BOOST_SYSTEM_LIB=""
BOOST_REGEX_LIB="-lboost_regex-mt"
if test x"$ac_cv_boost_system" = xyes; then
LIBS="-lboost_system-mt"
AC_MSG_CHECKING(for boost system library)
AC_TRY_LINK([#include <boost/system/error_code.hpp>],
[ boost::system::error_code error_code; std::string message(error_code.message()); return 0; ],
[BOOST_SYSTEM_LIB="-lboost_system-mt"],
[BOOST_SYSTEM_LIB=""])
if test "x$BOOST_SYSTEM_LIB" = "x"; then
AC_MSG_RESULT(no)
AC_MSG_ERROR(Unable to link with the boost::system library)
else
AC_MSG_RESULT(yes)
fi
fi
AC_SUBST(BOOST_FILESYSTEM_LIB)
AC_SUBST(BOOST_PROGOPTIONS_LIB)
AC_SUBST(BOOST_SIGNALS_LIB)
AC_SUBST(BOOST_SYSTEM_LIB)
AC_SUBST(BOOST_REGEX_LIB)
CPPFLAGS=$fc_boost_ac_save_cppflags
LDFLAGS=$fc_boost_ac_save_ldflags
LIBS=$fc_boost_ac_save_libs
all_includes="$all_includes -I$fc_boost_incs"
all_libraries="$all_libraries -L$fc_boost_libs"
])
-69
View File
@@ -1,69 +0,0 @@
#!/bin/bash
# autogen.sh
# Run this script to generate all initial makefiles.
# Get version and revision number
MAJ=0
MIN=13
REV=0
#if svn --xml info >/dev/null 2>&1; then
# REV=`svn --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*revision="\([0-9]*\)".*<\/commit>.*/\1/'`
#elif svn --version --quiet >/dev/null 2>&1; then
# REV=`svn info | grep "^Revision:" | cut -d" " -f2`
#fi
# count all lines that don't match this string
REV=`git rev-list HEAD | grep -cv "*"`
# if revision.m4 does not exist, create it
REV_FILE=revision.m4
#if [ -f $REV_FILE ]; then
# echo "$REV_FILE found"
#else
# echo "m4_define([FREECAD_MAJOR], $MAJ)" > $REV_FILE
# echo "m4_define([FREECAD_MINOR], $MIN)" >> $REV_FILE
# echo "m4_define([FREECAD_MICRO], $REV)" >> $REV_FILE
# echo "$REV_FILE created"
#fi
echo "m4_define([FREECAD_MAJOR], $MAJ)" > $REV_FILE
echo "m4_define([FREECAD_MINOR], $MIN)" >> $REV_FILE
echo "m4_define([FREECAD_MICRO], $REV)" >> $REV_FILE
# create m4 subdirectory which fails for some older versions of autotools
[ -d m4 ] || mkdir m4
if which glibtoolize > /dev/null 2>&1; then
echo "calling glibtoolize"
glibtoolize --force --copy
elif which libtoolize > /dev/null 2>&1; then
echo "calling libtoolize"
libtoolize --force --copy
else
echo "can't find libtoolize or glibtoolize"
exit 1
fi
# http://www.gnu.org/software/hello/manual/automake/Macro-Search-Path.html
if [ -d /usr/local/share/aclocal ]; then
echo "calling aclocal -I /usr/local/share/aclocal"
aclocal -I /usr/local/share/aclocal
else
echo "calling aclocal"
aclocal
fi
echo "calling autoheader"
autoheader
echo "calling automake"
automake --add-missing --copy
echo "calling autoconf"
autoconf
echo "Done"
echo "Please run configure."
# touch file to update Version.h
touch src/Build/Version.h.in
-8
View File
@@ -1,8 +0,0 @@
#! /bin/sh
# We almost need to specify the switches for the OpenCascade library to make
# configure running successfully.
# CASROOT=${CASROOT:-/opt/OpenCASCADE6.2.0/ros}
#./configure CXXFLAGS="-fno-strict-aliasing" LDFLAGS="-Wl,-z,defs" --with-occ-include=$CASROOT/inc --with-occ-lib=$CASROOT/Linux/lib
./configure CXXFLAGS="-fno-strict-aliasing -Wno-write-strings" LDFLAGS="-Wl,-z,defs"
+4 -1
View File
@@ -15,7 +15,10 @@ FIND_LIBRARY(NGLIB_LIBRARIES nglib /usr/lib /usr/local/lib)
SET(NETGEN_INCLUDE_DIRS)
SET(NETGEN_INCLUDE_DIRS ${NETGEN_INCLUDE_DIRS} -DNO_PARALLEL_THREADS -DOCCGEOMETRY)
SET(NETGENDATA /usr/share/netgen/libsrc)
if(NOT NETGENDATA)
SET(NETGENDATA /usr/share/netgen/libsrc)
endif()
FIND_PATH(NETGEN_DIR_csg csg.hpp PATHS ${NETGENDATA}/csg)
FIND_PATH(NETGEN_DIR_gen array.hpp PATHS ${NETGENDATA}/general)
FIND_PATH(NETGEN_DIR_geom2d geom2dmesh.hpp PATHS ${NETGENDATA}/geom2d)
+71 -36
View File
@@ -1,4 +1,4 @@
# Try to find OCC
# Try to find OCE / OCC
# Once done this will define
#
# OCC_FOUND - system has OCC - OpenCASCADE
@@ -7,56 +7,85 @@
# OCC_LIBRARIES - Link this to use OCC
# OCC_OCAF_LIBRARIES - Link this to use OCC OCAF framework
# First try to find OpenCASCADE Community Edition
if(NOT DEFINED OCE_DIR)
if(UNIX)
set(OCE_DIR "/usr/local/share/cmake/")
elseif(WIN32)
set(OCE_DIR "c:/OCE-0.4.0/share/cmake")
endif()
endif()
IF (WIN32)
IF (CYGWIN OR MINGW)
find_package(OCE QUIET)
if(OCE_FOUND)
message(STATUS "-- OpenCASCADE Community Edition has been found.")
# Disable this define. For more details see bug #0001872
#add_definitions (-DHAVE_CONFIG_H)
set(OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS})
#set(OCC_LIBRARY_DIR ${OCE_LIBRARY_DIR})
else(OCE_FOUND) #look for OpenCASCADE
if(WIN32)
if(CYGWIN OR MINGW)
FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
/usr/include/opencascade
/usr/local/include/opencascade
/opt/opencascade/include
/opt/opencascade/inc
)
FIND_LIBRARY(OCC_LIBRARY TKernel
/usr/lib
/usr/local/lib
/opt/opencascade/lib
)
else(CYGWIN OR MINGW)
FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/include"
)
FIND_LIBRARY(OCC_LIBRARY TKernel
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/lib"
)
endif(CYGWIN OR MINGW)
else(WIN32)
FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
/usr/include/opencascade
/usr/local/include/opencascade
/opt/opencascade/include
/opt/opencascade/inc
)
FIND_LIBRARY(OCC_LIBRARY TKernel
/usr/lib
/usr/local/lib
/opt/opencascade/lib
)
endif(WIN32)
if(OCC_LIBRARY)
GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
endif(OCC_LIBRARY)
endif(OCE_FOUND)
ELSE (CYGWIN OR MINGW)
FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/include"
)
FIND_LIBRARY(OCC_LIBRARY TKernel
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/lib"
)
ENDIF (CYGWIN OR MINGW)
ELSE (WIN32)
FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
/usr/include/opencascade
/usr/local/include/opencascade
/opt/opencascade/include
if(OCC_INCLUDE_DIR)
file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAJOR
REGEX "#define OCC_VERSION_MAJOR.*"
)
FIND_LIBRARY(OCC_LIBRARY TKernel
/usr/lib
/usr/local/lib
/opt/opencascade/lib
string(REGEX MATCH "[0-9]+" OCC_MAJOR ${OCC_MAJOR})
file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MINOR
REGEX "#define OCC_VERSION_MINOR.*"
)
string(REGEX MATCH "[0-9]+" OCC_MINOR ${OCC_MINOR})
file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT
REGEX "#define OCC_VERSION_MAINTENANCE.*"
)
string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
ENDIF (WIN32)
set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
endif(OCC_INCLUDE_DIR)
# handle the QUIETLY and REQUIRED arguments and set OCC_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OCC REQUIRED_VARS OCC_INCLUDE_DIR VERSION_VAR OCC_VERSION_STRING)
SET(OCC_FOUND FALSE)
IF(OCC_LIBRARY)
GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
SET(OCC_FOUND TRUE)
if(OCC_FOUND)
set(OCC_LIBRARIES
TKFillet
TKMesh
@@ -89,7 +118,13 @@ IF(OCC_LIBRARY)
TKXDESTEP
TKXDEIGES
TKMeshVS
TKAdvTools
)
ENDIF(OCC_LIBRARY)
if(OCC_VERSION_STRING VERSION_LESS 6.7.3)
list(APPEND OCC_OCAF_LIBRARIES TKAdvTools)
endif(OCC_VERSION_STRING VERSION_LESS 6.7.3)
message(STATUS "-- Found OCE/OpenCASCADE version: ${OCC_VERSION_STRING}")
message(STATUS "-- OCE/OpenCASCADE include directory: ${OCC_INCLUDE_DIR}")
message(STATUS "-- OCE/OpenCASCADE shared libraries directory: ${OCC_LIBRARY_DIR}")
else(OCC_FOUND)
message("Neither OpenCASCADE Community Edition nor OpenCasCade were found: will not build CAD modules!")
endif(OCC_FOUND)
+77
View File
@@ -0,0 +1,77 @@
# Try to find PySide utilities, PYSIDEUIC4 and PYSIDERCC4:
# PYSIDEUIC4BINARY - Location of PYSIDEUIC4 executable
# PYSIDERCC4BINARY - Location of PYSIDERCC4 executable
# PYSIDE_TOOLS_FOUND - PySide utilities found.
# Also provides macro similar to FindQt4.cmake's WRAP_UI and WRAP_RC,
# for the automatic generation of Python code from Qt4's user interface
# ('.ui') and resource ('.qrc') files. These macros are called:
# - PYSIDE_WRAP_UI
# - PYSIDE_WRAP_RC
IF(PYSIDEUIC4BINARY AND PYSIDERCC4BINARY)
# Already in cache, be silent
set(PYSIDE_TOOLS_FOUND_QUIETLY TRUE)
ENDIF(PYSIDEUIC4BINARY AND PYSIDERCC4BINARY)
if(WIN32 OR APPLE)
#pyside tools are often in same location as python interpreter
get_filename_component(PYTHON_BIN_DIR ${PYTHON_EXECUTABLE} PATH)
set(PYSIDE_BIN_DIR ${PYTHON_BIN_DIR})
endif(WIN32 OR APPLE)
FIND_PROGRAM(PYSIDEUIC4BINARY pyside-uic HINTS ${PYSIDE_BIN_DIR})
FIND_PROGRAM(PYSIDERCC4BINARY pyside-rcc HINTS ${PYSIDE_BIN_DIR})
#message(STATUS "PYSIDEUIC4BINARY ${PYSIDEUIC4BINARY}" )
#message(STATUS "PYSIDERCC4BINARY ${PYSIDERCC4BINARY}" )
MACRO(PYSIDE_WRAP_UI outfiles)
FOREACH(it ${ARGN})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.py)
#ADD_CUSTOM_TARGET(${it} ALL
# DEPENDS ${outfile}
#)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${PYSIDEUIC4BINARY} ${infile} -o ${outfile}
MAIN_DEPENDENCY ${infile}
)
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH(it)
ENDMACRO (PYSIDE_WRAP_UI)
MACRO(PYSIDE_WRAP_RC outfiles)
FOREACH(it ${ARGN})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}_rc.py)
#ADD_CUSTOM_TARGET(${it} ALL
# DEPENDS ${outfile}
#)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${PYSIDERCC4BINARY} ${infile} -o ${outfile}
MAIN_DEPENDENCY ${infile}
)
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH(it)
ENDMACRO (PYSIDE_WRAP_RC)
IF(EXISTS ${PYSIDEUIC4BINARY} AND EXISTS ${PYSIDERCC4BINARY})
set(PYSIDE_TOOLS_FOUND TRUE)
ENDIF(EXISTS ${PYSIDEUIC4BINARY} AND EXISTS ${PYSIDERCC4BINARY})
if(PYSIDERCC4BINARY AND PYSIDEUIC4BINARY)
if (NOT PySideTools_FIND_QUIETLY)
message(STATUS "Found PySide Tools: ${PYSIDEUIC4BINARY}, ${PYSIDERCC4BINARY}")
endif (NOT PySideTools_FIND_QUIETLY)
else(PYSIDERCC4BINARY AND PYSIDEUIC4BINARY)
if(PySideTools_FIND_REQUIRED)
message(FATAL_ERROR "PySideTools could not be not found, but are required.")
else(PySideTools_FIND_REQUIRED)
if (NOT PySideTools_FIND_QUIETLY)
message(STATUS "PySideTools: not found.")
endif (NOT PySideTools_FIND_QUIETLY)
endif(PySideTools_FIND_REQUIRED)
endif(PYSIDERCC4BINARY AND PYSIDEUIC4BINARY)
+100
View File
@@ -0,0 +1,100 @@
# Find OCULUS
#
# This module defines
# OCULUS_FOUND
# OCULUS_INCLUDE_DIRS
# OCULUS_LIBRARIES
#
# Copyright (c) 2012 I-maginer
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License along with
# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place - Suite 330, Boston, MA 02111-1307, USA, or go to
# http://www.gnu.org/copyleft/lesser.txt
#
# On a new cmake run, we do not need to be verbose
IF(OCULUS_INCLUDE_DIR AND OCULUS_LIBRARY)
SET(OCULUS_FIND_QUIETLY FALSE)
ENDIF()
# If OCULUS_ROOT was defined in the environment, use it.
if (NOT OCULUS_ROOT)
if(NOT "$ENV{OCULUS_ROOT}" STREQUAL "")
set(OCULUS_ROOT $ENV{OCULUS_ROOT})
else()
set(OCULUS_ROOT $ENV{SCOL_DEPENDENCIES_PATH}/oculus/LibOVR)
endif()
endif()
# concat all the search paths
IF(OCULUS_ROOT)
SET(OCULUS_INCLUDE_SEARCH_DIRS
${OCULUS_INCLUDE_SEARCH_DIRS}
${OCULUS_ROOT}/include
)
SET(OCULUS_LIBRARY_SEARCH_RELEASE_DIRS
${OCULUS_LIBRARY_SEARCH_DIRS}
${OCULUS_ROOT}/Lib/x64/VS2012
)
SET(OCULUS_LIBRARY_SEARCH_DEBUG_DIRS
${OCULUS_LIBRARY_SEARCH_DIRS}
${OCULUS_ROOT}/Lib/x64/VS2012
)
ENDIF()
# log message
IF (NOT OCULUS_FIND_QUIETLY)
MESSAGE(STATUS "Checking for OCULUS library")
ENDIF()
# Search for header files
FIND_PATH(OCULUS_INCLUDE_DIR OVR.h
PATHS ${OCULUS_INCLUDE_SEARCH_DIRS})
# Search for libraries files (release mode)
FIND_LIBRARY(OCULUS_LIBRARY_RELEASE libovr64
PATHS ${OCULUS_LIBRARY_SEARCH_RELEASE_DIRS})
# Search for libraries files (debug mode)
FIND_LIBRARY(OCULUS_LIBRARY_DEBUG libovr64d
PATHS ${OCULUS_LIBRARY_SEARCH_DEBUG_DIRS})
# Configure libraries for debug/release
SET(OCULUS_INCLUDE_DIRS ${OCULUS_INCLUDE_DIR} CACHE PATH "Directory containing OCULUS header files")
SET(OCULUS_LIBRARY debug ${OCULUS_LIBRARY_DEBUG} optimized ${OCULUS_LIBRARY_RELEASE})
SET(OCULUS_LIBRARIES ${OCULUS_LIBRARY} CACHE STRING "OCULUS libraries files")
#IF(OCULUS_INCLUDE_DIR AND OCULUS_LIBRARY)
SET(OCULUS_FOUND TRUE)
#ENDIF()
# Hide those variables in GUI
SET(OCULUS_INCLUDE_DIR ${OCULUS_INCLUDE_DIR} CACHE INTERNAL "")
SET(OCULUS_LIBRARY_RELEASE ${OCULUS_LIBRARY_RELEASE} CACHE INTERNAL "")
SET(OCULUS_LIBRARY_DEBUG ${OCULUS_LIBRARY_DEBUG} CACHE INTERNAL "")
SET(OCULUS_LIBRARY ${OCULUS_LIBRARY} CACHE INTERNAL "")
# log find result
IF(OCULUS_FOUND)
IF(NOT OCULUS_FIND_QUIETLY)
MESSAGE(STATUS " libraries: ${OCULUS_LIBRARIES}")
MESSAGE(STATUS " includes: ${OCULUS_INCLUDE_DIRS}")
ENDIF()
ELSE(OCULUS_FOUND)
IF(NOT OCULUS_LIBRARIES)
MESSAGE(STATUS, "OCULUS library or one of it dependencies could not be found.")
ENDIF()
IF(NOT OCULUS_INCLUDE_DIRS)
MESSAGE(STATUS "OCULUS include files could not be found.")
ENDIF()
ENDIF(OCULUS_FOUND)
+6 -4
View File
@@ -9,12 +9,14 @@
IF (CMAKE_COMPILER_IS_GNUCC)
FIND_PATH(SMESH_INCLUDE_DIR SMESH_Mesh.hxx
/usr/include
/usr/local/include
# These are default search paths, why specify them?
# /usr/include
# /usr/local/include
PATH_SUFFIXES smesh
)
FIND_LIBRARY(SMESH_LIBRARY SMESH
/usr/lib
/usr/local/lib
# /usr/lib
# /usr/local/lib
)
ELSE (CMAKE_COMPILER_IS_GNUCC)
# Not yet implemented
+3 -1
View File
@@ -1,3 +1,5 @@
include (CheckCXXSourceRuns)
# ================================================================================
# == Macros, mostly for special targets ==========================================
@@ -250,4 +252,4 @@ MACRO(SET_PYTHON_PREFIX_SUFFIX ProjectName)
if(WIN32)
set_target_properties(${ProjectName} PROPERTIES SUFFIX ".pyd")
endif(WIN32)
ENDMACRO(SET_PYTHON_PREFIX_SUFFIX)
ENDMACRO(SET_PYTHON_PREFIX_SUFFIX)
+526
View File
@@ -0,0 +1,526 @@
# ================================================================================
# == Win32 is default behaviour use the LibPack copied in Source tree ============
# --------------------------------------------------------------------------------
# General includes
link_directories(${FREECAD_LIBPACK_DIR}/lib)
include_directories(${FREECAD_LIBPACK_DIR}/include)
# OpenGL
set(OPENGL_gl_LIBRARY opengl32 glu32)
# Python
set(PYTHON_LIBRARY optimized python27.lib debug python27_d.lib)
set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.7.5)
set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe)
set(PYTHONLIBS_FOUND TRUE)
# XercesC
set(XERCESC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/xerces-c-3.1.1)
set(XERCESC_LIBRARIES xerces-c_3.lib)
set(XERCESC_DEBUG_LIBRARIES xerces-c_3D.lib)
set(XERCESC_FOUND TRUE)
# Boost
set(Boost_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/boost-1_55)
set(Boost_LIBRARIES
optimized boost_filesystem-vc110-mt-1_55.lib
optimized boost_system-vc110-mt-1_55.lib
optimized boost_graph-vc110-mt-1_55.lib
optimized boost_program_options-vc110-mt-1_55.lib
optimized boost_regex-vc110-mt-1_55.lib
optimized boost_signals-vc110-mt-1_55.lib
optimized boost_thread-vc110-mt-1_55.lib
)
set(Boost_DEBUG_LIBRARIES
debug boost_filesystem-vc110-mt-gd-1_55.lib
debug boost_system-vc110-mt-gd-1_55.lib
debug boost_graph-vc110-mt-gd-1_55.lib
debug boost_program_options-vc110-mt-gd-1_55.lib
debug boost_regex-vc110-mt-gd-1_55.lib
debug boost_signals-vc110-mt-gd-1_55.lib
debug boost_thread-vc110-mt-gd-1_55.lib
)
set(Boost_FOUND TRUE)
# Zlib
set(ZLIB_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/zlib-1.2.7)
set(ZLIB_LIBRARIES zlib.lib)
set(ZLIB_FOUND TRUE)
# SMESH
#set(SMESH_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/smesh)
#set(SMESH_LIBRARIES
# StdMeshers.lib
# MEFISTO2.lib
# SMESH.lib
# DriverUNV.lib
# SMESHDS.lib
# DriverSTL.lib
# DriverDAT.lib
# Driver.lib
# SMDS.lib
#)
set(SMESH_FOUND TRUE)
# Coin3D
find_path(COIN3D_INCLUDE_DIR Inventor/So.h
${FREECAD_LIBPACK_DIR}/include/Coin-4.0.0
)
find_library(COIN3D_LIBRARY_RELEASE coin4
"${FREECAD_LIBPACK_DIR}/lib"
)
find_library(COIN3D_LIBRARY_DEBUG coin4d
"${FREECAD_LIBPACK_DIR}/lib"
)
set(COIN3D_FOUND TRUE)
# QT
set(QT_INCLUDE_DIR
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/Qt
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtCore
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtGui
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtDesigner
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtSvg
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtNetwork
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtSql
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtTest
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtUiTools
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtXml
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtOpenGl
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtWebKit
)
set(QT_QTCORE_INCLUDE_DIR
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/QtCore
)
set(QT_QT3SUPPORT_INCLUDE_DIR
${FREECAD_LIBPACK_DIR}/include/Qt-4.8.6/Qt3Support
)
set(QT_LIBRARIES
optimized QtCore4.lib
optimized QtGui4.lib
optimized QtDesigner4.lib
optimized QtSvg4.lib
optimized QtNetwork4.lib
optimized QtSql4.lib
optimized QtTest4.lib
optimized QtXml4.lib
optimized QtOpenGl4.lib
optimized QtWebKit4.lib
)
set(QT_DEBUG_LIBRARIES
debug QtCored4.lib
debug QtGuid4.lib
debug QtDesignerd4.lib
debug QtSvgd4.lib
debug QtNetworkd4.lib
debug QtSqld4.lib
debug QtTestd4.lib
debug QtXmld4.lib
debug QtOpenGld4.lib
debug QtWebKitd4.lib
)
set(QT_QTCORE_LIBRARY
optimized QtCore4.lib debug QtCored4.lib
)
set(QT_QT3SUPPORT_LIBRARY_DEBUG
debug Qt3Supportd4.lib
)
set(QT_QT3SUPPORT_LIBRARY
optimized Qt3Support4.lib
)
set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe)
set(QT_MOC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/moc.exe)
set(QT_RCC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/rcc.exe)
set(QT_HELPCOMPILER_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/qhelpgenerator.exe)
set(QT_COLLECTIOMGENERATOR_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/qcollectiongenerator.exe)
MACRO (QT4_EXTRACT_OPTIONS _qt4_files _qt4_options)
SET(${_qt4_files})
SET(${_qt4_options})
#SET(_QT4_DOING_OPTIONS FALSE)
FOREACH(_currentArg ${ARGN})
# IF ("${_currentArg}" STREQUAL "OPTIONS")
# SET(_QT4_DOING_OPTIONS TRUE)
# ELSE ("${_currentArg}" STREQUAL "OPTIONS")
# IF(_QT4_DOING_OPTIONS)
# LIST(APPEND ${_qt4_options} "${_currentArg}")
# ELSE(_QT4_DOING_OPTIONS)
LIST(APPEND ${_qt4_files} "${_currentArg}")
# ENDIF(_QT4_DOING_OPTIONS)
# ENDIF ("${_currentArg}" STREQUAL "OPTIONS")
ENDFOREACH(_currentArg)
ENDMACRO (QT4_EXTRACT_OPTIONS)
# macro used to create the names of output files preserving relative dirs
MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile )
STRING(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
STRING(LENGTH ${infile} _infileLength)
SET(_checkinfile ${CMAKE_CURRENT_SOURCE_DIR})
IF(_infileLength GREATER _binlength)
STRING(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile)
IF(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})
ELSE(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
ENDIF(_checkinfile STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
ELSE(_infileLength GREATER _binlength)
FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
ENDIF(_infileLength GREATER _binlength)
SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
STRING(REPLACE ".." "__" _outfile ${_outfile})
GET_FILENAME_COMPONENT(outpath ${_outfile} PATH)
GET_FILENAME_COMPONENT(_outfile ${_outfile} NAME_WE)
FILE(MAKE_DIRECTORY ${outpath})
SET(${outfile} ${outpath}/${prefix}${_outfile}.${ext})
ENDMACRO (QT4_MAKE_OUTPUT_FILE )
MACRO (QT4_WRAP_CPP outfiles )
QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
SET(ARGN)
foreach(it ${moc_files})
get_filename_component(it ${it} ABSOLUTE)
QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_MOC_EXECUTABLE}
ARGS ${moc_options} ${it} -o ${outfile}
MAIN_DEPENDENCY ${it}
)
SET(${outfiles} ${${outfiles}} ${outfile})
endforeach(it)
ENDMACRO (QT4_WRAP_CPP)
# This is a special version of the built in macro qt4_wrap_cpp
# It is required since moc'ed files are now included instead of being added to projects directly
# It adds a reverse dependency to solve this
# This has the unfortunate side effect that some files are always rebuilt
# There is probably a cleaner solution than this
include(AddFileDependencies)
macro(fc_wrap_cpp outfiles )
QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
# fixes bug 0000585: bug with boost 1.48
SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
SET(ARGN)
foreach(it ${moc_files})
get_filename_component(it ${it} ABSOLUTE)
QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_MOC_EXECUTABLE}
ARGS ${moc_options} ${it} -o ${outfile}
MAIN_DEPENDENCY ${it}
)
SET(${outfiles} ${${outfiles}} ${outfile})
add_file_dependencies(${it} ${outfile})
endforeach(it)
endmacro(fc_wrap_cpp)
MACRO (QT4_ADD_RESOURCES outfiles )
QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
SET(ARGN)
FOREACH (it ${rcc_files})
GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
# parse file for dependencies
# all files are absolute paths or relative to the location of the qrc file
FILE(READ "${infile}" _RC_FILE_CONTENTS)
STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
SET(_RC_DEPENDS)
FOREACH(_RC_FILE ${_RC_FILES})
STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
IF(NOT _ABS_PATH_INDICATOR)
SET(_RC_FILE "${rc_path}/${_RC_FILE}")
ENDIF(NOT _ABS_PATH_INDICATOR)
SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
ENDFOREACH(_RC_FILE)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_RCC_EXECUTABLE}
ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile}
DEPENDS ${_RC_DEPENDS})
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH (it)
ENDMACRO (QT4_ADD_RESOURCES)
MACRO (QT4_WRAP_UI outfiles )
QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
FOREACH (it ${ui_files})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_UIC_EXECUTABLE}
ARGS -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile})
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH (it)
ENDMACRO (QT4_WRAP_UI)
set(QT4_FOUND TRUE)
# SoQt
set(SOQT_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/SoQt-1.6.0)
set(SOQT_LIBRARY_RELEASE soqt1.lib)
set(SOQT_LIBRARY_DEBUG soqt1d.lib)
set(SOQT_FOUND TRUE)
# OpenCV
set(OPENCV2_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/opencv)
set(OPENCV2_LIBRARIES
optimized opencv_calib3d249.lib
debug opencv_calib3d249d.lib
optimized opencv_contrib249.lib
debug opencv_contrib249d.lib
optimized opencv_core249.lib
debug opencv_core249d.lib
optimized opencv_features2d249.lib
debug opencv_features2d249d.lib
optimized opencv_flann249.lib
debug opencv_flann249d.lib
optimized opencv_gpu249.lib
debug opencv_gpu249d.lib
optimized opencv_highgui249.lib
debug opencv_highgui249d.lib
optimized opencv_imgproc249.lib
debug opencv_imgproc249d.lib
optimized opencv_legacy249.lib
debug opencv_legacy249d.lib
optimized opencv_ml249.lib
debug opencv_ml249d.lib
optimized opencv_nonfree249.lib
debug opencv_nonfree249d.lib
optimized opencv_objdetect249.lib
debug opencv_objdetect249d.lib
optimized opencv_ocl249.lib
debug opencv_ocl249d.lib
optimized opencv_photo249.lib
debug opencv_photo249d.lib
optimized opencv_stitching249.lib
debug opencv_stitching249d.lib
optimized opencv_superres249.lib
debug opencv_superres249d.lib
optimized opencv_ts249.lib
debug opencv_ts249d.lib
optimized opencv_video249.lib
debug opencv_video249d.lib
optimized opencv_videostab249.lib
debug opencv_videostab249d.lib
)
set(OPENCV2_FOUND TRUE)
# NGLIB (NetGen)
set(NGLIB_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/nglib/include)
set(NGLIB_LIBRARY_DIR
${FREECAD_LIBPACK_DIR}/lib
)
set(NGLIB_LIBRARIES
optimized nglib
)
set(NGLIB_DEBUG_LIBRARIES
debug nglibd
)
# Pointscloud library
set(PCL_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/pcl-1.7)
set(PCL_LIBRARY_DIRS ${FREECAD_LIBPACK_DIR}/lib)
set(PCL_COMMON_LIBRARIES optimized pcl_common_release debug pcl_common_debug)
set(PCL_FEATURES_LIBRARIES optimized pcl_features_release debug pcl_features_debug)
set(PCL_FILTERS_LIBRARIES optimized pcl_filters_release debug pcl_filters_debug)
set(PCL_IO_LIBRARIES optimized pcl_io_release debug pcl_io_debug)
set(PCL_IO_PLY_LIBRARIES optimized pcl_io_ply_release debug pcl_io_ply_debug)
set(PCL_KDTREE_LIBRARIES optimized pcl_kdtree_release debug pcl_kdtree_debug)
set(PCL_KEYPOINTS_LIBRARIES optimized pcl_keypoints_release debug pcl_keypoints_debug)
set(PCL_ML_LIBRARIES optimized pcl_ml_release debug pcl_ml_debug)
set(PCL_OCTREE_LIBRARIES optimized pcl_octree_release debug pcl_octree_debug)
set(PCL_RECOGNITION_LIBRARIES optimized pcl_recognition_release debug pcl_recognition_debug)
set(PCL_REGISTRATION_LIBRARIES optimized pcl_registration_release debug pcl_registration_debug)
set(PCL_SAMPLE_CONSENSUS_LIBRARIES optimized pcl_sample_consensus_release debug pcl_sample_consensus_debug)
set(PCL_SEARCH_LIBRARIES optimized pcl_search_release debug pcl_search_debug)
set(PCL_SEGMENTATION_LIBRARIES optimized pcl_segmentation_release debug pcl_segmentation_debug)
set(PCL_STEREO_LIBRARIES optimized pcl_stereo_release debug pcl_stereo_debug)
set(PCL_SURFACE_LIBRARIES optimized pcl_surface_release debug pcl_surface_debug)
set(PCL_TRACKING_LIBRARIES optimized pcl_tracking_release debug pcl_tracking_debug)
set(PCL_LIBRARIES
${PCL_COMMON_LIBRARIES}
${PCL_FEATURES_LIBRARIES}
${PCL_FILTERS_LIBRARIES}
${PCL_IO_LIBRARIES}
${PCL_IO_PLY_LIBRARIES}
${PCL_KDTREE_LIBRARIES}
${PCL_KEYPOINTS_LIBRARIES}
${PCL_ML_LIBRARIES}
${PCL_OCTREE_LIBRARIES}
${PCL_RECOGNITION_LIBRARIES}
${PCL_REGISTRATION_LIBRARIES}
${PCL_SAMPLE_CONSENSUS_LIBRARIES}
${PCL_SEARCH_LIBRARIES}
${PCL_SEGMENTATION_LIBRARIES}
${PCL_STEREO_LIBRARIES}
${PCL_SURFACE_LIBRARIES}
${PCL_TRACKING_LIBRARIES}
)
set(PCL_FOUND TRUE)
set(PCL_COMMON_FOUND TRUE)
set(PCL_FEATURES_FOUND TRUE)
set(PCL_FILTERS_FOUND TRUE)
set(PCL_IO_FOUND TRUE)
set(PCL_IO_PLY_FOUND TRUE)
set(PCL_KDTREE_FOUND TRUE)
set(PCL_KEYPOINTS_FOUND TRUE)
set(PCL_ML_FOUND TRUE)
set(PCL_OCTREE_FOUND TRUE)
set(PCL_RECOGNITION_FOUND TRUE)
set(PCL_REGISTRATION_FOUND TRUE)
set(PCL_SAMPLE_CONSENSUS_FOUND TRUE)
set(PCL_SEARCH_FOUND TRUE)
set(PCL_SEGMENTATION_FOUND TRUE)
set(PCL_STEREO_FOUND TRUE)
set(PCL_SURFACE_FOUND TRUE)
set(PCL_TRACKING_FOUND TRUE)
set(FLANN_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/flann-1.8)
set(OCC_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/oce-0.15)
set(OCC_LIBRARY_DIR ${FREECAD_LIBPACK_DIR}/lib)
set(OCC_LIBRARIES
optimized TKFillet
optimized TKMesh
optimized TKernel
optimized TKG2d
optimized TKG3d
optimized TKMath
optimized TKIGES
optimized TKSTL
optimized TKShHealing
optimized TKXSBase
optimized TKBool
optimized TKBO
optimized TKBRep
optimized TKTopAlgo
optimized TKGeomAlgo
optimized TKGeomBase
optimized TKOffset
optimized TKPrim
optimized TKSTEP
optimized TKSTEPBase
optimized TKSTEPAttr
optimized TKHLR
optimized TKFeat
)
set(OCC_DEBUG_LIBRARIES
debug TKFilletd
debug TKMeshd
debug TKerneld
debug TKG2dd
debug TKG3dd
debug TKMathd
debug TKIGESd
debug TKSTLd
debug TKShHealingd
debug TKXSBased
debug TKBoold
debug TKBOd
debug TKBRepd
debug TKTopAlgod
debug TKGeomAlgod
debug TKGeomBased
debug TKOffsetd
debug TKPrimd
debug TKSTEPd
debug TKSTEPBased
debug TKSTEPAttrd
debug TKHLRd
debug TKFeatd
)
set(OCC_OCAF_LIBRARIES
optimized TKCAF
optimized TKXCAF
optimized TKLCAF
optimized TKXDESTEP
optimized TKXDEIGES
optimized TKMeshVS
optimized TKAdvTools
)
set(OCC_OCAF_DEBUG_LIBRARIES
debug TKCAFd
debug TKXCAFd
debug TKLCAFd
debug TKXDESTEPd
debug TKXDEIGESd
debug TKMeshVSd
debug TKAdvToolsd
)
set(OCC_FOUND TRUE)
set(EIGEN3_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/eigen3)
set(EIGEN3_FOUND TRUE)
set(ODE_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/ode-0.11.1)
set(ODE_LIBRARIES ${FREECAD_LIBPACK_DIR}/lib/ode_double.lib)
set(ODE_FOUND TRUE)
# FreeType
if(FREECAD_USE_FREETYPE)
set(FREETYPE_LIBRARIES
optimized ${FREECAD_LIBPACK_DIR}/lib/freetype.lib
debug ${FREECAD_LIBPACK_DIR}/lib/freetyped.lib
)
set(FREETYPE_INCLUDE_DIRS
${FREECAD_LIBPACK_DIR}/include/FreeType-2.4.12
)
set(FREETYPE_VERSION_STRING
"2.4.12"
)
set(FREETYPE_FOUND
TRUE
)
endif(FREECAD_USE_FREETYPE)
# SHIBOKEN_INCLUDE_DIR - Directories to include to use SHIBOKEN
# SHIBOKEN_LIBRARY - Files to link against to use SHIBOKEN
# SHIBOKEN_BINARY - Executable name
SET(SHIBOKEN_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/shiboken-1.2.2)
SET(SHIBOKEN_LIBRARY optimized ${FREECAD_LIBPACK_DIR}/lib/shiboken-python2.7.lib debug ${FREECAD_LIBPACK_DIR}/lib/shiboken-python2.7_d.lib)
set(SHIBOKEN_BINARY ${FREECAD_LIBPACK_DIR}/bin/shiboken)
# PYSIDE_INCLUDE_DIR - Directories to include to use PySide
# PYSIDE_LIBRARY - Files to link against to use PySide
# PYSIDE_PYTHONPATH - Path to where the PySide Python module files could be found
# PYSIDE_TYPESYSTEMS - Type system files that should be used by other bindings extending PySide
SET(PYSIDE_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/PySide-1.2.2)
SET(PYSIDE_LIBRARY optimized ${FREECAD_LIBPACK_DIR}/lib/pyside-python2.7.lib debug ${FREECAD_LIBPACK_DIR}/lib/pyside-python2.7_d.lib)
SET(PYSIDE_PYTHONPATH ${FREECAD_LIBPACK_DIR}/pyside/Lib/site-packages)
SET(PYSIDE_TYPESYSTEMS ${FREECAD_LIBPACK_DIR}/pyside/share/PySide/typesystems)
+1 -4
View File
@@ -137,12 +137,9 @@ set(QT_DEBUG_LIBRARIES
debug QtWebKitd4.lib
)
set(QT_QTCORE_LIBRARY_DEBUG
debug QtCored4.lib
)
set(QT_QTCORE_LIBRARY
optimized QtCore4.lib
debug QtCored4.lib
)
set(QT_UIC_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/uic.exe)
+57 -6
View File
@@ -11,8 +11,7 @@ include_directories(${FREECAD_LIBPACK_DIR}/include)
set(OPENGL_gl_LIBRARY opengl32 glu32)
# Python
set(PYTHON_DEBUG_LIBRARY python27_d.lib)
set(PYTHON_LIBRARY python27.lib)
set(PYTHON_LIBRARY optimized python27.lib debug python27_d.lib)
set(PYTHON_INCLUDE_PATH ${FREECAD_LIBPACK_DIR}/include/Python-2.7.6)
set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe)
set(PYTHONLIBS_FOUND TRUE)
@@ -140,12 +139,9 @@ set(QT_DEBUG_LIBRARIES
debug QtWebKitd4.lib
)
set(QT_QTCORE_LIBRARY_DEBUG
debug QtCored4.lib
)
set(QT_QTCORE_LIBRARY
optimized QtCore4.lib
debug QtCored4.lib
)
set(QT_QT3SUPPORT_LIBRARY_DEBUG
@@ -471,3 +467,58 @@ SET(PYSIDE_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/PySide-1.2.1)
SET(PYSIDE_LIBRARY optimized ${FREECAD_LIBPACK_DIR}/lib/pyside-python2.7.lib debug ${FREECAD_LIBPACK_DIR}/lib/pyside-python2.7_d.lib)
SET(PYSIDE_PYTHONPATH ${FREECAD_LIBPACK_DIR}/pyside/Lib/site-packages)
SET(PYSIDE_TYPESYSTEMS ${FREECAD_LIBPACK_DIR}/pyside/share/PySide/typesystems)
SET(PYSIDE_BIN_DIR ${FREECAD_LIBPACK_DIR}/pyside-tools/bin)
# Pointscloud library
set(PCL_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/pcl-1.6)
set(PCL_LIBRARY_DIRS ${FREECAD_LIBPACK_DIR}/lib)
set(PCL_COMMON_LIBRARIES optimized pcl_common_release debug pcl_common_debug)
set(PCL_FEATURES_LIBRARIES optimized pcl_features_release debug pcl_features_debug)
set(PCL_FILTERS_LIBRARIES optimized pcl_filters_release debug pcl_filters_debug)
set(PCL_IO_LIBRARIES optimized pcl_io_release debug pcl_io_debug)
set(PCL_IO_PLY_LIBRARIES optimized pcl_io_ply_release debug pcl_io_ply_debug)
set(PCL_KDTREE_LIBRARIES optimized pcl_kdtree_release debug pcl_kdtree_debug)
set(PCL_KEYPOINTS_LIBRARIES optimized pcl_keypoints_release debug pcl_keypoints_debug)
set(PCL_OCTREE_LIBRARIES optimized pcl_octree_release debug pcl_octree_debug)
set(PCL_REGISTRATION_LIBRARIES optimized pcl_registration_release debug pcl_registration_debug)
set(PCL_SAMPLE_CONSENSUS_LIBRARIES optimized pcl_sample_consensus_release debug pcl_sample_consensus_debug)
set(PCL_SEARCH_LIBRARIES optimized pcl_search_release debug pcl_search_debug)
set(PCL_SEGMENTATION_LIBRARIES optimized pcl_segmentation_release debug pcl_segmentation_debug)
set(PCL_SURFACE_LIBRARIES optimized pcl_surface_release debug pcl_surface_debug)
set(PCL_TRACKING_LIBRARIES optimized pcl_tracking_release debug pcl_tracking_debug)
set(PCL_LIBRARIES
${PCL_COMMON_LIBRARIES}
${PCL_FEATURES_LIBRARIES}
${PCL_FILTERS_LIBRARIES}
${PCL_IO_LIBRARIES}
${PCL_IO_PLY_LIBRARIES}
${PCL_KDTREE_LIBRARIES}
${PCL_KEYPOINTS_LIBRARIES}
${PCL_OCTREE_LIBRARIES}
${PCL_REGISTRATION_LIBRARIES}
${PCL_SAMPLE_CONSENSUS_LIBRARIES}
${PCL_SEARCH_LIBRARIES}
${PCL_SEGMENTATION_LIBRARIES}
${PCL_SURFACE_LIBRARIES}
${PCL_TRACKING_LIBRARIES}
)
set(PCL_FOUND TRUE)
set(PCL_COMMON_FOUND TRUE)
set(PCL_FEATURES_FOUND TRUE)
set(PCL_FILTERS_FOUND TRUE)
set(PCL_IO_FOUND TRUE)
set(PCL_IO_PLY_FOUND TRUE)
set(PCL_KDTREE_FOUND TRUE)
set(PCL_KEYPOINTS_FOUND TRUE)
set(PCL_OCTREE_FOUND TRUE)
set(PCL_REGISTRATION_FOUND TRUE)
set(PCL_SAMPLE_CONSENSUS_FOUND TRUE)
set(PCL_SEARCH_FOUND TRUE)
set(PCL_SEGMENTATION_FOUND TRUE)
set(PCL_SURFACE_FOUND TRUE)
set(PCL_TRACKING_FOUND TRUE)
set(FLANN_LIBRARIES optimized flann debug flann)
set(FLANN_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/flann-1.7.1)
+87
View File
@@ -0,0 +1,87 @@
set(ENV{PATH} "${FREECAD_LIBPACK_DIR};$ENV{PATH}")
set(ENV{CMAKE_PREFIX_PATH} ${FREECAD_LIBPACK_DIR})
set(Boost_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include CACHE PATH "" FORCE)
set(OCE_DIR ${FREECAD_LIBPACK_DIR}/lib/cmake CACHE PATH "" FORCE)
set(SWIG_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/swig/swig.exe CACHE FILEPATH "Swig" FORCE)
set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe CACHE FILEPATH "" FORCE)
set(PYTHON_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27.lib CACHE FILEPATH "" FORCE)
set(PYTHON_DEBUG_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27_d.lib CACHE FILEPATH "" FORCE)
set(PYTHON_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/python2.7 CACHE PATH "" FORCE)
find_library(XERCESC_LIBRARIES xerces-c_3 "${FREECAD_LIBPACK_DIR}/lib")
find_library(XERCESC_DEBUG_LIBRARIES xerces-c_3D "${FREECAD_LIBPACK_DIR}/lib")
set(XERCESC_FOUND TRUE)
find_library(COIN3D_LIBRARY_RELEASE coin4 "${FREECAD_LIBPACK_DIR}/lib")
find_library(COIN3D_LIBRARY_DEBUG coin4d "${FREECAD_LIBPACK_DIR}/lib")
set(COIN3D_FOUND TRUE)
set(NETGENDATA ${FREECAD_LIBPACK_DIR}/include/netgen)
if(FREECAD_USE_FREETYPE)
set(FREETYPE_INCLUDE_DIR_freetype2 ${FREECAD_LIBPACK_DIR}/include/freetype2)
endif(FREECAD_USE_FREETYPE)
link_directories(${FREECAD_LIBPACK_DIR}/lib)
set(PCL_INCLUDE_DIRS ${FREECAD_LIBPACK_DIR}/include/pcl-1.7)
set(PCL_LIBRARY_DIRS ${FREECAD_LIBPACK_DIR}/lib)
set(PCL_COMMON_LIBRARIES optimized pcl_common_release debug pcl_common_debug)
set(PCL_FEATURES_LIBRARIES optimized pcl_features_release debug pcl_features_debug)
set(PCL_FILTERS_LIBRARIES optimized pcl_filters_release debug pcl_filters_debug)
set(PCL_IO_LIBRARIES optimized pcl_io_release debug pcl_io_debug)
set(PCL_IO_PLY_LIBRARIES optimized pcl_io_ply_release debug pcl_io_ply_debug)
set(PCL_KDTREE_LIBRARIES optimized pcl_kdtree_release debug pcl_kdtree_debug)
set(PCL_KEYPOINTS_LIBRARIES optimized pcl_keypoints_release debug pcl_keypoints_debug)
set(PCL_ML_LIBRARIES optimized pcl_ml_release debug pcl_ml_debug)
set(PCL_OCTREE_LIBRARIES optimized pcl_octree_release debug pcl_octree_debug)
set(PCL_RECOGNITION_LIBRARIES optimized pcl_recognition_release debug pcl_recognition_debug)
set(PCL_REGISTRATION_LIBRARIES optimized pcl_registration_release debug pcl_registration_debug)
set(PCL_SAMPLE_CONSENSUS_LIBRARIES optimized pcl_sample_consensus_release debug pcl_sample_consensus_debug)
set(PCL_SEARCH_LIBRARIES optimized pcl_search_release debug pcl_search_debug)
set(PCL_SEGMENTATION_LIBRARIES optimized pcl_segmentation_release debug pcl_segmentation_debug)
set(PCL_STEREO_LIBRARIES optimized pcl_stereo_release debug pcl_stereo_debug)
set(PCL_SURFACE_LIBRARIES optimized pcl_surface_release debug pcl_surface_debug)
set(PCL_TRACKING_LIBRARIES optimized pcl_tracking_release debug pcl_tracking_debug)
set(PCL_LIBRARIES
${PCL_COMMON_LIBRARIES}
${PCL_FEATURES_LIBRARIES}
${PCL_FILTERS_LIBRARIES}
${PCL_IO_LIBRARIES}
${PCL_IO_PLY_LIBRARIES}
${PCL_KDTREE_LIBRARIES}
${PCL_KEYPOINTS_LIBRARIES}
${PCL_ML_LIBRARIES}
${PCL_OCTREE_LIBRARIES}
${PCL_RECOGNITION_LIBRARIES}
${PCL_REGISTRATION_LIBRARIES}
${PCL_SAMPLE_CONSENSUS_LIBRARIES}
${PCL_SEARCH_LIBRARIES}
${PCL_SEGMENTATION_LIBRARIES}
${PCL_STEREO_LIBRARIES}
${PCL_SURFACE_LIBRARIES}
${PCL_TRACKING_LIBRARIES}
)
set(PCL_FOUND TRUE)
set(PCL_COMMON_FOUND TRUE)
set(PCL_FEATURES_FOUND TRUE)
set(PCL_FILTERS_FOUND TRUE)
set(PCL_IO_FOUND TRUE)
set(PCL_IO_PLY_FOUND TRUE)
set(PCL_KDTREE_FOUND TRUE)
set(PCL_KEYPOINTS_FOUND TRUE)
set(PCL_ML_FOUND TRUE)
set(PCL_OCTREE_FOUND TRUE)
set(PCL_RECOGNITION_FOUND TRUE)
set(PCL_REGISTRATION_FOUND TRUE)
set(PCL_SAMPLE_CONSENSUS_FOUND TRUE)
set(PCL_SEARCH_FOUND TRUE)
set(PCL_SEGMENTATION_FOUND TRUE)
set(PCL_STEREO_FOUND TRUE)
set(PCL_SURFACE_FOUND TRUE)
set(PCL_TRACKING_FOUND TRUE)
-1113
View File
File diff suppressed because it is too large Load Diff
-11
View File
@@ -1,11 +0,0 @@
SUBDIRS=examples
# Change data dir from default
datadir = @datadir@/data
data_DATA = \
License.txt
EXTRA_DIST = \
$(data_DATA) \
CMakeLists.txt
Binary file not shown.
-16
View File
@@ -33,21 +33,6 @@ if (WIN32 AND FREECAD_LIBPACK_USE)
endforeach (it)
SOURCE_GROUP("pivy" FILES ${FREECAD_LIBPACK_PIVY_COIN})
# pivy/gui
foreach (it ${FREECAD_LIBPACK_PIVY_SOQT})
get_filename_component(libfile ${it} NAME)
set(out "${CMAKE_BINARY_DIR}/lib/pivy/gui/${libfile}")
add_custom_command(
DEPENDS ${it}
OUTPUT ${out}
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different ${it} ${out}
MAIN_DEPENDENCY ${it}
COMMENT "Copy file to ${out}"
)
endforeach (it)
SOURCE_GROUP("pivy\\gui" FILES ${FREECAD_LIBPACK_PIVY_SOQT})
# shiboken
foreach (it ${FREECAD_LIBPACK_SHIBOKEN})
get_filename_component(libfile ${it} NAME)
@@ -130,7 +115,6 @@ if (WIN32 AND FREECAD_LIBPACK_USE)
set(FREECAD_LIBPACK_FILES
${FREECAD_LIBPACK_PIVY_COIN}
${FREECAD_LIBPACK_PIVY_SOQT}
${FREECAD_LIBPACK_SHIBOKEN}
${FREECAD_LIBPACK_PYSIDE}
${FREECAD_LIBPACK_PYSIDEUIC_ABS}
-15
View File
@@ -1,15 +0,0 @@
# Change data dir from default
datadir = @datadir@/data/examples
data_DATA = \
DrawingExample.FCStd \
EngineBlock.FCStd \
PartDesignExample.FCStd \
RobotExample.FCStd \
Schenkel.stp \
ArchDetail.FCStd
EXTRA_DIST = \
$(data_DATA) \
CMakeLists.txt
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
+137
View File
@@ -0,0 +1,137 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 2
1
1 0 0 0
0 1 0 0
0 0 1 0
2 1 -1 0
Curve2ds 6
1 0 10 1 0
2 0 0 1 0 -0 1 2
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 0 0 1 0
2 0 0 1 0 -0 1 2
Curves 3
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
Polygon3D 0
PolygonOnTriangulations 6
26 1 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 2
p 0.0310985626705653 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 1
p 0.0310985626705653 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
2 27 2
p 0.0310985626705653 1 0 10
2 28 1
p 0.0310985626705653 1 0 10
26 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 27
p 0.0310985626705653 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 1
p 0.0310985626705653 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
Surfaces 3
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 10 0 0 1 1 0 -0 -0 1 0
1 0 0 0 0 0 1 1 0 -0 -0 1 0
Triangulations 3
52 50 1 0.0157705973710445
2 -4.89842541528951e-16 10 2 -4.89842541528951e-16 10 1.93716632225726 0.49737977432971 10 1.75261336008773 0.963507348203431 10 1.45793725484282 1.36909421185738 10 1.07165358995799 1.68865585100403 10 0.618033988749894 1.90211303259031 10 0.125581039058625 1.99605345685654 10 -0.374762629171451 1.96457450145738 10 -0.851558583130147 1.80965410493204 10 -1.27484797949738 1.54102648555158 10 -1.6180339887499 1.17557050458494 10 -1.8595529717765 0.736249105369352 10 -1.98422940262896 0.250666467128604 10 -1.98422940262896 -0.250666467128614 10 -1.8595529717765 -0.736249105369362 10 -1.61803398874989 -1.17557050458495 10 -1.27484797949737 -1.54102648555158 10 -0.851558583130138 -1.80965410493204 10 -0.374762629171441 -1.96457450145738 10 0.125581039058636 -1.99605345685654 10 0.618033988749905 -1.9021130325903 10 1.071653589958 -1.68865585100402 10 1.45793725484283 -1.36909421185737 10 1.75261336008773 -0.96350734820342 10 1.93716632225727 -0.497379774329697 10 2 -4.89842541528951e-16 0 2 -4.89842541528951e-16 0 1.93716632225726 0.49737977432971 0 1.75261336008773 0.963507348203431 0 1.45793725484282 1.36909421185738 0 1.07165358995799 1.68865585100403 0 0.618033988749894 1.90211303259031 0 0.125581039058625 1.99605345685654 0 -0.374762629171451 1.96457450145738 0 -0.851558583130147 1.80965410493204 0 -1.27484797949738 1.54102648555158 0 -1.6180339887499 1.17557050458494 0 -1.8595529717765 0.736249105369352 0 -1.98422940262896 0.250666467128604 0 -1.98422940262896 -0.250666467128614 0 -1.8595529717765 -0.736249105369362 0 -1.61803398874989 -1.17557050458495 0 -1.27484797949737 -1.54102648555158 0 -0.851558583130138 -1.80965410493204 0 -0.374762629171441 -1.96457450145738 0 0.125581039058636 -1.99605345685654 0 0.618033988749905 -1.9021130325903 0 1.071653589958 -1.68865585100402 0 1.45793725484283 -1.36909421185737 0 1.75261336008773 -0.96350734820342 0 1.93716632225727 -0.497379774329697 0 0 10 6.28318530717959 10 0.251327412287184 10 0.502654824574367 10 0.753982236861551 10 1.00530964914873 10 1.25663706143592 10 1.5079644737231 10 1.75929188601029 10 2.01061929829747 10 2.26194671058465 10 2.51327412287184 10 2.76460153515902 10 3.0159289474462 10 3.26725635973339 10 3.51858377202057 10 3.76991118430776 10 4.02123859659494 10 4.27256600888212 10 4.52389342116931 10 4.77522083345649 10 5.02654824574367 10 5.27787565803086 10 5.52920307031804 10 5.78053048260523 10 6.03185789489241 10 6.28318530717959 0 0 0 0.251327412287184 0 0.502654824574367 0 0.753982236861551 0 1.00530964914873 0 1.25663706143592 0 1.5079644737231 0 1.75929188601029 0 2.01061929829747 0 2.26194671058465 0 2.51327412287184 0 2.76460153515902 0 3.0159289474462 0 3.26725635973339 0 3.51858377202057 0 3.76991118430776 0 4.02123859659494 0 4.27256600888212 0 4.52389342116931 0 4.77522083345649 0 5.02654824574367 0 5.27787565803086 0 5.52920307031804 0 5.78053048260523 0 6.03185789489241 0 22 21 47 22 47 48 22 48 49 23 22 49 3 28 29 3 1 28 24 23 49 24 49 50 24 50 51 4 29 30 4 3 29 25 24 51 5 30 31 26 51 52 5 4 30 26 25 51 26 52 27 2 26 27 6 31 32 6 32 33 6 5 31 7 6 33 8 33 34 8 34 35 8 7 33 9 8 35 10 35 36 10 9 35 11 36 37 11 10 36 12 37 38 12 11 37 13 38 39 13 12 38 14 13 39 14 39 40 15 14 40 15 40 41 16 15 41 16 41 42 17 16 42 17 42 43 18 17 43 18 43 44 19 18 44 19 44 45 19 45 46 20 19 46 20 46 47 21 20 47
26 25 1 2.22044604925031e-16
2 -4.89842541528951e-16 10 1.93716632225726 0.49737977432971 10 1.75261336008773 0.963507348203431 10 1.45793725484282 1.36909421185738 10 1.07165358995799 1.68865585100403 10 0.618033988749894 1.90211303259031 10 0.125581039058625 1.99605345685654 10 -0.374762629171451 1.96457450145738 10 -0.851558583130147 1.80965410493204 10 -1.27484797949738 1.54102648555158 10 -1.6180339887499 1.17557050458494 10 -1.8595529717765 0.736249105369352 10 -1.98422940262896 0.250666467128604 10 -1.98422940262896 -0.250666467128614 10 -1.8595529717765 -0.736249105369362 10 -1.61803398874989 -1.17557050458495 10 -1.27484797949737 -1.54102648555158 10 -0.851558583130138 -1.80965410493204 10 -0.374762629171441 -1.96457450145738 10 0.125581039058636 -1.99605345685654 10 0.618033988749905 -1.9021130325903 10 1.071653589958 -1.68865585100402 10 1.45793725484283 -1.36909421185737 10 1.75261336008773 -0.96350734820342 10 1.93716632225727 -0.497379774329697 10 0.0078852986855219 3.33066907387547e-16 10 2 0 1.93716632225726 0.49737977432971 1.75261336008773 0.963507348203431 1.45793725484282 1.36909421185738 1.07165358995799 1.68865585100403 0.618033988749894 1.90211303259031 0.125581039058625 1.99605345685654 -0.374762629171451 1.96457450145738 -0.851558583130147 1.80965410493204 -1.27484797949738 1.54102648555158 -1.6180339887499 1.17557050458494 -1.8595529717765 0.736249105369352 -1.98422940262896 0.250666467128604 -1.98422940262896 -0.250666467128614 -1.8595529717765 -0.736249105369362 -1.61803398874989 -1.17557050458495 -1.27484797949737 -1.54102648555158 -0.851558583130138 -1.80965410493204 -0.374762629171441 -1.96457450145738 0.125581039058636 -1.99605345685654 0.618033988749904 -1.9021130325903 1.071653589958 -1.68865585100402 1.45793725484283 -1.36909421185737 1.75261336008773 -0.96350734820342 1.93716632225727 -0.497379774329697 0.00788529868552179 2.22044604925031e-16 26 1 2 26 2 3 26 3 4 26 4 5 26 5 6 26 6 7 26 7 8 26 8 9 26 9 10 26 10 11 26 11 12 26 12 13 26 13 14 26 14 15 26 15 16 26 16 17 26 17 18 26 18 19 26 19 20 26 20 21 26 21 22 26 22 23 26 23 24 26 24 25 26 25 1
26 25 1 2.22044604925031e-16
2 -4.89842541528951e-16 0 1.93716632225726 0.49737977432971 0 1.75261336008773 0.963507348203431 0 1.45793725484282 1.36909421185738 0 1.07165358995799 1.68865585100403 0 0.618033988749894 1.90211303259031 0 0.125581039058625 1.99605345685654 0 -0.374762629171451 1.96457450145738 0 -0.851558583130147 1.80965410493204 0 -1.27484797949738 1.54102648555158 0 -1.6180339887499 1.17557050458494 0 -1.8595529717765 0.736249105369352 0 -1.98422940262896 0.250666467128604 0 -1.98422940262896 -0.250666467128614 0 -1.8595529717765 -0.736249105369362 0 -1.61803398874989 -1.17557050458495 0 -1.27484797949737 -1.54102648555158 0 -0.851558583130138 -1.80965410493204 0 -0.374762629171441 -1.96457450145738 0 0.125581039058636 -1.99605345685654 0 0.618033988749905 -1.9021130325903 0 1.071653589958 -1.68865585100402 0 1.45793725484283 -1.36909421185737 0 1.75261336008773 -0.96350734820342 0 1.93716632225727 -0.497379774329697 0 0.0078852986855219 3.33066907387547e-16 0 2 0 1.93716632225726 0.49737977432971 1.75261336008773 0.963507348203431 1.45793725484282 1.36909421185738 1.07165358995799 1.68865585100403 0.618033988749894 1.90211303259031 0.125581039058625 1.99605345685654 -0.374762629171451 1.96457450145738 -0.851558583130147 1.80965410493204 -1.27484797949738 1.54102648555158 -1.6180339887499 1.17557050458494 -1.8595529717765 0.736249105369352 -1.98422940262896 0.250666467128604 -1.98422940262896 -0.250666467128614 -1.8595529717765 -0.736249105369362 -1.61803398874989 -1.17557050458495 -1.27484797949737 -1.54102648555158 -0.851558583130138 -1.80965410493204 -0.374762629171441 -1.96457450145738 0.125581039058636 -1.99605345685654 0.618033988749904 -1.9021130325903 1.071653589958 -1.68865585100402 1.45793725484283 -1.36909421185737 1.75261336008773 -0.96350734820342 1.93716632225727 -0.497379774329697 0.00788529868552179 2.22044604925031e-16 26 1 2 26 2 3 26 3 4 26 4 5 26 5 6 26 6 7 26 7 8 26 8 9 26 9 10 26 10 11 26 11 12 26 12 13 26 13 14 26 14 15 26 15 16 26 16 17 26 17 18 26 18 19 26 19 20 26 20 21 26 21 22 26 22 23 26 23 24 26 24 25 26 25 1
TShapes 15
Ve
1e-07
2 -4.89842541528951e-16 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 1 0 0 6.28318530717959
2 1 1 0 0 6.28318530717959
2 2 2 0 0 6.28318530717959
6 1 1 0
6 2 2 0
0
0101100
+15 2 -15 2 *
Ve
1e-07
2 -4.89842541528951e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 2 0 0 10
3 3 4CN 1 0 0 10
7 3 4 1 0
0
0101000
-15 2 +13 2 *
Ed
1e-07 1 1 0
1 3 0 0 6.28318530717959
2 5 1 0 0 6.28318530717959
2 6 3 0 0 6.28318530717959
6 5 1 0
6 6 3 0
0
0101100
+13 2 -13 2 *
Wi
0101000
-14 0 +12 0 +11 0 -12 0 *
Fa
0 1e-07 1 0
2 1
0101000
+10 0 *
Wi
0101000
+14 0 *
Fa
0 1e-07 2 0
2 2
0101000
+8 0 *
Wi
0101000
-11 0 *
Fa
0 1e-07 3 0
2 3
0101000
-6 0 *
Sh
0101100
+9 0 +7 0 -5 0 *
So
0100100
+4 0 *
Co
0100000
+3 1 *
Co
1100000
+2 0 *
+1 0
+256
View File
@@ -0,0 +1,256 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 9
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
2 2 -1 0
2 1 -1 2 -1 0
1
1 0 0 0
0 1 0 0
0 0 1 5
2 2 1 5 -1 0
2 5 -1 0
2 1 -1 5 -1 0
2 5 1 2 -1 0
Curve2ds 14
2 0 0 1 0 -0 1 2
1 0 0 1 0
1 0 5 1 0
1 0 5 1 0
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 0 10 1 0
1 0 5 1 0
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 0 10 1 0
2 0 0 1 0 -0 1 2
Curves 7
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
Polygon3D 0
PolygonOnTriangulations 14
36 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 37
p 0.0157727586365918 1 0 0.179519580205131 0.359039160410262 0.538558740615393 0.718078320820525 0.897597901025656 1.07711748123079 1.25663706143592 1.43615664164105 1.61567622184618 1.79519580205131 1.97471538225644 2.15423496246157 2.3337545426667 2.51327412287184 2.69279370307697 2.8723132832821 3.05183286348723 3.23135244369236 3.41087202389749 3.59039160410262 3.76991118430775 3.94943076451288 4.12895034471801 4.30846992492315 4.48798950512828 4.66750908533341 4.84702866553854 5.02654824574367 5.2060678259488 5.38558740615393 5.56510698635906 5.74462656656419 5.92414614676933 6.10366572697446 6.28318530717959
36 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 1
p 0.0157727586365918 1 0 0.179519580205131 0.359039160410262 0.538558740615393 0.718078320820525 0.897597901025656 1.07711748123079 1.25663706143592 1.43615664164105 1.61567622184618 1.79519580205131 1.97471538225644 2.15423496246157 2.3337545426667 2.51327412287184 2.69279370307697 2.8723132832821 3.05183286348723 3.23135244369236 3.41087202389749 3.59039160410262 3.76991118430775 3.94943076451288 4.12895034471801 4.30846992492315 4.48798950512828 4.66750908533341 4.84702866553854 5.02654824574367 5.2060678259488 5.38558740615393 5.56510698635906 5.74462656656419 5.92414614676933 6.10366572697446 6.28318530717959
36 1 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 2
p 0.0157727586365918 1 0 0.179519580205131 0.359039160410262 0.538558740615393 0.718078320820525 0.897597901025656 1.07711748123079 1.25663706143592 1.43615664164105 1.61567622184618 1.79519580205131 1.97471538225644 2.15423496246157 2.3337545426667 2.51327412287184 2.69279370307697 2.8723132832821 3.05183286348723 3.23135244369236 3.41087202389749 3.59039160410262 3.76991118430775 3.94943076451288 4.12895034471801 4.30846992492315 4.48798950512828 4.66750908533341 4.84702866553854 5.02654824574367 5.2060678259488 5.38558740615393 5.56510698635906 5.74462656656419 5.92414614676933 6.10366572697446 6.28318530717959
36 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 1
p 0.0157727586365918 1 0 0.179519580205131 0.359039160410262 0.538558740615393 0.718078320820525 0.897597901025656 1.07711748123079 1.25663706143592 1.43615664164105 1.61567622184618 1.79519580205131 1.97471538225644 2.15423496246157 2.3337545426667 2.51327412287184 2.69279370307697 2.8723132832821 3.05183286348723 3.23135244369236 3.41087202389749 3.59039160410262 3.76991118430775 3.94943076451288 4.12895034471801 4.30846992492315 4.48798950512828 4.66750908533341 4.84702866553854 5.02654824574367 5.2060678259488 5.38558740615393 5.56510698635906 5.74462656656419 5.92414614676933 6.10366572697446 6.28318530717959
2 37 2
p 0.0157727586365918 1 0 5
2 38 1
p 0.0157727586365918 1 0 5
2 1 2
p 0.0157727586365918 1 5 10
2 3 38
p 0.0157727586365918 1 5 10
36 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 2
p 0.0157727586365918 1 0 0.179519580205131 0.359039160410262 0.538558740615393 0.718078320820525 0.897597901025656 1.07711748123079 1.25663706143592 1.43615664164105 1.61567622184618 1.79519580205131 1.97471538225644 2.15423496246157 2.3337545426667 2.51327412287184 2.69279370307697 2.8723132832821 3.05183286348723 3.23135244369236 3.41087202389749 3.59039160410262 3.76991118430775 3.94943076451288 4.12895034471801 4.30846992492315 4.48798950512828 4.66750908533341 4.84702866553854 5.02654824574367 5.2060678259488 5.38558740615393 5.56510698635906 5.74462656656419 5.92414614676933 6.10366572697446 6.28318530717959
36 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 1
p 0.0157727586365918 1 0 0.179519580205131 0.359039160410262 0.538558740615393 0.718078320820525 0.897597901025656 1.07711748123079 1.25663706143592 1.43615664164105 1.61567622184618 1.79519580205131 1.97471538225644 2.15423496246157 2.3337545426667 2.51327412287184 2.69279370307697 2.8723132832821 3.05183286348723 3.23135244369236 3.41087202389749 3.59039160410262 3.76991118430775 3.94943076451288 4.12895034471801 4.30846992492315 4.48798950512828 4.66750908533341 4.84702866553854 5.02654824574367 5.2060678259488 5.38558740615393 5.56510698635906 5.74462656656419 5.92414614676933 6.10366572697446 6.28318530717959
2 1 2
p 0.0157727586365918 1 5 10
2 3 38
p 0.0157727586365918 1 5 10
36 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 2
p 0.0157727586365918 1 0 0.179519580205131 0.359039160410262 0.538558740615393 0.718078320820525 0.897597901025656 1.07711748123079 1.25663706143592 1.43615664164105 1.61567622184618 1.79519580205131 1.97471538225644 2.15423496246157 2.3337545426667 2.51327412287184 2.69279370307697 2.8723132832821 3.05183286348723 3.23135244369236 3.41087202389749 3.59039160410262 3.76991118430775 3.94943076451288 4.12895034471801 4.30846992492315 4.48798950512828 4.66750908533341 4.84702866553854 5.02654824574367 5.2060678259488 5.38558740615393 5.56510698635906 5.74462656656419 5.92414614676933 6.10366572697446 6.28318530717959
36 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 1
p 0.0157727586365918 1 0 0.179519580205131 0.359039160410262 0.538558740615393 0.718078320820525 0.897597901025656 1.07711748123079 1.25663706143592 1.43615664164105 1.61567622184618 1.79519580205131 1.97471538225644 2.15423496246157 2.3337545426667 2.51327412287184 2.69279370307697 2.8723132832821 3.05183286348723 3.23135244369236 3.41087202389749 3.59039160410262 3.76991118430775 3.94943076451288 4.12895034471801 4.30846992492315 4.48798950512828 4.66750908533341 4.84702866553854 5.02654824574367 5.2060678259488 5.38558740615393 5.56510698635906 5.74462656656419 5.92414614676933 6.10366572697446 6.28318530717959
Surfaces 5
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 10 0 0 1 1 0 -0 -0 1 0
Triangulations 5
36 35 1 3.00432421995733e-16
2 -4.89842541528951e-16 0 1.96785917719726 0.357113789597274 0 1.87246974127947 0.702749648162686 0 1.71689758720373 1.02579855481181 0 1.50614293200722 1.31587745187943 0 1.24697960371747 1.56366296493606 0 0.947737324945996 1.76119106371348 0 0.618033988749893 1.90211303259031 0 0.268466531635309 1.98189952353587 0 -0.0897296607010315 1.99798613308263 0 -0.44504186791263 1.94985582436365 0 -0.786050063307849 1.8390555451029 0 -1.10179396290421 1.6691465074426 0 -1.38212529797373 1.44558972765478 0 -1.6180339887499 1.17557050458494 0 -1.80193773580484 0.867767478235115 0 -1.92792572139171 0.532073691133349 0 -1.99194858799048 0.179278617806865 0 -1.99194858799048 -0.179278617806869 0 -1.92792572139171 -0.532073691133352 0 -1.80193773580484 -0.867767478235118 0 -1.61803398874989 -1.17557050458495 0 -1.38212529797373 -1.44558972765478 0 -1.1017939629042 -1.66914650744261 0 -0.786050063307846 -1.8390555451029 0 -0.445041867912627 -1.94985582436365 0 -0.0897296607010284 -1.99798613308263 0 0.268466531635312 -1.98189952353587 0 0.618033988749896 -1.90211303259031 0 0.947737324945998 -1.76119106371348 0 1.24697960371747 -1.56366296493606 0 1.50614293200722 -1.31587745187942 0 1.71689758720373 -1.02579855481181 0 1.87246974127947 -0.702749648162684 0 1.96785917719726 -0.357113789597272 0 0.00402570600476093 -1.11022302462516e-16 0 2 0 1.96785917719726 0.357113789597273 1.87246974127947 0.702749648162686 1.71689758720373 1.02579855481181 1.50614293200722 1.31587745187943 1.24697960371747 1.56366296493606 0.947737324945996 1.76119106371348 0.618033988749893 1.90211303259031 0.268466531635309 1.98189952353587 -0.0897296607010316 1.99798613308263 -0.44504186791263 1.94985582436365 -0.786050063307849 1.8390555451029 -1.10179396290421 1.6691465074426 -1.38212529797373 1.44558972765478 -1.6180339887499 1.17557050458494 -1.80193773580484 0.867767478235115 -1.92792572139171 0.532073691133349 -1.99194858799048 0.179278617806865 -1.99194858799048 -0.179278617806869 -1.92792572139171 -0.532073691133352 -1.80193773580484 -0.867767478235117 -1.61803398874989 -1.17557050458495 -1.38212529797373 -1.44558972765478 -1.1017939629042 -1.66914650744261 -0.786050063307846 -1.8390555451029 -0.445041867912627 -1.94985582436365 -0.0897296607010285 -1.99798613308263 0.268466531635312 -1.98189952353587 0.618033988749896 -1.90211303259031 0.947737324945998 -1.76119106371348 1.24697960371747 -1.56366296493606 1.50614293200722 -1.31587745187942 1.71689758720373 -1.02579855481181 1.87246974127948 -0.702749648162684 1.96785917719726 -0.357113789597272 0.00402570600476104 0 36 25 26 36 26 27 36 27 28 36 28 29 36 29 30 36 30 31 36 31 32 36 32 33 36 33 34 36 34 35 36 35 1 36 1 2 36 2 3 36 3 4 36 4 5 36 5 6 36 6 7 36 7 8 36 8 9 36 9 10 36 10 11 36 11 12 36 12 13 36 13 14 36 14 15 36 15 16 36 16 17 36 17 18 36 18 19 36 19 20 36 20 21 36 21 22 36 22 23 36 23 24 36 24 25
72 70 1 0.0080514120095221
2 -4.89842541528951e-16 5 2 -4.89842541528951e-16 5 1.96785917719726 0.357113789597274 5 1.87246974127947 0.702749648162686 5 1.71689758720373 1.02579855481181 5 1.50614293200722 1.31587745187943 5 1.24697960371747 1.56366296493606 5 0.947737324945996 1.76119106371348 5 0.618033988749893 1.90211303259031 5 0.268466531635309 1.98189952353587 5 -0.0897296607010315 1.99798613308263 5 -0.44504186791263 1.94985582436365 5 -0.786050063307849 1.8390555451029 5 -1.10179396290421 1.6691465074426 5 -1.38212529797373 1.44558972765478 5 -1.6180339887499 1.17557050458494 5 -1.80193773580484 0.867767478235115 5 -1.92792572139171 0.532073691133349 5 -1.99194858799048 0.179278617806865 5 -1.99194858799048 -0.179278617806869 5 -1.92792572139171 -0.532073691133352 5 -1.80193773580484 -0.867767478235118 5 -1.61803398874989 -1.17557050458495 5 -1.38212529797373 -1.44558972765478 5 -1.1017939629042 -1.66914650744261 5 -0.786050063307846 -1.8390555451029 5 -0.445041867912627 -1.94985582436365 5 -0.0897296607010284 -1.99798613308263 5 0.268466531635312 -1.98189952353587 5 0.618033988749896 -1.90211303259031 5 0.947737324945998 -1.76119106371348 5 1.24697960371747 -1.56366296493606 5 1.50614293200722 -1.31587745187942 5 1.71689758720373 -1.02579855481181 5 1.87246974127947 -0.702749648162684 5 1.96785917719726 -0.357113789597272 5 2 -4.89842541528951e-16 0 2 -4.89842541528951e-16 0 1.96785917719726 0.357113789597274 0 1.87246974127947 0.702749648162686 0 1.71689758720373 1.02579855481181 0 1.50614293200722 1.31587745187943 0 1.24697960371747 1.56366296493606 0 0.947737324945996 1.76119106371348 0 0.618033988749893 1.90211303259031 0 0.268466531635309 1.98189952353587 0 -0.0897296607010315 1.99798613308263 0 -0.44504186791263 1.94985582436365 0 -0.786050063307849 1.8390555451029 0 -1.10179396290421 1.6691465074426 0 -1.38212529797373 1.44558972765478 0 -1.6180339887499 1.17557050458494 0 -1.80193773580484 0.867767478235115 0 -1.92792572139171 0.532073691133349 0 -1.99194858799048 0.179278617806865 0 -1.99194858799048 -0.179278617806869 0 -1.92792572139171 -0.532073691133352 0 -1.80193773580484 -0.867767478235118 0 -1.61803398874989 -1.17557050458495 0 -1.38212529797373 -1.44558972765478 0 -1.1017939629042 -1.66914650744261 0 -0.786050063307846 -1.8390555451029 0 -0.445041867912627 -1.94985582436365 0 -0.0897296607010284 -1.99798613308263 0 0.268466531635312 -1.98189952353587 0 0.618033988749896 -1.90211303259031 0 0.947737324945998 -1.76119106371348 0 1.24697960371747 -1.56366296493606 0 1.50614293200722 -1.31587745187942 0 1.71689758720373 -1.02579855481181 0 1.87246974127947 -0.702749648162684 0 1.96785917719726 -0.357113789597272 0 0 5 6.28318530717959 5 0.179519580205131 5 0.359039160410262 5 0.538558740615393 5 0.718078320820525 5 0.897597901025656 5 1.07711748123079 5 1.25663706143592 5 1.43615664164105 5 1.61567622184618 5 1.79519580205131 5 1.97471538225644 5 2.15423496246157 5 2.3337545426667 5 2.51327412287184 5 2.69279370307697 5 2.8723132832821 5 3.05183286348723 5 3.23135244369236 5 3.41087202389749 5 3.59039160410262 5 3.76991118430775 5 3.94943076451288 5 4.12895034471801 5 4.30846992492315 5 4.48798950512828 5 4.66750908533341 5 4.84702866553854 5 5.02654824574367 5 5.2060678259488 5 5.38558740615393 5 5.56510698635906 5 5.74462656656419 5 5.92414614676933 5 6.10366572697446 5 6.28318530717959 0 0 0 0.179519580205131 0 0.359039160410262 0 0.538558740615393 0 0.718078320820525 0 0.897597901025656 0 1.07711748123079 0 1.25663706143592 0 1.43615664164105 0 1.61567622184618 0 1.79519580205131 0 1.97471538225644 0 2.15423496246157 0 2.3337545426667 0 2.51327412287184 0 2.69279370307697 0 2.8723132832821 0 3.05183286348723 0 3.23135244369236 0 3.41087202389749 0 3.59039160410262 0 3.76991118430775 0 3.94943076451288 0 4.12895034471801 0 4.30846992492315 0 4.48798950512828 0 4.66750908533341 0 4.84702866553854 0 5.02654824574367 0 5.2060678259488 0 5.38558740615393 0 5.56510698635906 0 5.74462656656419 0 5.92414614676933 0 6.10366572697446 0 22 21 57 22 57 58 23 22 58 23 58 59 3 38 39 3 1 38 24 59 60 24 23 59 4 39 40 4 3 39 25 60 61 25 24 60 5 40 41 5 4 40 26 61 62 26 25 61 6 41 42 6 5 41 27 62 63 27 26 62 7 42 43 7 6 42 28 63 64 28 27 63 8 43 44 8 44 45 8 7 43 29 64 65 29 28 64 9 8 45 9 45 46 30 65 66 30 29 65 10 9 46 31 66 67 31 30 66 11 10 46 11 46 47 32 67 68 32 31 67 12 11 47 12 47 48 33 68 69 33 32 68 13 12 48 13 48 49 34 33 69 34 69 70 14 13 49 14 49 50 14 50 51 35 34 70 35 70 71 15 14 51 36 35 71 36 71 72 36 72 37 16 15 51 16 51 52 2 36 37 17 16 52 17 52 53 18 17 53 18 53 54 19 18 54 19 54 55 20 19 55 20 55 56 21 20 56 21 56 57
72 70 1 0.0080514120095221
2 -4.89842541528951e-16 5 2 -4.89842541528951e-16 10 2 -4.89842541528951e-16 5 1.96785917719726 0.357113789597274 5 1.87246974127947 0.702749648162686 5 1.71689758720373 1.02579855481181 5 1.50614293200722 1.31587745187943 5 1.24697960371747 1.56366296493606 5 0.947737324945996 1.76119106371348 5 0.618033988749893 1.90211303259031 5 0.268466531635309 1.98189952353587 5 -0.0897296607010315 1.99798613308263 5 -0.44504186791263 1.94985582436365 5 -0.786050063307849 1.8390555451029 5 -1.10179396290421 1.6691465074426 5 -1.38212529797373 1.44558972765478 5 -1.6180339887499 1.17557050458494 5 -1.80193773580484 0.867767478235115 5 -1.92792572139171 0.532073691133349 5 -1.99194858799048 0.179278617806865 5 -1.99194858799048 -0.179278617806869 5 -1.92792572139171 -0.532073691133352 5 -1.80193773580484 -0.867767478235118 5 -1.61803398874989 -1.17557050458495 5 -1.38212529797373 -1.44558972765478 5 -1.1017939629042 -1.66914650744261 5 -0.786050063307846 -1.8390555451029 5 -0.445041867912627 -1.94985582436365 5 -0.0897296607010284 -1.99798613308263 5 0.268466531635312 -1.98189952353587 5 0.618033988749896 -1.90211303259031 5 0.947737324945998 -1.76119106371348 5 1.24697960371747 -1.56366296493606 5 1.50614293200722 -1.31587745187942 5 1.71689758720373 -1.02579855481181 5 1.87246974127947 -0.702749648162684 5 1.96785917719726 -0.357113789597272 5 2 -4.89842541528951e-16 10 1.96785917719726 0.357113789597274 10 1.87246974127947 0.702749648162686 10 1.71689758720373 1.02579855481181 10 1.50614293200722 1.31587745187943 10 1.24697960371747 1.56366296493606 10 0.947737324945996 1.76119106371348 10 0.618033988749893 1.90211303259031 10 0.268466531635309 1.98189952353587 10 -0.0897296607010315 1.99798613308263 10 -0.44504186791263 1.94985582436365 10 -0.786050063307849 1.8390555451029 10 -1.10179396290421 1.6691465074426 10 -1.38212529797373 1.44558972765478 10 -1.6180339887499 1.17557050458494 10 -1.80193773580484 0.867767478235115 10 -1.92792572139171 0.532073691133349 10 -1.99194858799048 0.179278617806865 10 -1.99194858799048 -0.179278617806869 10 -1.92792572139171 -0.532073691133352 10 -1.80193773580484 -0.867767478235118 10 -1.61803398874989 -1.17557050458495 10 -1.38212529797373 -1.44558972765478 10 -1.1017939629042 -1.66914650744261 10 -0.786050063307846 -1.8390555451029 10 -0.445041867912627 -1.94985582436365 10 -0.0897296607010284 -1.99798613308263 10 0.268466531635312 -1.98189952353587 10 0.618033988749896 -1.90211303259031 10 0.947737324945998 -1.76119106371348 10 1.24697960371747 -1.56366296493606 10 1.50614293200722 -1.31587745187942 10 1.71689758720373 -1.02579855481181 10 1.87246974127947 -0.702749648162684 10 1.96785917719726 -0.357113789597272 10 6.28318530717959 5 6.28318530717959 10 0 5 0.179519580205131 5 0.359039160410262 5 0.538558740615393 5 0.718078320820525 5 0.897597901025656 5 1.07711748123079 5 1.25663706143592 5 1.43615664164105 5 1.61567622184618 5 1.79519580205131 5 1.97471538225644 5 2.15423496246157 5 2.3337545426667 5 2.51327412287184 5 2.69279370307697 5 2.8723132832821 5 3.05183286348723 5 3.23135244369236 5 3.41087202389749 5 3.59039160410262 5 3.76991118430775 5 3.94943076451288 5 4.12895034471801 5 4.30846992492315 5 4.48798950512828 5 4.66750908533341 5 4.84702866553854 5 5.02654824574367 5 5.2060678259488 5 5.38558740615393 5 5.56510698635906 5 5.74462656656419 5 5.92414614676933 5 6.10366572697446 5 0 10 0.179519580205131 10 0.359039160410262 10 0.538558740615393 10 0.718078320820525 10 0.897597901025656 10 1.07711748123079 10 1.25663706143592 10 1.43615664164105 10 1.61567622184618 10 1.79519580205131 10 1.97471538225644 10 2.15423496246157 10 2.3337545426667 10 2.51327412287184 10 2.69279370307697 10 2.8723132832821 10 3.05183286348723 10 3.23135244369236 10 3.41087202389749 10 3.59039160410262 10 3.76991118430775 10 3.94943076451288 10 4.12895034471801 10 4.30846992492315 10 4.48798950512828 10 4.66750908533341 10 4.84702866553854 10 5.02654824574367 10 5.2060678259488 10 5.38558740615393 10 5.56510698635906 10 5.74462656656419 10 5.92414614676933 10 6.10366572697446 10 58 22 23 58 57 22 59 23 24 59 58 23 39 3 4 39 38 3 60 24 25 60 59 24 40 4 5 40 39 4 61 25 26 61 60 25 41 5 6 41 40 5 62 26 27 62 61 26 42 6 7 42 41 6 63 27 28 63 62 27 43 7 8 43 42 7 64 28 29 64 63 28 44 8 9 44 9 10 44 43 8 65 29 30 65 64 29 45 44 10 45 10 11 66 30 31 66 65 30 46 45 11 67 31 32 67 66 31 47 11 12 47 46 11 68 32 33 68 67 32 48 47 12 48 12 13 69 33 34 49 13 14 69 68 33 49 48 13 70 69 34 70 34 35 50 14 15 50 15 16 50 49 14 71 70 35 71 35 36 51 50 16 72 71 36 72 36 37 52 16 17 52 51 16 2 72 37 2 37 1 53 17 18 53 52 17 54 18 19 54 53 18 55 19 20 55 54 19 56 20 21 56 55 20 57 21 22 57 56 21
72 70 1 0.0080514120095221
2 -4.89842541528951e-16 10 2 -4.89842541528951e-16 15 2 -4.89842541528951e-16 10 1.96785917719726 0.357113789597274 10 1.87246974127947 0.702749648162686 10 1.71689758720373 1.02579855481181 10 1.50614293200722 1.31587745187943 10 1.24697960371747 1.56366296493606 10 0.947737324945996 1.76119106371348 10 0.618033988749893 1.90211303259031 10 0.268466531635309 1.98189952353587 10 -0.0897296607010315 1.99798613308263 10 -0.44504186791263 1.94985582436365 10 -0.786050063307849 1.8390555451029 10 -1.10179396290421 1.6691465074426 10 -1.38212529797373 1.44558972765478 10 -1.6180339887499 1.17557050458494 10 -1.80193773580484 0.867767478235115 10 -1.92792572139171 0.532073691133349 10 -1.99194858799048 0.179278617806865 10 -1.99194858799048 -0.179278617806869 10 -1.92792572139171 -0.532073691133352 10 -1.80193773580484 -0.867767478235118 10 -1.61803398874989 -1.17557050458495 10 -1.38212529797373 -1.44558972765478 10 -1.1017939629042 -1.66914650744261 10 -0.786050063307846 -1.8390555451029 10 -0.445041867912627 -1.94985582436365 10 -0.0897296607010284 -1.99798613308263 10 0.268466531635312 -1.98189952353587 10 0.618033988749896 -1.90211303259031 10 0.947737324945998 -1.76119106371348 10 1.24697960371747 -1.56366296493606 10 1.50614293200722 -1.31587745187942 10 1.71689758720373 -1.02579855481181 10 1.87246974127947 -0.702749648162684 10 1.96785917719726 -0.357113789597272 10 2 -4.89842541528951e-16 15 1.96785917719726 0.357113789597274 15 1.87246974127947 0.702749648162686 15 1.71689758720373 1.02579855481181 15 1.50614293200722 1.31587745187943 15 1.24697960371747 1.56366296493606 15 0.947737324945996 1.76119106371348 15 0.618033988749893 1.90211303259031 15 0.268466531635309 1.98189952353587 15 -0.0897296607010315 1.99798613308263 15 -0.44504186791263 1.94985582436365 15 -0.786050063307849 1.8390555451029 15 -1.10179396290421 1.6691465074426 15 -1.38212529797373 1.44558972765478 15 -1.6180339887499 1.17557050458494 15 -1.80193773580484 0.867767478235115 15 -1.92792572139171 0.532073691133349 15 -1.99194858799048 0.179278617806865 15 -1.99194858799048 -0.179278617806869 15 -1.92792572139171 -0.532073691133352 15 -1.80193773580484 -0.867767478235118 15 -1.61803398874989 -1.17557050458495 15 -1.38212529797373 -1.44558972765478 15 -1.1017939629042 -1.66914650744261 15 -0.786050063307846 -1.8390555451029 15 -0.445041867912627 -1.94985582436365 15 -0.0897296607010284 -1.99798613308263 15 0.268466531635312 -1.98189952353587 15 0.618033988749896 -1.90211303259031 15 0.947737324945998 -1.76119106371348 15 1.24697960371747 -1.56366296493606 15 1.50614293200722 -1.31587745187942 15 1.71689758720373 -1.02579855481181 15 1.87246974127947 -0.702749648162684 15 1.96785917719726 -0.357113789597272 15 6.28318530717959 5 6.28318530717959 10 0 5 0.179519580205131 5 0.359039160410262 5 0.538558740615393 5 0.718078320820525 5 0.897597901025656 5 1.07711748123079 5 1.25663706143592 5 1.43615664164105 5 1.61567622184618 5 1.79519580205131 5 1.97471538225644 5 2.15423496246157 5 2.3337545426667 5 2.51327412287184 5 2.69279370307697 5 2.8723132832821 5 3.05183286348723 5 3.23135244369236 5 3.41087202389749 5 3.59039160410262 5 3.76991118430775 5 3.94943076451288 5 4.12895034471801 5 4.30846992492315 5 4.48798950512828 5 4.66750908533341 5 4.84702866553854 5 5.02654824574367 5 5.2060678259488 5 5.38558740615393 5 5.56510698635906 5 5.74462656656419 5 5.92414614676933 5 6.10366572697446 5 0 10 0.179519580205131 10 0.359039160410262 10 0.538558740615393 10 0.718078320820525 10 0.897597901025656 10 1.07711748123079 10 1.25663706143592 10 1.43615664164105 10 1.61567622184618 10 1.79519580205131 10 1.97471538225644 10 2.15423496246157 10 2.3337545426667 10 2.51327412287184 10 2.69279370307697 10 2.8723132832821 10 3.05183286348723 10 3.23135244369236 10 3.41087202389749 10 3.59039160410262 10 3.76991118430775 10 3.94943076451288 10 4.12895034471801 10 4.30846992492315 10 4.48798950512828 10 4.66750908533341 10 4.84702866553854 10 5.02654824574367 10 5.2060678259488 10 5.38558740615393 10 5.56510698635906 10 5.74462656656419 10 5.92414614676933 10 6.10366572697446 10 58 22 23 58 57 22 59 23 24 59 58 23 39 3 4 39 38 3 60 24 25 60 59 24 40 4 5 40 39 4 61 25 26 61 60 25 41 5 6 41 40 5 62 26 27 62 61 26 42 6 7 42 41 6 63 27 28 63 62 27 43 7 8 43 42 7 64 28 29 64 63 28 44 8 9 44 9 10 44 43 8 65 29 30 65 64 29 45 44 10 45 10 11 66 30 31 66 65 30 46 45 11 67 31 32 67 66 31 47 11 12 47 46 11 68 32 33 68 67 32 48 47 12 48 12 13 69 33 34 49 13 14 69 68 33 49 48 13 70 69 34 70 34 35 50 14 15 50 15 16 50 49 14 71 70 35 71 35 36 51 50 16 72 71 36 72 36 37 52 16 17 52 51 16 2 72 37 2 37 1 53 17 18 53 52 17 54 18 19 54 53 18 55 19 20 55 54 19 56 20 21 56 55 20 57 21 22 57 56 21
36 35 1 3.00432421995733e-16
2 -4.89842541528951e-16 10 1.96785917719726 0.357113789597274 10 1.87246974127947 0.702749648162686 10 1.71689758720373 1.02579855481181 10 1.50614293200722 1.31587745187943 10 1.24697960371747 1.56366296493606 10 0.947737324945996 1.76119106371348 10 0.618033988749893 1.90211303259031 10 0.268466531635309 1.98189952353587 10 -0.0897296607010315 1.99798613308263 10 -0.44504186791263 1.94985582436365 10 -0.786050063307849 1.8390555451029 10 -1.10179396290421 1.6691465074426 10 -1.38212529797373 1.44558972765478 10 -1.6180339887499 1.17557050458494 10 -1.80193773580484 0.867767478235115 10 -1.92792572139171 0.532073691133349 10 -1.99194858799048 0.179278617806865 10 -1.99194858799048 -0.179278617806869 10 -1.92792572139171 -0.532073691133352 10 -1.80193773580484 -0.867767478235118 10 -1.61803398874989 -1.17557050458495 10 -1.38212529797373 -1.44558972765478 10 -1.1017939629042 -1.66914650744261 10 -0.786050063307846 -1.8390555451029 10 -0.445041867912627 -1.94985582436365 10 -0.0897296607010284 -1.99798613308263 10 0.268466531635312 -1.98189952353587 10 0.618033988749896 -1.90211303259031 10 0.947737324945998 -1.76119106371348 10 1.24697960371747 -1.56366296493606 10 1.50614293200722 -1.31587745187942 10 1.71689758720373 -1.02579855481181 10 1.87246974127947 -0.702749648162684 10 1.96785917719726 -0.357113789597272 10 0.00402570600476093 -1.11022302462516e-16 10 2 0 1.96785917719726 0.357113789597273 1.87246974127947 0.702749648162686 1.71689758720373 1.02579855481181 1.50614293200722 1.31587745187943 1.24697960371747 1.56366296493606 0.947737324945996 1.76119106371348 0.618033988749893 1.90211303259031 0.268466531635309 1.98189952353587 -0.0897296607010316 1.99798613308263 -0.44504186791263 1.94985582436365 -0.786050063307849 1.8390555451029 -1.10179396290421 1.6691465074426 -1.38212529797373 1.44558972765478 -1.6180339887499 1.17557050458494 -1.80193773580484 0.867767478235115 -1.92792572139171 0.532073691133349 -1.99194858799048 0.179278617806865 -1.99194858799048 -0.179278617806869 -1.92792572139171 -0.532073691133352 -1.80193773580484 -0.867767478235117 -1.61803398874989 -1.17557050458495 -1.38212529797373 -1.44558972765478 -1.1017939629042 -1.66914650744261 -0.786050063307846 -1.8390555451029 -0.445041867912627 -1.94985582436365 -0.0897296607010285 -1.99798613308263 0.268466531635312 -1.98189952353587 0.618033988749896 -1.90211303259031 0.947737324945998 -1.76119106371348 1.24697960371747 -1.56366296493606 1.50614293200722 -1.31587745187942 1.71689758720373 -1.02579855481181 1.87246974127948 -0.702749648162684 1.96785917719726 -0.357113789597272 0.00402570600476104 0 36 25 26 36 26 27 36 27 28 36 28 29 36 29 30 36 30 31 36 31 32 36 32 33 36 33 34 36 34 35 36 35 1 36 1 2 36 2 3 36 3 4 36 4 5 36 5 6 36 6 7 36 7 8 36 8 9 36 9 10 36 10 11 36 11 12 36 12 13 36 13 14 36 14 15 36 15 16 36 16 17 36 17 18 36 18 19 36 19 20 36 20 21 36 21 22 36 22 23 36 23 24 36 24 25
TShapes 25
Ve
1e-07
2 -4.89842541528951e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 1 0 0 6.28318530717959
2 1 1 0 0 6.28318530717959
2 2 2 0 0 6.28318530717959
6 1 2 3
6 2 1 0
0
0101100
+25 4 -25 4 *
Wi
0101000
-24 0 *
Fa
0 1e-07 1 0
2 1
0101000
-23 0 *
Ve
1e-07
2 -4.89842541528951e-16 5
0 0
0101101
*
Ed
1e-07 1 1 0
1 2 0 0 6.28318530717959
2 3 2 6 0 6.28318530717959
2 4 3 6 0 6.28318530717959
6 3 2 7
6 4 3 7
0
0101100
+21 8 -21 8 *
Ed
1e-07 1 1 0
1 3 0 0 5
3 5 6CN 2 0 0 5
7 5 6 2 3
0
0101000
+25 4 -21 4 *
Wi
0101000
-20 5 +19 2 +24 2 -19 2 *
Fa
0 1e-07 2 2
2 2
0101000
+18 0 *
Ve
1e-07
2 -4.89842541528951e-16 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 4 0 5 10
3 7 8CN 3 0 5 10
7 7 8 3 3
0
0101000
+21 4 -16 4 *
Ed
1e-07 1 1 0
1 5 0 0 6.28318530717959
2 9 3 0 0 6.28318530717959
2 10 4 9 0 6.28318530717959
6 9 3 3
6 10 4 3
0
0101100
+16 4 -16 4 *
Wi
0101000
+15 2 +20 5 -15 2 -14 2 *
Fa
0 1e-07 3 2
2 3
0101000
+13 0 *
Ve
1e-07
2 -4.89842541528951e-16 15
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 5 10
3 11 12CN 4 0 5 10
7 11 12 4 7
0
0101000
+16 8 -11 8 *
Ed
1e-07 1 1 0
1 7 0 0 6.28318530717959
2 13 4 0 0 6.28318530717959
2 14 5 0 0 6.28318530717959
6 13 4 7
6 14 5 0
0
0101100
+11 8 -11 8 *
Wi
0101000
+10 5 +14 2 -10 5 -9 5 *
Fa
0 1e-07 4 5
2 4
0101000
+8 0 *
Wi
0101000
+9 0 *
Fa
0 1e-07 5 0
2 5
0101000
+6 0 *
Sh
0101000
-22 2 +17 0 +12 0 +7 0 +5 5 *
So
0100000
+4 0 *
Co
0100000
+3 0 *
Co
1100000
+2 1 *
+1 0
+531
View File
@@ -0,0 +1,531 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 18
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
2 2 1 3 1 0
2 2 -1 0
2 1 -1 3 -1 2 -1 0
1
1 0 0 0
0 1 0 0
0 0 1 5
2 2 1 7 -1 0
2 7 -1 0
2 3 -1 7 -1 0
2 1 -1 3 -1 7 -1 0
1
1 0 0 -6.5
0 1 0 -8
0 0 1 6
2 1 -1 0
2 7 1 3 1 0
2 3 -1 2 -1 0
2 7 1 2 -1 0
2 12 -1 0
2 1 -1 12 -1 0
Curve2ds 32
2 0 0 1 0 -0 1 2
1 0 0 1 0
1 0 5 1 0
1 0 5 1 0
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
8 5.75 8.75
1 4.6498482185881986 0 0 1
8 5.75 8.75
1 -6 -6.0039100721660859 1 0
1 -1.5707963267948966 8.5 1 0
2 6.5 8 0 -1 1 0 2
8 5.75 8.75
1 3.2041334153862846 0 0 1
8 5.75 8.75
1 -6 4.5039100721660859 1 0
1 -1.5707963267948966 6 1 0
2 6.5 8 0 -1 1 0 2
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 0 10 1 0
1 0 5 1 0
1 2.5 0 0 -1
1 6.375 0 0 1
1 0 -7.875 1 0
1 0 6.375 1 0
1 0 0 0 -1
1 6.375 0 0 1
1 0 7.875 1 0
1 2.5 0 0 1
1 0 0 0 1
1 0 7.875 1 0
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 0 10 1 0
2 0 0 1 0 -0 1 2
Curves 16
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
1 -0.125 -1.9960899278339139 0 0 0 1
2 0 0 8.5 0 0 1 0 -1 0 1 0 -0 2
1 -1.9960899278339139 -0.125 0 0 0 1
2 0 0 6 0 0 1 0 -1 0 1 0 -0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 6.375 0 2.5 0 1 0
1 6.375 7.875 0 0 0 1
1 6.375 0 0 -0 1 0
1 0 7.875 2.5 1 0 -0
1 0 7.875 0 1 0 -0
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
Polygon3D 0
PolygonOnTriangulations 32
26 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 27
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 1
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 1 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 2
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 13 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 14
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
2 27 2
p 0.0394318960038986 1 0 5
2 28 1
p 0.0394318960038986 1 0 5
2 1 2
p 0.0394318960038986 1 6 8.5
2 1 2
p 0.0394318960038986 1 6 8.5
6 3 4 5 6 7 2
p 0.0394318960038986 1 4.77492974218118 5.06407270282156 5.35321566346194 5.64235862410233 5.93150158474271 6.22064454538309
6 1 4 5 6 7 3
p 0.0394318960038986 1 4.77492974218118 5.06407270282156 5.35321566346194 5.64235862410233 5.93150158474271 6.22064454538309
2 8 3
p 0.0394318960038986 1 6 8.5
2 1 4
p 0.0394318960038986 1 6 8.5
6 8 9 10 11 12 1
p 0.0394318960038986 1 4.77492974218118 5.06407270282156 5.35321566346194 5.64235862410233 5.93150158474271 6.22064454538309
6 1 4 5 6 7 3
p 0.0394318960038986 1 4.77492974218118 5.06407270282156 5.35321566346194 5.64235862410233 5.93150158474271 6.22064454538309
2 14 40
p 0.0394318960038986 1 5 10
2 13 39
p 0.0394318960038986 1 5 10
26 39 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 40
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 1
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
2 2 3
p 0.0394318960038986 1 6.00391007216609 7.875
2 3 2
p 0.0394318960038986 1 6.00391007216609 7.875
2 4 3
p 0.0394318960038986 1 0 2.5
2 2 3
p 0.0394318960038986 1 0 2.5
2 1 4
p 0.0394318960038986 1 6.00391007216609 7.875
2 3 2
p 0.0394318960038986 1 6.00391007216609 7.875
2 1 2
p 0.0394318960038986 1 4.50391007216609 6.375
2 4 3
p 0.0394318960038986 1 4.50391007216609 6.375
2 1 2
p 0.0394318960038986 1 4.50391007216609 6.375
2 1 2
p 0.0394318960038986 1 4.50391007216609 6.375
2 1 2
p 0.0394318960038986 1 5 10
2 3 28
p 0.0394318960038986 1 5 10
26 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 2
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 1
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
Surfaces 9
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 6.375 0 0 1 0 -0 0 0 1 0 -1 0
1 0 0 2.5 0 0 1 1 0 -0 -0 1 0
1 0 7.875 0 -0 1 0 0 0 1 1 0 -0
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 10 0 0 1 1 0 -0 -0 1 0
Triangulations 9
26 25 1 2.22044604925031e-16
2 -4.89842541528951e-16 0 1.93716632225726 0.49737977432971 0 1.75261336008773 0.963507348203431 0 1.45793725484282 1.36909421185738 0 1.07165358995799 1.68865585100403 0 0.618033988749894 1.90211303259031 0 0.125581039058625 1.99605345685654 0 -0.374762629171451 1.96457450145738 0 -0.851558583130147 1.80965410493204 0 -1.27484797949738 1.54102648555158 0 -1.6180339887499 1.17557050458494 0 -1.8595529717765 0.736249105369352 0 -1.98422940262896 0.250666467128604 0 -1.98422940262896 -0.250666467128614 0 -1.8595529717765 -0.736249105369362 0 -1.61803398874989 -1.17557050458495 0 -1.27484797949737 -1.54102648555158 0 -0.851558583130138 -1.80965410493204 0 -0.374762629171441 -1.96457450145738 0 0.125581039058636 -1.99605345685654 0 0.618033988749905 -1.9021130325903 0 1.071653589958 -1.68865585100402 0 1.45793725484283 -1.36909421185737 0 1.75261336008773 -0.96350734820342 0 1.93716632225727 -0.497379774329697 0 0.0078852986855219 3.33066907387547e-16 0 2 0 1.93716632225726 0.49737977432971 1.75261336008773 0.963507348203431 1.45793725484282 1.36909421185738 1.07165358995799 1.68865585100403 0.618033988749894 1.90211303259031 0.125581039058625 1.99605345685654 -0.374762629171451 1.96457450145738 -0.851558583130147 1.80965410493204 -1.27484797949738 1.54102648555158 -1.6180339887499 1.17557050458494 -1.8595529717765 0.736249105369352 -1.98422940262896 0.250666467128604 -1.98422940262896 -0.250666467128614 -1.8595529717765 -0.736249105369362 -1.61803398874989 -1.17557050458495 -1.27484797949737 -1.54102648555158 -0.851558583130138 -1.80965410493204 -0.374762629171441 -1.96457450145738 0.125581039058636 -1.99605345685654 0.618033988749904 -1.9021130325903 1.071653589958 -1.68865585100402 1.45793725484283 -1.36909421185737 1.75261336008773 -0.96350734820342 1.93716632225727 -0.497379774329697 0.00788529868552179 2.22044604925031e-16 26 1 2 26 2 3 26 3 4 26 4 5 26 5 6 26 6 7 26 7 8 26 8 9 26 9 10 26 10 11 26 11 12 26 12 13 26 13 14 26 14 15 26 15 16 26 16 17 26 17 18 26 18 19 26 19 20 26 20 21 26 21 22 26 22 23 26 23 24 26 24 25 26 25 1
52 50 1 0.0157705973710445
2 -4.89842541528951e-16 5 2 -4.89842541528951e-16 5 1.93716632225726 0.49737977432971 5 1.75261336008773 0.963507348203431 5 1.45793725484282 1.36909421185738 5 1.07165358995799 1.68865585100403 5 0.618033988749894 1.90211303259031 5 0.125581039058625 1.99605345685654 5 -0.374762629171451 1.96457450145738 5 -0.851558583130147 1.80965410493204 5 -1.27484797949738 1.54102648555158 5 -1.6180339887499 1.17557050458494 5 -1.8595529717765 0.736249105369352 5 -1.98422940262896 0.250666467128604 5 -1.98422940262896 -0.250666467128614 5 -1.8595529717765 -0.736249105369362 5 -1.61803398874989 -1.17557050458495 5 -1.27484797949737 -1.54102648555158 5 -0.851558583130138 -1.80965410493204 5 -0.374762629171441 -1.96457450145738 5 0.125581039058636 -1.99605345685654 5 0.618033988749905 -1.9021130325903 5 1.071653589958 -1.68865585100402 5 1.45793725484283 -1.36909421185737 5 1.75261336008773 -0.96350734820342 5 1.93716632225727 -0.497379774329697 5 2 -4.89842541528951e-16 0 2 -4.89842541528951e-16 0 1.93716632225726 0.49737977432971 0 1.75261336008773 0.963507348203431 0 1.45793725484282 1.36909421185738 0 1.07165358995799 1.68865585100403 0 0.618033988749894 1.90211303259031 0 0.125581039058625 1.99605345685654 0 -0.374762629171451 1.96457450145738 0 -0.851558583130147 1.80965410493204 0 -1.27484797949738 1.54102648555158 0 -1.6180339887499 1.17557050458494 0 -1.8595529717765 0.736249105369352 0 -1.98422940262896 0.250666467128604 0 -1.98422940262896 -0.250666467128614 0 -1.8595529717765 -0.736249105369362 0 -1.61803398874989 -1.17557050458495 0 -1.27484797949737 -1.54102648555158 0 -0.851558583130138 -1.80965410493204 0 -0.374762629171441 -1.96457450145738 0 0.125581039058636 -1.99605345685654 0 0.618033988749905 -1.9021130325903 0 1.071653589958 -1.68865585100402 0 1.45793725484283 -1.36909421185737 0 1.75261336008773 -0.96350734820342 0 1.93716632225727 -0.497379774329697 0 0 5 6.28318530717959 5 0.251327412287184 5 0.502654824574367 5 0.753982236861551 5 1.00530964914873 5 1.25663706143592 5 1.5079644737231 5 1.75929188601029 5 2.01061929829747 5 2.26194671058465 5 2.51327412287184 5 2.76460153515902 5 3.0159289474462 5 3.26725635973339 5 3.51858377202057 5 3.76991118430776 5 4.02123859659494 5 4.27256600888212 5 4.52389342116931 5 4.77522083345649 5 5.02654824574367 5 5.27787565803086 5 5.52920307031804 5 5.78053048260523 5 6.03185789489241 5 6.28318530717959 0 0 0 0.251327412287184 0 0.502654824574367 0 0.753982236861551 0 1.00530964914873 0 1.25663706143592 0 1.5079644737231 0 1.75929188601029 0 2.01061929829747 0 2.26194671058465 0 2.51327412287184 0 2.76460153515902 0 3.0159289474462 0 3.26725635973339 0 3.51858377202057 0 3.76991118430776 0 4.02123859659494 0 4.27256600888212 0 4.52389342116931 0 4.77522083345649 0 5.02654824574367 0 5.27787565803086 0 5.52920307031804 0 5.78053048260523 0 6.03185789489241 0 22 21 47 22 47 48 22 48 49 1 28 29 23 22 49 3 29 30 3 1 29 24 23 49 24 49 50 4 3 30 25 50 51 25 24 50 25 51 52 5 30 31 5 31 32 5 4 30 26 52 27 26 25 52 2 26 27 6 5 32 7 32 33 7 6 32 8 33 34 8 7 33 9 34 35 9 8 34 10 35 36 10 36 37 10 9 35 11 10 37 12 37 38 12 38 39 12 11 37 13 12 39 14 39 40 14 13 39 15 14 40 15 40 41 16 15 41 16 41 42 17 16 42 17 42 43 17 43 44 18 17 44 19 18 44 19 44 45 20 19 45 20 45 46 21 20 46 21 46 47
64 64 1 0.0173770792535486
-0.125 -1.99608992783391 6 -0.125 -1.99608992783391 8.5 -1.99608992783391 -0.125 8.5 -1.87758807372937 -0.688957927154656 8.5 -1.60320358499452 -1.19571663242622 8.5 -1.19571663242623 -1.60320358499452 8.5 -0.688957927154665 -1.87758807372936 8.5 -1.99608992783391 -0.125 6 -1.87758807372937 -0.688957927154656 6 -1.60320358499452 -1.19571663242622 6 -1.19571663242623 -1.60320358499452 6 -0.688957927154665 -1.87758807372936 6 2 -4.89842541528951e-16 5 2 -4.89842541528951e-16 5 1.93716632225726 0.49737977432971 5 1.75261336008773 0.963507348203431 5 1.45793725484282 1.36909421185738 5 1.07165358995799 1.68865585100403 5 0.618033988749894 1.90211303259031 5 0.125581039058625 1.99605345685654 5 -0.374762629171451 1.96457450145738 5 -0.851558583130147 1.80965410493204 5 -1.27484797949738 1.54102648555158 5 -1.6180339887499 1.17557050458494 5 -1.8595529717765 0.736249105369352 5 -1.98422940262896 0.250666467128604 5 -1.98422940262896 -0.250666467128614 5 -1.8595529717765 -0.736249105369362 5 -1.61803398874989 -1.17557050458495 5 -1.27484797949737 -1.54102648555158 5 -0.851558583130138 -1.80965410493204 5 -0.374762629171441 -1.96457450145738 5 0.125581039058636 -1.99605345685654 5 0.618033988749905 -1.9021130325903 5 1.071653589958 -1.68865585100402 5 1.45793725484283 -1.36909421185737 5 1.75261336008773 -0.96350734820342 5 1.93716632225727 -0.497379774329697 5 2 -4.89842541528951e-16 10 2 -4.89842541528951e-16 10 1.93716632225726 0.49737977432971 10 1.75261336008773 0.963507348203431 10 1.45793725484282 1.36909421185738 10 1.07165358995799 1.68865585100403 10 0.618033988749894 1.90211303259031 10 0.125581039058625 1.99605345685654 10 -0.374762629171451 1.96457450145738 10 -0.851558583130147 1.80965410493204 10 -1.27484797949738 1.54102648555158 10 -1.6180339887499 1.17557050458494 10 -1.8595529717765 0.736249105369352 10 -1.98422940262896 0.250666467128604 10 -1.98422940262896 -0.250666467128614 10 -1.8595529717765 -0.736249105369362 10 -1.61803398874989 -1.17557050458495 10 -1.27484797949737 -1.54102648555158 10 -0.851558583130138 -1.80965410493204 10 -0.374762629171441 -1.96457450145738 10 0.125581039058636 -1.99605345685654 10 0.618033988749905 -1.9021130325903 10 1.071653589958 -1.68865585100402 10 1.45793725484283 -1.36909421185737 10 1.75261336008773 -0.96350734820342 10 1.93716632225727 -0.497379774329697 10 4.6498482185882 6 4.6498482185882 8.5 3.20413341538628 8.5 3.49327637602667 8.5 3.78241933666705 8.5 4.07156229730743 8.5 4.36070525794781 8.5 3.20413341538628 6 3.49327637602667 6 3.78241933666705 6 4.07156229730743 6 4.36070525794781 6 0 5 6.28318530717959 5 0.251327412287184 5 0.502654824574367 5 0.753982236861551 5 1.00530964914873 5 1.25663706143592 5 1.5079644737231 5 1.75929188601029 5 2.01061929829747 5 2.26194671058465 5 2.51327412287184 5 2.76460153515902 5 3.0159289474462 5 3.26725635973339 5 3.51858377202057 5 3.76991118430776 5 4.02123859659494 5 4.27256600888212 5 4.52389342116931 5 4.77522083345649 5 5.02654824574367 5 5.27787565803086 5 5.52920307031804 5 5.78053048260523 5 6.03185789489241 5 0 10 6.28318530717959 10 0.251327412287184 10 0.502654824574367 10 0.753982236861551 10 1.00530964914873 10 1.25663706143592 10 1.5079644737231 10 1.75929188601029 10 2.01061929829747 10 2.26194671058465 10 2.51327412287184 10 2.76460153515902 10 3.0159289474462 10 3.26725635973339 10 3.51858377202057 10 3.76991118430776 10 4.02123859659494 10 4.27256600888212 10 4.52389342116931 10 4.77522083345649 10 5.02654824574367 10 5.27787565803086 10 5.52920307031804 10 5.78053048260523 10 6.03185789489241 10 56 5 6 56 55 5 39 13 15 12 11 31 41 15 16 41 39 15 32 12 31 42 41 16 57 6 7 57 56 6 43 16 17 43 17 18 43 42 16 1 12 32 33 1 32 58 57 7 44 43 18 45 18 19 2 1 33 45 44 18 2 58 7 46 19 20 59 2 33 46 45 19 59 58 2 60 33 34 47 20 21 60 34 35 60 59 33 47 46 20 48 21 22 61 60 35 48 22 23 48 47 21 62 35 36 49 48 23 62 61 35 63 36 37 63 37 38 50 49 23 63 62 36 50 23 24 50 24 25 64 38 14 64 63 38 51 50 25 40 64 14 8 26 27 52 51 25 52 25 26 3 26 8 3 52 26 9 8 27 9 27 28 53 52 3 4 53 3 10 28 29 10 9 28 54 53 4 30 10 29 5 54 4 11 10 30 55 54 5 31 11 30
4 2 1 1.66533453693773e-15
-0.125 -1.99608992783391 6 -0.125 -1.99608992783391 8.5 -0.125 -0.125 8.5 -0.125 -0.125 6 0 -6.00391007216609 2.5 -6.00391007216609 2.5 -7.875 0 -7.875 2 4 3 2 1 4
8 7 1 4.9960036108132e-16
-1.99608992783391 -0.125 8.5 -0.125 -0.125 8.5 -0.125 -1.99608992783391 8.5 -1.87758807372937 -0.688957927154656 8.5 -1.60320358499452 -1.19571663242622 8.5 -1.19571663242623 -1.60320358499452 8.5 -0.688957927154665 -1.87758807372936 8.5 -1.06054496391696 -1.06054496391696 8.5 4.50391007216609 7.875 6.375 7.875 6.375 6.00391007216609 4.62241192627063 7.31104207284534 4.89679641500548 6.80428336757378 5.30428336757377 6.39679641500548 5.81104207284533 6.12241192627063 5.43945503608304 6.93945503608304 8 2 1 8 3 2 8 1 4 8 4 5 8 5 6 8 6 7 8 7 3
4 2 1 3.33066907387547e-16
-1.99608992783391 -0.125 6 -0.125 -0.125 6 -0.125 -0.125 8.5 -1.99608992783391 -0.125 8.5 0 4.50391007216609 0 6.375 2.5 6.375 2.5 4.50391007216609 3 2 1 3 1 4
8 7 1 4.9960036108132e-16
-1.99608992783391 -0.125 6 -0.125 -0.125 6 -0.125 -1.99608992783391 6 -1.87758807372937 -0.688957927154656 6 -1.60320358499452 -1.19571663242622 6 -1.19571663242623 -1.60320358499452 6 -0.688957927154665 -1.87758807372936 6 -1.06054496391696 -1.06054496391696 6 4.50391007216609 7.875 6.375 7.875 6.375 6.00391007216609 4.62241192627063 7.31104207284534 4.89679641500548 6.80428336757378 5.30428336757377 6.39679641500548 5.81104207284533 6.12241192627063 5.43945503608304 6.93945503608304 8 2 1 8 3 2 8 1 4 8 4 5 8 5 6 8 6 7 8 7 3
52 50 1 0.0157705973710445
2 -4.89842541528951e-16 10 2 -4.89842541528951e-16 15 2 -4.89842541528951e-16 10 1.93716632225726 0.49737977432971 10 1.75261336008773 0.963507348203431 10 1.45793725484282 1.36909421185738 10 1.07165358995799 1.68865585100403 10 0.618033988749894 1.90211303259031 10 0.125581039058625 1.99605345685654 10 -0.374762629171451 1.96457450145738 10 -0.851558583130147 1.80965410493204 10 -1.27484797949738 1.54102648555158 10 -1.6180339887499 1.17557050458494 10 -1.8595529717765 0.736249105369352 10 -1.98422940262896 0.250666467128604 10 -1.98422940262896 -0.250666467128614 10 -1.8595529717765 -0.736249105369362 10 -1.61803398874989 -1.17557050458495 10 -1.27484797949737 -1.54102648555158 10 -0.851558583130138 -1.80965410493204 10 -0.374762629171441 -1.96457450145738 10 0.125581039058636 -1.99605345685654 10 0.618033988749905 -1.9021130325903 10 1.071653589958 -1.68865585100402 10 1.45793725484283 -1.36909421185737 10 1.75261336008773 -0.96350734820342 10 1.93716632225727 -0.497379774329697 10 2 -4.89842541528951e-16 15 1.93716632225726 0.49737977432971 15 1.75261336008773 0.963507348203431 15 1.45793725484282 1.36909421185738 15 1.07165358995799 1.68865585100403 15 0.618033988749894 1.90211303259031 15 0.125581039058625 1.99605345685654 15 -0.374762629171451 1.96457450145738 15 -0.851558583130147 1.80965410493204 15 -1.27484797949738 1.54102648555158 15 -1.6180339887499 1.17557050458494 15 -1.8595529717765 0.736249105369352 15 -1.98422940262896 0.250666467128604 15 -1.98422940262896 -0.250666467128614 15 -1.8595529717765 -0.736249105369362 15 -1.61803398874989 -1.17557050458495 15 -1.27484797949737 -1.54102648555158 15 -0.851558583130138 -1.80965410493204 15 -0.374762629171441 -1.96457450145738 15 0.125581039058636 -1.99605345685654 15 0.618033988749905 -1.9021130325903 15 1.071653589958 -1.68865585100402 15 1.45793725484283 -1.36909421185737 15 1.75261336008773 -0.96350734820342 15 1.93716632225727 -0.497379774329697 15 6.28318530717959 5 6.28318530717959 10 0 5 0.251327412287184 5 0.502654824574367 5 0.753982236861551 5 1.00530964914873 5 1.25663706143592 5 1.5079644737231 5 1.75929188601029 5 2.01061929829747 5 2.26194671058465 5 2.51327412287184 5 2.76460153515902 5 3.0159289474462 5 3.26725635973339 5 3.51858377202057 5 3.76991118430776 5 4.02123859659494 5 4.27256600888212 5 4.52389342116931 5 4.77522083345649 5 5.02654824574367 5 5.27787565803086 5 5.52920307031804 5 5.78053048260523 5 6.03185789489241 5 0 10 0.251327412287184 10 0.502654824574367 10 0.753982236861551 10 1.00530964914873 10 1.25663706143592 10 1.5079644737231 10 1.75929188601029 10 2.01061929829747 10 2.26194671058465 10 2.51327412287184 10 2.76460153515902 10 3.0159289474462 10 3.26725635973339 10 3.51858377202057 10 3.76991118430776 10 4.02123859659494 10 4.27256600888212 10 4.52389342116931 10 4.77522083345649 10 5.02654824574367 10 5.27787565803086 10 5.52920307031804 10 5.78053048260523 10 6.03185789489241 10 48 22 23 48 23 24 48 47 22 28 3 4 49 48 24 29 4 5 29 28 4 50 24 25 50 49 24 30 29 5 51 25 26 51 26 27 51 50 25 31 5 6 31 6 7 52 27 1 31 30 5 52 51 27 2 52 1 32 31 7 33 7 8 33 32 7 34 8 9 34 33 8 35 9 10 35 34 9 36 10 11 36 11 12 36 35 10 37 36 12 38 12 13 38 13 14 38 37 12 39 38 14 40 14 15 40 39 14 41 40 15 41 15 16 42 41 16 42 16 17 43 42 17 43 17 18 43 18 19 44 43 19 45 19 20 45 44 19 46 20 21 46 45 20 47 21 22 47 46 21
26 25 1 2.22044604925031e-16
2 -4.89842541528951e-16 10 1.93716632225726 0.49737977432971 10 1.75261336008773 0.963507348203431 10 1.45793725484282 1.36909421185738 10 1.07165358995799 1.68865585100403 10 0.618033988749894 1.90211303259031 10 0.125581039058625 1.99605345685654 10 -0.374762629171451 1.96457450145738 10 -0.851558583130147 1.80965410493204 10 -1.27484797949738 1.54102648555158 10 -1.6180339887499 1.17557050458494 10 -1.8595529717765 0.736249105369352 10 -1.98422940262896 0.250666467128604 10 -1.98422940262896 -0.250666467128614 10 -1.8595529717765 -0.736249105369362 10 -1.61803398874989 -1.17557050458495 10 -1.27484797949737 -1.54102648555158 10 -0.851558583130138 -1.80965410493204 10 -0.374762629171441 -1.96457450145738 10 0.125581039058636 -1.99605345685654 10 0.618033988749905 -1.9021130325903 10 1.071653589958 -1.68865585100402 10 1.45793725484283 -1.36909421185737 10 1.75261336008773 -0.96350734820342 10 1.93716632225727 -0.497379774329697 10 0.0078852986855219 3.33066907387547e-16 10 2 0 1.93716632225726 0.49737977432971 1.75261336008773 0.963507348203431 1.45793725484282 1.36909421185738 1.07165358995799 1.68865585100403 0.618033988749894 1.90211303259031 0.125581039058625 1.99605345685654 -0.374762629171451 1.96457450145738 -0.851558583130147 1.80965410493204 -1.27484797949738 1.54102648555158 -1.6180339887499 1.17557050458494 -1.8595529717765 0.736249105369352 -1.98422940262896 0.250666467128604 -1.98422940262896 -0.250666467128614 -1.8595529717765 -0.736249105369362 -1.61803398874989 -1.17557050458495 -1.27484797949737 -1.54102648555158 -0.851558583130138 -1.80965410493204 -0.374762629171441 -1.96457450145738 0.125581039058636 -1.99605345685654 0.618033988749904 -1.9021130325903 1.071653589958 -1.68865585100402 1.45793725484283 -1.36909421185737 1.75261336008773 -0.96350734820342 1.93716632225727 -0.497379774329697 0.00788529868552179 2.22044604925031e-16 26 1 2 26 2 3 26 3 4 26 4 5 26 5 6 26 6 7 26 7 8 26 8 9 26 9 10 26 10 11 26 11 12 26 12 13 26 13 14 26 14 15 26 15 16 26 16 17 26 17 18 26 18 19 26 19 20 26 20 21 26 21 22 26 22 23 26 23 24 26 24 25 26 25 1
TShapes 49
Ve
1e-07
2 -4.89842541528951e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 1 0 0 6.28318530717959
2 1 1 0 0 6.28318530717959
2 2 2 0 0 6.28318530717959
6 1 2 5
6 2 1 0
0
0101100
+49 6 -49 6 *
Wi
0101000
-48 0 *
Fa
0 1e-07 1 0
2 1
0101000
-47 0 *
Ve
1e-07
2 -4.89842541528951e-16 5
0 0
0101101
*
Ed
1e-07 1 1 0
1 2 0 0 6.28318530717959
2 3 2 8 0 6.28318530717959
2 4 3 8 0 6.28318530717959
6 3 2 9
6 4 3 10
0
0101100
+45 11 -45 11 *
Ed
1e-07 1 1 0
1 3 0 0 5
3 5 6CN 2 0 0 5
7 5 6 2 5
0
0101000
+49 6 -45 6 *
Wi
0101000
-44 7 +43 2 +48 2 -43 2 *
Fa
0 1e-07 2 2
2 2
0101000
+42 0 *
Ve
2.00001e-07
-0.125 -1.99608992783391 6
0 0
0101101
*
Ve
2.00001e-07
-0.125 -1.99608992783391 8.5
0 0
0101101
*
Ed
1e-07 1 1 0
1 4 0 6 8.5
2 7 3 4 6 8.5
2 8 4 12 6 8.5
6 7 3 0
6 8 4 0
0
0101000
+40 13 -39 13 *
Ve
2.00001e-07
-1.99608992783391 -0.125 8.5
0 0
0101101
*
Ed
1e-07 1 1 0
1 5 0 4.77492974218118 6.22064454538309
2 9 3 4 4.77492974218118 6.22064454538309
2 10 5 12 4.77492974218118 6.22064454538309
6 9 3 0
6 10 5 0
0
0101000
+37 13 -39 13 *
Ve
2.00001e-07
-1.99608992783391 -0.125 6
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 6 8.5
2 11 3 4 6 8.5
2 12 6 12 6 8.5
6 11 3 0
6 12 6 0
0
0101000
+35 13 -37 13 *
Ed
1e-07 1 1 0
1 7 0 4.77492974218118 6.22064454538309
2 13 3 4 4.77492974218118 6.22064454538309
2 14 7 12 4.77492974218118 6.22064454538309
6 13 3 0
6 14 7 0
0
0101000
+35 13 -40 13 *
Wi
0101000
-38 0 +36 0 +34 0 -33 0 *
Ve
1e-07
2 -4.89842541528951e-16 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 8 0 5 10
3 15 16CN 3 0 5 10
7 15 16 3 15
0
0101000
+45 6 -31 6 *
Ed
1e-07 1 1 0
1 9 0 0 6.28318530717959
2 17 3 0 0 6.28318530717959
2 18 8 16 0 6.28318530717959
6 17 3 15
6 18 8 5
0
0101100
+31 6 -31 6 *
Wi
0101000
+44 14 -30 4 -29 4 +30 4 *
Fa
0 1e-07 3 4
2 3
0101000
+32 0 +28 0 *
Ve
1e-07
-0.125 -0.125 8.5
0 0
0101101
*
Ed
1e-07 1 1 0
1 10 0 6.00391007216609 7.875
2 19 4 0 6.00391007216609 7.875
2 20 5 0 6.00391007216609 7.875
6 19 4 17
6 20 5 17
0
0101000
+39 18 -26 18 *
Ve
1e-07
-0.125 -0.125 6
0 0
0101101
*
Ed
1e-07 1 1 0
1 11 0 0 2.5
2 21 4 0 0 2.5
2 22 6 0 0 2.5
6 21 4 17
6 22 6 17
0
0101000
-26 18 +24 18 *
Ed
1e-07 1 1 0
1 12 0 6.00391007216609 7.875
2 23 4 0 6.00391007216609 7.875
2 24 7 0 6.00391007216609 7.875
6 23 4 17
6 24 7 17
0
0101000
+40 18 -24 18 *
Wi
0101000
-38 0 -25 12 +23 12 +22 12 *
Fa
0 1e-07 4 12
2 4
0101000
+21 0 *
Ed
1e-07 1 1 0
1 13 0 4.50391007216609 6.375
2 25 5 0 4.50391007216609 6.375
2 26 6 0 4.50391007216609 6.375
6 25 5 17
6 26 6 17
0
0101000
+37 18 -26 18 *
Wi
0101000
-19 12 +25 12 +36 0 *
Fa
0 1e-07 5 12
2 5
0101000
+18 0 *
Ed
1e-07 1 1 0
1 14 0 4.50391007216609 6.375
2 27 6 0 4.50391007216609 6.375
2 28 7 0 4.50391007216609 6.375
6 27 6 17
6 28 7 17
0
0101000
+35 18 -24 18 *
Wi
0101000
-16 12 -23 12 +19 12 +34 0 *
Fa
0 1e-07 6 12
2 6
0101000
+15 0 *
Wi
0101000
-16 12 +22 12 +33 0 *
Fa
0 1e-07 7 12
2 7
0101000
+13 0 *
Ve
1e-07
2 -4.89842541528951e-16 15
0 0
0101101
*
Ed
1e-07 1 1 0
1 15 0 5 10
3 29 30CN 8 0 5 10
7 29 30 8 9
0
0101000
+31 11 -11 11 *
Ed
1e-07 1 1 0
1 16 0 0 6.28318530717959
2 31 8 0 0 6.28318530717959
2 32 9 0 0 6.28318530717959
6 31 8 9
6 32 9 0
0
0101100
+11 11 -11 11 *
Wi
0101000
+10 7 +29 2 -10 7 -9 7 *
Fa
0 1e-07 8 7
2 8
0101000
+8 0 *
Wi
0101000
+9 0 *
Fa
0 1e-07 9 0
2 9
0101000
+6 0 *
Sh
0101000
-46 4 +41 3 +27 0 -20 0 -17 0 -14 0 +12 0 +7 3 +5 14 *
So
0100000
+4 0 *
Co
0100000
+3 0 *
Co
1100000
+2 1 *
+1 0
+514
View File
@@ -0,0 +1,514 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 18
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
2 2 1 3 1 0
2 2 -1 0
2 1 -1 3 -1 2 -1 0
1
1 0 0 0
0 1 0 0
0 0 1 5
2 2 1 7 -1 0
2 7 -1 0
2 3 -1 7 -1 0
2 1 -1 3 -1 7 -1 0
1
1 0 0 1.5
0 1 0 -4
0 0 1 6
2 1 -1 0
2 3 -1 2 -1 0
2 7 1 3 1 0
2 7 1 2 -1 0
2 12 -1 0
2 1 -1 12 -1 0
Curve2ds 32
2 0 0 1 0 -0 1 2
1 0 0 1 0
1 0 5 1 0
1 0 5 1 0
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 4.7123889803846897 6 1 0
2 -1.5 4 0 -1 1 0 2
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 -1.5707963267948966 6 1 0
2 -1.5 4 0 -1 1 0 2
8 5.75 8.75
1 0.72273424781341566 0 0 1
8 5.75 8.75
1 -6 -5.3228756555322949 1 0
1 -1.5707963267948966 8.5 1 0
2 -1.5 4 0 -1 1 0 2
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 0 10 1 0
1 0 5 1 0
1 4.7123889803846897 8.5 1 0
2 -1.5 4 0 -1 1 0 2
8 5.75 8.75
1 5.5604510593661702 0 0 1
8 5.75 8.75
1 -6 -2.6771243444677046 1 0
1 0 0 0 1
1 0 0 0 -1
1 2.5 0 0 -1
1 0 0 0 1
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 0 10 1 0
2 0 0 1 0 -0 1 2
Curves 16
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 6 0 0 1 0 -1 0 1 0 -0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 6 0 0 1 0 -1 0 1 0 -0 2
1 1.5 1.3228756555322954 0 0 0 1
2 0 0 8.5 0 0 1 0 -1 0 1 0 -0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
2 0 0 8.5 0 0 1 0 -1 0 1 0 -0 2
1 1.5 -1.3228756555322954 0 0 0 1
1 0 0 0 -0 1 0
1 0 0 2.5 -0 1 0
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
Polygon3D 0
PolygonOnTriangulations 32
26 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 27
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 1
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 1 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 2
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 5
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
2 27 2
p 0.0394318960038986 1 0 5
2 28 1
p 0.0394318960038986 1 0 5
4 1 3 4 2
p 0.0394318960038986 1 0.848062078981481 1.08897349491929 1.32988491085709 1.5707963267949
4 1 6 7 3
p 0.0394318960038986 1 0.848062078981481 1.08897349491929 1.32988491085709 1.5707963267949
2 5 2
p 0.0394318960038986 1 5 6
2 6 31
p 0.0394318960038986 1 5 6
4 31 33 34 32
p 0.0394318960038986 1 1.5707963267949 1.8117077427327 2.05261915867051 2.29353057460831
4 3 4 5 2
p 0.0394318960038986 1 1.5707963267949 1.8117077427327 2.05261915867051 2.29353057460831
2 32 35
p 0.0394318960038986 1 6 8.5
2 4 3
p 0.0394318960038986 1 6 8.5
4 36 37 38 35
p 0.0394318960038986 1 1.5707963267949 1.8117077427327 2.05261915867051 2.29353057460831
4 3 4 5 2
p 0.0394318960038986 1 1.5707963267949 1.8117077427327 2.05261915867051 2.29353057460831
2 65 40
p 0.0394318960038986 1 8.5 10
2 36 39
p 0.0394318960038986 1 8.5 10
26 39 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 40
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 1
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
4 66 67 68 65
p 0.0394318960038986 1 0.848062078981481 1.08897349491929 1.32988491085709 1.5707963267949
4 1 6 7 3
p 0.0394318960038986 1 0.848062078981481 1.08897349491929 1.32988491085709 1.5707963267949
2 1 66
p 0.0394318960038986 1 6 8.5
2 1 2
p 0.0394318960038986 1 6 8.5
2 1 2
p 0.0394318960038986 1 2.6771243444677 5.32287565553229
2 1 4
p 0.0394318960038986 1 2.6771243444677 5.32287565553229
2 2 3
p 0.0394318960038986 1 2.6771243444677 5.32287565553229
2 1 2
p 0.0394318960038986 1 2.6771243444677 5.32287565553229
2 1 2
p 0.0394318960038986 1 5 10
2 3 28
p 0.0394318960038986 1 5 10
26 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 2
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
26 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 1
p 0.0394318960038986 1 0 0.251327412287184 0.502654824574367 0.753982236861551 1.00530964914873 1.25663706143592 1.5079644737231 1.75929188601029 2.01061929829747 2.26194671058465 2.51327412287184 2.76460153515902 3.0159289474462 3.26725635973339 3.51858377202057 3.76991118430776 4.02123859659494 4.27256600888212 4.52389342116931 4.77522083345649 5.02654824574367 5.27787565803086 5.52920307031804 5.78053048260523 6.03185789489241 6.28318530717959
Surfaces 8
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 0 0 0 1 1 0 -0 -0 1 0
1 0 0 0 1 0 -0 0 0 1 0 -1 0
1 0 0 2.5 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 10 0 0 1 1 0 -0 -0 1 0
Triangulations 8
26 25 1 2.22044604925031e-16
2 -4.89842541528951e-16 0 1.93716632225726 0.49737977432971 0 1.75261336008773 0.963507348203431 0 1.45793725484282 1.36909421185738 0 1.07165358995799 1.68865585100403 0 0.618033988749894 1.90211303259031 0 0.125581039058625 1.99605345685654 0 -0.374762629171451 1.96457450145738 0 -0.851558583130147 1.80965410493204 0 -1.27484797949738 1.54102648555158 0 -1.6180339887499 1.17557050458494 0 -1.8595529717765 0.736249105369352 0 -1.98422940262896 0.250666467128604 0 -1.98422940262896 -0.250666467128614 0 -1.8595529717765 -0.736249105369362 0 -1.61803398874989 -1.17557050458495 0 -1.27484797949737 -1.54102648555158 0 -0.851558583130138 -1.80965410493204 0 -0.374762629171441 -1.96457450145738 0 0.125581039058636 -1.99605345685654 0 0.618033988749905 -1.9021130325903 0 1.071653589958 -1.68865585100402 0 1.45793725484283 -1.36909421185737 0 1.75261336008773 -0.96350734820342 0 1.93716632225727 -0.497379774329697 0 0.0078852986855219 3.33066907387547e-16 0 2 0 1.93716632225726 0.49737977432971 1.75261336008773 0.963507348203431 1.45793725484282 1.36909421185738 1.07165358995799 1.68865585100403 0.618033988749894 1.90211303259031 0.125581039058625 1.99605345685654 -0.374762629171451 1.96457450145738 -0.851558583130147 1.80965410493204 -1.27484797949738 1.54102648555158 -1.6180339887499 1.17557050458494 -1.8595529717765 0.736249105369352 -1.98422940262896 0.250666467128604 -1.98422940262896 -0.250666467128614 -1.8595529717765 -0.736249105369362 -1.61803398874989 -1.17557050458495 -1.27484797949737 -1.54102648555158 -0.851558583130138 -1.80965410493204 -0.374762629171441 -1.96457450145738 0.125581039058636 -1.99605345685654 0.618033988749904 -1.9021130325903 1.071653589958 -1.68865585100402 1.45793725484283 -1.36909421185737 1.75261336008773 -0.96350734820342 1.93716632225727 -0.497379774329697 0.00788529868552179 2.22044604925031e-16 26 1 2 26 2 3 26 3 4 26 4 5 26 5 6 26 6 7 26 7 8 26 8 9 26 9 10 26 10 11 26 11 12 26 12 13 26 13 14 26 14 15 26 15 16 26 16 17 26 17 18 26 18 19 26 19 20 26 20 21 26 21 22 26 22 23 26 23 24 26 24 25 26 25 1
52 50 1 0.0157705973710445
2 -4.89842541528951e-16 5 2 -4.89842541528951e-16 5 1.93716632225726 0.49737977432971 5 1.75261336008773 0.963507348203431 5 1.45793725484282 1.36909421185738 5 1.07165358995799 1.68865585100403 5 0.618033988749894 1.90211303259031 5 0.125581039058625 1.99605345685654 5 -0.374762629171451 1.96457450145738 5 -0.851558583130147 1.80965410493204 5 -1.27484797949738 1.54102648555158 5 -1.6180339887499 1.17557050458494 5 -1.8595529717765 0.736249105369352 5 -1.98422940262896 0.250666467128604 5 -1.98422940262896 -0.250666467128614 5 -1.8595529717765 -0.736249105369362 5 -1.61803398874989 -1.17557050458495 5 -1.27484797949737 -1.54102648555158 5 -0.851558583130138 -1.80965410493204 5 -0.374762629171441 -1.96457450145738 5 0.125581039058636 -1.99605345685654 5 0.618033988749905 -1.9021130325903 5 1.071653589958 -1.68865585100402 5 1.45793725484283 -1.36909421185737 5 1.75261336008773 -0.96350734820342 5 1.93716632225727 -0.497379774329697 5 2 -4.89842541528951e-16 0 2 -4.89842541528951e-16 0 1.93716632225726 0.49737977432971 0 1.75261336008773 0.963507348203431 0 1.45793725484282 1.36909421185738 0 1.07165358995799 1.68865585100403 0 0.618033988749894 1.90211303259031 0 0.125581039058625 1.99605345685654 0 -0.374762629171451 1.96457450145738 0 -0.851558583130147 1.80965410493204 0 -1.27484797949738 1.54102648555158 0 -1.6180339887499 1.17557050458494 0 -1.8595529717765 0.736249105369352 0 -1.98422940262896 0.250666467128604 0 -1.98422940262896 -0.250666467128614 0 -1.8595529717765 -0.736249105369362 0 -1.61803398874989 -1.17557050458495 0 -1.27484797949737 -1.54102648555158 0 -0.851558583130138 -1.80965410493204 0 -0.374762629171441 -1.96457450145738 0 0.125581039058636 -1.99605345685654 0 0.618033988749905 -1.9021130325903 0 1.071653589958 -1.68865585100402 0 1.45793725484283 -1.36909421185737 0 1.75261336008773 -0.96350734820342 0 1.93716632225727 -0.497379774329697 0 0 5 6.28318530717959 5 0.251327412287184 5 0.502654824574367 5 0.753982236861551 5 1.00530964914873 5 1.25663706143592 5 1.5079644737231 5 1.75929188601029 5 2.01061929829747 5 2.26194671058465 5 2.51327412287184 5 2.76460153515902 5 3.0159289474462 5 3.26725635973339 5 3.51858377202057 5 3.76991118430776 5 4.02123859659494 5 4.27256600888212 5 4.52389342116931 5 4.77522083345649 5 5.02654824574367 5 5.27787565803086 5 5.52920307031804 5 5.78053048260523 5 6.03185789489241 5 6.28318530717959 0 0 0 0.251327412287184 0 0.502654824574367 0 0.753982236861551 0 1.00530964914873 0 1.25663706143592 0 1.5079644737231 0 1.75929188601029 0 2.01061929829747 0 2.26194671058465 0 2.51327412287184 0 2.76460153515902 0 3.0159289474462 0 3.26725635973339 0 3.51858377202057 0 3.76991118430776 0 4.02123859659494 0 4.27256600888212 0 4.52389342116931 0 4.77522083345649 0 5.02654824574367 0 5.27787565803086 0 5.52920307031804 0 5.78053048260523 0 6.03185789489241 0 22 21 47 22 47 48 22 48 49 1 28 29 23 22 49 3 29 30 3 1 29 24 23 49 24 49 50 4 3 30 25 50 51 25 24 50 25 51 52 5 30 31 5 31 32 5 4 30 26 52 27 26 25 52 2 26 27 6 5 32 7 32 33 7 6 32 8 33 34 8 7 33 9 34 35 9 8 34 10 35 36 10 36 37 10 9 35 11 10 37 12 37 38 12 38 39 12 11 37 13 12 39 14 39 40 14 13 39 15 14 40 15 40 41 16 15 41 16 41 42 17 16 42 17 42 43 17 43 44 18 17 44 19 18 44 19 44 45 20 19 45 20 45 46 21 20 46 21 46 47
68 66 1 0.0199290289484098
1.5 -1.3228756555323 6 2 -4.89842541528951e-16 6 1.77230340765808 -0.926790500169036 6 1.94224185096967 -0.477175640977116 6 2 -4.89842541528951e-16 5 2 -4.89842541528951e-16 5 1.93716632225726 0.49737977432971 5 1.75261336008773 0.963507348203431 5 1.45793725484282 1.36909421185738 5 1.07165358995799 1.68865585100403 5 0.618033988749894 1.90211303259031 5 0.125581039058625 1.99605345685654 5 -0.374762629171451 1.96457450145738 5 -0.851558583130147 1.80965410493204 5 -1.27484797949738 1.54102648555158 5 -1.6180339887499 1.17557050458494 5 -1.8595529717765 0.736249105369352 5 -1.98422940262896 0.250666467128604 5 -1.98422940262896 -0.250666467128614 5 -1.8595529717765 -0.736249105369362 5 -1.61803398874989 -1.17557050458495 5 -1.27484797949737 -1.54102648555158 5 -0.851558583130138 -1.80965410493204 5 -0.374762629171441 -1.96457450145738 5 0.125581039058636 -1.99605345685654 5 0.618033988749905 -1.9021130325903 5 1.071653589958 -1.68865585100402 5 1.45793725484283 -1.36909421185737 5 1.75261336008773 -0.96350734820342 5 1.93716632225727 -0.497379774329697 5 2 -4.89842541528951e-16 6 1.5 1.32287565553229 6 1.94224185096967 0.477175640977123 6 1.77230340765808 0.926790500169037 6 1.5 1.32287565553229 8.5 2 -4.89842541528951e-16 8.5 1.94224185096967 0.477175640977123 8.5 1.77230340765808 0.926790500169037 8.5 2 -4.89842541528951e-16 10 2 -4.89842541528951e-16 10 1.93716632225726 0.49737977432971 10 1.75261336008773 0.963507348203431 10 1.45793725484282 1.36909421185738 10 1.07165358995799 1.68865585100403 10 0.618033988749894 1.90211303259031 10 0.125581039058625 1.99605345685654 10 -0.374762629171451 1.96457450145738 10 -0.851558583130147 1.80965410493204 10 -1.27484797949738 1.54102648555158 10 -1.6180339887499 1.17557050458494 10 -1.8595529717765 0.736249105369352 10 -1.98422940262896 0.250666467128604 10 -1.98422940262896 -0.250666467128614 10 -1.8595529717765 -0.736249105369362 10 -1.61803398874989 -1.17557050458495 10 -1.27484797949737 -1.54102648555158 10 -0.851558583130138 -1.80965410493204 10 -0.374762629171441 -1.96457450145738 10 0.125581039058636 -1.99605345685654 10 0.618033988749905 -1.9021130325903 10 1.071653589958 -1.68865585100402 10 1.45793725484283 -1.36909421185737 10 1.75261336008773 -0.96350734820342 10 1.93716632225727 -0.497379774329697 10 2 -4.89842541528951e-16 8.5 1.5 -1.3228756555323 8.5 1.77230340765808 -0.926790500169036 8.5 1.94224185096967 -0.477175640977116 8.5 5.56045105936617 6 6.28318530717959 6 5.80136247530398 6 6.04227389124178 6 6.28318530717959 5 0 5 0.251327412287184 5 0.502654824574367 5 0.753982236861551 5 1.00530964914873 5 1.25663706143592 5 1.5079644737231 5 1.75929188601029 5 2.01061929829747 5 2.26194671058465 5 2.51327412287184 5 2.76460153515902 5 3.0159289474462 5 3.26725635973339 5 3.51858377202057 5 3.76991118430776 5 4.02123859659494 5 4.27256600888212 5 4.52389342116931 5 4.77522083345649 5 5.02654824574367 5 5.27787565803086 5 5.52920307031804 5 5.78053048260523 5 6.03185789489241 5 0 6 0.722734247813413 6 0.240911415937807 6 0.48182283187561 6 0.722734247813416 8.5 3.5527136788005e-15 8.5 0.240911415937807 8.5 0.48182283187561 8.5 0 10 6.28318530717959 10 0.251327412287184 10 0.502654824574367 10 0.753982236861551 10 1.00530964914873 10 1.25663706143592 10 1.5079644737231 10 1.75929188601029 10 2.01061929829747 10 2.26194671058465 10 2.51327412287184 10 2.76460153515902 10 3.0159289474462 10 3.26725635973339 10 3.51858377202057 10 3.76991118430776 10 4.02123859659494 10 4.27256600888212 10 4.52389342116931 10 4.77522083345649 10 5.02654824574367 10 5.27787565803086 10 5.52920307031804 10 5.78053048260523 10 6.03185789489241 10 6.28318530717959 8.5 5.56045105936617 8.5 5.80136247530398 8.5 6.04227389124178 8.5 56 55 22 57 22 23 57 56 22 33 6 7 33 31 6 58 23 24 58 57 23 37 39 36 59 24 25 59 58 24 34 7 8 34 33 7 41 39 37 60 25 26 60 26 27 60 59 25 1 27 28 38 41 37 32 8 9 61 60 27 32 34 8 42 41 38 29 1 28 66 27 1 66 61 27 35 42 38 10 35 32 3 1 29 10 32 9 43 42 35 62 61 66 30 3 29 44 35 10 44 43 35 4 3 30 63 66 67 45 44 10 45 10 11 63 62 66 5 4 30 46 11 12 46 45 11 47 12 13 2 4 5 64 67 68 47 46 12 64 63 67 48 47 13 48 13 14 48 14 15 40 68 65 40 64 68 49 48 15 50 15 16 50 16 17 50 49 15 51 50 17 52 17 18 52 51 17 53 18 19 53 52 18 54 19 20 54 53 19 55 20 21 55 21 22 55 54 20
8 7 1 3.79763494956498e-15
1.5 -1.3228756555323 6 1.5 1.32287565553229 6 2 -4.89842541528951e-16 6 1.94224185096967 0.477175640977123 6 1.77230340765808 0.926790500169037 6 1.77230340765808 -0.926790500169036 6 1.94224185096967 -0.477175640977116 6 1.75 -5.32907051820075e-15 6 0 2.6771243444677 0 5.32287565553229 0.5 4.00000000000001 0.442241850969666 4.47717564097712 0.272303407658075 4.92679050016904 0.272303407658076 3.07320949983096 0.442241850969667 3.52282435902288 0.25 3.99999999999999 8 2 1 8 3 4 8 4 5 8 5 2 8 1 6 8 6 7 8 7 3
4 2 1 1.66533453693773e-15
1.5 -1.3228756555323 6 1.5 -1.3228756555323 8.5 1.5 1.32287565553229 8.5 1.5 1.32287565553229 6 0 -2.6771243444677 2.5 -2.6771243444677 2.5 -5.32287565553229 0 -5.32287565553229 1 4 3 2 1 3
8 7 1 3.79763494956498e-15
1.5 -1.3228756555323 8.5 1.5 1.32287565553229 8.5 2 -4.89842541528951e-16 8.5 1.94224185096967 0.477175640977123 8.5 1.77230340765808 0.926790500169037 8.5 1.77230340765808 -0.926790500169036 8.5 1.94224185096967 -0.477175640977116 8.5 1.75 -5.32907051820075e-15 8.5 0 2.6771243444677 0 5.32287565553229 0.5 4.00000000000001 0.442241850969666 4.47717564097712 0.272303407658075 4.92679050016904 0.272303407658076 3.07320949983096 0.442241850969667 3.52282435902288 0.25 3.99999999999999 8 2 1 8 3 4 8 4 5 8 5 2 8 1 6 8 6 7 8 7 3
52 50 1 0.0157705973710445
2 -4.89842541528951e-16 10 2 -4.89842541528951e-16 15 2 -4.89842541528951e-16 10 1.93716632225726 0.49737977432971 10 1.75261336008773 0.963507348203431 10 1.45793725484282 1.36909421185738 10 1.07165358995799 1.68865585100403 10 0.618033988749894 1.90211303259031 10 0.125581039058625 1.99605345685654 10 -0.374762629171451 1.96457450145738 10 -0.851558583130147 1.80965410493204 10 -1.27484797949738 1.54102648555158 10 -1.6180339887499 1.17557050458494 10 -1.8595529717765 0.736249105369352 10 -1.98422940262896 0.250666467128604 10 -1.98422940262896 -0.250666467128614 10 -1.8595529717765 -0.736249105369362 10 -1.61803398874989 -1.17557050458495 10 -1.27484797949737 -1.54102648555158 10 -0.851558583130138 -1.80965410493204 10 -0.374762629171441 -1.96457450145738 10 0.125581039058636 -1.99605345685654 10 0.618033988749905 -1.9021130325903 10 1.071653589958 -1.68865585100402 10 1.45793725484283 -1.36909421185737 10 1.75261336008773 -0.96350734820342 10 1.93716632225727 -0.497379774329697 10 2 -4.89842541528951e-16 15 1.93716632225726 0.49737977432971 15 1.75261336008773 0.963507348203431 15 1.45793725484282 1.36909421185738 15 1.07165358995799 1.68865585100403 15 0.618033988749894 1.90211303259031 15 0.125581039058625 1.99605345685654 15 -0.374762629171451 1.96457450145738 15 -0.851558583130147 1.80965410493204 15 -1.27484797949738 1.54102648555158 15 -1.6180339887499 1.17557050458494 15 -1.8595529717765 0.736249105369352 15 -1.98422940262896 0.250666467128604 15 -1.98422940262896 -0.250666467128614 15 -1.8595529717765 -0.736249105369362 15 -1.61803398874989 -1.17557050458495 15 -1.27484797949737 -1.54102648555158 15 -0.851558583130138 -1.80965410493204 15 -0.374762629171441 -1.96457450145738 15 0.125581039058636 -1.99605345685654 15 0.618033988749905 -1.9021130325903 15 1.071653589958 -1.68865585100402 15 1.45793725484283 -1.36909421185737 15 1.75261336008773 -0.96350734820342 15 1.93716632225727 -0.497379774329697 15 6.28318530717959 5 6.28318530717959 10 0 5 0.251327412287184 5 0.502654824574367 5 0.753982236861551 5 1.00530964914873 5 1.25663706143592 5 1.5079644737231 5 1.75929188601029 5 2.01061929829747 5 2.26194671058465 5 2.51327412287184 5 2.76460153515902 5 3.0159289474462 5 3.26725635973339 5 3.51858377202057 5 3.76991118430776 5 4.02123859659494 5 4.27256600888212 5 4.52389342116931 5 4.77522083345649 5 5.02654824574367 5 5.27787565803086 5 5.52920307031804 5 5.78053048260523 5 6.03185789489241 5 0 10 0.251327412287184 10 0.502654824574367 10 0.753982236861551 10 1.00530964914873 10 1.25663706143592 10 1.5079644737231 10 1.75929188601029 10 2.01061929829747 10 2.26194671058465 10 2.51327412287184 10 2.76460153515902 10 3.0159289474462 10 3.26725635973339 10 3.51858377202057 10 3.76991118430776 10 4.02123859659494 10 4.27256600888212 10 4.52389342116931 10 4.77522083345649 10 5.02654824574367 10 5.27787565803086 10 5.52920307031804 10 5.78053048260523 10 6.03185789489241 10 48 22 23 48 23 24 48 47 22 28 3 4 49 48 24 29 4 5 29 28 4 50 24 25 50 49 24 30 29 5 51 25 26 51 26 27 51 50 25 31 5 6 31 6 7 52 27 1 31 30 5 52 51 27 2 52 1 32 31 7 33 7 8 33 32 7 34 8 9 34 33 8 35 9 10 35 34 9 36 10 11 36 11 12 36 35 10 37 36 12 38 12 13 38 13 14 38 37 12 39 38 14 40 14 15 40 39 14 41 40 15 41 15 16 42 41 16 42 16 17 43 42 17 43 17 18 43 18 19 44 43 19 45 19 20 45 44 19 46 20 21 46 45 20 47 21 22 47 46 21
26 25 1 2.22044604925031e-16
2 -4.89842541528951e-16 10 1.93716632225726 0.49737977432971 10 1.75261336008773 0.963507348203431 10 1.45793725484282 1.36909421185738 10 1.07165358995799 1.68865585100403 10 0.618033988749894 1.90211303259031 10 0.125581039058625 1.99605345685654 10 -0.374762629171451 1.96457450145738 10 -0.851558583130147 1.80965410493204 10 -1.27484797949738 1.54102648555158 10 -1.6180339887499 1.17557050458494 10 -1.8595529717765 0.736249105369352 10 -1.98422940262896 0.250666467128604 10 -1.98422940262896 -0.250666467128614 10 -1.8595529717765 -0.736249105369362 10 -1.61803398874989 -1.17557050458495 10 -1.27484797949737 -1.54102648555158 10 -0.851558583130138 -1.80965410493204 10 -0.374762629171441 -1.96457450145738 10 0.125581039058636 -1.99605345685654 10 0.618033988749905 -1.9021130325903 10 1.071653589958 -1.68865585100402 10 1.45793725484283 -1.36909421185737 10 1.75261336008773 -0.96350734820342 10 1.93716632225727 -0.497379774329697 10 0.0078852986855219 3.33066907387547e-16 10 2 0 1.93716632225726 0.49737977432971 1.75261336008773 0.963507348203431 1.45793725484282 1.36909421185738 1.07165358995799 1.68865585100403 0.618033988749894 1.90211303259031 0.125581039058625 1.99605345685654 -0.374762629171451 1.96457450145738 -0.851558583130147 1.80965410493204 -1.27484797949738 1.54102648555158 -1.6180339887499 1.17557050458494 -1.8595529717765 0.736249105369352 -1.98422940262896 0.250666467128604 -1.98422940262896 -0.250666467128614 -1.8595529717765 -0.736249105369362 -1.61803398874989 -1.17557050458495 -1.27484797949737 -1.54102648555158 -0.851558583130138 -1.80965410493204 -0.374762629171441 -1.96457450145738 0.125581039058636 -1.99605345685654 0.618033988749904 -1.9021130325903 1.071653589958 -1.68865585100402 1.45793725484283 -1.36909421185737 1.75261336008773 -0.96350734820342 1.93716632225727 -0.497379774329697 0.00788529868552179 2.22044604925031e-16 26 1 2 26 2 3 26 3 4 26 4 5 26 5 6 26 6 7 26 7 8 26 8 9 26 9 10 26 10 11 26 11 12 26 12 13 26 13 14 26 14 15 26 15 16 26 16 17 26 17 18 26 18 19 26 19 20 26 20 21 26 21 22 26 22 23 26 23 24 26 24 25 26 25 1
TShapes 46
Ve
1e-07
2 -4.89842541528951e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 1 0 0 6.28318530717959
2 1 1 0 0 6.28318530717959
2 2 2 0 0 6.28318530717959
6 1 2 5
6 2 1 0
0
0101100
+46 6 -46 6 *
Wi
0101000
-45 0 *
Fa
0 1e-07 1 0
2 1
0101000
-44 0 *
Ve
1e-07
2 -4.89842541528951e-16 5
0 0
0101101
*
Ed
1e-07 1 1 0
1 2 0 0 6.28318530717959
2 3 2 8 0 6.28318530717959
2 4 3 8 0 6.28318530717959
6 3 2 9
6 4 3 10
0
0101100
+42 11 -42 11 *
Ed
1e-07 1 1 0
1 3 0 0 5
3 5 6CN 2 0 0 5
7 5 6 2 5
0
0101000
+46 6 -42 6 *
Wi
0101000
-41 7 +40 2 +45 2 -40 2 *
Fa
0 1e-07 2 2
2 2
0101000
+39 0 *
Ve
2.00001e-07
1.5 -1.3228756555323 6
0 0
0101101
*
Ve
2.00001e-07
2 -4.89842541528951e-16 6
0 0
0101101
*
Ed
1e-07 1 1 0
1 4 0 0.848062078981481 1.5707963267949
2 7 3 4 0.848062078981481 1.5707963267949
2 8 4 12 0.848062078981481 1.5707963267949
6 7 3 0
6 8 4 0
0
0101000
+37 13 -36 13 *
Ed
1e-07 1 1 0
1 5 0 5 6
3 9 10CN 3 0 5 6
7 9 10 3 14
0
0101000
+42 6 -36 6 *
Ve
2.00001e-07
1.5 1.32287565553229 6
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 1.5707963267949 2.29353057460831
2 11 3 4 1.5707963267949 2.29353057460831
2 12 4 12 1.5707963267949 2.29353057460831
6 11 3 0
6 12 4 0
0
0101000
+36 13 -33 13 *
Ve
2.00001e-07
1.5 1.32287565553229 8.5
0 0
0101101
*
Ed
1e-07 1 1 0
1 7 0 6 8.5
2 13 3 4 6 8.5
2 14 5 12 6 8.5
6 13 3 0
6 14 5 0
0
0101000
+33 13 -31 13 *
Ve
2.00001e-07
2 -4.89842541528951e-16 8.5
0 0
0101101
*
Ed
1e-07 1 1 0
1 8 0 1.5707963267949 2.29353057460831
2 15 3 4 1.5707963267949 2.29353057460831
2 16 6 12 1.5707963267949 2.29353057460831
6 15 3 0
6 16 6 0
0
0101000
+29 13 -31 13 *
Ve
1e-07
2 -4.89842541528951e-16 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 9 0 8.5 10
3 17 18CN 3 0 8.5 10
7 17 18 3 14
0
0101000
+29 6 -27 6 *
Ed
1e-07 1 1 0
1 10 0 0 6.28318530717959
2 19 3 0 0 6.28318530717959
2 20 7 16 0 6.28318530717959
6 19 3 14
6 20 7 5
0
0101100
+27 6 -27 6 *
Ve
2.00001e-07
1.5 -1.3228756555323 8.5
0 0
0101101
*
Ed
1e-07 1 1 0
1 11 0 0.848062078981481 1.5707963267949
2 21 3 4 0.848062078981481 1.5707963267949
2 22 6 12 0.848062078981481 1.5707963267949
6 21 3 0
6 22 6 0
0
0101000
+24 13 -29 13 *
Ed
1e-07 1 1 0
1 12 0 6 8.5
2 23 3 4 6 8.5
2 24 5 12 6 8.5
6 23 3 0
6 24 5 0
0
0101000
+37 13 -24 13 *
Wi
0101000
-35 0 +34 4 +41 15 -34 4 -32 0 -30 0 +28 0 -26 4 -25 4 +26 4
+23 0 +22 0 *
Fa
0 1e-07 3 4
2 3
0101000
+21 0 *
Ed
1e-07 1 1 0
1 13 0 2.6771243444677 5.32287565553229
2 25 4 0 2.6771243444677 5.32287565553229
2 26 5 0 2.6771243444677 5.32287565553229
6 25 4 17
6 26 5 17
0
0101000
+37 18 -33 18 *
Wi
0101000
-19 12 +32 0 +35 0 *
Fa
0 1e-07 4 12
2 4
0101000
+18 0 *
Ed
1e-07 1 1 0
1 14 0 2.6771243444677 5.32287565553229
2 27 5 0 2.6771243444677 5.32287565553229
2 28 6 0 2.6771243444677 5.32287565553229
6 27 5 17
6 28 6 17
0
0101000
+24 18 -31 18 *
Wi
0101000
-22 0 -16 12 +30 0 +19 12 *
Fa
0 1e-07 5 12
2 5
0101000
+15 0 *
Wi
0101000
-16 12 +28 0 +23 0 *
Fa
0 1e-07 6 12
2 6
0101000
+13 0 *
Ve
1e-07
2 -4.89842541528951e-16 15
0 0
0101101
*
Ed
1e-07 1 1 0
1 15 0 5 10
3 29 30CN 7 0 5 10
7 29 30 7 9
0
0101000
+27 11 -11 11 *
Ed
1e-07 1 1 0
1 16 0 0 6.28318530717959
2 31 7 0 0 6.28318530717959
2 32 8 0 0 6.28318530717959
6 31 7 9
6 32 8 0
0
0101100
+11 11 -11 11 *
Wi
0101000
+10 7 +25 2 -10 7 -9 7 *
Fa
0 1e-07 7 7
2 7
0101000
+8 0 *
Wi
0101000
+9 0 *
Fa
0 1e-07 8 0
2 8
0101000
+6 0 *
Sh
0101000
-43 4 +38 3 +20 0 +17 0 +14 0 -12 0 +7 3 +5 15 *
So
0100000
+4 0 *
Co
0100000
+3 0 *
Co
1100000
+2 1 *
+1 0
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,307 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 4
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 -10
0 1 0 -5
0 0 1 -2
2 2 -1 0
Curve2ds 14
8 0 10
1 4.7123889803846897 0 0 1
8 0 10
1 2 -3 1 0
1 0 10 1 0
2 0 0 1 0 -0 1 2
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 0 0 1 0
2 0 0 1 0 -0 1 2
8 0.35316954888546093 4.6468304511145391
1 0 -2.5 0 1
8 0.35316954888546093 4.6468304511145391
1 12 -2.5 0 -1
8 0 10
1 1.5707963267948966 0 0 1
8 0 10
1 2 -7 1 0
8 0.35316954888546093 4.6468304511145391
1 0 -2.5 0 1
8 0.35316954888546093 4.6468304511145391
1 2 -2.5 0 -1
Curves 7
1 0 -2 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 -2.5 10 0 1 0
1 0 2 0 0 0 1
1 0 -2.5 0 0 1 0
Polygon3D 0
PolygonOnTriangulations 18
2 1 2
p 0.0137452943347953 1 0 10
2 1 2
p 0.0137452943347953 1 0 10
10 2 4 5 6 7 8 9 10 11 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638185 5.75958653158129 5.93411945678072 6.10865238198015 6.28318530717959
10 1 12 13 14 15 16 17 18 19 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638185 5.75958653158129 5.93411945678072 6.10865238198015 6.28318530717959
2 12 3
p 0.0137452943347953 1 0 10
2 1 11
p 0.0137452943347953 1 0 10
10 1 13 14 15 16 17 18 19 20 12
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638185 5.75958653158129 5.93411945678072 6.10865238198015 6.28318530717959
10 1 12 13 14 15 16 17 18 19 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638185 5.75958653158129 5.93411945678072 6.10865238198015 6.28318530717959
2 2 3
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
2 2 12
p 0.0137452943347953 1 0 10
2 4 3
p 0.0137452943347953 1 0 10
2 1 4
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
10 11 13 14 15 16 17 18 19 20 12
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398866 0.523598775598299 0.698131700797732 0.872664625997165 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
10 3 4 5 6 7 8 9 10 11 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398866 0.523598775598299 0.698131700797732 0.872664625997165 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
10 1 3 4 5 6 7 8 9 10 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398866 0.523598775598299 0.698131700797732 0.872664625997165 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
10 3 4 5 6 7 8 9 10 11 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398866 0.523598775598299 0.698131700797732 0.872664625997165 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
Surfaces 4
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 10 0 0 1 0 -0 0 0 1 0 -1 0
1 0 0 10 0 0 1 1 0 -0 -0 1 0
1 0 0 0 0 0 1 1 0 -0 -0 1 0
Triangulations 5
20 18 1 0.00761060381650905
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 10 0.34729635533386 -1.96961550602442 10 0.684040286651336 -1.87938524157182 10 0.999999999999999 -1.73205080756888 10 1.28557521937308 -1.53208888623796 10 1.53208888623795 -1.28557521937308 10 1.73205080756888 -1 10 1.87938524157182 -0.684040286651341 10 1.96961550602442 -0.347296355333864 10 2 -4.89842541528951e-16 0 0.34729635533386 -1.96961550602442 0 0.684040286651336 -1.87938524157182 0 0.999999999999999 -1.73205080756888 0 1.28557521937308 -1.53208888623796 0 1.53208888623795 -1.28557521937308 0 1.73205080756888 -1 0 1.87938524157182 -0.684040286651341 0 1.96961550602442 -0.347296355333864 0 4.71238898038469 0 4.71238898038469 10 6.28318530717959 10 4.88692190558412 10 5.06145483078356 10 5.23598775598299 10 5.41052068118242 10 5.58505360638185 10 5.75958653158129 10 5.93411945678072 10 6.10865238198015 10 6.28318530717959 0 4.88692190558412 0 5.06145483078356 0 5.23598775598299 0 5.41052068118242 0 5.58505360638185 0 5.75958653158129 0 5.93411945678072 0 6.10865238198015 0 2 1 13 4 13 14 4 2 13 5 4 14 6 14 15 6 5 14 7 15 16 7 16 17 7 6 15 8 7 17 9 17 18 9 8 17 10 18 19 10 19 20 10 9 18 11 10 20 3 20 12 3 11 20
4 2 1 2.5357526258398e-16
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 1.22460635382238e-16 2 0 2 -3 12 -3 12 -7 2 -7 2 4 3 2 1 4
20 19 1 2.44921270764475e-16
-3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 2 -4.89842541528951e-16 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651337 10 1.73205080756888 1 10 1.53208888623796 1.28557521937308 10 1.28557521937308 1.53208888623796 10 1 1.73205080756888 10 0.684040286651338 1.87938524157182 10 0.347296355333861 1.96961550602442 10 0.34729635533386 -1.96961550602442 10 0.684040286651336 -1.87938524157182 10 0.999999999999999 -1.73205080756888 10 1.28557521937308 -1.53208888623796 10 1.53208888623795 -1.28557521937308 10 1.73205080756888 -1 10 1.87938524157182 -0.684040286651341 10 1.96961550602442 -0.347296355333864 10 1 0 10 0 -2 0 2 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651337 1.73205080756888 1 1.53208888623796 1.28557521937308 1.28557521937308 1.53208888623796 1 1.73205080756888 0.684040286651338 1.87938524157182 0.347296355333861 1.96961550602442 0.34729635533386 -1.96961550602442 0.684040286651336 -1.87938524157182 0.999999999999999 -1.73205080756888 1.28557521937308 -1.53208888623796 1.53208888623795 -1.28557521937308 1.73205080756888 -1 1.87938524157182 -0.68404028665134 1.96961550602442 -0.347296355333864 1 0 20 2 1 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 2 20 1 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 3
20 18 1 0.00761060381650902
2 -4.89842541528951e-16 0 1.22460635382238e-16 2 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651337 0 1.73205080756888 1 0 1.53208888623796 1.28557521937308 0 1.28557521937308 1.53208888623796 0 1 1.73205080756888 0 0.684040286651338 1.87938524157182 0 0.347296355333861 1.96961550602442 0 2 -4.89842541528951e-16 10 1.22460635382238e-16 2 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651337 10 1.73205080756888 1 10 1.53208888623796 1.28557521937308 10 1.28557521937308 1.53208888623796 10 1 1.73205080756888 10 0.684040286651338 1.87938524157182 10 0.347296355333861 1.96961550602442 10 0 0 1.5707963267949 0 0.174532925199433 0 0.349065850398866 0 0.523598775598299 0 0.698131700797732 0 0.872664625997165 0 1.0471975511966 0 1.22173047639603 0 1.39626340159546 0 0 10 1.5707963267949 10 0.174532925199433 10 0.349065850398866 10 0.523598775598299 10 0.698131700797732 10 0.872664625997165 10 1.0471975511966 10 1.22173047639603 10 1.39626340159546 10 13 1 3 13 3 4 13 11 1 14 4 5 14 13 4 15 5 6 15 14 5 16 15 6 17 6 7 17 16 6 18 7 8 18 8 9 18 17 7 19 9 10 19 18 9 20 19 10 12 10 2 12 20 10
20 19 1 2.44921270764475e-16
-3.67381906146713e-16 -2 0 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651337 0 1.73205080756888 1 0 1.53208888623796 1.28557521937308 0 1.28557521937308 1.53208888623796 0 1 1.73205080756888 0 0.684040286651338 1.87938524157182 0 0.347296355333861 1.96961550602442 0 0.34729635533386 -1.96961550602442 0 0.684040286651336 -1.87938524157182 0 0.999999999999999 -1.73205080756888 0 1.28557521937308 -1.53208888623796 0 1.53208888623795 -1.28557521937308 0 1.73205080756888 -1 0 1.87938524157182 -0.684040286651341 0 1.96961550602442 -0.347296355333864 0 1 0 0 0 -2 0 2 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651337 1.73205080756888 1 1.53208888623796 1.28557521937308 1.28557521937308 1.53208888623796 1 1.73205080756888 0.684040286651338 1.87938524157182 0.347296355333861 1.96961550602442 0.34729635533386 -1.96961550602442 0.684040286651336 -1.87938524157182 0.999999999999999 -1.73205080756888 1.28557521937308 -1.53208888623796 1.53208888623795 -1.28557521937308 1.73205080756888 -1 1.87938524157182 -0.68404028665134 1.96961550602442 -0.347296355333864 1 0 20 2 1 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 2 20 1 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 3
TShapes 29
Ve
2.00001e-07
-3.67381906146713e-16 -2 0
0 0
0101101
*
Ve
2.00001e-07
-3.67381906146713e-16 -2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 1 0 0 10
2 1 1 2 0 10
2 2 2 3 0 10
6 1 1 0
6 2 2 0
0
0101000
+29 0 -28 0 *
Ve
1e-07
2 -4.89842541528951e-16 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 2 0 4.71238898038469 6.28318530717959
2 3 1 0 4.71238898038469 6.28318530717959
2 4 3 0 4.71238898038469 6.28318530717959
6 3 1 4
6 4 3 4
0
0101000
+28 4 -26 0 *
Ve
1e-07
2 -4.89842541528951e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 3 0 0 10
3 5 6CN 1 0 0 10
6 5 1 4
6 6 4 4
0
0101000
-26 0 +24 0 *
Ed
1e-07 1 1 0
1 4 0 4.71238898038469 6.28318530717959
2 7 1 0 4.71238898038469 6.28318530717959
2 8 4 0 4.71238898038469 6.28318530717959
6 7 1 4
6 8 5 4
0
0101000
+29 4 -24 0 *
Wi
0101000
-27 0 -25 2 +23 2 +22 2 *
Fa
0 1e-07 1 2
2 1
0101000
+21 0 *
Ve
2.00001e-07
1.22460635382238e-16 2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 5 0 0.5 4.5
2 9 3 2 0.5 4.5
2 10 2 3 0.5 4.5
6 9 2 0
6 10 3 0
0
0101000
+28 0 -19 0 *
Ve
2.00001e-07
1.22460635382238e-16 2 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 0 10
2 11 1 2 0 10
2 12 2 3 0 10
6 11 4 0
6 12 2 0
0
0101000
+17 0 -19 0 *
Ed
1e-07 1 1 0
1 7 0 0.5 4.5
2 13 4 2 0.5 4.5
2 14 2 3 0.5 4.5
6 13 2 0
6 14 5 0
0
0101000
+29 0 -17 0 *
Wi
0101000
-27 0 -18 0 +16 0 +15 0 *
Fa
0 1e-07 2 3
2 2
0101000
+14 0 *
Ed
1e-07 1 1 0
1 2 0 0 1.5707963267949
2 3 1 0 0 1.5707963267949
2 4 3 0 0 1.5707963267949
6 15 4 4
6 16 3 4
0
0101000
+26 0 -19 4 *
Wi
0101000
-18 0 +12 2 +25 2 *
Fa
0 1e-07 3 2
2 3
0101000
+11 0 *
Ed
1e-07 1 1 0
1 4 0 0 1.5707963267949
2 7 1 0 0 1.5707963267949
2 8 4 0 0 1.5707963267949
6 17 4 4
6 18 5 4
0
0101000
+24 0 -17 4 *
Wi
0101000
+9 2 -23 2 -12 2 +16 0 *
Fa
0 1e-07 1 2
2 4
0101000
+8 0 *
Wi
0101000
-15 0 +9 2 +22 2 *
Fa
0 1e-07 4 2
2 5
0101000
+6 0 *
Sh
0101000
+20 0 -13 0 +10 0 +7 0 -5 0 *
So
0100000
+4 0 *
Co
0100000
+3 0 *
Co
1100000
+2 1 *
+1 0
File diff suppressed because one or more lines are too long
@@ -0,0 +1,762 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 10
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 -10
0 1 0 -5
0 0 1 -2
1
1 0 0 0
0 1 0 0
0 0 1 0
2 2 -1 0
2 4 1 2 1 0
1
1 0 0 1
0 1 0 -1
0 0 1 3
2 2 -1 4 -1 0
2 4 -1 0
2 7 -1 0
Curve2ds 42
8 0 10
1 4.7123889803846897 0 0 1
8 0 10
1 2 -3 1 0
8 0.35316954888546093 4.6468304511145391
1 0 -2.5 0 1
8 0.35316954888546093 4.6468304511145391
1 12 -2.5 0 -1
8 0 10
1 1.5707963267948966 0 0 1
8 0 10
1 2 -7 1 0
8 0.35316954888546093 4.6468304511145391
1 0 -2.5 0 1
8 0.35316954888546093 4.6468304511145391
1 2 -2.5 0 -1
1 4.7123889803846897 3 1 0
2 -1 1 0 -1 1 0 2
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 0 0 1 0
2 0 0 1 0 -0 1 2
1 0 10 1 0
2 0 0 1 0 -0 1 2
1 4.7123889803846897 6 1 0
2 -1 1 0 -1 1 0 2
8 2.7000000000000002 6.2999999999999998
1 5.7595865315812871 0 0 1
8 2.7000000000000002 6.2999999999999998
1 -3 0.73205080756887719 1 0
8 2.7000000000000002 6.2999999999999998
1 0.52359877559829893 0 0 1
8 2.7000000000000002 6.2999999999999998
1 -3 0.73205080756887719 1 0
1 -1.5707963267948966 6 1 0
2 -1 1 0 -1 1 0 2
1 -1.5707963267948966 3 1 0
2 -1 1 0 -1 1 0 2
1 0 0 0 1
1 0 0 1 0
1 0 0 0 -1
1 0 0 0 1
1 0 0 0 1
1 0 2 1 0
1 3 0 0 1
1 0 0 1 0
1 3 0 0 -1
1 0 0 0 1
1 3 0 0 1
1 0 2 1 0
1 0 0 1 0
1 0 0 1 0
1 0 -2 1 0
1 0 0 1 0
Curves 21
1 0 -2 0 0 0 1
1 0 -2.5 10 0 1 0
1 0 2 0 0 0 1
1 0 -2.5 0 0 1 0
2 0 0 3 0 0 1 0 -1 0 1 0 -0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
2 0 0 6 0 0 1 0 -1 0 1 0 -0 2
1 1.7320508075688772 -1 0 0 0 1
1 1.7320508075688772 1 0 0 0 1
2 0 0 6 0 0 1 0 -1 0 1 0 -0 2
2 0 0 3 0 0 1 0 -1 0 1 0 -0 2
1 0 0 0 1 0 -0
1 0 0 0 -0 1 0
1 0 2 0 1 0 -0
1 0 0 3 1 0 -0
1 0 0 3 -0 1 0
1 0 2 3 1 0 -0
1 0 0 0 0 0 1
1 0 2 0 0 0 1
Polygon3D 0
PolygonOnTriangulations 58
2 1 2
p 0.0137452943347953 1 0 10
2 1 2
p 0.0137452943347953 1 0 10
2 6 15
p 0.0137452943347953 1 0 10
2 2 3
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
2 2 12
p 0.0137452943347953 1 0 10
2 4 3
p 0.0137452943347953 1 0 10
2 16 7
p 0.0137452943347953 1 0 10
2 1 4
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
4 1 3 4 2
p 0.0137452943347953 1 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
4 2 8 9 5
p 0.0137452943347953 1 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
2 5 2
p 0.0137452943347953 1 0 3
2 17 26
p 0.0137452943347953 1 0 3
10 1 13 14 15 16 17 18 19 20 12
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638185 5.75958653158129 5.93411945678072 6.10865238198015 6.28318530717959
10 1 12 13 14 15 16 17 18 19 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638185 5.75958653158129 5.93411945678072 6.10865238198015 6.28318530717959
10 6 7 8 9 10 11 12 13 14 5
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638185 5.75958653158129 5.93411945678072 6.10865238198015 6.28318530717959
10 2 4 5 6 7 8 9 10 11 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638185 5.75958653158129 5.93411945678072 6.10865238198015 6.28318530717959
10 1 12 13 14 15 16 17 18 19 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638185 5.75958653158129 5.93411945678072 6.10865238198015 6.28318530717959
10 15 17 18 19 20 21 22 23 24 16
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638185 5.75958653158129 5.93411945678072 6.10865238198015 6.28318530717959
2 25 16
p 0.0137452943347953 1 6 10
2 3 6
p 0.0137452943347953 1 6 10
4 26 27 28 25
p 0.0137452943347953 1 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
4 2 8 9 5
p 0.0137452943347953 1 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
2 1 26
p 0.0137452943347953 1 3 6
2 1 2
p 0.0137452943347953 1 3 6
10 11 13 14 15 16 17 18 19 20 12
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398866 0.523598775598299 0.698131700797732 0.872664625997165 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
10 3 4 5 6 7 8 9 10 11 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398866 0.523598775598299 0.698131700797732 0.872664625997165 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
10 6 8 9 10 11 12 13 14 15 7
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398866 0.523598775598299 0.698131700797732 0.872664625997165 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
2 1 2
p 0.0137452943347953 1 3 6
2 1 2
p 0.0137452943347953 1 3 6
4 3 4 5 2
p 0.0137452943347953 1 1.5707963267949 1.74532925199433 1.91986217719376 2.0943951023932
4 5 6 7 4
p 0.0137452943347953 1 1.5707963267949 1.74532925199433 1.91986217719376 2.0943951023932
10 1 3 4 5 6 7 8 9 10 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398866 0.523598775598299 0.698131700797732 0.872664625997165 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
10 3 4 5 6 7 8 9 10 11 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398866 0.523598775598299 0.698131700797732 0.872664625997165 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
10 17 18 19 20 21 22 23 24 25 16
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398866 0.523598775598299 0.698131700797732 0.872664625997165 1.0471975511966 1.22173047639603 1.39626340159546 1.5707963267949
4 26 27 28 1
p 0.0137452943347953 1 1.5707963267949 1.74532925199433 1.91986217719376 2.0943951023932
4 5 6 7 4
p 0.0137452943347953 1 1.5707963267949 1.74532925199433 1.91986217719376 2.0943951023932
2 1 2
p 0.0137452943347953 1 0 0.732050807568877
2 4 1
p 0.0137452943347953 1 0 0.732050807568877
2 1 4
p 0.00833333333333333 1 0 2
2 1 2
p 0.00833333333333333 1 0 2
2 1 3
p 0.0137452943347953 1 0 2
2 3 4
p 0.0137452943347953 1 0 0.732050807568877
2 4 1
p 0.0137452943347953 1 0 0.732050807568877
2 1 2
p 0.0137452943347953 1 0 0.732050807568877
2 3 2
p 0.0137452943347953 1 0 0.732050807568877
2 2 3
p 0.00833333333333333 1 0 2
2 1 2
p 0.00833333333333333 1 0 2
2 1 3
p 0.0137452943347953 1 0 2
2 3 4
p 0.0137452943347953 1 0 0.732050807568877
2 3 2
p 0.0137452943347953 1 0 0.732050807568877
2 1 2
p 0.00833333333333333 1 0 3
2 1 4
p 0.00833333333333333 1 0 3
2 4 3
p 0.0137452943347953 1 0 3
2 4 3
p 0.00833333333333333 1 0 3
2 1 4
p 0.00833333333333333 1 0 3
2 4 3
p 0.0137452943347953 1 0 3
Surfaces 9
1 10 0 0 1 0 -0 0 0 1 0 -1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 10 0 0 1 1 0 -0 -0 1 0
1 0 0 0 0 0 1 1 0 -0 -0 1 0
1 0 0 0 0 0 1 1 0 -0 -0 1 0
1 0 0 3 0 0 1 1 0 -0 -0 1 0
1 0 0 0 -0 1 0 0 0 1 1 0 -0
1 0 2 0 -0 1 0 0 0 1 1 0 -0
1 0 0 0 1 0 -0 0 0 1 0 -1 0
Triangulations 16
4 2 1 2.5357526258398e-16
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 1.22460635382238e-16 2 0 2 -3 12 -3 12 -7 2 -7 2 4 3 2 1 4
20 18 1 0.00761060381650905
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 10 0.34729635533386 -1.96961550602442 10 0.684040286651336 -1.87938524157182 10 0.999999999999999 -1.73205080756888 10 1.28557521937308 -1.53208888623796 10 1.53208888623795 -1.28557521937308 10 1.73205080756888 -1 10 1.87938524157182 -0.684040286651341 10 1.96961550602442 -0.347296355333864 10 2 -4.89842541528951e-16 0 0.34729635533386 -1.96961550602442 0 0.684040286651336 -1.87938524157182 0 0.999999999999999 -1.73205080756888 0 1.28557521937308 -1.53208888623796 0 1.53208888623795 -1.28557521937308 0 1.73205080756888 -1 0 1.87938524157182 -0.684040286651341 0 1.96961550602442 -0.347296355333864 0 4.71238898038469 0 4.71238898038469 10 6.28318530717959 10 4.88692190558412 10 5.06145483078356 10 5.23598775598299 10 5.41052068118242 10 5.58505360638185 10 5.75958653158129 10 5.93411945678072 10 6.10865238198015 10 6.28318530717959 0 4.88692190558412 0 5.06145483078356 0 5.23598775598299 0 5.41052068118242 0 5.58505360638185 0 5.75958653158129 0 5.93411945678072 0 6.10865238198015 0 2 1 13 4 13 14 4 2 13 5 4 14 6 14 15 6 5 14 7 15 16 7 16 17 7 6 15 8 7 17 9 17 18 9 8 17 10 18 19 10 19 20 10 9 18 11 10 20 3 20 12 3 11 20
28 26 1 0.00761060381650908
1.73205080756888 -1 3 2 -4.89842541528951e-16 3 1.87938524157182 -0.684040286651338 3 1.96961550602442 -0.347296355333861 3 2 -4.89842541528951e-16 0 -3.67381906146713e-16 -2 0 0.34729635533386 -1.96961550602442 0 0.684040286651336 -1.87938524157182 0 0.999999999999999 -1.73205080756888 0 1.28557521937308 -1.53208888623796 0 1.53208888623795 -1.28557521937308 0 1.73205080756888 -1 0 1.87938524157182 -0.684040286651341 0 1.96961550602442 -0.347296355333864 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 10 0.34729635533386 -1.96961550602442 10 0.684040286651336 -1.87938524157182 10 0.999999999999999 -1.73205080756888 10 1.28557521937308 -1.53208888623796 10 1.53208888623795 -1.28557521937308 10 1.73205080756888 -1 10 1.87938524157182 -0.684040286651341 10 1.96961550602442 -0.347296355333864 10 2 -4.89842541528951e-16 6 1.73205080756888 -1 6 1.87938524157182 -0.684040286651338 6 1.96961550602442 -0.347296355333861 6 5.75958653158129 3 6.28318530717959 3 5.93411945678072 3 6.10865238198015 3 6.28318530717959 0 4.71238898038469 0 4.88692190558412 0 5.06145483078356 0 5.23598775598299 0 5.41052068118242 0 5.58505360638185 0 5.75958653158129 0 5.93411945678072 0 6.10865238198015 0 4.71238898038469 10 6.28318530717959 10 4.88692190558412 10 5.06145483078356 10 5.23598775598299 10 5.41052068118242 10 5.58505360638185 10 5.75958653158129 10 5.93411945678072 10 6.10865238198015 10 6.28318530717959 6 5.75958653158129 6 5.93411945678072 6 6.10865238198015 6 15 6 7 17 7 8 17 15 7 18 17 8 19 8 9 19 18 8 20 9 10 20 10 11 20 19 9 21 20 11 1 11 12 26 11 1 26 21 11 13 1 12 22 21 26 3 1 13 14 3 13 23 26 27 23 22 26 4 3 14 5 4 14 24 27 28 24 23 27 2 4 5 16 28 25 16 24 28
20 19 1 2.44921270764475e-16
-3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 2 -4.89842541528951e-16 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651337 10 1.73205080756888 1 10 1.53208888623796 1.28557521937308 10 1.28557521937308 1.53208888623796 10 1 1.73205080756888 10 0.684040286651338 1.87938524157182 10 0.347296355333861 1.96961550602442 10 0.34729635533386 -1.96961550602442 10 0.684040286651336 -1.87938524157182 10 0.999999999999999 -1.73205080756888 10 1.28557521937308 -1.53208888623796 10 1.53208888623795 -1.28557521937308 10 1.73205080756888 -1 10 1.87938524157182 -0.684040286651341 10 1.96961550602442 -0.347296355333864 10 1 0 10 0 -2 0 2 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651337 1.73205080756888 1 1.53208888623796 1.28557521937308 1.28557521937308 1.53208888623796 1 1.73205080756888 0.684040286651338 1.87938524157182 0.347296355333861 1.96961550602442 0.34729635533386 -1.96961550602442 0.684040286651336 -1.87938524157182 0.999999999999999 -1.73205080756888 1.28557521937308 -1.53208888623796 1.53208888623795 -1.28557521937308 1.73205080756888 -1 1.87938524157182 -0.68404028665134 1.96961550602442 -0.347296355333864 1 0 20 2 1 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 2 20 1 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 3
20 18 1 0.00761060381650902
2 -4.89842541528951e-16 0 1.22460635382238e-16 2 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651337 0 1.73205080756888 1 0 1.53208888623796 1.28557521937308 0 1.28557521937308 1.53208888623796 0 1 1.73205080756888 0 0.684040286651338 1.87938524157182 0 0.347296355333861 1.96961550602442 0 2 -4.89842541528951e-16 10 1.22460635382238e-16 2 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651337 10 1.73205080756888 1 10 1.53208888623796 1.28557521937308 10 1.28557521937308 1.53208888623796 10 1 1.73205080756888 10 0.684040286651338 1.87938524157182 10 0.347296355333861 1.96961550602442 10 0 0 1.5707963267949 0 0.174532925199433 0 0.349065850398866 0 0.523598775598299 0 0.698131700797732 0 0.872664625997165 0 1.0471975511966 0 1.22173047639603 0 1.39626340159546 0 0 10 1.5707963267949 10 0.174532925199433 10 0.349065850398866 10 0.523598775598299 10 0.698131700797732 10 0.872664625997165 10 1.0471975511966 10 1.22173047639603 10 1.39626340159546 10 13 1 3 13 3 4 13 11 1 14 4 5 14 13 4 15 5 6 15 14 5 16 15 6 17 6 7 17 16 6 18 7 8 18 8 9 18 17 7 19 9 10 19 18 9 20 19 10 12 10 2 12 20 10
28 26 1 0.00761060381650902
1.73205080756888 1 3 1.73205080756888 1 6 2 -4.89842541528951e-16 6 1.96961550602442 0.347296355333861 6 1.87938524157182 0.684040286651337 6 2 -4.89842541528951e-16 10 1.22460635382238e-16 2 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651337 10 1.73205080756888 1 10 1.53208888623796 1.28557521937308 10 1.28557521937308 1.53208888623796 10 1 1.73205080756888 10 0.684040286651338 1.87938524157182 10 0.347296355333861 1.96961550602442 10 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651337 0 1.73205080756888 1 0 1.53208888623796 1.28557521937308 0 1.28557521937308 1.53208888623796 0 1 1.73205080756888 0 0.684040286651338 1.87938524157182 0 0.347296355333861 1.96961550602442 0 2 -4.89842541528951e-16 3 1.96961550602442 0.347296355333861 3 1.87938524157182 0.684040286651337 3 0.523598775598299 3 0.523598775598299 6 0 6 0.174532925199433 6 0.349065850398866 6 0 10 1.5707963267949 10 0.174532925199433 10 0.349065850398866 10 0.523598775598299 10 0.698131700797732 10 0.872664625997165 10 1.0471975511966 10 1.22173047639603 10 1.39626340159546 10 1.5707963267949 0 0 0 0.174532925199433 0 0.349065850398866 0 0.523598775598299 0 0.698131700797732 0 0.872664625997165 0 1.0471975511966 0 1.22173047639603 0 1.39626340159546 0 0 3 0.174532925199433 3 0.349065850398866 3 18 26 17 27 26 18 19 27 18 8 3 4 8 6 3 28 27 19 20 28 19 9 4 5 9 8 4 1 28 20 21 2 1 21 1 20 10 5 2 10 9 5 11 2 21 11 10 2 12 21 22 12 11 21 13 22 23 13 23 24 13 12 22 14 24 25 14 13 24 15 14 25 7 25 16 7 15 25
20 19 1 2.44921270764475e-16
-3.67381906146713e-16 -2 0 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651337 0 1.73205080756888 1 0 1.53208888623796 1.28557521937308 0 1.28557521937308 1.53208888623796 0 1 1.73205080756888 0 0.684040286651338 1.87938524157182 0 0.347296355333861 1.96961550602442 0 0.34729635533386 -1.96961550602442 0 0.684040286651336 -1.87938524157182 0 0.999999999999999 -1.73205080756888 0 1.28557521937308 -1.53208888623796 0 1.53208888623795 -1.28557521937308 0 1.73205080756888 -1 0 1.87938524157182 -0.684040286651341 0 1.96961550602442 -0.347296355333864 0 1 0 0 0 -2 0 2 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651337 1.73205080756888 1 1.53208888623796 1.28557521937308 1.28557521937308 1.53208888623796 1 1.73205080756888 0.684040286651338 1.87938524157182 0.347296355333861 1.96961550602442 0.34729635533386 -1.96961550602442 0.684040286651336 -1.87938524157182 0.999999999999999 -1.73205080756888 1.28557521937308 -1.53208888623796 1.53208888623795 -1.28557521937308 1.73205080756888 -1 1.87938524157182 -0.68404028665134 1.96961550602442 -0.347296355333864 1 0 20 2 1 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 2 20 1 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 3
10 9 1 2.44921270764475e-16
1 -1 3 1.73205080756888 -1 3 1 1 3 1.73205080756888 1 3 2 -4.89842541528951e-16 3 1.96961550602442 0.347296355333861 3 1.87938524157182 0.684040286651337 3 1.87938524157182 -0.684040286651338 3 1.96961550602442 -0.347296355333861 3 1.5 0 3 0 0 0.732050807568877 0 0 2 0.732050807568877 2 1 1 0.969615506024416 1.34729635533386 0.879385241571817 1.68404028665134 0.879385241571817 0.315959713348662 0.969615506024416 0.652703644666139 0.5 1 8 1 2 4 3 7 10 3 1 10 5 6 10 6 7 10 8 9 10 9 5 10 1 8 10 7 3
10 9 1 2.44921270764475e-16
1 -1 6 1.73205080756888 -1 6 1 1 6 1.73205080756888 1 6 2 -4.89842541528951e-16 6 1.96961550602442 0.347296355333861 6 1.87938524157182 0.684040286651337 6 1.87938524157182 -0.684040286651338 6 1.96961550602442 -0.347296355333861 6 1.5 0 6 0 0 0.732050807568877 0 0 2 0.732050807568877 2 1 1 0.969615506024416 1.34729635533386 0.879385241571817 1.68404028665134 0.879385241571817 0.315959713348662 0.969615506024416 0.652703644666139 0.5 1 8 1 2 4 3 7 10 3 1 10 5 6 10 6 7 10 8 9 10 9 5 10 1 8 10 7 3
4 2 1 0
1.73205080756888 -1 3 1.73205080756888 -1 6 1 -1 6 1 -1 3 0 0.732050807568877 3 0.732050807568877 3 0 0 0 2 4 3 2 1 4
4 2 1 0
1.73205080756888 1 3 1.73205080756888 1 6 1 1 6 1 1 3 0 0.732050807568877 3 0.732050807568877 3 0 0 0 2 4 3 2 1 4
4 2 1 0
0 0 0 0 0 3 0 2 3 0 2 0 0 0 3 0 3 -2 0 -2 2 4 3 2 1 4
4 2 1 1.11022302462516e-16
0 0 0 0 2 0 5 2 0 5 0 0 0 0 0 2 5 2 5 0 3 2 1 3 1 4
4 2 1 1.11022302462516e-16
0 0 3 0 2 3 5 2 3 5 0 3 0 0 0 2 5 2 5 0 3 2 1 3 1 4
4 2 1 0
0 0 0 5 0 0 5 0 3 0 0 3 0 0 0 5 3 5 3 0 3 2 1 3 1 4
4 2 1 0
0 2 0 5 2 0 5 2 3 0 2 3 0 0 0 5 3 5 3 0 3 2 1 3 1 4
TShapes 64
Ve
2.00001e-07
-3.67381906146713e-16 -2 0
0 0
0101101
*
Ve
2.00001e-07
-3.67381906146713e-16 -2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 1 0 0 10
2 1 2 4 0 10
2 2 1 3 0 10
6 1 2 0
6 2 1 0
6 3 3 5
0
0101000
+64 0 -63 0 *
Ve
2.00001e-07
1.22460635382238e-16 2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 2 0 0.5 4.5
2 3 3 4 0.5 4.5
2 4 1 3 0.5 4.5
6 4 1 0
6 5 4 0
0
0101000
+63 0 -61 0 *
Ve
2.00001e-07
1.22460635382238e-16 2 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 3 0 0 10
2 5 2 4 0 10
2 6 1 3 0 10
6 6 5 0
6 7 1 0
6 8 6 5
0
0101000
+59 0 -61 0 *
Ed
1e-07 1 1 0
1 4 0 0.5 4.5
2 7 4 4 0.5 4.5
2 8 1 3 0.5 4.5
6 9 1 0
6 10 7 0
0
0101000
+64 0 -59 0 *
Wi
0101000
-62 0 -60 0 +58 0 +57 0 *
Fa
0 1e-07 1 3
2 1
0111000
+56 0 *
Ve
2.00001e-07
1.73205080756888 -1 3
0 0
0101101
*
Ve
2.00001e-07
2 -4.89842541528951e-16 3
0 0
0101101
*
Ed
1e-07 1 1 0
1 5 0 1.0471975511966 1.5707963267949
2 9 2 6 1.0471975511966 1.5707963267949
2 10 5 7 1.0471975511966 1.5707963267949
6 11 3 0
6 12 8 0
0
0101000
+54 0 -53 0 *
Ve
1e-07
2 -4.89842541528951e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 0 3
3 11 12CN 2 0 0 3
6 13 3 8
6 14 6 8
0
0101000
+51 0 -53 8 *
Ed
1e-07 1 1 0
1 7 0 4.71238898038469 6.28318530717959
2 13 2 0 4.71238898038469 6.28318530717959
2 14 4 0 4.71238898038469 6.28318530717959
6 15 2 9
6 16 7 9
6 17 3 8
0
0101000
+64 9 -51 0 *
Ve
1e-07
2 -4.89842541528951e-16 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 8 0 4.71238898038469 6.28318530717959
2 15 2 0 4.71238898038469 6.28318530717959
2 16 3 0 4.71238898038469 6.28318530717959
6 18 2 9
6 19 4 9
6 20 3 8
0
0101000
+63 9 -48 0 *
Ve
2.00001e-07
2 -4.89842541528951e-16 6
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 6 10
3 11 12CN 2 0 6 10
6 21 3 8
6 22 6 8
0
0101000
+46 8 -48 0 *
Ve
2.00001e-07
1.73205080756888 -1 6
0 0
0101101
*
Ed
1e-07 1 1 0
1 9 0 1.0471975511966 1.5707963267949
2 17 2 6 1.0471975511966 1.5707963267949
2 18 6 7 1.0471975511966 1.5707963267949
6 23 3 0
6 24 9 0
0
0101000
+44 0 -46 0 *
Ed
1e-07 1 1 0
1 10 0 3 6
2 19 2 6 3 6
2 20 7 7 3 6
6 25 3 0
6 26 10 0
0
0101000
+54 0 -44 0 *
Wi
0101000
-52 0 +50 6 +49 6 -62 2 -47 6 +45 6 +43 0 +42 0 *
Fa
0 1e-07 2 6
2 3
0101000
+41 0 *
Ed
1e-07 1 1 0
1 8 0 0 1.5707963267949
2 15 2 0 0 1.5707963267949
2 16 3 0 0 1.5707963267949
6 27 5 9
6 28 4 9
6 29 6 8
0
0101000
+48 0 -61 9 *
Wi
0101000
-60 0 +39 4 +47 4 *
Fa
0 1e-07 3 4
2 4
0101000
+38 0 *
Ve
2.00001e-07
1.73205080756888 1 3
0 0
0101101
*
Ve
2.00001e-07
1.73205080756888 1 6
0 0
0101101
*
Ed
1e-07 1 1 0
1 11 0 3 6
2 21 2 6 3 6
2 22 8 7 3 6
6 30 6 0
6 31 11 0
0
0101000
+36 0 -35 0 *
Ed
1e-07 1 1 0
1 12 0 1.5707963267949 2.0943951023932
2 23 2 6 1.5707963267949 2.0943951023932
2 24 6 7 1.5707963267949 2.0943951023932
6 32 6 0
6 33 9 0
0
0101000
+46 0 -35 0 *
Ed
1e-07 1 1 0
1 7 0 0 1.5707963267949
2 13 2 0 0 1.5707963267949
2 14 4 0 0 1.5707963267949
6 34 5 9
6 35 7 9
6 36 6 8
0
0101000
+51 0 -59 9 *
Ed
1e-07 1 1 0
1 13 0 1.5707963267949 2.0943951023932
2 25 2 6 1.5707963267949 2.0943951023932
2 26 5 7 1.5707963267949 2.0943951023932
6 37 6 0
6 38 8 0
0
0101000
+53 0 -36 0 *
Wi
0101000
-34 0 +33 0 -45 6 -39 6 +58 2 +32 6 -50 6 -31 0 *
Fa
0 1e-07 2 6
2 6
0101000
+30 0 *
Wi
0101000
-57 0 +32 4 +49 4 *
Fa
0 1e-07 4 4
2 7
0101000
+28 0 *
Ve
1e-07
0 0 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 14 0 0 0.732050807568877
2 27 7 0 0 0.732050807568877
2 28 5 0 0 0.732050807568877
6 39 8 10
6 40 10 10
0
0101000
+26 0 -54 10 *
Ve
1e-07
0 2 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 15 0 0 2
2 29 9 0 0 2
2 30 5 0 0 2
6 41 12 0
6 42 13 0
6 43 8 10
0
0101000
-24 0 +26 0 *
Ed
1e-07 1 1 0
1 16 0 0 0.732050807568877
2 31 8 0 0 0.732050807568877
2 32 5 0 0 0.732050807568877
6 44 8 10
6 45 11 10
0
0101000
+24 0 -36 10 *
Wi
0101000
+25 7 -23 7 -22 7 +31 0 +52 0 *
Fa
0 1e-07 5 7
2 8
0101000
+21 0 *
Ve
1e-07
0 0 3
0 0
0101101
*
Ed
1e-07 1 1 0
1 17 0 0 0.732050807568877
2 33 7 0 0 0.732050807568877
2 34 6 0 0 0.732050807568877
6 46 9 10
6 47 10 10
0
0101000
+19 0 -44 10 *
Ve
1e-07
0 2 3
0 0
0101101
*
Ed
1e-07 1 1 0
1 18 0 0 2
2 35 9 0 0 2
2 36 6 0 0 2
6 48 12 0
6 49 14 0
6 50 9 10
0
0101000
-17 0 +19 0 *
Ed
1e-07 1 1 0
1 19 0 0 0.732050807568877
2 37 8 0 0 0.732050807568877
2 38 6 0 0 0.732050807568877
6 51 9 10
6 52 11 10
0
0101000
+17 0 -35 10 *
Wi
0101000
+18 7 -16 7 -15 7 +33 0 +43 0 *
Fa
0 1e-07 6 7
2 9
0101000
+14 0 *
Ed
1e-07 1 1 0
1 20 0 0 3
2 39 9 0 0 3
2 40 7 0 0 3
6 53 12 0
6 54 15 0
6 55 10 10
0
0101000
-19 0 +26 0 *
Wi
0101000
-42 0 +18 7 +12 7 -25 7 *
Fa
0 1e-07 7 7
2 10
0101000
+11 0 *
Ed
1e-07 1 1 0
1 21 0 0 3
2 41 9 0 0 3
2 42 8 0 0 3
6 56 12 0
6 57 16 0
6 58 11 10
0
0101000
-17 0 +24 0 *
Wi
0101000
-34 0 +15 7 +9 7 -22 7 *
Fa
0 1e-07 8 7
2 11
0101000
+8 0 *
Wi
0101000
-12 0 -16 0 +9 0 +23 0 *
Fa
0 1e-07 9 0
2 12
0111000
+6 0 *
Sh
0101000
-55 2 +40 0 +37 2 +29 0 -27 2 +20 0 -13 0 +10 0 -7 0 +5 7
*
So
0100000
+4 0 *
Co
0100000
+3 0 *
Co
1100000
+2 1 *
+1 0
@@ -0,0 +1,610 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 10
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 -10
0 1 0 -5
0 0 1 -2
1
1 0 0 0
0 1 0 0
0 0 1 0
2 2 -1 0
2 4 1 2 1 0
2 4 -1 0
2 2 -1 4 -1 0
1
2.22044604925031e-16 0 1 1
0 1 0 1
-1 0 2.22044604925031e-16 5
2 9 -1 0
Curve2ds 36
8 0 10
1 4.7123889803846897 0 0 1
8 0 10
1 2 -3 1 0
8 0 10
1 -1.5707963267948966 0 0 1
8 0.35316954888546093 4.6468304511145391
1 12 -2.5 0 -1
8 0.35316954888546093 4.6468304511145391
1 0 -2.5 0 1
8 0 10
1 2 -7 1 0
8 0 10
1 1.5707963267948966 0 0 1
8 0 10
1 1.5707963267948966 0 0 1
8 0.35316954888546093 4.6468304511145391
1 2 -2.5 0 -1
8 0.35316954888546093 4.6468304511145391
1 0 -2.5 0 1
1 0 0 1 0
2 0 0 1 0 -0 1 2
8 4.7123889803846897 6.2831853071795898
1 -6.2831853071795862 0 1 0
1 0 10 1 0
2 0 0 1 0 -0 1 2
8 4.7123889803846897 6.2831853071795898
1 -6.2831853071795862 10 1 0
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
2 0 0 1 0 -0 1 2
1 0 10 1 0
8 0 1.5707963267949001
1 0 10 1 0
1 0 0 1 0
2 0 0 1 0 -0 1 2
8 0 1.5707963267949001
1 0 0 1 0
7 0 0 8 30 5 1.0471975511965981 5.6812500386332125 1.0167504152567413 5.713967614092649 0.98571047930641464 5.7459433662006871 0.95397918566863471 5.7770785702083929 0.92145792378483915 5.8072324603586702 0.88803929798864745 5.8362069304973243 0.85360441720976787 5.8637430350269275 0.81800885546054114 5.8894972600295334 0.74675376679387051 5.9347307645937502 0.71140526388304559 5.954454263810808 0.67470967191151243 5.9718370828267924 0.63648872031703707 5.9863216760149403 0.59667509462624102 5.9970683678451735 0.5553294261066164 6.0030262102059195 0.51266263741370177 6.0028640912379849 0.42613170001726824 5.9880327410163305 0.38221116284603335 5.9734793542174245 0.33900642586288882 5.9507597721429972 0.29766486673009207 5.9198682367928832 0.25900034002704592 5.8816711186035793 0.22357195800743698 5.8375409335243349 0.19169536384315305 5.7891483854772154 0.11943743995320998 5.6588772166296213 0.083661437805504141 5.5722704909271661 0.05486830206244446 5.481030805174365 0.032574299948937728 5.3868785772336896 0.01620972215746995 5.291144470386218 0.0054431673477414316 5.1945964490647007 -8.5783476433411108e-16 5.0975928037287401 0 4.9999999999999822
0 9 0.23356403088958771 7 0.45017880299011015 7 0.66488945475593475 7 1 9
7 0 0 8 30 5 2.3202651922123754 0 2.3649582334916275 0.052735985369722189 2.4107619431636262 0.10543938842414724 2.457864557901047 0.15813352765455746 2.5064645703525539 0.21081304191602179 2.556792284186455 0.26344539790143495 2.6091156933592403 0.3159717205413185 2.6637750034457297 0.36830998162996242 2.7746314697208119 0.46863976017922038 2.8302441153438664 0.51650356890832005 2.888715864049145 0.56406218428436428 2.950529383376272 0.6111591260074426 3.0160871228399579 0.65738577358832584 3.0856703195664505 0.70211886518555955 3.1595052449986381 0.74455489306672618 3.3145747826703356 0.82280973280527137 3.3958642726603161 0.85874702066634634 3.479188595246157 0.88988377957613651 3.5630117694839667 0.91557165496538384 3.6461464582899499 0.93605113921283167 3.7275936624095074 0.95197800551431122 3.80645565177963 0.96414961595342175 3.9995934637789388 0.98766967693500252 4.1106638447310662 0.99494174172703764 4.2171590055108465 0.99838876400404764 4.3198959883564445 0.99965867656585927 4.4198369679869831 1.0000045255032937 4.5177905533523859 0.99999894743614304 4.6147961766559495 0.99999999999999978 4.7123889803847074 0.99999999999999978
0 9 0.23356403088958771 7 0.45017880299011015 7 0.66488945475593475 7 1 9
7 0 0 8 23 4 0 4.9999999999999831 9.3065751736350978e-16 4.8941224112066992 0.0064057756075617976 4.7878714078966862 0.019296334952456806 4.6828702547232233 0.038660124954262153 4.5812680839353703 0.064143455211081044 4.4854944479905186 0.094978086896778835 4.3980935450031176 0.12987287564899111 4.3211657385255462 0.18450888192939574 4.2244369513379745 0.20263871994409946 4.1958412388594235 0.22093962870149536 4.1701157141820353 0.23923135245905983 4.1471551468752867 0.25738034041943003 4.1267753834229071 0.2752941475358644 4.1087625829640704 0.29291235428077 4.0928980415654195 0.34034512681573348 4.0546949363196232 0.36947179487044929 4.0363242784088929 0.39753071292480441 4.0226423487765492 0.42454740104191591 4.0127688515461593 0.45057714038605912 4.0060323417426051 0.47569468105632468 4.0019096847460158 0.49999758940954042 4.0000000030658835 0.52359877559829904 4
0 9 0.43124700431813123 7 0.6385783453898124 7 1 9
7 0 0 8 23 4 4.7123889803847074 0.99999999999999978 4.8182665691779913 0.99999999999999978 4.9245179885449737 0.99999988838474807 5.0313253810958827 1.0000004678539347 5.1384138464637754 0.9995394963694606 5.2452403360728583 0.9976746168050179 5.3508864328877737 0.99301835412156503 5.4538730518268626 0.98450185722450489 5.5986757121612181 0.96636293333245626 5.6442974098821992 0.95963467295681348 5.6883033828590381 0.95208824887530186 5.7306015558165395 0.94378090273295712 5.7711786371575489 0.93479137576351967 5.810070407504444 0.92520454560386145 5.8473465341346893 0.91509926472071224 5.945430108411248 0.88614134095241182 6.0030939966816801 0.86638173306870747 6.0568380618756255 0.84555573812133678 6.1072119109622163 0.82390890538736605 6.1546619960570732 0.80163031380855465 6.1995766554855329 0.77885213651001051 6.2423068525598024 0.75565199198754651 6.2831853071795862 0.73205080756887686
0 9 0.43124700431813123 7 0.6385783453898124 7 1 9
7 0 0 8 16 3 0.52359877559829893 4 0.55887750531915947 3.9999999954171583 0.59383751978074018 4.0042672730835864 0.62791863886756483 4.0123183829036977 0.66085296264297944 4.0233906441908225 0.69252039437930946 4.0368199621524212 0.72292712253292091 4.0520605900431592 0.75219106778193801 4.0687500040304068 0.81850504441671257 4.1107793318218295 0.85467110798409784 4.1370345485950839 0.88938870342154308 4.1649031612275476 0.92284878448332486 4.1940250465857938 0.95522054070282159 4.2241231643925579 0.98664287261064221 4.2550135627198804 1.0172551453906564 4.2865747537108652 1.0471975511965976 4.3187499613667866
0 9 0.42744492275589169 7 1 9
7 0 0 8 16 3 0 0.73205080756887697 0.061104553830634956 0.69677208049392125 0.12023460728782887 0.65934839849255378 0.17669728657842487 0.62048486133601644 0.23034686544168803 0.58081346548771051 0.28120407780786749 0.54082760410478259 0.3294556393716217 0.50084229090136045 0.37541373649709531 0.46096339293692462 0.47859835297056463 0.36763829820730959 0.53411311494574143 0.31439982370430908 0.58684451738176602 0.26136426573940585 0.6372122580549604 0.20858462916595175 0.68557391753197372 0.15608426920952204 0.73220714727623992 0.10385907685122542 0.77737530832996793 0.0518617671506292 0.82132746137741552 0
0 9 0.42744492275589169 7 1 9
8 3.7119017293312759 6.2880982706687236
1 1.0471975511965972 2.220446049250316e-16 0 1
8 3.7119017293312759 6.2880982706687236
1 5 0.73205080756887675 -1 0
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 0 0 1 0
2 0 0 1 0 -0 1 1
Curves 15
1 0 -2 0 0 0 1
1 0 -2.5 10 0 1 0
1 0 2 0 0 0 1
1 0 -2.5 0 0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
7 0 0 8 30 5 0.99999999999999989 1.7320508075688781 5.6812500386332125 1.052735985369722 1.7016036698570189 5.713967614092649 1.1054393884241467 1.6687287751681366 5.7459433662006871 1.1581335276545588 1.6332450470454707 5.7770785702083929 1.2108130419160208 1.594947108535375 5.8072324603586702 1.2634453979014333 1.5535932600636997 5.8362069304973243 1.3159717205413199 1.5089054183912485 5.8637430350269275 1.3683099816299624 1.460545993589957 5.8894972600295334 1.46863976017922 1.3593378606171695 5.9347307645937502 1.5165035689083677 1.3072384760849933 5.954454263810808 1.5640621842842175 1.2512161277230911 5.9718370828267924 1.6111591260076397 1.1908304660846791 5.9863216760149403 1.6573857735881883 1.1257884163761545 5.9970683678451735 1.7021188651856014 1.0560363652899847 6.0030262102059195 1.7445548930667258 0.98187681679682048 6.0028640912379849 1.822809732805271 0.82751816765685005 5.9880327410163305 1.8587470206663657 0.74725281718949121 5.9734793542174245 1.8898837795760755 0.6664308717464501 5.9507597721429972 1.9155716549654649 0.58761922385071719 5.9198682367928832 1.9360511392127768 0.51290919575063476 5.8816711186035793 1.9519780055143268 0.4437907751223289 5.8375409335243349 1.9641496159534215 0.38118392088560638 5.7891483854772154 1.9876696769350022 0.23859487154814163 5.6588772166296213 1.9949417417270228 0.16727582764465709 5.5722704909271661 1.9983887640041127 0.10974162075150035 5.481030805174365 1.999658676565732 0.065145031381211749 5.3868785772336896 2.0000045255034165 0.032421103808960905 5.291144470386218 1.9999989474360937 0.010885950592602044 5.1945964490647007 2 -1.7156695286682224e-15 5.0975928037287401 2 0 4.9999999999999822
0 9 0.23356403088958771 7 0.45017880299011015 7 0.66488945475593475 7 1 9
7 0 0 8 23 4 2 0 4.9999999999999831 2 1.8613150347270196e-15 4.8941224112066992 1.999999888384755 0.012811372737928935 4.7878714078966862 2.0000004678539156 0.038593438168590871 4.6828702547232233 1.9995394963694815 0.077318640110322356 4.5812680839353703 1.9976746168050057 0.12828882313289569 4.4854944479905186 1.9930183541215687 0.18988799033190484 4.3980935450031176 1.984501857224505 0.25922563134005833 4.3211657385255462 1.9663629333324564 0.36698161571739174 4.2244369513379745 1.9596346729568168 0.40261883347114069 4.1958412388594235 1.9520882488752964 0.43844807710527578 4.1701157141820353 1.9437809027329582 0.47409278960757129 4.1471551468752867 1.9347913757635253 0.50927624567338214 4.1267753834229071 1.9252045456038571 0.54380989566373605 4.1087625829640704 1.9150992647207121 0.57757312880320544 4.0928980415654195 1.8861413409524115 0.66791088554114741 4.0546949363196232 1.866381733068708 0.72274997121383633 4.0363242784088929 1.8455557381213363 0.77491687627258166 4.0226423487765492 1.8239089053873665 0.82448172026807454 4.0127688515461593 1.8016303138085557 0.87158159323830919 4.0060323417426051 1.7788521365100098 0.91639105609120208 4.0019096847460158 1.7556519919875468 0.95912154538021577 4.0000000030658835 1.732050807568877 1 4
0 9 0.43124700431813123 7 0.6385783453898124 7 1 9
7 0 0 8 16 3 1.7320508075688772 1 4 1.6967720804939215 1.0611045538306345 3.9999999954171583 1.6593483984925013 1.1202346812283244 4.0042672730835864 1.6204848613361849 1.1763492367357016 4.0123183829036977 1.5808134654874761 1.2290517685657678 4.0233906441908225 1.5408276041049509 1.2782701282311641 4.0368199621524212 1.5008422909013079 1.3241620984714726 4.0520605900431592 1.4609633929369248 1.3670405445512275 4.0687500040304068 1.3676382982073099 1.4612774836047542 4.1107793318218295 1.3143998237043035 1.5103534942103352 4.1370345485950839 1.2613642657394299 1.5553188395494877 4.1649031612275476 1.2085846291659146 1.5966210155600447 4.1940250465857938 1.156084269209551 1.6346519175325664 4.2241231643925579 1.1038590768512166 1.6697213688004067 4.2550135627198804 1.0518617671506294 1.7021084000203088 4.2865747537108652 1.0000000000000002 1.7320508075688772 4.3187499613667866
0 9 0.42744492275589169 7 1 9
1 1.0000000000000011 1.7320508075688767 2.220446049250316e-16 0 0 1
1 1 -2.4492127076447545e-16 0 0 0 1
2 0 0 0 0 0 1 1 0 -0 -0 1 0 1
Polygon3D 0
PolygonOnTriangulations 44
2 1 2
p 0.0137452943347953 1 0 10
2 1 2
p 0.0137452943347953 1 0 10
2 1 21
p 0.0137452943347953 1 0 10
2 1 2
p 0.0137452943347953 1 0 10
2 2 3
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
2 2 12
p 0.0137452943347953 1 0 10
2 4 3
p 0.0137452943347953 1 0 10
2 2 20
p 0.0137452943347953 1 0 10
2 12 3
p 0.0137452943347953 1 0 10
2 1 4
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
10 1 13 14 15 16 17 18 19 20 12
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 12 13 14 15 16 17 18 19 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 4 5 6 7 8 9 10 11 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 2 4 5 6 7 8 9 10 11 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 12 13 14 15 16 17 18 19 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 2 13 14 15 16 17 18 19 20 12
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
2 3 21
p 0.0137452943347953 1 0 5
2 13 1
p 0.0137452943347953 1 0 5
2 21 12
p 0.0137452943347953 1 5 10
2 1 2
p 0.0137452943347953 1 5 10
10 11 13 14 15 16 17 18 19 20 12
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
10 3 4 5 6 7 8 9 10 11 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
10 2 4 5 6 7 8 9 10 11 3
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
10 1 3 4 5 6 7 8 9 10 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
10 3 4 5 6 7 8 9 10 11 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
10 13 14 15 16 17 18 19 20 21 12
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
13 22 23 24 25 26 27 28 29 30 31 32 33 1
p 0.0137452943347953 1 0 0.133280178814704 0.241237123654614 0.340042035392087 0.422390806492424 0.49261976237292 0.55641765705301 0.61383576226509 0.687580595121945 0.773707752940066 0.865399608469326 0.932699804234663 1
13 1 3 4 5 6 7 8 9 10 11 12 13 2
p 0.0137452943347953 1 0 0.133280178814704 0.241237123654614 0.340042035392087 0.422390806492424 0.49261976237292 0.55641765705301 0.61383576226509 0.687580595121945 0.773707752940066 0.865399608469326 0.932699804234663 1
10 1 35 36 37 38 39 40 41 42 34
p 0.0137452943347953 1 0 0.10744439664062 0.21488879328124 0.32233318992186 0.42977758656248 0.5372219832031 0.676460989377689 0.837627584338619 0.918813792169309 1
10 2 15 16 17 18 19 20 21 22 14
p 0.0137452943347953 1 0 0.10744439664062 0.21488879328124 0.32233318992186 0.42977758656248 0.5372219832031 0.676460989377689 0.837627584338619 0.918813792169309 1
6 34 44 45 46 47 43
p 0.0137452943347953 1 0 0.187022385761478 0.411449248675252 0.673356028400084 0.836678014200042 1
6 5 6 7 8 9 2
p 0.0137452943347953 1 0 0.187022385761478 0.411449248675252 0.673356028400084 0.836678014200042 1
2 43 22
p 0.0137452943347953 1 4.31874996136679 5.68125003863321
2 2 5
p 0.0137452943347953 1 4.31874996136679 5.68125003863321
2 23 14
p 0.0137452943347953 1 0 0.732050807568877
2 1 5
p 0.0137452943347953 1 0 0.732050807568877
17 1 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 23
p 0.0137452943347953 1 2.32026519221238 2.56794769939783 2.81563020658328 3.06331271376873 3.31099522095418 3.55867772813963 3.80636023532508 4.05404274251053 4.30172524969598 4.54940775688143 4.79709026406688 5.04477277125233 5.29245527843778 5.54013778562323 5.78782029280868 6.03550279999413 6.28318530717959
17 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 1
p 0.0137452943347953 1 2.32026519221238 2.56794769939783 2.81563020658328 3.06331271376873 3.31099522095418 3.55867772813963 3.80636023532508 4.05404274251053 4.30172524969598 4.54940775688143 4.79709026406688 5.04477277125233 5.29245527843778 5.54013778562323 5.78782029280868 6.03550279999413 6.28318530717959
4 1 3 4 2
p 0.0137452943347953 1 0 0.273775820459139 0.547551640918278 0.821327461377416
4 1 3 4 2
p 0.0137452943347953 1 0 0.273775820459139 0.547551640918278 0.821327461377416
Surfaces 8
1 10 0 0 1 0 -0 0 0 1 0 -1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 0 0 1 0 2
1 0 0 10 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 1
1 0 0 0 0 0 1 1 0 -0 -0 1 0
Triangulations 13
4 2 1 2.5357526258398e-16
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 1.22460635382238e-16 2 0 2 -3 12 -3 12 -7 2 -7 2 4 3 2 1 4
20 18 1 0.00761060381650911
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 2 -4.89842541528951e-16 0 0.347296355333862 -1.96961550602442 0 0.68404028665134 -1.87938524157182 0 1 -1.73205080756888 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999993 0 1.87938524157182 -0.684040286651329 0 1.96961550602442 -0.34729635533385 0 4.71238898038469 0 4.71238898038469 10 6.28318530717959 10 4.88692190558412 10 5.06145483078356 10 5.23598775598299 10 5.41052068118242 10 5.58505360638186 10 5.75958653158129 10 5.93411945678073 10 6.10865238198016 10 6.28318530717959 0 4.88692190558412 0 5.06145483078356 0 5.23598775598299 0 5.41052068118242 0 5.58505360638186 0 5.75958653158129 0 5.93411945678073 0 6.10865238198016 0 2 1 13 4 13 14 4 2 13 5 14 15 5 4 14 6 15 16 6 5 15 7 16 17 7 6 16 8 17 18 8 7 17 9 18 19 9 8 18 10 19 20 10 9 19 11 20 12 11 10 20 3 11 12
65 65 1 0.00761060381650926
-3.67381906146713e-16 -2 0 1.22460635382238e-16 2 0 0.347296355333868 -1.96961550602441 0 0.684040286651344 -1.87938524157181 0 1.00000000000001 -1.73205080756887 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999994 0 1.87938524157182 -0.68404028665133 0 1.96961550602442 -0.347296355333853 0 2 7.43849426498855e-15 0 1.96961550602441 0.347296355333868 0 1.87938524157181 0.684040286651344 0 1.73205080756887 1.00000000000001 0 1.53208888623795 1.28557521937308 0 1.28557521937307 1.53208888623796 0 0.999999999999994 1.73205080756888 0 0.684040286651331 1.87938524157182 0 0.347296355333853 1.96961550602442 0 1.22460635382238e-16 2 10 -3.67381906146713e-16 -2 10 0.34729635533386 -1.96961550602442 10 0.684040286651336 -1.87938524157182 10 0.999999999999999 -1.73205080756888 10 1.28557521937308 -1.53208888623796 10 1.53208888623795 -1.28557521937308 10 1.73205080756888 -1 10 1.87938524157182 -0.684040286651341 10 1.96961550602442 -0.347296355333864 10 2 -4.04255622032945e-15 10 1.96961550602442 0.347296355333856 10 1.87938524157182 0.684040286651333 10 1.73205080756888 0.999999999999995 10 1.53208888623796 1.28557521937307 10 1.28557521937308 1.53208888623795 10 1.00000000000001 1.73205080756887 10 0.684040286651344 1.87938524157181 10 0.347296355333868 1.96961550602441 10 1 1.73205080756888 4.31874996136679 1 1.73205080756888 5.68125003863321 1.73205080756888 1 4 1.60013337496175 1.19982214564076 4.02016781738018 1.43301426765703 1.39515952854561 4.08138748613269 1.23857550173601 1.57032822525004 4.17858310088266 1.11875734642046 1.6578244803034 4.24682873200189 2 -4.89842541528951e-16 5 1.9998753386975 0.0223303784430507 4.78985217576749 1.99803576865049 0.0886175024799289 4.58843962555086 1.99051127439151 0.194588934159727 4.40728336247146 1.97258491307184 0.330013273887316 4.25762692201371 1.94233349217937 0.476802488149819 4.14778854610411 1.88871343962192 0.657846118766615 4.06035605852875 1.81434243348109 0.841523336889793 4.01263727496541 1.77387317221046 0.92378242836598 4.00290879073139 1.24048229318484 1.56882239069873 5.82246039414449 1.43402993492017 1.39411554341372 5.91906090428251 1.60707971795827 1.19050190287921 5.98168682789949 1.74217597761149 0.982253969564564 5.99984252249271 1.84149963564802 0.780307046315801 5.9755690670722 1.90955431579187 0.594644697114414 5.91415921950494 1.95055722232724 0.441957613180972 5.8298124460455 1.98024710786393 0.28039532972893 5.69438404922498 1.99489132350184 0.142858859612764 5.51508163805171 1.99938875042075 0.0494419586150867 5.31054685244434 1.99996241608763 0.0122645266977549 5.15613672232847 -1.57079632679489 0 1.5707963267949 0 -1.39626340159546 0 -1.22173047639603 0 -1.04719755119659 0 -0.872664625997161 0 -0.698131700797728 0 -0.523598775598295 0 -0.349065850398862 0 -0.174532925199429 0 3.77475828372553e-15 0 0.174532925199437 0 0.349065850398869 0 0.523598775598303 0 0.698131700797735 0 0.872664625997169 0 1.0471975511966 0 1.22173047639603 0 1.39626340159547 0 1.5707963267949 10 -1.5707963267949 10 -1.39626340159546 10 -1.22173047639603 10 -1.0471975511966 10 -0.872664625997166 10 -0.698131700797733 10 -0.5235987755983 10 -0.349065850398867 10 -0.174532925199435 10 -1.77635683940025e-15 10 0.174532925199431 10 0.349065850398864 10 0.523598775598296 10 0.698131700797729 10 0.872664625997162 10 1.04719755119659 10 1.22173047639603 10 1.39626340159546 10 1.0471975511966 4.31874996136679 1.0471975511966 5.68125003863321 0.523598775598299 4 0.643389948933223 4.02016780092719 0.772014159311766 4.08138753685279 0.902961086644455 4.17858309453882 0.977160287467381 4.24682871745841 2.22044604925031e-16 4.99999999999998 0.0111654267213279 4.78985216985236 0.0443232765623132 4.58843962649861 0.097448636078624 4.40728336467662 0.165765326074273 4.2576259075142 0.240719270187781 4.14778857680432 0.335162971048532 4.06035603243524 0.434284764999167 4.01263727215907 0.480126314760647 4.00290878094013 0.901746238162991 5.82246040106638 0.771287716371716 5.91905973078786 0.637577920224154 5.98168683076011 0.513383246161581 5.99984250800983 0.400798273563099 5.97556872620425 0.301887107109011 5.9141589167632 0.222817971864201 5.82981244617987 0.140662046748933 5.69438564032578 0.071490311242403 5.51508164127231 0.0247234969078505 5.31054685613755 0.00613230313934365 5.15613671993895 54 53 14 32 31 60 32 60 59 41 54 14 22 1 3 22 21 1 23 3 4 42 14 15 23 22 3 42 41 14 33 32 59 24 4 5 33 59 58 24 23 4 57 33 58 25 5 6 25 24 5 43 42 15 16 43 15 26 6 7 26 25 6 34 57 56 27 7 8 34 33 57 27 26 7 44 43 16 28 8 9 28 27 8 45 16 17 29 9 10 45 44 16 29 28 9 35 56 55 46 29 10 35 34 56 46 10 11 47 46 11 39 45 17 18 39 17 36 35 55 48 47 11 49 11 12 49 48 11 37 40 39 37 39 18 37 36 40 30 29 46 30 64 63 38 18 19 30 65 64 30 46 65 38 37 18 20 19 2 50 49 12 20 38 19 55 40 36 51 50 12 13 51 12 31 30 63 31 62 61 31 63 62 52 51 13 60 31 61 53 13 14 53 52 13
21 19 1 0.00761060381650911
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 0 0.347296355333862 -1.96961550602442 0 0.68404028665134 -1.87938524157182 0 1 -1.73205080756888 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999993 0 1.87938524157182 -0.684040286651329 0 1.96961550602442 -0.34729635533385 0 2 -4.89842541528951e-16 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 2 -4.89842541528951e-16 5 4.71238898038469 0 4.71238898038469 10 6.28318530717959 0 4.88692190558412 0 5.06145483078356 0 5.23598775598299 0 5.41052068118242 0 5.58505360638186 0 5.75958653158129 0 5.93411945678073 0 6.10865238198016 0 6.28318530717959 10 4.88692190558412 10 5.06145483078356 10 5.23598775598299 10 5.41052068118242 10 5.58505360638186 10 5.75958653158129 10 5.93411945678073 10 6.10865238198016 10 6.28318530717959 5 2 1 4 13 4 5 13 2 4 14 5 6 14 13 5 15 6 7 15 14 6 16 7 8 16 15 7 17 8 9 17 16 8 18 9 10 18 17 9 19 10 11 19 18 10 20 19 11 21 11 3 21 20 11 12 20 21
20 19 1 2.44921270764476e-16
-3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 2 -4.89842541528951e-16 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651339 10 1.73205080756888 1 10 1.53208888623795 1.28557521937308 10 1.28557521937308 1.53208888623796 10 0.999999999999996 1.73205080756888 10 0.684040286651332 1.87938524157182 10 0.347296355333854 1.96961550602442 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 1 0 10 0 -2 0 2 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651339 1.73205080756888 1 1.53208888623795 1.28557521937308 1.28557521937308 1.53208888623796 0.999999999999996 1.73205080756888 0.684040286651332 1.87938524157182 0.347296355333854 1.96961550602442 0.347296355333862 -1.96961550602442 0.68404028665134 -1.87938524157182 1 -1.73205080756888 1.28557521937308 -1.53208888623795 1.53208888623796 -1.28557521937307 1.73205080756888 -0.999999999999993 1.87938524157182 -0.684040286651329 1.96961550602442 -0.34729635533385 1 0 20 2 1 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 2 20 1 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 3
20 19 1 1.66533453693773e-16
-3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 0.34729635533386 -1.96961550602442 10 0.684040286651336 -1.87938524157182 10 0.999999999999999 -1.73205080756888 10 1.28557521937308 -1.53208888623796 10 1.53208888623795 -1.28557521937308 10 1.73205080756888 -1 10 1.87938524157182 -0.684040286651341 10 1.96961550602442 -0.347296355333864 10 2 -4.04255622032945e-15 10 1.96961550602442 0.347296355333856 10 1.87938524157182 0.684040286651333 10 1.73205080756888 0.999999999999995 10 1.53208888623796 1.28557521937307 10 1.28557521937308 1.53208888623795 10 1.00000000000001 1.73205080756887 10 0.684040286651344 1.87938524157181 10 0.347296355333868 1.96961550602441 10 1 0 10 0 -2 0 2 0.34729635533386 -1.96961550602442 0.684040286651336 -1.87938524157182 0.999999999999999 -1.73205080756888 1.28557521937308 -1.53208888623796 1.53208888623795 -1.28557521937308 1.73205080756888 -1 1.87938524157182 -0.68404028665134 1.96961550602442 -0.347296355333864 2 -3.99680288865056e-15 1.96961550602442 0.347296355333856 1.87938524157182 0.684040286651333 1.73205080756888 0.999999999999996 1.53208888623796 1.28557521937307 1.28557521937308 1.53208888623795 1.00000000000001 1.73205080756887 0.684040286651344 1.87938524157181 0.347296355333868 1.96961550602441 1 0 20 2 1 20 1 3 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 2
20 18 1 0.00761060381650915
2 -4.89842541528951e-16 0 1.22460635382238e-16 2 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651339 0 1.73205080756888 1 0 1.53208888623795 1.28557521937308 0 1.28557521937308 1.53208888623796 0 0.999999999999996 1.73205080756888 0 0.684040286651332 1.87938524157182 0 0.347296355333854 1.96961550602442 0 2 -4.89842541528951e-16 10 1.22460635382238e-16 2 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651339 10 1.73205080756888 1 10 1.53208888623795 1.28557521937308 10 1.28557521937308 1.53208888623796 10 0.999999999999996 1.73205080756888 10 0.684040286651332 1.87938524157182 10 0.347296355333854 1.96961550602442 10 0 0 1.5707963267949 0 0.174532925199433 0 0.349065850398867 0 0.5235987755983 0 0.698131700797733 0 0.872664625997167 0 1.0471975511966 0 1.22173047639603 0 1.39626340159547 0 0 10 1.5707963267949 10 0.174532925199433 10 0.349065850398867 10 0.5235987755983 10 0.698131700797733 10 0.872664625997167 10 1.0471975511966 10 1.22173047639603 10 1.39626340159547 10 13 1 3 13 11 1 14 3 4 14 13 3 15 4 5 15 14 4 16 5 6 16 15 5 17 6 7 17 7 8 17 16 6 18 17 8 19 8 9 19 18 8 20 9 10 20 19 9 12 10 2 12 20 10
47 46 1 0.00761060381650921
2 -4.89842541528951e-16 5 2 -4.89842541528951e-16 10 1.22460635382238e-16 2 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651339 10 1.73205080756888 1 10 1.53208888623795 1.28557521937308 10 1.28557521937308 1.53208888623796 10 0.999999999999996 1.73205080756888 10 0.684040286651332 1.87938524157182 10 0.347296355333854 1.96961550602442 10 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651339 0 1.73205080756888 1 0 1.53208888623795 1.28557521937308 0 1.28557521937308 1.53208888623796 0 0.999999999999996 1.73205080756888 0 0.684040286651332 1.87938524157182 0 0.347296355333854 1.96961550602442 0 1 1.73205080756888 5.68125003863321 1.24048229318484 1.56882239069873 5.82246039414449 1.43402993492017 1.39411554341372 5.91906090428251 1.60707971795827 1.19050190287921 5.98168682789949 1.74217597761149 0.982253969564564 5.99984252249271 1.84149963564802 0.780307046315801 5.9755690670722 1.90955431579187 0.594644697114414 5.91415921950494 1.95055722232724 0.441957613180972 5.8298124460455 1.98024710786393 0.28039532972893 5.69438404922498 1.99489132350184 0.142858859612764 5.51508163805171 1.99938875042075 0.0494419586150867 5.31054685244434 1.99996241608763 0.0122645266977549 5.15613672232847 1.73205080756888 1 4 1.9998753386975 0.0223303784430507 4.78985217576749 1.99803576865049 0.0886175024799289 4.58843962555086 1.99051127439151 0.194588934159727 4.40728336247146 1.97258491307184 0.330013273887316 4.25762692201371 1.94233349217937 0.476802488149819 4.14778854610411 1.88871343962192 0.657846118766615 4.06035605852875 1.81434243348109 0.841523336889793 4.01263727496541 1.77387317221046 0.92378242836598 4.00290879073139 1 1.73205080756888 4.31874996136679 1.60013337496175 1.19982214564076 4.02016781738018 1.43301426765703 1.39515952854561 4.08138748613269 1.23857550173601 1.57032822525004 4.17858310088266 1.11875734642046 1.6578244803034 4.24682873200189 0 5 0 10 1.5707963267949 10 0.174532925199433 10 0.349065850398867 10 0.5235987755983 10 0.698131700797733 10 0.872664625997167 10 1.0471975511966 10 1.22173047639603 10 1.39626340159547 10 1.5707963267949 0 0 0 0.174532925199433 0 0.349065850398867 0 0.5235987755983 0 0.698131700797733 0 0.872664625997167 0 1.0471975511966 0 1.22173047639603 0 1.39626340159547 0 1.0471975511966 5.68125003863321 0.901746239232893 5.82246039414449 0.771285826789065 5.91906090428251 0.637577919987958 5.98168682789949 0.513383048601699 5.99984252249271 0.400798324922251 5.9755690670722 0.301886946578452 5.91415921950494 0.222817972070325 5.8298124460455 0.14066104068829 5.69438404922498 0.0714903081802944 5.51508163805171 0.0247235033843023 5.31054685244434 0.00613229793193554 5.15613672232847 0.523598775598299 4 0.011165418138626 4.78985217576749 0.0443232632821499 4.58843962555086 0.0974486286823575 4.40728336247146 0.165764740454833 4.25762692201371 0.240719295648803 4.14778854610411 0.335162952689773 4.06035605852875 0.434284765172602 4.01263727496541 0.480126316592792 4.00290879073139 1.0471975511966 4.31874996136679 0.643389954488479 4.02016781738018 0.772014092536229 4.08138748613269 0.902961083743141 4.17858310088266 0.977160286387809 4.24682873200189 8 7 24 8 24 23 43 47 19 35 1 13 20 43 19 20 22 43 9 8 23 36 35 13 37 13 14 10 22 20 37 36 13 10 9 22 2 32 31 11 20 21 2 33 32 11 21 12 2 1 33 11 10 20 3 11 12 38 37 14 23 22 9 39 38 14 15 39 14 4 30 29 4 31 30 4 2 31 40 39 15 28 4 29 41 15 16 41 40 15 42 41 16 5 28 27 5 4 28 34 42 16 44 16 17 44 34 16 6 27 26 6 5 27 25 6 26 45 44 17 18 45 17 7 6 25 7 25 24 46 45 18 47 46 18 47 18 19
20 19 1 2.44921270764476e-16
-3.67381906146713e-16 -2 0 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651339 0 1.73205080756888 1 0 1.53208888623795 1.28557521937308 0 1.28557521937308 1.53208888623796 0 0.999999999999996 1.73205080756888 0 0.684040286651332 1.87938524157182 0 0.347296355333854 1.96961550602442 0 0.347296355333862 -1.96961550602442 0 0.68404028665134 -1.87938524157182 0 1 -1.73205080756888 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999993 0 1.87938524157182 -0.684040286651329 0 1.96961550602442 -0.34729635533385 0 1 0 0 0 -2 0 2 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651339 1.73205080756888 1 1.53208888623795 1.28557521937308 1.28557521937308 1.53208888623796 0.999999999999996 1.73205080756888 0.684040286651332 1.87938524157182 0.347296355333854 1.96961550602442 0.347296355333862 -1.96961550602442 0.68404028665134 -1.87938524157182 1 -1.73205080756888 1.28557521937308 -1.53208888623795 1.53208888623796 -1.28557521937307 1.73205080756888 -0.999999999999993 1.87938524157182 -0.684040286651329 1.96961550602442 -0.34729635533385 1 0 20 2 1 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 2 20 1 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 3
20 19 1 1.66533453693773e-16
-3.67381906146713e-16 -2 0 1.22460635382238e-16 2 0 0.347296355333868 -1.96961550602441 0 0.684040286651344 -1.87938524157181 0 1.00000000000001 -1.73205080756887 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999994 0 1.87938524157182 -0.68404028665133 0 1.96961550602442 -0.347296355333853 0 2 7.43849426498855e-15 0 1.96961550602441 0.347296355333868 0 1.87938524157181 0.684040286651344 0 1.73205080756887 1.00000000000001 0 1.53208888623795 1.28557521937308 0 1.28557521937307 1.53208888623796 0 0.999999999999994 1.73205080756888 0 0.684040286651331 1.87938524157182 0 0.347296355333853 1.96961550602442 0 1 0 0 0 -2 0 2 0.347296355333868 -1.96961550602441 0.684040286651344 -1.87938524157181 1.00000000000001 -1.73205080756887 1.28557521937308 -1.53208888623795 1.53208888623796 -1.28557521937307 1.73205080756888 -0.999999999999994 1.87938524157182 -0.68404028665133 1.96961550602442 -0.347296355333853 2 7.54951656745106e-15 1.96961550602441 0.347296355333868 1.87938524157181 0.684040286651344 1.73205080756887 1.00000000000001 1.53208888623795 1.28557521937308 1.28557521937307 1.53208888623796 0.999999999999994 1.73205080756888 0.684040286651331 1.87938524157182 0.347296355333853 1.96961550602442 1 0 20 2 1 20 1 3 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 2
38 36 1 0.00605301377262471
1 1.73205080756888 5.68125003863321 2 -4.89842541528951e-16 5 1.24048229318484 1.56882239069873 5.82246039414449 1.43402993492017 1.39411554341372 5.91906090428251 1.60707971795827 1.19050190287921 5.98168682789949 1.74217597761149 0.982253969564564 5.99984252249271 1.84149963564802 0.780307046315801 5.9755690670722 1.90955431579187 0.594644697114414 5.91415921950494 1.95055722232724 0.441957613180972 5.8298124460455 1.98024710786393 0.28039532972893 5.69438404922498 1.99489132350184 0.142858859612764 5.51508163805171 1.99938875042075 0.0494419586150867 5.31054685244434 1.99996241608763 0.0122645266977549 5.15613672232847 1.73205080756888 1 4 1.9998753386975 0.0223303784430507 4.78985217576749 1.99803576865049 0.0886175024799289 4.58843962555086 1.99051127439151 0.194588934159727 4.40728336247146 1.97258491307184 0.330013273887316 4.25762692201371 1.94233349217937 0.476802488149819 4.14778854610411 1.88871343962192 0.657846118766615 4.06035605852875 1.81434243348109 0.841523336889793 4.01263727496541 1.77387317221046 0.92378242836598 4.00290879073139 1 1 4 1 1.54269714773929 5.83992845280752 1 1.32022070143252 5.94734296977075 1 1.07820001767526 5.99693768974575 1 0.83140650159566 5.98568566606996 1 0.594902861687974 5.91427365079138 1 0.383123777770166 5.78706017968606 1 0.208994899822458 5.6118095549214 1 0.083143948421233 5.39921796137373 1 0.0132520661864173 5.1622606394497 1 0.00358500962953112 4.9153999588356 1 0.0547327944739489 4.6737027273222 1 0.163573684843151 4.45192060856739 1 0.323464724188162 4.26358977425473 1 0.524647179156683 4.12020474216082 1 0.7548421506857 4.03051682380787 2.32026519221238 0 4.71238898038471 1 2.53651932101137 0.240482293184836 2.73648734705961 0.43402993492017 2.94991926547433 0.60707971795827 3.15933961862768 0.742175977611485 3.363092375699 0.841499635648022 3.55896011732797 0.909554315791866 3.73361747744334 0.95055722232724 3.9448254724206 0.980247107863935 4.17128611068064 0.994891323501842 4.39662065107608 0.999388750420749 4.55561083437125 0.99996241608763 6.28318530717959 0.732050807568877 4.92411512530744 0.999875338697502 5.13655448157357 0.998035768650485 5.34681664460302 0.990511274391507 5.54899440013362 0.972584913071845 5.73258663902991 0.942333492179365 5.93397714857373 0.888713439621922 6.12403768417551 0.814342433481088 6.20689374612166 0.773873172210459 6.28318530717959 0 2.56794769939783 0 2.81563020658328 0 3.06331271376873 0 3.31099522095418 0 3.55867772813963 0 3.80636023532508 0 4.05404274251053 0 4.30172524969598 0 4.54940775688143 0 4.79709026406688 0 5.04477277125233 0 5.29245527843778 0 5.54013778562323 0 5.78782029280868 0 6.03550279999413 0 3 1 24 4 24 25 4 3 24 5 25 26 5 4 25 6 26 27 6 5 26 7 27 28 7 6 27 8 7 28 9 28 29 9 8 28 10 29 30 10 9 29 11 30 31 11 10 30 12 31 32 12 11 31 13 12 32 2 32 33 2 13 32 15 33 34 15 2 33 16 34 35 16 15 34 17 35 36 17 16 35 18 17 36 19 18 36 19 36 37 20 19 37 20 37 38 21 20 38 22 21 38 22 38 23 14 22 23
9 7 1 0.00669485450761149
1 1 4 1 1.73205080756888 4.31874996136679 1 1.27036855254164 4.03724310140278 1 1.52059837824641 4.14619830840692 1.73205080756888 1 4 1.60013337496175 1.19982214564076 4.02016781738018 1.43301426765703 1.39515952854561 4.08138748613269 1.23857550173601 1.57032822525004 4.17858310088266 1.11875734642046 1.6578244803034 4.24682873200189 0 0 0.821327461377416 0 0.273775820459139 0 0.547551640918278 0 0 0.732050807568877 0.201176400922048 0.60013337496175 0.406241508243795 0.433014267657035 0.606905383591012 0.238575501736006 0.717926623979333 0.118757346420462 6 1 3 6 5 1 7 3 4 7 6 3 8 7 4 9 8 4 2 9 4
21 20 1 4.30211422042248e-16
1 1 4 1 1.73205080756888 4.31874996136679 1 1.27036855254164 4.03724310140278 1 1.52059837824641 4.14619830840692 1 1.73205080756888 5.68125003863321 1 1.54269714773929 5.83992845280752 1 1.32022070143252 5.94734296977075 1 1.07820001767526 5.99693768974575 1 0.83140650159566 5.98568566606996 1 0.594902861687974 5.91427365079138 1 0.383123777770166 5.78706017968606 1 0.208994899822458 5.6118095549214 1 0.083143948421233 5.39921796137373 1 0.0132520661864173 5.1622606394497 1 0.00358500962953112 4.9153999588356 1 0.0547327944739489 4.6737027273222 1 0.163573684843151 4.45192060856739 1 0.323464724188162 4.26358977425473 1 0.524647179156683 4.12020474216082 1 0.7548421506857 4.03051682380787 1 0.867817908599204 4.99846884487287 1 0 0.681250038633213 0.732050807568877 0.962756898597222 0.270368552541635 0.853801691593082 0.520598378246409 -0.681250038633213 0.732050807568877 -0.839928452807522 0.542697147739292 -0.947342969770749 0.320220701432523 -0.996937689745748 0.0782000176752592 -0.985685666069963 -0.16859349840434 -0.914273650791385 -0.405097138312026 -0.787060179686057 -0.616876222229834 -0.611809554921397 -0.791005100177542 -0.399217961373726 -0.916856051578767 -0.1622606394497 -0.986747933813583 0.0846000411644022 -0.996414990370469 0.3262972726778 -0.945267205526051 0.548079391432606 -0.836426315156849 0.73641022574527 -0.676535275811838 0.879795257839176 -0.475352820843317 0.969483176192133 -0.2451578493143 0.00153115512712609 -0.132182091400796 21 1 3 21 3 4 21 4 2 21 5 6 21 6 7 21 7 8 21 8 9 21 9 10 21 10 11 21 11 12 21 12 13 21 13 14 21 14 15 21 15 16 21 16 17 21 17 18 21 18 19 21 19 20 21 20 1 21 2 5
TShapes 49
Ve
2.00001e-07
-3.67381906146713e-16 -2 0
0 0
0101101
*
Ve
2.00001e-07
-3.67381906146713e-16 -2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 1 0 0 10
2 1 2 4 0 10
2 2 1 3 0 10
6 1 2 0
6 2 1 0
2 3 3 5 0 10
6 3 3 5
6 4 4 5
0
0101000
+49 5 -48 5 *
Ve
2.00001e-07
1.22460635382238e-16 2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 2 0 0.5 4.5
2 4 1 3 0.5 4.5
2 5 4 4 0.5 4.5
6 5 1 0
6 6 5 0
6 7 6 0
0
0101000
+48 5 -46 5 *
Ve
2.00001e-07
1.22460635382238e-16 2 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 3 0 0 10
2 6 1 3 0 10
2 7 5 4 0 10
6 8 7 0
6 9 1 0
2 8 3 5 0 10
6 10 3 5
6 11 8 5
0
0101000
+44 5 -46 5 *
Ed
1e-07 1 1 0
1 4 0 0.5 4.5
2 9 1 3 0.5 4.5
2 10 6 4 0.5 4.5
6 12 1 0
6 13 9 0
6 14 10 0
0
0101000
+49 5 -44 5 *
Wi
0101000
-47 0 -45 0 +43 0 +42 0 *
Fa
0 1e-07 1 3
2 1
0111000
+41 0 *
Ve
1e-07
2 -4.89842541528951e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 5 0 4.71238898038469 6.28318530717959
2 11 2 0 4.71238898038469 6.28318530717959
2 12 6 0 4.71238898038469 6.28318530717959
6 15 2 7
6 16 9 7
2 13 3 8 4.71238898038469 6.28318530717959
6 17 4 8
0
0101000
+49 8 -39 8 *
Ve
1e-07
2 -4.89842541528951e-16 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 4.71238898038469 6.28318530717959
2 14 2 0 4.71238898038469 6.28318530717959
2 15 4 0 4.71238898038469 6.28318530717959
6 18 2 7
6 19 5 7
2 16 3 8 4.71238898038469 6.28318530717959
6 20 4 8
0
0101000
+48 8 -37 8 *
Ve
2.00001e-07
2 -4.89842541528951e-16 5
0 0
0101101
*
Ed
1e-07 1 1 0
1 7 0 0 5
2 17 2 0 0 5
2 18 5 0 0 5
4 CN 2 0 5 0
6 21 4 8
6 22 8 8
0
0101000
+39 8 -35 8 *
Ed
1e-07 1 1 0
1 7 0 5 10
2 17 2 0 5 10
2 18 5 0 5 10
4 CN 2 0 5 0
6 23 4 8
6 24 8 8
0
0101000
+35 8 -37 8 *
Wi
0101000
-47 2 +38 6 -36 6 +34 6 +33 6 *
Fa
0 1e-07 2 6
2 4
0101000
+32 0 *
Ed
1e-07 1 1 0
1 8 0 0 1.5707963267949
2 19 4 0 0 1.5707963267949
2 20 5 0 0 1.5707963267949
6 25 7 7
6 26 5 7
2 21 3 8 0 1.5707963267949
6 27 8 8
0
0101000
+37 8 -46 8 *
Wi
0101000
-45 0 +30 4 +36 4 *
Fa
0 1e-07 4 4
2 5
0101000
+29 0 *
Ed
1e-07 1 1 0
1 9 0 0 1.5707963267949
2 22 5 0 0 1.5707963267949
2 23 6 0 0 1.5707963267949
6 28 7 7
6 29 9 7
2 24 3 8 0 1.5707963267949
6 30 8 8
0
0101000
+39 8 -44 8 *
Wi
0101000
-33 6 -30 6 +43 2 +27 6 -34 6 *
Ve
2.00001e-07
1 1.73205080756888 5.68125003863321
0 0
0101101
*
Ed
2.00001e-07 1 1 0
1 10 0 0 1
2 25 5 6 0 1
2 26 7 9 0 1
6 31 8 0
6 32 11 0
0
0101000
+25 0 -35 0 *
Ve
2.00001e-07
1.73205080756888 1 4
0 0
0101101
*
Ed
2.00001e-07 1 1 0
1 11 0 0 1
2 27 5 6 0 1
2 28 7 9 0 1
6 33 8 0
6 34 11 0
0
0101000
+35 0 -23 0 *
Ve
2.00001e-07
1 1.73205080756888 4.31874996136679
0 0
0101101
*
Ed
2.00001e-07 1 1 0
1 12 0 0 1
2 29 5 6 0 1
2 30 7 9 0 1
6 35 8 0
6 36 12 0
0
0101000
+23 0 -21 0 *
Ed
1e-07 1 1 0
1 13 0 4.31874996136679 5.68125003863321
2 31 5 6 4.31874996136679 5.68125003863321
2 32 8 9 4.31874996136679 5.68125003863321
6 37 8 0
6 38 13 0
0
0101000
+21 0 -25 0 *
Wi
0101000
-24 0 -22 0 -20 0 -19 0 *
Fa
0 1e-07 5 6
2 8
0101000
+26 0 +18 0 *
Wi
0101000
-42 0 +27 4 +38 4 *
Fa
0 1e-07 6 4
2 9
0101000
+16 0 *
Ve
1e-07
1 -2.44921270764475e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 14 0 0 0.732050807568877
3 33 34CN 7 0 0 0.732050807568877
6 39 11 10
6 40 12 10
0
0101000
+14 0 -23 10 *
Ed
1e-07 1 1 0
1 15 0 2.32026519221238 6.28318530717959
2 35 7 0 2.32026519221238 6.28318530717959
2 36 8 0 2.32026519221238 6.28318530717959
6 41 11 10
6 42 13 10
0
0101000
+25 10 -14 0 *
Wi
0101000
-24 0 -22 0 +13 9 +12 9 *
Fa
0 1e-07 7 9
2 11
0101000
+11 0 *
Ed
1e-07 1 1 0
1 15 0 0 0.821327461377416
2 35 7 0 0 0.821327461377416
2 36 8 0 0 0.821327461377416
6 43 12 10
6 44 13 10
0
0101000
+14 0 -21 10 *
Wi
0101000
+9 9 -13 9 -20 0 *
Fa
0 1e-07 7 9
2 12
0101000
+8 0 *
Wi
0101000
+9 9 +12 9 +19 0 *
Fa
0 1e-07 8 9
2 13
0101000
+6 0 *
Sh
0101000
-40 2 +31 0 +28 2 +17 0 -15 2 -10 0 -7 0 +5 0 *
So
0100000
+4 0 *
Co
0100000
+3 0 *
Co
1100000
+2 1 *
+1 0
@@ -0,0 +1,571 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 25
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
2 2 1 3 1 4 1 0
2 4 -1 3 -1 2 -1 0
2 1 -1 4 -1 3 -1 2 -1 0
2 2 1 3 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
2 2 1 3 1 9 1 4 -1 0
2 4 -1 0
2 1 -1 4 -1 0
1
1 0 0 0
0 1 0 0
0 0 1 10
2 13 1 2 -1 0
2 2 1 3 1 9 1 0
2 9 -1 3 -1 2 -1 0
2 1 -1 9 -1 3 -1 2 -1 0
2 13 1 3 1 4 1 0
2 13 1 3 1 0
2 13 1 3 1 9 1 4 -1 0
2 4 -1 3 -1 13 -1 0
2 1 -1 4 -1 3 -1 13 -1 0
2 13 1 3 1 9 1 0
2 9 -1 3 -1 13 -1 0
2 1 -1 9 -1 3 -1 13 -1 0
Curve2ds 34
2 0 0 1 0 -0 1 2
1 0 0 1 0
8 -0.14683045111453996 4.14683045111454
1 0 -2 0 1
1 0 -2 0 1
8 0 10
1 1.5707963267948966 0 0 1
1 1.5707963267948966 0 0 1
8 0 10
1 4.7123889803846897 0 0 1
1 4.7123889803846897 0 0 1
1 0 10 1 0
1 0 0 1 0
2 0 0 1 0 -0 1 2
1 0 0 1 0
2 0 0 1 0 -0 1 2
1 0 0 1 0
1 0 -0 0 1
1 6.2831853071795862 -0 0 1
1 0 10 1 0
1 0 0 1 0
1 0 10 1 0
1 0 0 1 0
8 0 10
1 1.5707963267948966 0 0 1
1 1.5707963267948966 0 0 1
8 0 10
1 4.7123889803846897 0 0 1
1 4.7123889803846897 0 0 1
1 0 10 1 0
2 0 0 1 0 -0 1 2
1 0 -0 0 1
1 6.2831853071795862 -0 0 1
1 0 10 1 0
2 0 0 1 0 -0 1 2
1 0 10 1 0
2 0 0 1 0 -0 1 2
8 -0.14683045111453996 4.14683045111454
1 0 -2 0 1
1 0 -2 0 1
Curves 17
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 -2 0 0 1 0
1 0 2 0 0 0 1
1 0 -2 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 0 2 10 0 0 1
1 0 -2 10 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 0 -2 20 0 1 0
Polygon3D 0
PolygonOnTriangulations 34
15 1 3 4 5 6 7 8 9 10 11 12 13 14 15 2
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
15 1 3 4 5 6 7 8 9 10 11 12 13 14 15 2
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
2 2 1
p 0.023882614668616 1 0 4
2 1 2
p 0.023882614668616 1 0 4
2 1 16
p 0.023882614668616 1 0 10
2 2 10
p 0.023882614668616 1 0 10
2 2 17
p 0.023882614668616 1 0 10
2 1 2
p 0.023882614668616 1 0 10
15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 17
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
15 1 3 4 5 6 7 8 9 10 11 12 13 14 15 2
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
8 1 4 5 6 7 8 9 3
p 0.023882614668616 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
8 1 4 5 6 7 8 9 3
p 0.023882614668616 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
8 1 3 4 5 6 7 8 2
p 0.023882614668616 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
8 3 10 11 12 13 14 15 2
p 0.023882614668616 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
2 1 9
p 0.023882614668616 1 0 10
2 3 10
p 0.023882614668616 1 0 10
8 9 11 12 13 14 15 16 10
p 0.023882614668616 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
8 1 3 4 5 6 7 8 2
p 0.023882614668616 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
8 2 11 12 13 14 15 16 10
p 0.023882614668616 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
8 1 4 5 6 7 8 9 3
p 0.023882614668616 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
2 1 16
p 0.023882614668616 1 0 10
2 2 10
p 0.023882614668616 1 0 10
2 2 17
p 0.023882614668616 1 0 10
2 1 2
p 0.023882614668616 1 0 10
15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 17
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
15 1 3 4 5 6 7 8 9 10 11 12 13 14 15 2
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
2 1 9
p 0.023882614668616 1 0 10
2 3 10
p 0.023882614668616 1 0 10
8 9 11 12 13 14 15 16 10
p 0.023882614668616 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
8 3 10 11 12 13 14 15 2
p 0.023882614668616 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
8 2 11 12 13 14 15 16 10
p 0.023882614668616 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
8 1 4 5 6 7 8 9 3
p 0.023882614668616 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
2 2 1
p 0.023882614668616 1 0 4
2 1 2
p 0.023882614668616 1 0 4
Surfaces 10
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 10 0 0 1 1 0 -0 -0 1 0
1 0 0 10 0 0 1 1 0 -0 -0 1 0
Triangulations 10
16 15 1 3.1641356201817e-15
1.22460635382238e-16 2 0 -3.67381906146713e-16 -2 0 -0.445041867912635 1.94985582436365 0 -0.867767478235122 1.80193773580484 0 -1.24697960371747 1.56366296493606 0 -1.56366296493606 1.24697960371746 0 -1.80193773580484 0.867767478235113 0 -1.94985582436365 0.445041867912626 0 -2 -1.53143556863578e-15 0 -1.94985582436365 -0.445041867912629 0 -1.80193773580484 -0.867767478235116 0 -1.56366296493606 -1.24697960371747 0 -1.24697960371747 -1.56366296493606 0 -0.867767478235118 -1.80193773580484 0 -0.445041867912631 -1.94985582436365 0 -1 0 0 -6.88338275267597e-15 2 -4.44089209850063e-16 -2 -0.445041867912635 1.94985582436365 -0.867767478235122 1.80193773580484 -1.24697960371747 1.56366296493606 -1.56366296493606 1.24697960371746 -1.80193773580484 0.867767478235113 -1.94985582436365 0.445041867912626 -2 -1.55431223447522e-15 -1.94985582436365 -0.445041867912629 -1.80193773580484 -0.867767478235116 -1.56366296493606 -1.24697960371747 -1.24697960371747 -1.56366296493606 -0.867767478235118 -1.80193773580484 -0.445041867912631 -1.94985582436365 -1 0 16 1 3 16 3 4 16 4 5 16 5 6 16 6 7 16 7 8 16 8 9 16 9 10 16 10 11 16 11 12 16 12 13 16 13 14 16 14 15 16 15 2 16 2 1
30 28 1 0.0125755802135152
1.22460635382238e-16 2 0 -3.67381906146713e-16 -2 0 -0.445041867912635 1.94985582436365 0 -0.867767478235122 1.80193773580484 0 -1.24697960371747 1.56366296493606 0 -1.56366296493606 1.24697960371746 0 -1.80193773580484 0.867767478235113 0 -1.94985582436365 0.445041867912626 0 -2 -1.53143556863578e-15 0 -1.94985582436365 -0.445041867912629 0 -1.80193773580484 -0.867767478235116 0 -1.56366296493606 -1.24697960371747 0 -1.24697960371747 -1.56366296493606 0 -0.867767478235118 -1.80193773580484 0 -0.445041867912631 -1.94985582436365 0 1.22460635382238e-16 2 10 -3.67381906146713e-16 -2 10 -0.445041867912635 1.94985582436365 10 -0.867767478235122 1.80193773580484 10 -1.24697960371747 1.56366296493606 10 -1.56366296493606 1.24697960371746 10 -1.80193773580484 0.867767478235113 10 -1.94985582436365 0.445041867912626 10 -2 -1.53143556863578e-15 10 -1.94985582436365 -0.445041867912629 10 -1.80193773580484 -0.867767478235116 10 -1.56366296493606 -1.24697960371747 10 -1.24697960371747 -1.56366296493606 10 -0.867767478235118 -1.80193773580484 10 -0.445041867912631 -1.94985582436365 10 1.5707963267949 0 4.71238898038469 0 1.79519580205131 0 2.01959527730773 0 2.24399475256414 0 2.46839422782055 0 2.69279370307697 0 2.91719317833338 0 3.14159265358979 0 3.36599212884621 0 3.59039160410262 0 3.81479107935903 0 4.03919055461545 0 4.26359002987186 0 4.48798950512827 0 1.5707963267949 10 4.71238898038469 10 1.79519580205131 10 2.01959527730773 10 2.24399475256414 10 2.46839422782055 10 2.69279370307697 10 2.91719317833338 10 3.14159265358979 10 3.36599212884621 10 3.59039160410262 10 3.81479107935903 10 4.03919055461545 10 4.26359002987186 10 4.48798950512827 10 18 1 3 18 3 4 18 16 1 19 4 5 19 18 4 20 19 5 21 5 6 21 20 5 22 6 7 22 7 8 22 21 6 23 8 9 23 22 8 24 23 9 25 9 10 25 10 11 25 24 9 26 25 11 27 11 12 27 12 13 27 26 11 28 13 14 28 27 13 29 14 15 29 28 14 30 15 2 30 29 15 17 30 2
16 15 1 3.57559034463995e-15
-3.67381906146713e-16 -2 0 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 0.44504186791263 -1.94985582436365 0 0.867767478235119 -1.80193773580484 0 1.24697960371747 -1.56366296493606 0 1.56366296493606 -1.24697960371746 0 1.80193773580484 -0.867767478235109 0 1.94985582436365 -0.445041867912619 0 1.94985582436365 0.44504186791263 0 1.80193773580484 0.867767478235118 0 1.56366296493606 1.24697960371747 0 1.24697960371746 1.56366296493606 0 0.867767478235112 1.80193773580484 0 0.445041867912623 1.94985582436365 0 1 0 0 0 -2 0 2 2 6.66133814775094e-15 0.44504186791263 -1.94985582436365 0.867767478235119 -1.80193773580484 1.24697960371747 -1.56366296493606 1.56366296493606 -1.24697960371746 1.80193773580484 -0.867767478235109 1.94985582436365 -0.445041867912619 1.94985582436365 0.44504186791263 1.80193773580484 0.867767478235118 1.56366296493606 1.24697960371747 1.24697960371746 1.56366296493606 0.867767478235112 1.80193773580484 0.445041867912623 1.94985582436365 1 0 16 2 1 16 1 4 16 4 5 16 5 6 16 6 7 16 7 8 16 8 9 16 9 3 16 3 10 16 10 11 16 11 12 16 12 13 16 13 14 16 14 15 16 15 2
16 14 1 0.012575580213515
2 -4.89842541528951e-16 0 1.22460635382238e-16 2 0 1.94985582436365 0.44504186791263 0 1.80193773580484 0.867767478235118 0 1.56366296493606 1.24697960371747 0 1.24697960371746 1.56366296493606 0 0.867767478235112 1.80193773580484 0 0.445041867912623 1.94985582436365 0 2 -4.89842541528951e-16 10 1.22460635382238e-16 2 10 1.94985582436365 0.44504186791263 10 1.80193773580484 0.867767478235118 10 1.56366296493606 1.24697960371747 10 1.24697960371746 1.56366296493606 10 0.867767478235112 1.80193773580484 10 0.445041867912623 1.94985582436365 10 0 0 1.5707963267949 0 0.224399475256414 0 0.448798950512829 0 0.673198425769243 0 0.897597901025657 0 1.12199737628207 0 1.34639685153849 0 0 10 1.5707963267949 10 0.224399475256414 10 0.448798950512829 10 0.673198425769243 10 0.897597901025657 10 1.12199737628207 10 1.34639685153849 10 11 1 3 11 9 1 12 3 4 12 11 3 13 4 5 13 12 4 14 5 6 14 6 7 14 13 5 15 14 7 16 7 8 16 15 7 10 8 2 10 16 8
16 14 1 0.012575580213515
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 0 0.44504186791263 -1.94985582436365 0 0.867767478235119 -1.80193773580484 0 1.24697960371747 -1.56366296493606 0 1.56366296493606 -1.24697960371746 0 1.80193773580484 -0.867767478235109 0 1.94985582436365 -0.445041867912619 0 2 -4.89842541528951e-16 10 0.44504186791263 -1.94985582436365 10 0.867767478235119 -1.80193773580484 10 1.24697960371747 -1.56366296493606 10 1.56366296493606 -1.24697960371746 10 1.80193773580484 -0.867767478235109 10 1.94985582436365 -0.445041867912619 10 4.71238898038469 0 4.71238898038469 10 6.28318530717959 0 4.9367884556411 0 5.16118793089752 0 5.38558740615393 0 5.60998688141035 0 5.83438635666676 0 6.05878583192318 0 6.28318530717959 10 4.9367884556411 10 5.16118793089752 10 5.38558740615393 10 5.60998688141035 10 5.83438635666676 10 6.05878583192318 10 11 2 1 11 1 4 11 4 5 12 11 5 13 5 6 13 12 5 14 6 7 14 7 8 14 13 6 15 14 8 16 8 9 16 15 8 10 9 3 10 16 9
30 28 1 0.0125755802135152
1.22460635382238e-16 2 10 -3.67381906146713e-16 -2 10 -0.445041867912635 1.94985582436365 10 -0.867767478235122 1.80193773580484 10 -1.24697960371747 1.56366296493606 10 -1.56366296493606 1.24697960371746 10 -1.80193773580484 0.867767478235113 10 -1.94985582436365 0.445041867912626 10 -2 -1.53143556863578e-15 10 -1.94985582436365 -0.445041867912629 10 -1.80193773580484 -0.867767478235116 10 -1.56366296493606 -1.24697960371747 10 -1.24697960371747 -1.56366296493606 10 -0.867767478235118 -1.80193773580484 10 -0.445041867912631 -1.94985582436365 10 1.22460635382238e-16 2 20 -3.67381906146713e-16 -2 20 -0.445041867912635 1.94985582436365 20 -0.867767478235122 1.80193773580484 20 -1.24697960371747 1.56366296493606 20 -1.56366296493606 1.24697960371746 20 -1.80193773580484 0.867767478235113 20 -1.94985582436365 0.445041867912626 20 -2 -1.53143556863578e-15 20 -1.94985582436365 -0.445041867912629 20 -1.80193773580484 -0.867767478235116 20 -1.56366296493606 -1.24697960371747 20 -1.24697960371747 -1.56366296493606 20 -0.867767478235118 -1.80193773580484 20 -0.445041867912631 -1.94985582436365 20 1.5707963267949 0 4.71238898038469 0 1.79519580205131 0 2.01959527730773 0 2.24399475256414 0 2.46839422782055 0 2.69279370307697 0 2.91719317833338 0 3.14159265358979 0 3.36599212884621 0 3.59039160410262 0 3.81479107935903 0 4.03919055461545 0 4.26359002987186 0 4.48798950512827 0 1.5707963267949 10 4.71238898038469 10 1.79519580205131 10 2.01959527730773 10 2.24399475256414 10 2.46839422782055 10 2.69279370307697 10 2.91719317833338 10 3.14159265358979 10 3.36599212884621 10 3.59039160410262 10 3.81479107935903 10 4.03919055461545 10 4.26359002987186 10 4.48798950512827 10 18 1 3 18 3 4 18 16 1 19 4 5 19 18 4 20 19 5 21 5 6 21 20 5 22 6 7 22 7 8 22 21 6 23 8 9 23 22 8 24 23 9 25 9 10 25 10 11 25 24 9 26 25 11 27 11 12 27 12 13 27 26 11 28 13 14 28 27 13 29 14 15 29 28 14 30 15 2 30 29 15 17 30 2
16 14 1 0.012575580213515
2 -4.89842541528951e-16 10 1.22460635382238e-16 2 10 1.94985582436365 0.44504186791263 10 1.80193773580484 0.867767478235118 10 1.56366296493606 1.24697960371747 10 1.24697960371746 1.56366296493606 10 0.867767478235112 1.80193773580484 10 0.445041867912623 1.94985582436365 10 2 -4.89842541528951e-16 20 1.22460635382238e-16 2 20 1.94985582436365 0.44504186791263 20 1.80193773580484 0.867767478235118 20 1.56366296493606 1.24697960371747 20 1.24697960371746 1.56366296493606 20 0.867767478235112 1.80193773580484 20 0.445041867912623 1.94985582436365 20 0 0 1.5707963267949 0 0.224399475256414 0 0.448798950512829 0 0.673198425769243 0 0.897597901025657 0 1.12199737628207 0 1.34639685153849 0 0 10 1.5707963267949 10 0.224399475256414 10 0.448798950512829 10 0.673198425769243 10 0.897597901025657 10 1.12199737628207 10 1.34639685153849 10 11 1 3 11 9 1 12 3 4 12 11 3 13 4 5 13 12 4 14 5 6 14 6 7 14 13 5 15 14 7 16 7 8 16 15 7 10 8 2 10 16 8
16 14 1 0.012575580213515
-3.67381906146713e-16 -2 10 -3.67381906146713e-16 -2 20 2 -4.89842541528951e-16 10 0.44504186791263 -1.94985582436365 10 0.867767478235119 -1.80193773580484 10 1.24697960371747 -1.56366296493606 10 1.56366296493606 -1.24697960371746 10 1.80193773580484 -0.867767478235109 10 1.94985582436365 -0.445041867912619 10 2 -4.89842541528951e-16 20 0.44504186791263 -1.94985582436365 20 0.867767478235119 -1.80193773580484 20 1.24697960371747 -1.56366296493606 20 1.56366296493606 -1.24697960371746 20 1.80193773580484 -0.867767478235109 20 1.94985582436365 -0.445041867912619 20 4.71238898038469 0 4.71238898038469 10 6.28318530717959 0 4.9367884556411 0 5.16118793089752 0 5.38558740615393 0 5.60998688141035 0 5.83438635666676 0 6.05878583192318 0 6.28318530717959 10 4.9367884556411 10 5.16118793089752 10 5.38558740615393 10 5.60998688141035 10 5.83438635666676 10 6.05878583192318 10 11 2 1 11 1 4 11 4 5 12 11 5 13 5 6 13 12 5 14 6 7 14 7 8 14 13 6 15 14 8 16 8 9 16 15 8 10 9 3 10 16 9
16 15 1 3.1641356201817e-15
1.22460635382238e-16 2 20 -3.67381906146713e-16 -2 20 -0.445041867912635 1.94985582436365 20 -0.867767478235122 1.80193773580484 20 -1.24697960371747 1.56366296493606 20 -1.56366296493606 1.24697960371746 20 -1.80193773580484 0.867767478235113 20 -1.94985582436365 0.445041867912626 20 -2 -1.53143556863578e-15 20 -1.94985582436365 -0.445041867912629 20 -1.80193773580484 -0.867767478235116 20 -1.56366296493606 -1.24697960371747 20 -1.24697960371747 -1.56366296493606 20 -0.867767478235118 -1.80193773580484 20 -0.445041867912631 -1.94985582436365 20 -1 0 20 -6.88338275267597e-15 2 -4.44089209850063e-16 -2 -0.445041867912635 1.94985582436365 -0.867767478235122 1.80193773580484 -1.24697960371747 1.56366296493606 -1.56366296493606 1.24697960371746 -1.80193773580484 0.867767478235113 -1.94985582436365 0.445041867912626 -2 -1.55431223447522e-15 -1.94985582436365 -0.445041867912629 -1.80193773580484 -0.867767478235116 -1.56366296493606 -1.24697960371747 -1.24697960371747 -1.56366296493606 -0.867767478235118 -1.80193773580484 -0.445041867912631 -1.94985582436365 -1 0 16 1 3 16 3 4 16 4 5 16 5 6 16 6 7 16 7 8 16 8 9 16 9 10 16 10 11 16 11 12 16 12 13 16 13 14 16 14 15 16 15 2 16 2 1
16 15 1 3.57559034463995e-15
-3.67381906146713e-16 -2 20 1.22460635382238e-16 2 20 2 -4.89842541528951e-16 20 0.44504186791263 -1.94985582436365 20 0.867767478235119 -1.80193773580484 20 1.24697960371747 -1.56366296493606 20 1.56366296493606 -1.24697960371746 20 1.80193773580484 -0.867767478235109 20 1.94985582436365 -0.445041867912619 20 1.94985582436365 0.44504186791263 20 1.80193773580484 0.867767478235118 20 1.56366296493606 1.24697960371747 20 1.24697960371746 1.56366296493606 20 0.867767478235112 1.80193773580484 20 0.445041867912623 1.94985582436365 20 1 0 20 0 -2 0 2 2 6.66133814775094e-15 0.44504186791263 -1.94985582436365 0.867767478235119 -1.80193773580484 1.24697960371747 -1.56366296493606 1.56366296493606 -1.24697960371746 1.80193773580484 -0.867767478235109 1.94985582436365 -0.445041867912619 1.94985582436365 0.44504186791263 1.80193773580484 0.867767478235118 1.56366296493606 1.24697960371747 1.24697960371746 1.56366296493606 0.867767478235112 1.80193773580484 0.445041867912623 1.94985582436365 1 0 16 2 1 16 1 4 16 4 5 16 5 6 16 6 7 16 7 8 16 8 9 16 9 3 16 3 10 16 10 11 16 11 12 16 12 13 16 13 14 16 14 15 16 15 2
TShapes 50
Ve
2.00001e-07
1.22460635382238e-16 2 0
0 0
0101101
*
Ve
2.00001e-07
-3.67381906146713e-16 -2 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 1 0 1.5707963267949 4.71238898038469
2 1 1 0 1.5707963267949 4.71238898038469
2 2 2 0 1.5707963267949 4.71238898038469
6 1 2 6
6 2 1 6
0
0101000
+50 7 -49 7 *
Ed
1e-07 1 1 0
1 2 0 0 4
2 3 1 8 0 4
2 4 3 10 0 4
6 3 1 11
6 4 3 11
0
0101000
+49 12 -50 12 *
Wi
0101000
+48 5 +47 4 *
Fa
0 1e-07 1 5
2 1
0101000
+46 0 *
Ve
2.00001e-07
1.22460635382238e-16 2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 3 0 0 10
2 5 2 8 0 10
2 6 4 10 0 10
6 5 2 11
6 6 4 11
0
0101000
+50 12 -44 12 *
Ve
2.00001e-07
-3.67381906146713e-16 -2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 4 0 0 10
2 7 2 8 0 10
2 8 5 10 0 10
6 7 2 11
6 8 5 11
0
0101000
+49 12 -42 12 *
Ed
1e-07 1 1 0
1 5 0 1.5707963267949 4.71238898038469
2 9 2 0 1.5707963267949 4.71238898038469
2 10 6 14 1.5707963267949 4.71238898038469
6 9 2 6
6 10 6 6
0
0101000
+44 7 -42 7 *
Wi
0101000
+48 5 -43 4 +41 4 -40 5 *
Fa
0 1e-07 2 5
2 2
0101000
+39 0 *
Ve
1e-07
2 -4.89842541528951e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 4.71238898038469 6.28318530717959
2 11 3 0 4.71238898038469 6.28318530717959
2 12 5 0 4.71238898038469 6.28318530717959
6 11 5 16
6 12 3 16
0
0101000
+49 17 -37 17 *
Ed
1e-07 1 1 0
1 7 0 0 1.5707963267949
2 13 3 0 0 1.5707963267949
2 14 4 0 0 1.5707963267949
6 13 4 16
6 14 3 16
0
0101000
+37 17 -50 17 *
Wi
0101000
-47 4 +36 15 +35 15 *
Fa
0 1e-07 3 15
2 3
0101000
+34 0 *
Ve
1e-07
2 -4.89842541528951e-16 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 8 0 0 10
2 15 4 0 0 10
2 16 5 0 0 10
4 CN 4 0 5 0
6 15 4 16
6 16 5 16
0
0101000
+37 17 -32 17 *
Ed
1e-07 1 1 0
1 9 0 0 1.5707963267949
2 17 4 0 0 1.5707963267949
2 18 7 14 0 1.5707963267949
6 17 4 16
6 18 7 16
0
0101000
+32 17 -44 17 *
Wi
0101000
+35 15 -31 15 +43 4 -30 15 *
Fa
0 1e-07 4 15
2 4
0101000
+29 0 *
Ed
1e-07 1 1 0
1 10 0 4.71238898038469 6.28318530717959
2 19 5 0 4.71238898038469 6.28318530717959
2 20 8 14 4.71238898038469 6.28318530717959
6 19 5 16
6 20 8 16
0
0101000
+42 17 -32 17 *
Wi
0101000
-41 4 +36 15 -27 15 +31 15 *
Fa
0 1e-07 5 15
2 5
0101000
+26 0 *
Ve
2.00001e-07
1.22460635382238e-16 2 20
0 0
0101101
*
Ed
1e-07 1 1 0
1 11 0 0 10
2 21 6 19 0 10
2 22 7 20 0 10
6 21 6 11
6 22 7 11
0
0101000
+44 12 -24 12 *
Ve
2.00001e-07
-3.67381906146713e-16 -2 20
0 0
0101101
*
Ed
1e-07 1 1 0
1 12 0 0 10
2 23 6 19 0 10
2 24 8 20 0 10
6 23 6 11
6 24 8 11
0
0101000
+42 12 -22 12 *
Ed
1e-07 1 1 0
1 13 0 1.5707963267949 4.71238898038469
2 25 6 0 1.5707963267949 4.71238898038469
2 26 9 0 1.5707963267949 4.71238898038469
6 25 6 21
6 26 9 21
0
0101000
+24 22 -22 22 *
Wi
0101000
+40 5 -23 4 +21 4 -20 18 *
Fa
0 1e-07 6 18
2 6
0101000
+19 0 *
Ve
1e-07
2 -4.89842541528951e-16 20
0 0
0101101
*
Ed
1e-07 1 1 0
1 14 0 0 10
2 27 7 0 0 10
2 28 8 0 0 10
4 CN 7 0 8 0
6 27 7 24
6 28 8 24
0
0101000
+32 25 -17 25 *
Ed
1e-07 1 1 0
1 15 0 0 1.5707963267949
2 29 7 0 0 1.5707963267949
2 30 10 0 0 1.5707963267949
6 29 7 24
6 30 10 24
0
0101000
+17 25 -24 25 *
Wi
0101000
+30 15 -16 23 +23 4 -15 23 *
Fa
0 1e-07 7 23
2 7
0101000
+14 0 *
Ed
1e-07 1 1 0
1 16 0 4.71238898038469 6.28318530717959
2 31 8 0 4.71238898038469 6.28318530717959
2 32 10 0 4.71238898038469 6.28318530717959
6 31 8 24
6 32 10 24
0
0101000
+22 25 -17 25 *
Wi
0101000
-21 4 +27 15 -12 23 +16 23 *
Fa
0 1e-07 8 23
2 8
0101000
+11 0 *
Ed
1e-07 1 1 0
1 17 0 0 4
2 33 9 19 0 4
2 34 10 20 0 4
6 33 9 11
6 34 10 11
0
0101000
+22 12 -24 12 *
Wi
0101000
+20 18 +9 4 *
Fa
0 1e-07 9 18
2 9
0101000
+8 0 *
Wi
0101000
-9 4 +12 23 +15 23 *
Fa
0 1e-07 10 23
2 10
0101000
+6 0 *
Sh
0101000
-45 0 +38 0 -33 0 +28 0 +25 0 +18 0 +13 0 +10 0 +7 0 +5 0
*
So
0100000
+4 0 *
Co
0100000
+3 0 *
Co
1100000
+2 1 *
+1 0
@@ -0,0 +1,689 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 10
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 -10
0 1 0 -5
0 0 1 -2
1
1 0 0 0
0 1 0 0
0 0 1 0
2 2 -1 0
2 4 1 2 1 0
2 4 -1 0
2 2 -1 4 -1 0
1
2.22044604925031e-16 0 1 1
0 1 0 1
-1 0 2.22044604925031e-16 9
2 9 -1 0
Curve2ds 34
8 0 10
1 4.7123889803846897 0 0 1
8 0 10
1 2 -3 1 0
8 0.35316954888546093 4.6468304511145391
1 12 -2.5 0 -1
8 0.35316954888546093 4.6468304511145391
1 0 -2.5 0 1
8 0 10
1 2 -7 1 0
8 0 10
1 1.5707963267948966 0 0 1
8 0.35316954888546093 4.6468304511145391
1 2 -2.5 0 -1
8 0.35316954888546093 4.6468304511145391
1 0 -2.5 0 1
1 0 0 1 0
2 0 0 1 0 -0 1 2
1 0 10 1 0
2 0 0 1 0 -0 1 2
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
2 0 0 1 0 -0 1 2
1 0 10 1 0
8 -2.2204460492503131e-16 1.2110633883680135
1 1 1 1 0
8 -2.2204460492503131e-16 1.2110633883680135
1 3.1415926535897931 2.2204460492503136e-16 0 1
7 0 0 8 16 3 1.0471975511965981 9.6812500386332108 1.0191849723756432 9.711351512321853 0.99057736649464334 9.7409253837196985 0.96126547595850964 9.7699151707934853 0.93114296736600188 9.7982239446961188 0.90009228522354834 9.82570048031174 0.86798442888468164 9.8521400402585346 0.8346593033880334 9.877267196784393 0.76967972140688579 9.9209545000122876 0.73850980596194393 9.9398650856737714 0.70604396004731318 9.957240903979887 0.67211257930387225 9.9726772455864783 0.63668047313636433 9.9855204063579261 0.59986448805037684 9.9949566487541102 0.56195141197948439 9.9999999991515285 0.52359878297260398 10
0 9 0.53564531288130945 7 1 9
7 0 0 8 16 3 2.3202651922123754 0 2.3613845718497992 0.048519208827660143 2.4035809325932971 0.097172428051076648 2.4470511777396444 0.14602303595999122 2.4919963470085245 0.19510311222690058 2.5386514923287358 0.24442052634171163 2.5872860189371036 0.29395994968175793 2.6382448774656471 0.34369439452827688 2.7387892375706668 0.43690810817694875 2.7874744490937378 0.48017156065832095 2.838722926183979 0.52361601339995401 2.8929447473924776 0.56715630272151318 2.9504066662164066 0.61043696323629393 3.0111777517634528 0.65287339298230529 3.0751639390561891 0.69369817069782636 3.1415926408171222 0.73205080019457225
0 9 0.53564531288130945 7 1 9
1 0 0 1 0
2 0 0 1 0 -0 1 2
7 0 0 8 23 4 0 8.9999999999999858 7.4258113837806729e-16 8.8941224112057444 0.0064057756076805229 8.7878714078946292 0.019296334952808913 8.6828702547202781 0.038660124955066828 8.5812680839312669 0.06414345521223494 8.485494447986067 0.094978086898630729 8.398093544997943 0.12987287565130523 8.3211657385204365 0.18450888193235468 8.2244369513332209 0.20263871994715144 8.1958412388549924 0.22093962870467343 8.1701157141778342 0.23923135246229144 8.1471551468714143 0.25738034042269409 8.1267753834193766 0.2752941475392004 8.1087625829607841 0.2929123542841251 8.0928980415624316 0.34034512681857798 8.0546949363178335 0.36947179487287446 8.036324278407708 0.39753071292662179 8.0226423487758787 0.42454740104337996 8.0127688515457898 0.45057714038719349 8.006032341742408 0.47569468105693596 8.001909684745975 0.49999758940989447 8.0000000030658853 0.52359877559829904 8
0 9 0.43124700432252816 7 0.63857834539514746 7 1 9
7 0 0 8 23 4 4.7123889803847039 0.99999999999999978 4.8182665691789452 0.99999999999999978 4.9245179885469765 0.99999988838466836 5.0313253810990277 1.0000004678541856 5.1384138464679321 0.99953949636909878 5.2452403360779085 0.99767461680518021 5.3508864328940273 0.99301835412120187 5.453873051833698 0.9845018572239419 5.5986757121687232 0.96636293333137557 5.644297409889619 0.95963467295558913 5.6883033828665344 0.95208824887391807 5.7306015558239025 0.94378090273143123 5.7711786371647475 0.93479137576185645 5.8100704075116631 0.92520454560205145 5.8473465341417725 0.91509926471877523 5.9454301084168781 0.8861413409504808 6.0030939966863359 0.86638173306691801 6.0568380618789881 0.8455557381198634 6.1072119109648915 0.8239089053861095 6.1546619960591364 0.80163031380755267 6.1995766554865765 0.77885213650941021 6.2423068525604144 0.75565199198719224 6.2831853071795862 0.73205080756887686
0 9 0.43124700432252816 7 0.63857834539514746 7 1 9
7 0 0 8 16 3 0.52359877559829893 8 0.55887750531975944 7.9999999954171583 0.59383751978182975 8.0042672730837179 0.62791863886936161 8.0123183829041231 0.66085296264498328 8.0233906441915011 0.69252039438202728 8.0368199621535705 0.72292712253585756 8.0520605900446292 0.75219106778532008 8.0687500040323368 0.81850504441984606 8.1107793318241015 0.85467110798653878 8.1370345485970521 0.88938870342381438 8.1649031612295122 0.92284878448464824 8.194025046587031 0.95522054070417606 8.2241231643938946 0.98664287261129946 8.2550135627205492 1.0172551453910488 8.286574753711287 1.0471975511965976 8.3187499613667875
0 9 0.42744492276261664 7 1 9
7 0 0 8 16 3 0 0.73205080756887697 0.061104553831674124 0.69677208049332129 0.12023460728967006 0.65934839849139804 0.17669728658140738 0.62048486133391823 0.23034686544494853 0.58081346548537871 0.28120407781222934 0.54082760410128461 0.32945563937628819 0.50084229089752297 0.37541373650240661 0.46096339293231486 0.47859835297537501 0.36763829820269917 0.53411311494946911 0.31439982370059355 0.58684451738511445 0.26136426573577742 0.63721225805704318 0.20858462916387013 0.68557391753391528 0.15608426920722296 0.73220714727722225 0.10385907685012509 0.77737530833054613 0.051861767149949563 0.82132746137741819 0
0 9 0.42744492276261664 7 1 9
8 7.7119017293312764 10
1 1.0471975511965965 2.220446049250318e-16 0 1
8 7.7119017293312764 10
1 9 0.73205080756887608 -1 0
7 0 0 8 23 4 0.52359878297260398 10 0.50047270032166247 10.000000000511617 0.47667005626166731 9.9981664323901676 0.45208662070266581 9.9942131290036862 0.42663183961299694 9.9877649222323264 0.40023504943942395 9.9783344560342364 0.37284275051362237 9.9652991824742081 0.34442705168869181 9.9478465595461429 0.29771490300533954 9.9113192534485304 0.28006927396893022 9.8958683163180226 0.26211531568453528 9.8782909663278176 0.2439082848910365 9.8583643641889509 0.22553513665088951 9.8358674803661472 0.20712391555880269 9.810603961128729 0.18885032702899199 9.782450165794577 0.133341913736577 9.6863935698399786 0.097627231298003297 9.6093245810947501 0.065976640986410803 9.521323209508429 0.03977316172003105 9.4245326231193722 0.019846499628095669 9.3216123175652452 0.0065830736970027481 9.2151194566795649 -7.5278645464333113e-16 9.1073326678734077 0 8.9999999999999858
0 9 0.35411451882931427 7 0.56260271896423419 7 1 9
7 0 0 8 23 4 3.1415926408171226 0.73205080019457214 3.1816481907780512 0.75517688314089559 3.2234865709658784 0.77792073864154754 3.267417494770517 0.80026010460234043 3.3137683558661304 0.82212177556766797 3.3629020821404403 0.84338305213526699 3.4152356476585006 0.8638699279852553 3.4712814281069022 0.883357366568434 3.5673253520900903 0.9123040087765143 3.6044310506840986 0.92258750535687095 3.6431517689046919 0.93236158920188461 3.683565001366865 0.94154782521209623 3.7257158754773592 0.95006038385701941 3.7696027481074106 0.95781764823646331 3.8151475954008371 0.96475745840369598 3.9607326073221309 0.98364157117681739 4.0648884959317035 0.99260919432553418 4.1719182251458076 0.9975386098408463 4.2802472341904858 0.99951346077895376 4.3888945807891746 1.0000005623058816 4.4972690716078176 0.99999986892953208 4.605056312511282 0.99999999999999978 4.7123889803847039 0.99999999999999978
0 9 0.35411451882931427 7 0.56260271896423419 7 1 9
1 0 0 1 0
2 0 0 1 0 -0 1 1
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
Curves 17
1 0 -2 0 0 0 1
1 0 -2.5 10 0 1 0
1 0 2 0 0 0 1
1 0 -2.5 0 0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 1 1 10 1 0 2.2204460492503136e-16
7 0 0 8 16 3 0.99999999999999989 1.7320508075688781 9.6812500386332108 1.04851920882766 1.70403822711761 9.711351512321853 1.0971724280510806 1.6738774656120146 9.7409253837196985 1.1460230359599839 1.6413763408939686 9.7699151707934853 1.1951031122269005 1.6063202550463507 9.7982239446961188 1.2444205263417181 1.5684506597293177 9.82570048031174 1.2939599496817531 1.5274709375065052 9.8521400402585346 1.3436943945282764 1.4830142302183067 9.877267196784393 1.4369081081769484 1.3924571328399007 9.9209545000122876 1.4801715606583103 1.3475253933581972 9.9398650856737714 1.5236160133999883 1.2991807180348958 9.957240903979887 1.5671563027214632 1.2470012334619505 9.9726772455864783 1.6104369632363285 1.1907386160532663 9.9855204063579261 1.6528733929822939 1.1304150304141567 9.9949566487541102 1.693698170697826 1.066428714533604 9.9999999991515285 1.732050800194572 1.0000000127726711 10
0 9 0.53564531288130945 7 1 9
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
7 0 0 8 23 4 2 0 8.9999999999999858 2 1.4851622767561346e-15 8.8941224112057444 1.9999998883846797 0.012811372738185285 8.7878714078946292 2.0000004678541514 0.038593438169234107 8.6828702547202781 1.9995394963691431 0.077318640112016612 8.5812680839312669 1.9976746168051496 0.12828882313514312 8.485494447986067 1.9930183541212121 0.18988799033562281 8.398093544997943 1.9845018572239423 0.25922563134465693 8.3211657385204365 1.9663629333313757 0.36698161572321092 8.2244369513332209 1.9596346729555918 0.402618833477142 8.1958412388549924 1.9520882488739133 0.43844807711144873 8.1701157141778342 1.9437809027314312 0.47409278961385504 8.1471551468714143 1.9347913757618618 0.50927624567973062 8.1267753834193766 1.9252045456020483 0.54380989567013815 8.1087625829607841 1.9150992647187755 0.57757312880963096 8.0928980415624316 1.8861413409504808 0.66791088554650291 8.0546949363178335 1.8663817330669177 0.72274997121833373 8.036324278407708 1.8455557381198648 0.77491687627594175 8.0226423487758787 1.8239089053861099 0.82448172027071531 8.0127688515457898 1.8016303138075516 0.87158159324030848 8.006032341742408 1.778852136509411 0.9163910560922971 8.001909684745975 1.7556519919871927 0.95912154538082939 8.0000000030658853 1.732050807568877 1 8
0 9 0.43124700432252816 7 0.63857834539514746 7 1 9
7 0 0 8 16 3 1.7320508075688772 1 8 1.6967720804933217 1.0611045538316737 7.9999999954171583 1.6593483984914124 1.1202346812301605 8.0042672730837179 1.6204848613338632 1.1763492367386752 8.0123183829041231 1.5808134654854706 1.2290517685689595 8.0233906441915011 1.5408276041012092 1.2782701282353948 8.0368199621535705 1.5008422908975496 1.3241620984759059 8.0520605900446292 1.4609633929323151 1.367040544556182 8.0687500040323368 1.3676382982026993 1.4612774836090079 8.1107793318241015 1.3143998237005865 1.5103534942133865 8.1370345485970521 1.2613642657357973 1.5553188395526441 8.1649031612295122 1.2085846291638478 1.5966210155610945 8.194025046587031 1.1560842692072359 1.6346519175344481 8.2241231643938946 1.1038590768501224 1.669721368800984 8.2550135627205492 1.0518617671499497 1.7021084000207012 8.286574753711287 1.0000000000000002 1.7320508075688772 8.3187499613667875
0 9 0.42744492276261664 7 1 9
1 1.000000000000002 1.7320508075688761 2.220446049250318e-16 0 0 1
7 0 0 8 23 4 1.7320508001945716 1.0000000127726711 10 1.7551768831408954 0.95994446281174206 10.000000000511617 1.7779207386415474 0.91810583117132671 9.9981664323901676 1.8002601046023399 0.87427379789546689 9.9942131290036862 1.8221217755676677 0.82825187993339033 9.9877649222323264 1.8433830521352674 0.77987554204909926 9.9783344560342364 1.8638699279852551 0.72901316435367614 9.9652991824742081 1.8833573665684338 0.67559074789789419 9.9478465595461429 1.9123040087765137 0.58676399943021784 9.9113192534485304 1.9225875053568715 0.55299726392782522 9.8958683163180226 1.9323615892018839 0.51843262939387047 9.8782909663278176 1.9415478252120957 0.48317993121893554 9.8583643641889509 1.9500603838570194 0.44741602333761549 9.8358674803661472 1.9578176482364633 0.41140580704822438 9.810603961128729 1.9647574584036958 0.37551607207414872 9.782450165794577 1.9836415711768172 0.26611714123047786 9.6863935698399786 1.9926091943255446 0.19517961603964304 9.6093245810947501 1.9975386098408201 0.13195588089995156 9.521323209508429 1.9995134607789773 0.079544274847824309 9.4245326231193722 2.0000005623058756 0.039693955310272887 9.3216123175652452 1.99999986892953 0.013165928230988829 9.2151194566795649 2 -1.5055729092866621e-15 9.1073326678734077 2 0 8.9999999999999858
0 9 0.35411451882931427 7 0.56260271896423419 7 1 9
2 0 0 0 0 0 1 1 0 -0 -0 1 0 1
1 1 -2.4492127076447545e-16 0 0 0 1
Polygon3D 0
PolygonOnTriangulations 50
2 1 2
p 0.0137452943347953 1 0 10
2 1 2
p 0.0137452943347953 1 0 10
2 1 2
p 0.0138139545017056 1 0 10
2 2 3
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0138139545017056 1 0.5 4.5
2 2 12
p 0.0137452943347953 1 0 10
2 4 3
p 0.0137452943347953 1 0 10
2 12 6
p 0.0138139545017056 1 0 10
2 1 4
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
10 1 13 14 15 16 17 18 19 20 12
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 12 13 14 15 16 17 18 19 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 4 5 6 7 8 9 10 11 3
p 0.0138139545017056 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 2 4 5 6 7 8 9 10 11 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 12 13 14 15 16 17 18 19 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 2 13 14 15 16 17 18 19 20 12
p 0.0138139545017056 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 12 13 14 15 16 17 18 19 9
p 0.0138139545017056 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
2 3 21
p 0.0138139545017056 1 0 9
2 13 22
p 0.0138139545017056 1 0 9
2 21 12
p 0.0138139545017056 1 9 10
2 2 10
p 0.0138139545017056 1 9 10
7 2 7 8 9 10 11 6
p 0.0138139545017056 1 0.523598775598299 0.698131700797732 0.872664625997166 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
7 3 4 5 6 7 8 2
p 0.0138139545017056 1 0.523598775598299 0.698131700797732 0.872664625997166 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
4 10 11 12 1
p 0.0138139545017056 1 0 0.174532925199433 0.349065850398866 0.523598775598299
4 9 10 11 3
p 0.0138139545017056 1 0 0.174532925199433 0.349065850398866 0.523598775598299
2 2 5
p 0.0138139545017056 1 -2.22044604925031e-16 0.732050807568877
2 1 2
p 0.0138139545017056 1 -2.22044604925031e-16 0.732050807568877
2 20 3
p 0.0138139545017056 1 -2.22044604925031e-16 0.732050807568877
5 1 3 4 5 2
p 0.0138139545017056 1 0 0.333333333333333 0.603333333333333 0.801666666666667 1
5 1 6 7 8 5
p 0.0138139545017056 1 0 0.333333333333333 0.603333333333333 0.801666666666667 1
10 1 3 4 5 6 7 8 9 10 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
10 3 4 5 6 7 8 9 10 11 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
10 13 14 15 16 17 18 19 20 21 12
p 0.0138139545017056 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
9 22 24 25 26 27 28 29 30 23
p 0.0138139545017056 1 0 0.107712414204458 0.215424828408916 0.323137242613374 0.430849656817832 0.53856207102229 0.678105989413049 0.839052994706525 1
9 3 12 13 14 15 16 17 18 11
p 0.0138139545017056 1 0 0.107712414204458 0.215424828408916 0.323137242613374 0.430849656817832 0.53856207102229 0.678105989413049 0.839052994706525 1
6 23 32 33 34 35 31
p 0.0138139545017056 1 0 0.187488908780393 0.412475599316864 0.675247073758471 0.837623536879236 1
6 2 4 5 6 7 3
p 0.0138139545017056 1 0 0.187488908780393 0.412475599316864 0.675247073758471 0.837623536879236 1
2 31 1
p 0.0138139545017056 1 8.31874996136679 9.68125003863321
2 2 18
p 0.0138139545017056 1 8.31874996136679 9.68125003863321
9 1 3 4 5 6 7 8 9 2
p 0.0138139545017056 1 0 0.191928772035815 0.364664666868049 0.506308221197201 0.625465878846877 0.732707770731585 0.839949662616294 0.919974831308147 1
9 2 4 5 6 7 8 9 10 3
p 0.0138139545017056 1 0 0.191928772035815 0.364664666868049 0.506308221197201 0.625465878846877 0.732707770731585 0.839949662616294 0.919974831308147 1
4 1 3 4 2
p 0.0138139545017056 1 2.32026519221238 2.59404101267152 2.86781683313065 3.14159265358979
4 18 19 20 5
p 0.0138139545017056 1 2.32026519221238 2.59404101267152 2.86781683313065 3.14159265358979
2 19 11
p 0.0138139545017056 1 0 0.732050807568877
2 1 2
p 0.0138139545017056 1 0 0.732050807568877
14 1 20 21 22 23 24 25 26 27 28 29 30 31 19
p 0.0138139545017056 1 3.14159265358979 3.38325362694285 3.62491460029591 3.86657557364898 4.10823654700204 4.3498975203551 4.59155849370816 4.83321946706122 5.07488044041428 5.31654141376734 5.5582023871204 5.79986336047346 6.04152433382652 6.28318530717959
14 5 6 7 8 9 10 11 12 13 14 15 16 17 1
p 0.0138139545017056 1 3.14159265358979 3.38325362694285 3.62491460029591 3.86657557364898 4.10823654700204 4.3498975203551 4.59155849370816 4.83321946706122 5.07488044041428 5.31654141376734 5.5582023871204 5.79986336047346 6.04152433382652 6.28318530717959
4 1 8 9 3
p 0.0138139545017056 1 0 0.273775820459139 0.547551640918278 0.821327461377416
4 1 3 4 2
p 0.0138139545017056 1 0 0.273775820459139 0.547551640918278 0.821327461377416
Surfaces 7
1 10 0 0 1 0 -0 0 0 1 0 -1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 10 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 1
1 0 0 0 0 0 1 1 0 -0 -0 1 0
Triangulations 13
4 2 1 2.5357526258398e-16
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 1.22460635382238e-16 2 0 2 -3 12 -3 12 -7 2 -7 2 4 3 2 1 4
20 18 1 0.00761060381650911
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 2 -4.89842541528951e-16 0 0.347296355333862 -1.96961550602442 0 0.68404028665134 -1.87938524157182 0 1 -1.73205080756888 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999993 0 1.87938524157182 -0.684040286651329 0 1.96961550602442 -0.34729635533385 0 4.71238898038469 0 4.71238898038469 10 6.28318530717959 10 4.88692190558412 10 5.06145483078356 10 5.23598775598299 10 5.41052068118242 10 5.58505360638186 10 5.75958653158129 10 5.93411945678073 10 6.10865238198016 10 6.28318530717959 0 4.88692190558412 0 5.06145483078356 0 5.23598775598299 0 5.41052068118242 0 5.58505360638186 0 5.75958653158129 0 5.93411945678073 0 6.10865238198016 0 2 1 13 4 13 14 4 2 13 5 14 15 5 4 14 6 15 16 6 5 15 7 16 17 7 6 16 8 17 18 8 7 17 9 18 19 9 8 18 10 19 20 10 9 19 11 20 12 11 10 20 3 11 12
21 19 1 0.00761060381650909
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 0 0.347296355333862 -1.96961550602442 0 0.68404028665134 -1.87938524157182 0 1 -1.73205080756888 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999993 0 1.87938524157182 -0.684040286651329 0 1.96961550602442 -0.34729635533385 0 2 -4.89842541528951e-16 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 2 -4.89842541528951e-16 9 4.71238898038469 0 4.71238898038469 10 6.28318530717959 0 4.88692190558412 0 5.06145483078356 0 5.23598775598299 0 5.41052068118242 0 5.58505360638186 0 5.75958653158129 0 5.93411945678073 0 6.10865238198016 0 6.28318530717959 10 4.88692190558412 10 5.06145483078356 10 5.23598775598299 10 5.41052068118242 10 5.58505360638186 10 5.75958653158129 10 5.93411945678073 10 6.10865238198016 10 6.28318530717959 9 13 2 1 13 1 4 14 4 5 14 5 6 14 13 4 15 14 6 16 6 7 16 7 8 16 15 6 17 16 8 18 8 9 18 17 8 19 9 10 19 18 9 20 10 11 20 19 10 21 11 3 21 20 11 12 20 21
20 19 1 2.44921270764476e-16
-3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 2 -4.89842541528951e-16 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651339 10 1.73205080756888 1 10 1.53208888623795 1.28557521937308 10 1.28557521937308 1.53208888623796 10 0.999999999999996 1.73205080756888 10 0.684040286651332 1.87938524157182 10 0.347296355333854 1.96961550602442 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 1 0 10 0 -2 0 2 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651339 1.73205080756888 1 1.53208888623795 1.28557521937308 1.28557521937308 1.53208888623796 0.999999999999996 1.73205080756888 0.684040286651332 1.87938524157182 0.347296355333854 1.96961550602442 0.347296355333862 -1.96961550602442 0.68404028665134 -1.87938524157182 1 -1.73205080756888 1.28557521937308 -1.53208888623795 1.53208888623796 -1.28557521937307 1.73205080756888 -0.999999999999993 1.87938524157182 -0.684040286651329 1.96961550602442 -0.34729635533385 1 0 20 2 1 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 2 20 1 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 3
21 21 1 2.44921270764476e-16
-3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 1.73205080756888 1 10 1.53208888623796 1.28557521937308 10 1.28557521937308 1.53208888623796 10 0.999999999999997 1.73205080756888 10 0.684040286651333 1.87938524157182 10 0.347296355333855 1.96961550602442 10 2 -4.89842541528951e-16 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651337 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 1 1 10 1 0 10 0 -2 0 2 1.73205080756888 1 1.53208888623796 1.28557521937308 1.28557521937308 1.53208888623796 0.999999999999997 1.73205080756888 0.684040286651333 1.87938524157182 0.347296355333855 1.96961550602442 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651337 0.347296355333862 -1.96961550602442 0.68404028665134 -1.87938524157182 1 -1.73205080756888 1.28557521937308 -1.53208888623795 1.53208888623796 -1.28557521937307 1.73205080756888 -0.999999999999993 1.87938524157182 -0.684040286651329 1.96961550602442 -0.34729635533385 1 1 1 0 8 2 20 7 8 20 6 7 20 3 20 11 5 6 20 4 20 3 4 5 20 21 2 1 21 9 10 21 10 11 21 1 12 21 12 13 21 13 14 21 14 15 21 15 16 21 16 17 21 17 18 21 18 19 21 19 9 21 20 2 21 11 20
20 18 1 0.00761060381650915
2 -4.89842541528951e-16 0 1.22460635382238e-16 2 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651339 0 1.73205080756888 1 0 1.53208888623795 1.28557521937308 0 1.28557521937308 1.53208888623796 0 0.999999999999996 1.73205080756888 0 0.684040286651332 1.87938524157182 0 0.347296355333854 1.96961550602442 0 2 -4.89842541528951e-16 10 1.22460635382238e-16 2 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651339 10 1.73205080756888 1 10 1.53208888623795 1.28557521937308 10 1.28557521937308 1.53208888623796 10 0.999999999999996 1.73205080756888 10 0.684040286651332 1.87938524157182 10 0.347296355333854 1.96961550602442 10 0 0 1.5707963267949 0 0.174532925199433 0 0.349065850398867 0 0.5235987755983 0 0.698131700797733 0 0.872664625997167 0 1.0471975511966 0 1.22173047639603 0 1.39626340159547 0 0 10 1.5707963267949 10 0.174532925199433 10 0.349065850398867 10 0.5235987755983 10 0.698131700797733 10 0.872664625997167 10 1.0471975511966 10 1.22173047639603 10 1.39626340159547 10 13 1 3 13 11 1 14 3 4 14 13 3 15 4 5 15 14 4 16 5 6 16 15 5 17 6 7 17 7 8 17 16 6 18 17 8 19 8 9 19 18 8 20 9 10 20 19 9 12 10 2 12 20 10
35 33 1 0.00761060381650912
1 1.73205080756888 9.68125003863321 1.73205080756888 1 10 1.24356077504528 1.56638328433057 9.82414196047073 1.44411313553921 1.38366804318938 9.92347108067014 1.59184799648933 1.2107931090258 9.97753069361392 1.22460635382238e-16 2 10 1.53208888623796 1.28557521937308 10 1.28557521937308 1.53208888623796 10 0.999999999999997 1.73205080756888 10 0.684040286651333 1.87938524157182 10 0.347296355333855 1.96961550602442 10 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651339 0 1.73205080756888 1 0 1.53208888623795 1.28557521937308 0 1.28557521937308 1.53208888623796 0 0.999999999999996 1.73205080756888 0 0.684040286651332 1.87938524157182 0 0.347296355333854 1.96961550602442 0 2 -4.89842541528951e-16 9 1.73205080756888 1 8 1.99987409110094 0.0224418334324644 8.78933432184124 1.99801638802384 0.0890533997184125 8.58747570976523 1.99042099726536 0.195510204635373 8.40603353089891 1.97234241951612 0.331459469911709 8.25632429135014 1.94188583642251 0.478622404008537 8.14667391873539 1.8880088194413 0.65986564624576 8.05962314131714 1.8136457281387 0.843023823297785 8.01239760885774 1 1.73205080756888 8.31874996136679 1.59979017704133 1.20027971251923 8.02026124258194 1.43224799832147 1.3959461567654 8.08172626942327 1.23718150592219 1.57142671786896 8.17934689877746 1.1180670165784 1.65829012972423 8.24723568687829 1.0471975511966 9.68125003863321 0.523598782972604 10 0.899782422184016 9.82414196047073 0.764025969170863 9.92347108067014 0.650264004823151 9.97753069361392 1.5707963267949 10 0.698131700797732 10 0.872664625997166 10 1.0471975511966 10 1.22173047639603 10 1.39626340159547 10 1.5707963267949 0 0 0 0.174532925199433 0 0.349065850398867 0 0.5235987755983 0 0.698131700797733 0 0.872664625997167 0 1.0471975511966 0 1.22173047639603 0 1.39626340159547 0 0 9 0.523598775598299 8 0.0112211491236271 8.78933432184124 0.0445414271711193 8.58747570976523 0.097911470294066 8.40603353089891 0.166497933186523 8.25632429135014 0.241656377503374 8.14667391873539 0.336232412997137 8.05962314131714 0.43511193781139 8.01239760885774 1.0471975511966 8.31874996136679 0.643675940617773 8.02026124258194 0.772563171913424 8.08172626942327 0.903848483101006 8.17934689877746 0.977576635015398 8.24723568687829 24 22 13 25 24 13 26 13 14 26 25 13 27 26 14 28 14 15 28 27 14 29 28 15 30 15 16 30 29 15 23 30 16 32 16 17 32 23 16 33 17 18 33 32 17 34 33 18 35 18 19 35 34 18 31 19 20 31 35 19 9 8 3 10 1 31 10 31 20 10 9 1 11 20 21 11 21 12 11 10 20 6 11 12 3 1 9 4 3 8 5 4 7 7 2 5 8 7 4
20 19 1 2.44921270764476e-16
-3.67381906146713e-16 -2 0 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651339 0 1.73205080756888 1 0 1.53208888623795 1.28557521937308 0 1.28557521937308 1.53208888623796 0 0.999999999999996 1.73205080756888 0 0.684040286651332 1.87938524157182 0 0.347296355333854 1.96961550602442 0 0.347296355333862 -1.96961550602442 0 0.68404028665134 -1.87938524157182 0 1 -1.73205080756888 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999993 0 1.87938524157182 -0.684040286651329 0 1.96961550602442 -0.34729635533385 0 1 0 0 0 -2 0 2 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651339 1.73205080756888 1 1.53208888623795 1.28557521937308 1.28557521937308 1.53208888623796 0.999999999999996 1.73205080756888 0.684040286651332 1.87938524157182 0.347296355333854 1.96961550602442 0.347296355333862 -1.96961550602442 0.68404028665134 -1.87938524157182 1 -1.73205080756888 1.28557521937308 -1.53208888623795 1.53208888623796 -1.28557521937307 1.73205080756888 -0.999999999999993 1.87938524157182 -0.684040286651329 1.96961550602442 -0.34729635533385 1 0 20 2 1 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 2 20 1 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 3
12 10 1 0.00553510651650774
1.73205080756888 1 10 2 -4.89842541528951e-16 9 1.82867673612081 0.809902076658239 9.98176514004978 1.90588728839154 0.60629501952173 9.91923685029758 1.95600397285368 0.417191143919895 9.81260927857655 1.98334665140491 0.257557886204334 9.66991022415855 1.99538385000879 0.135806133933335 9.50315898521262 1.9993889253772 0.0494359992519591 9.31052871447953 1.99996166439723 0.0123832812987782 9.15688599077136 2 -4.89842541528951e-16 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651337 10 0.523598782972604 10 4.73401438798341e-19 8.99999999999999 0.416925281655647 9.98176514004978 0.307993860323647 9.91923685029758 0.210138721729519 9.81260927857655 0.129137570453418 9.66991022415855 0.0679553542900344 9.50315898521262 0.024720518862582 9.31052871447953 0.00619167916432403 9.15688599077136 0 10 0.174532925199433 10 0.349065850398866 10 10 8 7 10 9 8 6 10 7 11 6 5 11 10 6 4 11 5 12 11 4 3 12 4 10 2 9 1 12 3
8 6 1 0.00698675705080398
1 1.73205080756888 9.68125003863321 1 1 10 1 1.52059837824641 9.85380169159308 1 1.27036855254163 9.96275689859722 1.73205080756888 1 10 1.24356077504528 1.56638328433057 9.82414196047073 1.44411313553921 1.38366804318938 9.92347108067014 1.59184799648933 1.2107931090258 9.97753069361392 2.32026519221238 0 3.14159265358979 0 2.59404101267152 0 2.86781683313065 0 3.14159264081712 0.732050800194572 2.53948191195458 0.243560775045281 2.74782760006998 0.444113135539208 2.9292064280182 0.591847996489334 6 1 3 7 3 4 7 6 3 8 4 2 8 7 4 5 8 2
31 29 1 0.00574004185429744
1 1 10 1.73205080756888 1 10 2 -4.89842541528951e-16 9 1.82867673612081 0.809902076658239 9.98176514004978 1.90588728839154 0.60629501952173 9.91923685029758 1.95600397285368 0.417191143919895 9.81260927857655 1.98334665140491 0.257557886204334 9.66991022415855 1.99538385000879 0.135806133933335 9.50315898521262 1.9993889253772 0.0494359992519591 9.31052871447953 1.99996166439723 0.0123832812987782 9.15688599077136 1.73205080756888 1 8 1.99987409110094 0.0224418334324644 8.78933432184124 1.99801638802384 0.0890533997184125 8.58747570976523 1.99042099726536 0.195510204635373 8.40603353089891 1.97234241951612 0.331459469911709 8.25632429135014 1.94188583642251 0.478622404008537 8.14667391873539 1.8880088194413 0.65986564624576 8.05962314131714 1.8136457281387 0.843023823297785 8.01239760885774 1 1 8 1 0.760684335712443 9.97094181742605 1 0.535276827956232 9.88545602565321 1 0.336877341759205 9.7485107481711 1 0.177016134106344 9.56806474673116 1 0.0649837573145855 9.35460488704254 1 0.00729112590194603 9.12053668025532 1 0.00729112590194569 8.87946331974468 1 0.0649837573145844 8.64539511295747 1 0.177016134106342 8.43193525326885 1 0.336877341759203 8.2514892518289 1 0.535276827956229 8.11454397434679 1 0.76068433571244 8.02905818257395 3.14159265358979 4.93038065763132e-32 3.14159265358979 0.732050807568878 4.7123889803847 1 3.33285452922313 0.828676736120809 3.54625128314393 0.905887288391544 3.76377366216794 0.956003972853683 3.97830112309655 0.983346651404907 4.18513867650964 0.995383850008792 4.39663978065854 0.999388925377198 4.55485218181589 0.999961664397228 6.28318530717959 0.732050807568877 4.92464483741872 0.99987409110094 5.13761237556875 0.99801638802384 5.34836932590852 0.990420997265357 5.55094076372226 0.972342419516118 5.73472076413548 0.941885836422513 5.93612555722863 0.888008819441296 6.12555718993006 0.813645728138699 6.28318530717959 0 3.38325362694285 0 3.62491460029591 0 3.86657557364898 0 4.10823654700204 0 4.3498975203551 0 4.59155849370816 0 4.83321946706122 0 5.07488044041428 0 5.31654141376734 0 5.5582023871204 0 5.79986336047346 0 6.04152433382652 0 4 2 1 4 1 20 5 20 21 5 4 20 6 21 22 6 5 21 7 22 23 7 6 22 8 23 24 8 7 23 9 24 25 9 8 24 10 9 25 3 25 26 3 10 25 12 26 27 12 3 26 13 27 28 13 12 27 14 28 29 14 13 28 15 14 29 16 29 30 16 15 29 17 30 31 17 16 30 18 31 19 18 17 31 11 18 19
9 7 1 0.00670154686291069
1 1 8 1.73205080756888 1 8 1 1.73205080756888 8.31874996136679 1.59979017704133 1.20027971251923 8.02026124258194 1.43224799832147 1.3959461567654 8.08172626942327 1.23718150592219 1.57142671786896 8.17934689877746 1.1180670165784 1.65829012972423 8.24723568687829 1 1.27036855254164 8.03724310140278 1 1.52059837824641 8.14619830840692 0 0 0 0.732050807568877 0.821327461377418 2.08166817117217e-17 0.201643408141249 0.599790177041329 0.407097988151891 0.432247998321467 0.608243319816803 0.237181505922189 0.718545042716869 0.1180670165784 0.273775820459139 0 0.547551640918278 0 4 2 1 4 1 8 5 8 9 5 4 8 6 5 9 7 6 9 3 7 9
21 20 1 8.60422844084496e-16
1 1 8 1 1.73205080756888 8.31874996136679 1 1.27036855254164 8.03724310140278 1 1.52059837824641 8.14619830840692 1 1 10 1 0.760684335712443 9.97094181742605 1 0.535276827956232 9.88545602565321 1 0.336877341759205 9.7485107481711 1 0.177016134106344 9.56806474673116 1 0.0649837573145855 9.35460488704254 1 0.00729112590194603 9.12053668025532 1 0.00729112590194569 8.87946331974468 1 0.0649837573145844 8.64539511295747 1 0.177016134106342 8.43193525326885 1 0.336877341759203 8.2514892518289 1 0.535276827956229 8.11454397434679 1 0.76068433571244 8.02905818257395 1 1.73205080756888 9.68125003863321 1 1.52059837824641 9.85380169159308 1 1.27036855254163 9.96275689859722 1 0.869670966735412 9 1 0 0.681250038633213 0.732050807568877 0.962756898597222 0.270368552541635 0.853801691593082 0.520598378246409 -1 1.11022302462516e-16 -0.970941817426052 -0.239315664287557 -0.88545602565321 -0.464723172043768 -0.748510748171102 -0.663122658240795 -0.568064746731157 -0.822983865893656 -0.354604887042537 -0.935016242685414 -0.120536680255324 -0.992708874098054 0.120536680255321 -0.992708874098054 0.354604887042534 -0.935016242685415 0.568064746731154 -0.822983865893658 0.7485107481711 -0.663122658240797 0.885456025653209 -0.464723172043771 0.970941817426051 -0.23931566428756 -0.681250038633213 0.732050807568877 -0.853801691593082 0.520598378246409 -0.962756898597222 0.270368552541635 0 -0.130329033264588 21 1 3 21 3 4 21 4 2 21 5 6 21 6 7 21 7 8 21 8 9 21 9 10 21 10 11 21 11 12 21 12 13 21 13 14 21 14 15 21 15 16 21 16 17 21 17 1 21 18 19 21 19 20 21 20 5 21 2 18
TShapes 59
Ve
2.00001e-07
-3.67381906146713e-16 -2 0
0 0
0101101
*
Ve
2.00001e-07
-3.67381906146713e-16 -2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 1 0 0 10
2 1 2 4 0 10
2 2 1 3 0 10
6 1 2 0
6 2 1 0
6 3 3 5
0
0101000
+59 5 -58 5 *
Ve
2.00001e-07
1.22460635382238e-16 2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 2 0 0.5 4.5
2 3 1 3 0.5 4.5
2 4 3 4 0.5 4.5
6 4 1 0
6 5 4 0
6 6 5 5
0
0101000
+58 5 -56 5 *
Ve
2.00001e-07
1.22460635382238e-16 2 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 3 0 0 10
2 5 1 3 0 10
2 6 4 4 0 10
6 7 6 0
6 8 1 0
6 9 7 5
0
0101000
+54 5 -56 5 *
Ed
1e-07 1 1 0
1 4 0 0.5 4.5
2 7 1 3 0.5 4.5
2 8 5 4 0.5 4.5
6 10 1 0
6 11 8 0
0
0101000
+59 5 -54 5 *
Wi
0101000
-57 0 -55 0 +53 0 +52 0 *
Fa
0 1e-07 1 3
2 1
0111000
+51 0 *
Ve
1e-07
2 -4.89842541528951e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 5 0 4.71238898038469 6.28318530717959
2 9 2 0 4.71238898038469 6.28318530717959
2 10 5 0 4.71238898038469 6.28318530717959
6 12 2 7
6 13 8 7
6 14 3 8
0
0101000
+59 8 -49 8 *
Ve
1e-07
2 -4.89842541528951e-16 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 4.71238898038469 6.28318530717959
2 11 2 0 4.71238898038469 6.28318530717959
2 12 3 0 4.71238898038469 6.28318530717959
6 15 2 7
6 16 4 7
6 17 3 8
6 18 5 8
0
0101000
+58 8 -47 8 *
Ve
2.00001e-07
2 -4.89842541528951e-16 9
0 0
0101101
*
Ed
1e-07 1 1 0
1 7 0 0 9
2 13 2 0 0 9
2 14 4 0 0 9
4 CN 2 0 4 0
6 19 3 8
6 20 7 8
0
0101000
+49 8 -45 8 *
Ed
1e-07 1 1 0
1 7 0 9 10
2 13 2 0 9 10
2 14 4 0 9 10
4 CN 2 0 4 0
6 21 3 8
6 22 9 8
0
0101000
+45 8 -47 8 *
Wi
0101000
-57 2 +48 6 -46 6 +44 6 +43 6 *
Fa
0 1e-07 2 6
2 3
0111000
+42 0 *
Ve
2.00001e-07
1.73205080756888 1 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 8 0 0.523598775598299 1.5707963267949
2 15 3 0 0.523598775598299 1.5707963267949
2 16 4 0 0.523598775598299 1.5707963267949
6 23 7 8
6 24 5 8
0
0101000
+40 8 -56 8 *
Ed
1e-07 1 1 0
1 8 0 0 0.523598775598299
2 15 3 0 0 0.523598775598299
2 16 4 0 0 0.523598775598299
6 25 9 8
6 26 5 8
0
0101000
+47 8 -40 8 *
Wi
0101000
-55 2 +39 6 +38 6 +46 6 *
Ve
2.00001e-07
1 1 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 9 0 -2.22044604925031e-16 0.732050807568877
2 17 3 6 -2.22044604925031e-16 0.732050807568877
2 18 6 9 -2.22044604925031e-16 0.732050807568877
6 27 10 0
6 28 11 0
6 29 5 0
0
0101000
+36 0 -40 0 *
Wi
0101000
i35 0 *
Fa
0 1e-07 3 6
2 5
0111000
+37 0 +34 0 *
Ve
2.00001e-07
1 1.73205080756888 9.68125003863321
0 0
0101101
*
Ed
1e-07 1 1 0
1 10 0 0 1
2 19 4 6 0 1
2 20 6 9 0 1
6 30 7 0
6 31 10 0
0
0101000
+32 0 -40 0 *
Ed
1e-07 1 1 0
1 11 0 0 1.5707963267949
2 21 4 0 0 1.5707963267949
2 22 5 0 0 1.5707963267949
6 32 6 7
6 33 8 7
6 34 7 8
0
0101000
+49 8 -54 8 *
Ve
2.00001e-07
1.73205080756888 1 8
0 0
0101101
*
Ed
1e-07 1 1 0
1 12 0 0 1
2 23 4 6 0 1
2 24 6 9 0 1
6 35 7 0
6 36 11 0
0
0101000
+45 0 -29 0 *
Ve
2.00001e-07
1 1.73205080756888 8.31874996136679
0 0
0101101
*
Ed
1e-07 1 1 0
1 13 0 0 1
2 25 4 6 0 1
2 26 6 9 0 1
6 37 7 0
6 38 12 0
0
0101000
+29 0 -27 0 *
Ed
1e-07 1 1 0
1 14 0 8.31874996136679 9.68125003863321
2 27 4 6 8.31874996136679 9.68125003863321
2 28 7 9 8.31874996136679 9.68125003863321
6 39 7 0
6 40 13 0
0
0101000
+27 0 -32 0 *
Wi
0101000
-31 0 -39 6 +53 2 +30 6 -44 6 -28 0 -26 0 -25 0 *
Fa
0 1e-07 4 6
2 7
0111000
+24 0 *
Wi
0101000
-52 0 +30 4 +48 4 *
Fa
0 1e-07 5 4
2 8
0111000
+22 0 *
Ed
1e-07 1 1 0
1 15 0 0 1
2 29 4 6 0 1
2 30 6 9 0 1
6 41 9 0
6 42 11 0
0
0101000
+40 0 -45 0 *
Wi
0101000
-20 0 -43 6 -38 6 *
Fa
0 1e-07 4 6
2 9
0111000
+19 0 *
Ed
1e-07 1 1 0
1 16 0 2.32026519221238 3.14159265358979
2 31 6 0 2.32026519221238 3.14159265358979
2 32 7 0 2.32026519221238 3.14159265358979
6 43 10 10
6 44 13 10
0
0101000
+32 10 -36 10 *
Wi
0101000
+17 9 -31 0 +35 0 *
Fa
0 1e-07 6 9
2 10
0111000
+16 0 *
Ve
1e-07
1 -2.44921270764475e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 17 0 0 0.732050807568877
3 33 34CN 6 0 0 0.732050807568877
6 45 11 10
6 46 12 10
0
0101000
+14 0 -29 10 *
Ed
1e-07 1 1 0
1 16 0 3.14159265358979 6.28318530717959
2 31 6 0 3.14159265358979 6.28318530717959
2 32 7 0 3.14159265358979 6.28318530717959
6 47 11 10
6 48 13 10
0
0101000
+36 10 -14 0 *
Wi
0101000
-35 0 -20 0 -28 0 +13 9 +12 9 *
Fa
0 1e-07 6 9
2 11
0111000
+11 0 *
Ed
1e-07 1 1 0
1 16 0 0 0.821327461377416
2 31 6 0 0 0.821327461377416
2 32 7 0 0 0.821327461377416
6 49 12 10
6 50 13 10
0
0101000
+14 0 -27 10 *
Wi
0101000
-13 9 -26 0 +9 9 *
Fa
0 1e-07 6 9
2 12
0111000
+8 0 *
Wi
0101000
+9 9 +12 9 +17 9 +25 0 *
Fa
0 1e-07 7 9
2 13
0111000
+6 0 *
Sh
0101000
-50 2 +41 0 +33 0 +23 0 -21 2 +18 0 -15 0 -10 0 -7 0 +5 0
*
So
0100000
+4 0 *
Co
0100000
+3 0 *
Co
1100000
+2 1 *
+1 0
@@ -0,0 +1,610 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 10
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 -10
0 1 0 -5
0 0 1 -2
1
1 0 0 0
0 1 0 0
0 0 1 0
2 2 -1 0
2 4 1 2 1 0
2 4 -1 0
2 2 -1 4 -1 0
1
2.22044604925031e-16 0 1 1
0 1 0 1
-1 0 2.22044604925031e-16 10
2 9 -1 0
Curve2ds 32
8 0 10
1 4.7123889803846897 0 0 1
8 0 10
1 2 -3 1 0
8 0.35316954888546093 4.6468304511145391
1 12 -2.5 0 -1
8 0.35316954888546093 4.6468304511145391
1 0 -2.5 0 1
8 0 10
1 2 -7 1 0
8 0 10
1 1.5707963267948966 0 0 1
8 0.35316954888546093 4.6468304511145391
1 2 -2.5 0 -1
8 0.35316954888546093 4.6468304511145391
1 0 -2.5 0 1
1 0 0 1 0
2 0 0 1 0 -0 1 2
1 0 10 1 0
2 0 0 1 0 -0 1 2
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
8 0 1.2110633883680135
1 1 1.1102230246251565e-16 1 0
8 0 1.2110633883680135
1 4.7123889803846897 0 0 1
2 0 0 1 0 -0 1 2
1 0 10 1 0
8 -0.57341522555726954 1.5091341405892065
1 1 0.5 0 1
8 -0.57341522555726954 1.5091341405892065
1 0 -0.5 0 1
7 0 0 8 23 4 0 10 -9.7243775973680629e-18 9.8941224112056876 0.0064057756076670328 9.7878714078948743 0.019296334952849933 9.682870254719866 0.038660124954986871 9.581268083931759 0.064143455212326381 9.4854944479856904 0.094978086898561687 9.3980935449981313 0.12987287565133043 9.3211657385203921 0.18450888193236056 9.2244369513332121 0.20263871994712773 9.1958412388550101 0.22093962870470363 9.17011571417782 0.23923135246228935 9.1471551468714161 0.25738034042266433 9.1267753834193943 0.27529414753922915 9.1087625829607681 0.29291235428411566 9.0928980415624387 0.34034512681859386 9.0546949363178175 0.36947179487282711 9.0363242784077418 0.39753071292667364 9.0226423487758538 0.42454740104337957 9.0127688515457791 0.45057714038714142 9.0060323417424328 0.47569468105698359 9.0019096847459625 0.49999758940987826 9.0000000030658853 0.52359877559829904 9
0 9 0.43124700432228547 7 0.6385783453949937 7 1 9
7 0 0 8 23 4 4.7123889803846906 1 4.818266569179003 1 4.9245179885468735 0.99999988838472509 5.0313253810989895 1.0000004678539893 5.1384138464680396 0.99953949636939021 5.2452403360778952 0.99767461680495328 5.3508864328939252 0.99301835412128847 5.4538730518337655 0.98450185722393346 5.5986757121687383 0.96636293333137335 5.6442974098895924 0.9596346729556009 5.6883033828665557 0.95208824887389987 5.7306015558238963 0.94378090273143411 5.7711786371647253 0.93479137576187443 5.8100704075117013 0.92520454560203302 5.8473465341417521 0.915099264718781 5.945430108416911 0.88614134095047137 6.0030939966862338 0.86638173306695054 6.0568380618791142 0.84555573811982276 6.1072119109648852 0.82390890538611505 6.1546619960590059 0.80163031380759375 6.199576655486692 0.77885213650936669 6.2423068525603878 0.75565199198720856 6.2831853071795871 0.73205080756887686
0 9 0.43124700432228547 7 0.6385783453949937 7 1 9
7 0 0 8 16 3 0.52359877559829893 9 0.55887750531979552 8.9999999954171575 0.5938375197816782 9.0042672730837037 0.62791863886966859 9.0123183829041658 0.66085296264462379 9.0233906441914264 0.69252039438227986 9.0368199621536434 0.72292712253575808 9.0520605900445901 0.75219106778533684 9.0687500040323474 0.81850504441980754 9.1107793318240766 0.85467110798673063 9.1370345485971818 0.88938870342337972 9.1649031612291978 0.92284878448520913 9.1940250465874573 0.95522054070374707 9.2241231643935464 0.98664287261148398 9.2550135627207144 1.0172551453910139 9.2865747537112497 1.0471975511965976 9.3187499613667875
0 9 0.42744492276272067 7 1 9
7 0 0 8 16 3 0 0.73205080756887697 0.061104553831736297 0.69677208049328521 0.12023460728944713 0.6593483984915065 0.17669728658180794 0.62048486133375924 0.23034686544451421 0.58081346548552637 0.28120407781252776 0.54082760410117692 0.32945563937616296 0.50084229089758736 0.37541373650243237 0.46096339293229127 0.4785983529753155 0.3676382982027534 0.53411311494968938 0.31439982370037184 0.58684451738472809 0.26136426573621913 0.63721225805746151 0.2085846291633279 0.68557391753360264 0.1560842692076593 0.73220714727738656 0.10385907684990153 0.77737530833049551 0.051861767150009772 0.82132746137741819 0
0 9 0.42744492276272067 7 1 9
8 8.7119017293312773 10
1 1.0471975511965965 2.2204460492503185e-16 0 1
8 8.7119017293312773 10
1 10 0.73205080756887608 -1 0
1 0 0 1 0
2 0 0 1 0 -0 1 2
1 6.2831853071795862 -0 0 1
1 0 -0 0 1
1 0 0 1 0
2 0 0 1 0 -0 1 1
Curves 16
1 0 -2 0 0 0 1
1 0 -2.5 10 0 1 0
1 0 2 0 0 0 1
1 0 -2.5 0 0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
1 1 1.1102230246251565e-16 10 1 0 2.2204460492503136e-16
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 1 0.5 10 0 1 0
7 0 0 8 23 4 2 0 10 2 -1.9448755194736123e-17 9.8941224112056876 1.9999998883846963 0.012811372738141993 9.7878714078948743 2.0000004678540786 0.038593438169371275 9.682870254719866 1.9995394963692699 0.077318640111777026 9.581268083931759 1.9976746168050377 0.1282888231353847 9.4854944479856904 1.9930183541212625 0.18988799033546624 9.3980935449981313 1.9845018572239339 0.25922563134470661 9.3211657385203921 1.9663629333313739 0.36698161572322258 9.2244369513332121 1.9596346729555936 0.40261883347709415 9.1958412388550101 1.9520882488739111 0.43844807711151135 9.17011571417782 1.9437809027314348 0.47409278961385093 9.1471551468714161 1.9347913757618636 0.50927624567966878 9.1267753834193943 1.9252045456020399 0.54380989567019589 9.1087625829607681 1.9150992647187814 0.57757312880961287 9.0928980415624387 1.8861413409504715 0.667910885546533 9.0546949363178175 1.8663817330669514 0.72274997121824613 9.0363242784077418 1.8455557381198215 0.77491687627603545 9.0226423487758538 1.8239089053861155 0.82448172027071709 9.0127688515457791 1.8016303138075953 0.87158159324021456 9.0060323417424328 1.7788521365093655 0.91639105609237981 9.0019096847459625 1.7556519919872087 0.9591215453808013 9.0000000030658853 1.732050807568877 1 9
0 9 0.43124700432228547 7 0.6385783453949937 7 1 9
7 0 0 8 16 3 1.7320508075688772 1 9 1.6967720804932855 1.0611045538317361 8.9999999954171575 1.6593483984915407 1.1202346812299289 9.0042672730837037 1.620484861333654 1.1763492367391066 9.0123183829041658 1.5808134654856665 1.2290517685684821 9.0233906441914264 1.5408276041010849 1.2782701282357203 9.0368199621536434 1.5008422908976136 1.3241620984757765 9.0520605900445901 1.4609633929322916 1.3670405445562057 9.0687500040323474 1.3676382982027535 1.4612774836089533 9.1107793318240766 1.3143998237003607 1.5103534942136239 9.1370345485971818 1.2613642657362611 1.5553188395521516 9.1649031612291978 1.2085846291632651 1.5966210155616967 9.1940250465874573 1.1560842692077065 1.6346519175340029 9.2241231643935464 1.1038590768498868 1.6697213688011709 9.2550135627207144 1.0518617671500099 1.7021084000206663 9.2865747537112497 1.0000000000000002 1.7320508075688772 9.3187499613667875
0 9 0.42744492276272067 7 1 9
1 1.0000000000000022 1.7320508075688761 2.2204460492503185e-16 0 0 1
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 1 -2.4492127076447545e-16 0 0 0 1
2 0 0 0 0 0 1 1 0 -0 -0 1 0 1
Polygon3D 0
PolygonOnTriangulations 50
2 1 2
p 0.0137452943347953 1 0 10
2 1 2
p 0.0137452943347953 1 0 10
2 1 2
p 0.0138139545017056 1 0 10
2 1 2
p 0.0137509455200675 1 0 10
2 2 3
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0138139545017056 1 0.5 4.5
2 3 12
p 0.0137509455200675 1 0.5 4.5
2 2 12
p 0.0137452943347953 1 0 10
2 4 3
p 0.0137452943347953 1 0 10
2 12 6
p 0.0138139545017056 1 0 10
2 20 17
p 0.0137509455200675 1 0 10
2 1 4
p 0.0137452943347953 1 0.5 4.5
2 1 2
p 0.0137452943347953 1 0.5 4.5
10 1 13 14 15 16 17 18 19 20 12
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 12 13 14 15 16 17 18 19 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 4 5 6 7 8 9 10 11 3
p 0.0138139545017056 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 4 5 6 7 8 9 10 11 3
p 0.0137509455200675 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 2 4 5 6 7 8 9 10 11 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 12 13 14 15 16 17 18 19 3
p 0.0137452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 2 13 14 15 16 17 18 19 20 12
p 0.0138139545017056 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 1 12 13 14 15 16 17 18 19 9
p 0.0138139545017056 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 2 13 14 15 16 17 18 19 20 12
p 0.0137509455200675 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
10 3 4 5 6 7 8 9 10 11 2
p 0.0137509455200675 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299 5.41052068118242 5.58505360638186 5.75958653158129 5.93411945678073 6.10865238198016 6.28318530717959
2 12 3
p 0.0137452943347953 1 0 10
2 1 11
p 0.0137452943347953 1 0 10
2 3 12
p 0.0137509455200675 1 0 10
2 21 1
p 0.0137509455200675 1 0 10
2 1 2
p 0.0137509455200675 1 0 1
2 1 2
p 0.0137509455200675 1 0 1
4 16 18 19 17
p 0.0137509455200675 1 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
4 13 14 15 12
p 0.0137509455200675 1 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
2 1 13
p 0.0137509455200675 1 -0.5 1.23205080756888
2 1 2
p 0.0137509455200675 1 -0.5 1.23205080756888
10 1 3 4 5 6 7 8 9 10 2
p 0.0137509455200675 1 0 0.107466481500505 0.21493296300101 0.322399444501515 0.42986592600202 0.537332407502525 0.676596515630099 0.837796237880857 0.918898118940428 1
10 2 4 5 6 7 8 9 10 11 3
p 0.0137509455200675 1 0 0.107466481500505 0.21493296300101 0.322399444501515 0.42986592600202 0.537332407502525 0.676596515630099 0.837796237880857 0.918898118940428 1
6 2 12 13 14 15 11
p 0.0137509455200675 1 0 0.187060827628949 0.411533820783688 0.673511822433078 0.836755911216539 1
6 5 6 7 8 9 2
p 0.0137509455200675 1 0 0.187060827628949 0.411533820783688 0.673511822433078 0.836755911216539 1
2 11 16
p 0.0137509455200675 1 9.31874996136679 10
2 3 2
p 0.0137509455200675 1 9.31874996136679 10
10 1 3 4 5 6 7 8 9 10 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
10 3 4 5 6 7 8 9 10 11 2
p 0.0137452943347953 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
10 13 14 15 16 17 18 19 20 21 12
p 0.0138139545017056 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
10 21 22 23 24 25 26 27 28 29 20
p 0.0137509455200675 1 0 0.174532925199433 0.349065850398867 0.5235987755983 0.698131700797733 0.872664625997167 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
2 12 3
p 0.0137509455200675 1 0 0.732050807568877
2 1 5
p 0.0137509455200675 1 0 0.732050807568877
7 1 13 14 15 16 17 12
p 0.0137509455200675 1 4.71238898038469 4.97418836818384 5.23598775598299 5.49778714378214 5.75958653158129 6.02138591938044 6.28318530717959
7 1 7 8 9 10 11 4
p 0.0137509455200675 1 4.71238898038469 4.97418836818384 5.23598775598299 5.49778714378214 5.75958653158129 6.02138591938044 6.28318530717959
4 1 3 4 2
p 0.0137509455200675 1 0 0.273775820459139 0.547551640918278 0.821327461377416
4 4 5 6 3
p 0.0137509455200675 1 0 0.273775820459139 0.547551640918278 0.821327461377416
Surfaces 7
1 10 0 0 1 0 -0 0 0 1 0 -1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 10 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 1
1 0 0 0 0 0 1 1 0 -0 -0 1 0
Triangulations 14
4 2 1 2.5357526258398e-16
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 1.22460635382238e-16 2 0 2 -3 12 -3 12 -7 2 -7 2 4 3 2 1 4
20 18 1 0.00761060381650911
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 2 -4.89842541528951e-16 0 0.347296355333862 -1.96961550602442 0 0.68404028665134 -1.87938524157182 0 1 -1.73205080756888 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999993 0 1.87938524157182 -0.684040286651329 0 1.96961550602442 -0.34729635533385 0 4.71238898038469 0 4.71238898038469 10 6.28318530717959 10 4.88692190558412 10 5.06145483078356 10 5.23598775598299 10 5.41052068118242 10 5.58505360638186 10 5.75958653158129 10 5.93411945678073 10 6.10865238198016 10 6.28318530717959 0 4.88692190558412 0 5.06145483078356 0 5.23598775598299 0 5.41052068118242 0 5.58505360638186 0 5.75958653158129 0 5.93411945678073 0 6.10865238198016 0 2 1 13 4 13 14 4 2 13 5 14 15 5 4 14 6 15 16 6 5 15 7 16 17 7 6 16 8 17 18 8 7 17 9 18 19 9 8 18 10 19 20 10 9 19 11 20 12 11 10 20 3 11 12
21 19 1 0.00761060381650909
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 0 0.347296355333862 -1.96961550602442 0 0.68404028665134 -1.87938524157182 0 1 -1.73205080756888 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999993 0 1.87938524157182 -0.684040286651329 0 1.96961550602442 -0.34729635533385 0 2 -4.89842541528951e-16 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 2 -4.89842541528951e-16 9 4.71238898038469 0 4.71238898038469 10 6.28318530717959 0 4.88692190558412 0 5.06145483078356 0 5.23598775598299 0 5.41052068118242 0 5.58505360638186 0 5.75958653158129 0 5.93411945678073 0 6.10865238198016 0 6.28318530717959 10 4.88692190558412 10 5.06145483078356 10 5.23598775598299 10 5.41052068118242 10 5.58505360638186 10 5.75958653158129 10 5.93411945678073 10 6.10865238198016 10 6.28318530717959 9 13 2 1 13 1 4 14 4 5 14 5 6 14 13 4 15 14 6 16 6 7 16 7 8 16 15 6 17 16 8 18 8 9 18 17 8 19 9 10 19 18 9 20 10 11 20 19 10 21 11 3 21 20 11 12 20 21
20 18 1 0.00761060381650909
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 0 0.347296355333862 -1.96961550602442 0 0.68404028665134 -1.87938524157182 0 1 -1.73205080756888 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999993 0 1.87938524157182 -0.684040286651329 0 1.96961550602442 -0.34729635533385 0 2 -4.89842541528951e-16 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 4.71238898038469 0 4.71238898038469 10 6.28318530717959 0 4.88692190558412 0 5.06145483078356 0 5.23598775598299 0 5.41052068118242 0 5.58505360638186 0 5.75958653158129 0 5.93411945678073 0 6.10865238198016 0 6.28318530717959 10 4.88692190558412 10 5.06145483078356 10 5.23598775598299 10 5.41052068118242 10 5.58505360638186 10 5.75958653158129 10 5.93411945678073 10 6.10865238198016 10 13 2 1 13 1 4 14 4 5 14 13 4 15 5 6 15 14 5 16 6 7 16 15 6 17 7 8 17 16 7 18 8 9 18 17 8 19 9 10 19 18 9 20 10 11 20 19 10 12 11 3 12 20 11
20 19 1 2.44921270764476e-16
-3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 2 -4.89842541528951e-16 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651339 10 1.73205080756888 1 10 1.53208888623795 1.28557521937308 10 1.28557521937308 1.53208888623796 10 0.999999999999996 1.73205080756888 10 0.684040286651332 1.87938524157182 10 0.347296355333854 1.96961550602442 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 1 0 10 0 -2 0 2 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651339 1.73205080756888 1 1.53208888623795 1.28557521937308 1.28557521937308 1.53208888623796 0.999999999999996 1.73205080756888 0.684040286651332 1.87938524157182 0.347296355333854 1.96961550602442 0.347296355333862 -1.96961550602442 0.68404028665134 -1.87938524157182 1 -1.73205080756888 1.28557521937308 -1.53208888623795 1.53208888623796 -1.28557521937307 1.73205080756888 -0.999999999999993 1.87938524157182 -0.684040286651329 1.96961550602442 -0.34729635533385 1 0 20 2 1 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 2 20 1 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 3
21 21 1 2.44921270764476e-16
-3.67381906146713e-16 -2 10 1.22460635382238e-16 2 10 1.73205080756888 1 10 1.53208888623796 1.28557521937308 10 1.28557521937308 1.53208888623796 10 0.999999999999997 1.73205080756888 10 0.684040286651333 1.87938524157182 10 0.347296355333855 1.96961550602442 10 2 -4.89842541528951e-16 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651337 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 1 1 10 1 0 10 0 -2 0 2 1.73205080756888 1 1.53208888623796 1.28557521937308 1.28557521937308 1.53208888623796 0.999999999999997 1.73205080756888 0.684040286651333 1.87938524157182 0.347296355333855 1.96961550602442 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651337 0.347296355333862 -1.96961550602442 0.68404028665134 -1.87938524157182 1 -1.73205080756888 1.28557521937308 -1.53208888623795 1.53208888623796 -1.28557521937307 1.73205080756888 -0.999999999999993 1.87938524157182 -0.684040286651329 1.96961550602442 -0.34729635533385 1 1 1 0 8 2 20 7 8 20 6 7 20 3 20 11 5 6 20 4 20 3 4 5 20 21 2 1 21 9 10 21 10 11 21 1 12 21 12 13 21 13 14 21 14 15 21 15 16 21 16 17 21 17 18 21 18 19 21 19 9 21 20 2 21 11 20
15 13 1 1.11022302462516e-16
1 1.11022302462516e-16 10 2 -4.89842541528951e-16 10 -3.67381906146713e-16 -2 10 0.347296355333862 -1.96961550602442 10 0.68404028665134 -1.87938524157182 10 1 -1.73205080756888 10 1.28557521937308 -1.53208888623795 10 1.53208888623796 -1.28557521937307 10 1.73205080756888 -0.999999999999993 10 1.87938524157182 -0.684040286651329 10 1.96961550602442 -0.34729635533385 10 1.22460635382238e-16 2 10 1 1.73205080756888 10 0.684040286651336 1.87938524157182 10 0.347296355333856 1.96961550602442 10 1 0 2 0 -3.67381906146713e-16 -2 0.347296355333862 -1.96961550602442 0.68404028665134 -1.87938524157182 1 -1.73205080756888 1.28557521937308 -1.53208888623795 1.53208888623796 -1.28557521937307 1.73205080756888 -0.999999999999993 1.87938524157182 -0.684040286651329 1.96961550602442 -0.34729635533385 0 2 1 1.73205080756888 0.684040286651336 1.87938524157182 0.347296355333856 1.96961550602442 1 3 4 1 4 5 1 5 6 1 6 7 1 7 8 1 8 9 10 1 9 11 1 10 12 3 1 2 1 11 15 12 1 14 15 1 13 14 1
20 18 1 0.00761060381650915
2 -4.89842541528951e-16 0 1.22460635382238e-16 2 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651339 0 1.73205080756888 1 0 1.53208888623795 1.28557521937308 0 1.28557521937308 1.53208888623796 0 0.999999999999996 1.73205080756888 0 0.684040286651332 1.87938524157182 0 0.347296355333854 1.96961550602442 0 2 -4.89842541528951e-16 10 1.22460635382238e-16 2 10 1.96961550602442 0.347296355333861 10 1.87938524157182 0.684040286651339 10 1.73205080756888 1 10 1.53208888623795 1.28557521937308 10 1.28557521937308 1.53208888623796 10 0.999999999999996 1.73205080756888 10 0.684040286651332 1.87938524157182 10 0.347296355333854 1.96961550602442 10 0 0 1.5707963267949 0 0.174532925199433 0 0.349065850398867 0 0.5235987755983 0 0.698131700797733 0 0.872664625997167 0 1.0471975511966 0 1.22173047639603 0 1.39626340159547 0 0 10 1.5707963267949 10 0.174532925199433 10 0.349065850398867 10 0.5235987755983 10 0.698131700797733 10 0.872664625997167 10 1.0471975511966 10 1.22173047639603 10 1.39626340159547 10 13 1 3 13 11 1 14 3 4 14 13 3 15 4 5 15 14 4 16 5 6 16 15 5 17 6 7 17 7 8 17 16 6 18 17 8 19 8 9 19 18 8 20 9 10 20 19 9 12 10 2 12 20 10
35 33 1 0.00761060381650912
1 1.73205080756888 9.68125003863321 1.73205080756888 1 10 1.24356077504528 1.56638328433057 9.82414196047073 1.44411313553921 1.38366804318938 9.92347108067014 1.59184799648933 1.2107931090258 9.97753069361392 1.22460635382238e-16 2 10 1.53208888623796 1.28557521937308 10 1.28557521937308 1.53208888623796 10 0.999999999999997 1.73205080756888 10 0.684040286651333 1.87938524157182 10 0.347296355333855 1.96961550602442 10 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651339 0 1.73205080756888 1 0 1.53208888623795 1.28557521937308 0 1.28557521937308 1.53208888623796 0 0.999999999999996 1.73205080756888 0 0.684040286651332 1.87938524157182 0 0.347296355333854 1.96961550602442 0 2 -4.89842541528951e-16 9 1.73205080756888 1 8 1.99987409110094 0.0224418334324644 8.78933432184124 1.99801638802384 0.0890533997184125 8.58747570976523 1.99042099726536 0.195510204635373 8.40603353089891 1.97234241951612 0.331459469911709 8.25632429135014 1.94188583642251 0.478622404008537 8.14667391873539 1.8880088194413 0.65986564624576 8.05962314131714 1.8136457281387 0.843023823297785 8.01239760885774 1 1.73205080756888 8.31874996136679 1.59979017704133 1.20027971251923 8.02026124258194 1.43224799832147 1.3959461567654 8.08172626942327 1.23718150592219 1.57142671786896 8.17934689877746 1.1180670165784 1.65829012972423 8.24723568687829 1.0471975511966 9.68125003863321 0.523598782972604 10 0.899782422184016 9.82414196047073 0.764025969170863 9.92347108067014 0.650264004823151 9.97753069361392 1.5707963267949 10 0.698131700797732 10 0.872664625997166 10 1.0471975511966 10 1.22173047639603 10 1.39626340159547 10 1.5707963267949 0 0 0 0.174532925199433 0 0.349065850398867 0 0.5235987755983 0 0.698131700797733 0 0.872664625997167 0 1.0471975511966 0 1.22173047639603 0 1.39626340159547 0 0 9 0.523598775598299 8 0.0112211491236271 8.78933432184124 0.0445414271711193 8.58747570976523 0.097911470294066 8.40603353089891 0.166497933186523 8.25632429135014 0.241656377503374 8.14667391873539 0.336232412997137 8.05962314131714 0.43511193781139 8.01239760885774 1.0471975511966 8.31874996136679 0.643675940617773 8.02026124258194 0.772563171913424 8.08172626942327 0.903848483101006 8.17934689877746 0.977576635015398 8.24723568687829 24 22 13 25 24 13 26 13 14 26 25 13 27 26 14 28 14 15 28 27 14 29 28 15 30 15 16 30 29 15 23 30 16 32 16 17 32 23 16 33 17 18 33 32 17 34 33 18 35 18 19 35 34 18 31 19 20 31 35 19 9 8 3 10 1 31 10 31 20 10 9 1 11 20 21 11 21 12 11 10 20 6 11 12 3 1 9 4 3 8 5 4 7 7 2 5 8 7 4
29 27 1 0.00761060381650913
2 -4.89842541528951e-16 10 1.73205080756888 1 9 1.99987523624578 0.0223395520067707 9.7898095021718 1.99803417695096 0.0886533829575376 9.58836017903088 1.99050385798473 0.194664783921575 9.40718030809096 1.97256498027803 0.330132395829614 9.25751943260492 1.94229666432695 0.476952487440466 9.14769647533098 1.88865543996888 0.658012615446287 9.06029544857059 1.81426002823504 0.841700981685414 9.01260877850726 1.77383037868552 0.923864596988277 9.00290251315512 1 1.73205080756888 9.31874996136679 1.60010509669307 1.19985985780586 9.02017550896718 1.43295112634321 1.39522438012761 9.08141538606319 1.23846065134292 1.5704188051504 9.17864599995806 1.11870047211312 1.65786285964092 9.24686225446853 1 1.73205080756888 10 1.22460635382238e-16 2 10 0.684040286651336 1.87938524157182 10 0.347296355333856 1.96961550602442 10 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651339 0 1.73205080756888 1 0 1.53208888623795 1.28557521937308 0 1.28557521937308 1.53208888623796 0 0.999999999999996 1.73205080756888 0 0.684040286651332 1.87938524157182 0 0.347296355333854 1.96961550602442 0 0 10 0.523598775598299 9 0.0111700052064358 9.7898095021718 0.0443412211608221 9.58836017903088 0.0974867344254273 9.40718030809096 0.165825129516517 9.25751943260492 0.240796522712668 9.14769647533098 0.335251107531939 9.06029544857059 0.434382678786069 9.01260877850726 0.480172638742751 9.00290251315512 1.0471975511966 9.31874996136679 0.643413522835291 9.02017550896718 0.772059348897633 9.08141538606319 0.903034219457019 9.17864599995806 0.977194592584853 9.24686225446853 1.0471975511966 10 1.5707963267949 10 1.22173047639603 10 1.39626340159547 10 1.5707963267949 0 0 0 0.174532925199433 0 0.349065850398867 0 0.5235987755983 0 0.698131700797733 0 0.872664625997167 0 1.0471975511966 0 1.22173047639603 0 1.39626340159547 0 3 1 21 4 3 21 5 21 22 5 4 21 6 5 22 7 22 23 7 6 22 8 7 23 9 23 24 9 8 23 10 9 24 2 10 24 12 24 25 12 2 24 13 25 26 13 12 25 14 13 26 15 26 27 15 14 26 11 27 28 11 15 27 18 16 11 18 11 28 19 28 29 19 29 20 19 18 28 17 19 20
20 19 1 2.44921270764476e-16
-3.67381906146713e-16 -2 0 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 1.96961550602442 0.347296355333861 0 1.87938524157182 0.684040286651339 0 1.73205080756888 1 0 1.53208888623795 1.28557521937308 0 1.28557521937308 1.53208888623796 0 0.999999999999996 1.73205080756888 0 0.684040286651332 1.87938524157182 0 0.347296355333854 1.96961550602442 0 0.347296355333862 -1.96961550602442 0 0.68404028665134 -1.87938524157182 0 1 -1.73205080756888 0 1.28557521937308 -1.53208888623795 0 1.53208888623796 -1.28557521937307 0 1.73205080756888 -0.999999999999993 0 1.87938524157182 -0.684040286651329 0 1.96961550602442 -0.34729635533385 0 1 0 0 0 -2 0 2 2 0 1.96961550602442 0.347296355333861 1.87938524157182 0.684040286651339 1.73205080756888 1 1.53208888623795 1.28557521937308 1.28557521937308 1.53208888623796 0.999999999999996 1.73205080756888 0.684040286651332 1.87938524157182 0.347296355333854 1.96961550602442 0.347296355333862 -1.96961550602442 0.68404028665134 -1.87938524157182 1 -1.73205080756888 1.28557521937308 -1.53208888623795 1.53208888623796 -1.28557521937307 1.73205080756888 -0.999999999999993 1.87938524157182 -0.684040286651329 1.96961550602442 -0.34729635533385 1 0 20 2 1 20 3 4 20 4 5 20 5 6 20 6 7 20 7 8 20 8 9 20 9 10 20 10 11 20 11 2 20 1 12 20 12 13 20 13 14 20 14 15 20 15 16 20 16 17 20 17 18 20 18 19 20 19 3
17 15 1 0.00642942848935936
1 1.11022302462516e-16 10 2 -4.89842541528951e-16 10 1.73205080756888 1 9 1.99987523624578 0.0223395520067707 9.7898095021718 1.99803417695096 0.0886533829575376 9.58836017903088 1.99050385798473 0.194664783921575 9.40718030809096 1.97256498027803 0.330132395829614 9.25751943260492 1.94229666432695 0.476952487440466 9.14769647533098 1.88865543996888 0.658012615446287 9.06029544857059 1.81426002823504 0.841700981685414 9.01260877850726 1.77383037868552 0.923864596988277 9.00290251315512 1 1 9 1 0.0340741737109315 9.74118095489748 1 0.133974596215561 9.5 1 0.292893218813452 9.29289321881345 1 0.499999999999999 9.13397459621556 1 0.741180954897478 9.03407417371093 4.71238898038469 0 4.71238898038469 1 6.28318530717959 0.732050807568877 4.92415877379089 0.999875236245783 5.13664165470711 0.998034176950957 5.34694460317156 0.990503857984729 5.54915484954815 0.972564980278033 5.73276264134943 0.94229666432695 5.93415433408826 0.888655439968882 6.12421759997208 0.814260028235043 6.20697615425511 0.773830378685517 6.28318530717959 0 4.97418836818384 0 5.23598775598299 0 5.49778714378214 0 5.75958653158129 0 6.02138591938044 0 4 2 1 4 1 13 5 13 14 5 4 13 6 14 15 6 5 14 7 15 16 7 6 15 8 7 16 9 16 17 9 8 16 10 9 17 11 17 12 11 10 17 3 11 12
12 11 1 8.40036148998055e-16
1 1.11022302462516e-16 10 1 1.73205080756888 10 1 1.73205080756888 9.31874996136679 1 1 9 1 1.27036855254164 9.03724310140278 1 1.52059837824641 9.14619830840692 1 0.0340741737109315 9.74118095489748 1 0.133974596215561 9.5 1 0.292893218813452 9.29289321881345 1 0.499999999999999 9.13397459621556 1 0.741180954897478 9.03407417371093 1 0.866025403784439 9.5 0 -1 0 0.732050807568877 0.681250038633213 0.732050807568876 1 0 0.962756898597222 0.270368552541635 0.853801691593082 0.520598378246409 0.25881904510252 -0.965925826289068 0.499999999999999 -0.866025403784439 0.707106781186547 -0.707106781186548 0.866025403784438 -0.500000000000001 0.965925826289068 -0.258819045102522 0.5 -0.133974596215561 12 2 1 12 3 2 12 4 5 12 5 6 12 6 3 12 1 7 12 7 8 12 8 9 12 9 10 12 10 11 12 11 4
9 7 1 0.00669540423217571
1 1 9 1 1.73205080756888 9.31874996136679 1 1.27036855254164 9.03724310140278 1 1.52059837824641 9.14619830840692 1.73205080756888 1 9 1.60010509669307 1.19985985780586 9.02017550896718 1.43295112634321 1.39522438012761 9.08141538606319 1.23846065134292 1.5704188051504 9.17864599995806 1.11870047211312 1.65786285964092 9.24686225446853 0 0 0.821327461377416 0 0.273775820459139 0 0.547551640918278 0 0 0.732050807568877 0.201214889466525 0.600105096693067 0.40631210662822 0.432951126343211 0.607015660564445 0.238460651342922 0.717977582097307 0.11870047211312 6 1 3 6 5 1 7 3 4 7 6 3 8 7 4 9 8 4 2 9 4
TShapes 48
Ve
2.00001e-07
-3.67381906146713e-16 -2 0
0 0
0101101
*
Ve
2.00001e-07
-3.67381906146713e-16 -2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 1 0 0 10
2 1 2 4 0 10
2 2 1 3 0 10
6 1 2 0
6 2 1 0
6 3 3 5
6 4 4 5
0
0101000
+48 5 -47 5 *
Ve
2.00001e-07
1.22460635382238e-16 2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 2 0 0.5 4.5
2 3 1 3 0.5 4.5
2 4 3 4 0.5 4.5
6 5 1 0
6 6 5 0
6 7 6 5
6 8 7 5
0
0101000
+47 5 -45 5 *
Ve
2.00001e-07
1.22460635382238e-16 2 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 3 0 0 10
2 5 1 3 0 10
2 6 4 4 0 10
6 9 8 0
6 10 1 0
6 11 9 5
6 12 10 5
0
0101000
+43 5 -45 5 *
Ed
1e-07 1 1 0
1 4 0 0.5 4.5
2 7 1 3 0.5 4.5
2 8 5 4 0.5 4.5
6 13 1 0
6 14 11 0
0
0101000
+48 5 -43 5 *
Wi
0101000
-46 0 -44 0 +42 0 +41 0 *
Fa
0 1e-07 1 3
2 1
0111000
+40 0 *
Ve
1e-07
2 -4.89842541528951e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 5 0 4.71238898038469 6.28318530717959
2 9 2 0 4.71238898038469 6.28318530717959
2 10 5 0 4.71238898038469 6.28318530717959
6 15 2 7
6 16 11 7
6 17 3 8
6 18 4 8
0
0101000
+48 8 -38 8 *
Ve
3.00000999953116e-07
2 -4.89842541528951e-16 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 4.71238898038469 6.28318530717959
2 11 2 0 4.71238898038469 6.28318530717959
2 12 3 0 4.71238898038469 6.28318530717959
6 19 2 7
6 20 5 7
6 21 3 8
6 22 6 8
6 23 4 8
6 24 7 8
0
0101000
+47 8 -36 8 *
Ed
1e-07 1 1 0
1 7 0 0 10
2 13 2 0 0 10
2 14 4 0 0 10
4 CN 2 0 4 0
6 25 2 7
6 26 8 7
6 27 4 8
6 28 10 8
0
0101000
-36 8 +38 8 *
Wi
0101000
-46 2 +37 6 -35 6 +34 6 *
Fa
0 1e-07 2 6
2 4
0101000
+33 0 *
Ve
2.00001e-07
1 1.11022302462516e-16 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 8 0 0 1
2 15 3 6 0 1
2 16 6 9 0 1
6 29 12 0
6 30 7 0
0
0101000
+31 0 -36 0 *
Ve
2.00001e-07
1 1.73205080756888 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 9 0 1.0471975511966 1.5707963267949
2 17 3 0 1.0471975511966 1.5707963267949
2 18 4 0 1.0471975511966 1.5707963267949
6 31 10 8
6 32 7 8
0
0101000
+29 8 -45 8 *
Ed
1e-07 1 1 0
1 10 0 -0.5 1.23205080756888
2 19 3 6 -0.5 1.23205080756888
2 20 7 9 -0.5 1.23205080756888
6 33 7 0
6 34 13 0
0
0101000
+31 0 -29 0 *
Wi
0101000
-30 0 +35 6 -44 2 +28 6 +27 0 *
Fa
0 1e-07 3 6
2 7
0101000
+26 0 *
Ve
2.00001e-07
1.73205080756888 1 9
0 0
0101101
*
Ed
1e-07 1 1 0
1 11 0 0 1
2 21 4 6 0 1
2 22 6 9 0 1
6 35 10 0
6 36 12 0
0
0101000
+36 0 -24 0 *
Ve
2.00001e-07
1 1.73205080756888 9.31874996136679
0 0
0101101
*
Ed
1e-07 1 1 0
1 12 0 0 1
2 23 4 6 0 1
2 24 6 9 0 1
6 37 10 0
6 38 14 0
0
0101000
+24 0 -22 0 *
Ed
1e-07 1 1 0
1 13 0 9.31874996136679 10
2 25 4 6 9.31874996136679 10
2 26 7 9 9.31874996136679 10
6 39 10 0
6 40 13 0
0
0101000
+22 0 -29 0 *
Ed
1e-07 1 1 0
1 14 0 0 1.5707963267949
2 27 4 0 0 1.5707963267949
2 28 5 0 0 1.5707963267949
6 41 8 7
6 42 11 7
6 43 9 8
6 44 10 8
0
0101000
+38 8 -43 8 *
Wi
0101000
-23 0 -21 0 -20 0 -28 6 +42 2 +19 6 -34 6 *
Fa
0 1e-07 4 6
2 10
0101000
+18 0 *
Wi
0101000
-41 0 +19 4 +37 4 *
Fa
0 1e-07 5 4
2 11
0111000
+16 0 *
Ve
1e-07
1 -2.44921270764475e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 15 0 0 0.732050807568877
3 29 30CN 6 0 0 0.732050807568877
6 45 12 10
6 46 14 10
0
0101000
+14 0 -24 10 *
Ed
1e-07 1 1 0
1 16 0 4.71238898038469 6.28318530717959
2 31 6 0 4.71238898038469 6.28318530717959
2 32 7 0 4.71238898038469 6.28318530717959
6 47 12 10
6 48 13 10
0
0101000
+31 10 -14 0 *
Wi
0101000
-30 0 -23 0 +13 9 +12 9 *
Fa
0 1e-07 6 9
2 12
0101000
+11 0 *
Ed
1e-07 1 1 0
1 16 0 0 0.821327461377416
2 31 6 0 0 0.821327461377416
2 32 7 0 0 0.821327461377416
6 49 14 10
6 50 13 10
0
0101000
+14 0 -22 10 *
Wi
0101000
-27 0 +20 0 +9 9 +12 9 *
Fa
0 1e-07 7 9
2 13
0101000
+8 0 *
Wi
0101000
+9 9 -13 9 -21 0 *
Fa
0 1e-07 6 9
2 14
0101000
+6 0 *
Sh
0101000
-39 2 +32 0 +25 0 +17 0 -15 2 -10 0 +7 0 -5 0 *
So
0100000
+4 0 *
Co
0100000
+3 0 *
Co
1100000
+2 1 *
+1 0
@@ -0,0 +1,888 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 31
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
2 3 1 4 1 5 1 0
2 5 -1 4 -1 3 -1 0
2 2 -1 5 -1 4 -1 3 -1 0
2 3 1 4 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
2 3 1 4 1 10 1 5 -1 0
2 5 -1 0
2 2 -1 5 -1 0
1
1 0 0 0
0 1 0 0
0 0 1 10
2 14 1 3 -1 0
2 3 1 4 1 10 1 0
2 10 -1 4 -1 3 -1 0
2 2 -1 10 -1 4 -1 3 -1 0
2 3 1 4 1 10 1 2 1 0
1
1 0 0 1
0 1 0 -4
0 0 1 4
2 5 1 2 1 0
2 14 1 4 1 5 1 0
2 14 1 4 1 0
2 14 1 4 1 10 1 5 -1 0
2 5 -1 4 -1 14 -1 0
2 2 -1 5 -1 4 -1 14 -1 0
2 20 -1 0
2 14 1 4 1 10 1 2 1 0
2 2 -1 10 -1 4 -1 14 -1 0
2 10 -1 4 -1 14 -1 0
2 14 1 4 1 10 1 0
Curve2ds 54
2 0 0 1 0 -0 1 2
1 0 0 1 0
8 -0.14683045111453996 4.14683045111454
1 0 -2 0 1
1 0 -2 0 1
8 0 10
1 1.5707963267948966 0 0 1
1 1.5707963267948966 0 0 1
8 0 10
1 4.7123889803846897 0 0 1
1 4.7123889803846897 0 0 1
1 0 10 1 0
1 0 0 1 0
2 0 0 1 0 -0 1 2
1 0 0 1 0
2 0 0 1 0 -0 1 2
1 0 0 1 0
8 3 10
1 1.0471975511965976 0 0 1
8 3 10
1 -4 -5.7320508075688767 1 0
1 0 10 1 0
1 0 0 1 0
1 0 -0 0 1
1 6.2831853071795862 -0 0 1
1 -1.5707963267948966 4 1 0
2 -1 4 0 -1 1 0 2
1 4.7123889803846897 4 1 0
2 -1 4 0 -1 1 0 2
1 0 10 1 0
1 0 0 1 0
8 3 10
1 5.2359877559829888 0 0 1
8 3 10
1 -4 -2.2679491924311228 1 0
8 0 10
1 1.5707963267948966 0 0 1
1 1.5707963267948966 0 0 1
8 0 10
1 4.7123889803846897 0 0 1
1 4.7123889803846897 0 0 1
1 0 10 1 0
2 0 0 1 0 -0 1 2
1 0 0 0 -1
1 0 0 0 1
8 0 5
1 5.2359877559829888 0 0 1
8 0 5
1 6 -2.2679491924311228 1 0
1 10 0 0 -1
1 0 0 0 1
8 0 5
1 1.0471975511965976 0 0 1
8 0 5
1 6 -5.7320508075688767 1 0
1 -1.5707963267948966 4 1 0
2 -1 4 0 -1 1 0 2
1 0 -0 0 1
1 6.2831853071795862 -0 0 1
1 0 10 1 0
2 0 0 1 0 -0 1 2
1 0 10 1 0
2 0 0 1 0 -0 1 2
1 4.7123889803846897 4 1 0
2 -1 4 0 -1 1 0 2
8 -0.14683045111453996 4.14683045111454
1 0 -2 0 1
1 0 -2 0 1
Curves 27
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 -2 0 0 1 0
1 0 2 0 0 0 1
1 0 -2 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 1 1.7320508075688772 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 4 0 0 1 0 -1 0 1 0 -0 2
2 0 0 4 0 0 1 0 -1 0 1 0 -0 2
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 1 -1.7320508075688772 0 0 0 1
1 0 2 10 0 0 1
1 0 -2 10 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
1 0 0 0 -0 1 0
1 1 -1.7320508075688772 10 0 0 1
1 0 0 10 -0 1 0
1 1 1.7320508075688772 10 0 0 1
2 0 0 14 0 0 1 0 -1 0 1 0 -0 2
1 2 -4.898425415289509e-16 0 0 0 1
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
2 0 0 10 0 0 1 1 0 -0 -0 1 0 2
2 0 0 14 0 0 1 0 -1 0 1 0 -0 2
1 0 -2 20 0 1 0
Polygon3D 0
PolygonOnTriangulations 62
15 1 3 4 5 6 7 8 9 10 11 12 13 14 15 2
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
15 1 3 4 5 6 7 8 9 10 11 12 13 14 15 2
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
2 2 1
p 0.023882614668616 1 0 4
2 1 2
p 0.023882614668616 1 0 4
2 1 16
p 0.023882614668616 1 0 10
2 2 10
p 0.023882614668616 1 0 10
2 6 3
p 0.0237452943347953 1 0 10
2 2 17
p 0.023882614668616 1 0 10
2 1 2
p 0.023882614668616 1 0 10
2 7 14
p 0.0237452943347953 1 0 10
15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 17
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
15 1 3 4 5 6 7 8 9 10 11 12 13 14 15 2
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
8 1 4 5 6 7 8 9 3
p 0.023882614668616 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
8 1 4 5 6 7 8 9 3
p 0.023882614668616 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
8 7 8 9 10 11 12 13 6
p 0.0237452943347953 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
8 1 3 4 5 6 7 8 2
p 0.023882614668616 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
8 3 10 11 12 13 14 15 2
p 0.023882614668616 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
8 7 8 9 10 11 12 13 6
p 0.0237452943347953 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
2 1 2
p 0.0237452943347953 1 4 10
2 2 6
p 0.0237452943347953 1 4 10
4 2 4 5 3
p 0.0237452943347953 1 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
4 1 16 17 15
p 0.0237452943347953 1 1.0471975511966 1.22173047639603 1.39626340159547 1.5707963267949
2 7 14
p 0.0237452943347953 1 0 4
2 6 2
p 0.0237452943347953 1 0 4
5 14 15 16 17 1
p 0.0237452943347953 1 1.5707963267949 1.83259571459405 2.0943951023932 2.35619449019234 2.61799387799149
5 2 7 8 9 6
p 0.0237452943347953 1 1.5707963267949 1.83259571459405 2.0943951023932 2.35619449019234 2.61799387799149
5 1 3 4 5 2
p 0.0237452943347953 1 0.523598775598299 0.785398163397449 1.0471975511966 1.30899693899575 1.5707963267949
5 1 3 4 5 2
p 0.0237452943347953 1 0.523598775598299 0.785398163397449 1.0471975511966 1.30899693899575 1.5707963267949
4 14 16 17 15
p 0.0237452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299
4 1 3 4 2
p 0.0237452943347953 1 4.71238898038469 4.88692190558412 5.06145483078356 5.23598775598299
2 1 15
p 0.0237452943347953 1 4 10
2 1 3
p 0.0237452943347953 1 4 10
2 1 16
p 0.023882614668616 1 0 10
2 2 10
p 0.023882614668616 1 0 10
2 15 8
p 0.0237452943347953 1 0 10
2 2 17
p 0.023882614668616 1 0 10
2 1 2
p 0.023882614668616 1 0 10
2 1 5
p 0.0237452943347953 1 0 10
15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 17
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
15 1 3 4 5 6 7 8 9 10 11 12 13 14 15 2
p 0.023882614668616 1 1.5707963267949 1.79519580205131 2.01959527730773 2.24399475256414 2.46839422782055 2.69279370307697 2.91719317833338 3.14159265358979 3.36599212884621 3.59039160410262 3.81479107935903 4.03919055461545 4.26359002987186 4.48798950512827 4.71238898038469
2 1 2
p 0.0237452943347953 1 2.26794919243112 5.73205080756888
2 1 6
p 0.0237452943347953 1 2.26794919243112 5.73205080756888
2 2 14
p 0.0237452943347953 1 0 4
2 3 4
p 0.0237452943347953 1 0 4
2 4 5
p 0.0237452943347953 1 2.26794919243112 5.73205080756888
2 1 6
p 0.0237452943347953 1 2.26794919243112 5.73205080756888
2 1 2
p 0.0237452943347953 1 0 4
2 6 5
p 0.0237452943347953 1 0 4
5 3 4 5 6 2
p 0.0237452943347953 1 1.5707963267949 1.83259571459405 2.0943951023932 2.35619449019234 2.61799387799149
5 2 7 8 9 6
p 0.0237452943347953 1 1.5707963267949 1.83259571459405 2.0943951023932 2.35619449019234 2.61799387799149
2 3 7
p 0.0237452943347953 1 4 10
2 13 6
p 0.0237452943347953 1 4 10
8 9 11 12 13 14 15 16 10
p 0.023882614668616 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
8 3 10 11 12 13 14 15 2
p 0.023882614668616 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
8 7 9 10 11 12 13 14 8
p 0.0237452943347953 1 0 0.224399475256414 0.448798950512829 0.673198425769243 0.897597901025657 1.12199737628207 1.34639685153849 1.5707963267949
8 2 11 12 13 14 15 16 10
p 0.023882614668616 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
8 1 4 5 6 7 8 9 3
p 0.023882614668616 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
8 5 7 8 9 10 11 12 6
p 0.0237452943347953 1 4.71238898038469 4.9367884556411 5.16118793089752 5.38558740615393 5.60998688141035 5.83438635666676 6.05878583192318 6.28318530717959
5 14 15 16 17 13
p 0.0237452943347953 1 0.523598775598299 0.785398163397449 1.0471975511966 1.30899693899575 1.5707963267949
5 1 3 4 5 2
p 0.0237452943347953 1 0.523598775598299 0.785398163397449 1.0471975511966 1.30899693899575 1.5707963267949
2 2 1
p 0.023882614668616 1 0 4
2 1 2
p 0.023882614668616 1 0 4
Surfaces 13
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 0 1 0 -0 0 0 1 0 -1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 0 0 0 1 1 0 -0 -0 1 0
2 0 0 0 0 0 1 1 0 -0 -0 1 0 2
1 0 0 10 0 0 1 1 0 -0 -0 1 0
1 0 0 10 0 0 1 1 0 -0 -0 1 0
1 0 0 10 0 0 1 1 0 -0 -0 1 0
Triangulations 17
16 15 1 3.1641356201817e-15
1.22460635382238e-16 2 0 -3.67381906146713e-16 -2 0 -0.445041867912635 1.94985582436365 0 -0.867767478235122 1.80193773580484 0 -1.24697960371747 1.56366296493606 0 -1.56366296493606 1.24697960371746 0 -1.80193773580484 0.867767478235113 0 -1.94985582436365 0.445041867912626 0 -2 -1.53143556863578e-15 0 -1.94985582436365 -0.445041867912629 0 -1.80193773580484 -0.867767478235116 0 -1.56366296493606 -1.24697960371747 0 -1.24697960371747 -1.56366296493606 0 -0.867767478235118 -1.80193773580484 0 -0.445041867912631 -1.94985582436365 0 -1 0 0 -6.88338275267597e-15 2 -4.44089209850063e-16 -2 -0.445041867912635 1.94985582436365 -0.867767478235122 1.80193773580484 -1.24697960371747 1.56366296493606 -1.56366296493606 1.24697960371746 -1.80193773580484 0.867767478235113 -1.94985582436365 0.445041867912626 -2 -1.55431223447522e-15 -1.94985582436365 -0.445041867912629 -1.80193773580484 -0.867767478235116 -1.56366296493606 -1.24697960371747 -1.24697960371747 -1.56366296493606 -0.867767478235118 -1.80193773580484 -0.445041867912631 -1.94985582436365 -1 0 16 1 3 16 3 4 16 4 5 16 5 6 16 6 7 16 7 8 16 8 9 16 9 10 16 10 11 16 11 12 16 12 13 16 13 14 16 14 15 16 15 2 16 2 1
30 28 1 0.0125755802135152
1.22460635382238e-16 2 0 -3.67381906146713e-16 -2 0 -0.445041867912635 1.94985582436365 0 -0.867767478235122 1.80193773580484 0 -1.24697960371747 1.56366296493606 0 -1.56366296493606 1.24697960371746 0 -1.80193773580484 0.867767478235113 0 -1.94985582436365 0.445041867912626 0 -2 -1.53143556863578e-15 0 -1.94985582436365 -0.445041867912629 0 -1.80193773580484 -0.867767478235116 0 -1.56366296493606 -1.24697960371747 0 -1.24697960371747 -1.56366296493606 0 -0.867767478235118 -1.80193773580484 0 -0.445041867912631 -1.94985582436365 0 1.22460635382238e-16 2 10 -3.67381906146713e-16 -2 10 -0.445041867912635 1.94985582436365 10 -0.867767478235122 1.80193773580484 10 -1.24697960371747 1.56366296493606 10 -1.56366296493606 1.24697960371746 10 -1.80193773580484 0.867767478235113 10 -1.94985582436365 0.445041867912626 10 -2 -1.53143556863578e-15 10 -1.94985582436365 -0.445041867912629 10 -1.80193773580484 -0.867767478235116 10 -1.56366296493606 -1.24697960371747 10 -1.24697960371747 -1.56366296493606 10 -0.867767478235118 -1.80193773580484 10 -0.445041867912631 -1.94985582436365 10 1.5707963267949 0 4.71238898038469 0 1.79519580205131 0 2.01959527730773 0 2.24399475256414 0 2.46839422782055 0 2.69279370307697 0 2.91719317833338 0 3.14159265358979 0 3.36599212884621 0 3.59039160410262 0 3.81479107935903 0 4.03919055461545 0 4.26359002987186 0 4.48798950512827 0 1.5707963267949 10 4.71238898038469 10 1.79519580205131 10 2.01959527730773 10 2.24399475256414 10 2.46839422782055 10 2.69279370307697 10 2.91719317833338 10 3.14159265358979 10 3.36599212884621 10 3.59039160410262 10 3.81479107935903 10 4.03919055461545 10 4.26359002987186 10 4.48798950512827 10 18 1 3 18 3 4 18 16 1 19 4 5 19 18 4 20 19 5 21 5 6 21 20 5 22 6 7 22 7 8 22 21 6 23 8 9 23 22 8 24 23 9 25 9 10 25 10 11 25 24 9 26 25 11 27 11 12 27 12 13 27 26 11 28 13 14 28 27 13 29 14 15 29 28 14 30 15 2 30 29 15 17 30 2
16 15 1 3.57559034463995e-15
-3.67381906146713e-16 -2 0 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 0.44504186791263 -1.94985582436365 0 0.867767478235119 -1.80193773580484 0 1.24697960371747 -1.56366296493606 0 1.56366296493606 -1.24697960371746 0 1.80193773580484 -0.867767478235109 0 1.94985582436365 -0.445041867912619 0 1.94985582436365 0.44504186791263 0 1.80193773580484 0.867767478235118 0 1.56366296493606 1.24697960371747 0 1.24697960371746 1.56366296493606 0 0.867767478235112 1.80193773580484 0 0.445041867912623 1.94985582436365 0 1 0 0 0 -2 0 2 2 6.66133814775094e-15 0.44504186791263 -1.94985582436365 0.867767478235119 -1.80193773580484 1.24697960371747 -1.56366296493606 1.56366296493606 -1.24697960371746 1.80193773580484 -0.867767478235109 1.94985582436365 -0.445041867912619 1.94985582436365 0.44504186791263 1.80193773580484 0.867767478235118 1.56366296493606 1.24697960371747 1.24697960371746 1.56366296493606 0.867767478235112 1.80193773580484 0.445041867912623 1.94985582436365 1 0 16 2 1 16 1 4 16 4 5 16 5 6 16 6 7 16 7 8 16 8 9 16 9 3 16 3 10 16 10 11 16 11 12 16 12 13 16 13 14 16 14 15 16 15 2
16 14 1 0.012575580213515
2 -4.89842541528951e-16 0 1.22460635382238e-16 2 0 1.94985582436365 0.44504186791263 0 1.80193773580484 0.867767478235118 0 1.56366296493606 1.24697960371747 0 1.24697960371746 1.56366296493606 0 0.867767478235112 1.80193773580484 0 0.445041867912623 1.94985582436365 0 2 -4.89842541528951e-16 10 1.22460635382238e-16 2 10 1.94985582436365 0.44504186791263 10 1.80193773580484 0.867767478235118 10 1.56366296493606 1.24697960371747 10 1.24697960371746 1.56366296493606 10 0.867767478235112 1.80193773580484 10 0.445041867912623 1.94985582436365 10 0 0 1.5707963267949 0 0.224399475256414 0 0.448798950512829 0 0.673198425769243 0 0.897597901025657 0 1.12199737628207 0 1.34639685153849 0 0 10 1.5707963267949 10 0.224399475256414 10 0.448798950512829 10 0.673198425769243 10 0.897597901025657 10 1.12199737628207 10 1.34639685153849 10 11 1 3 11 9 1 12 3 4 12 11 3 13 4 5 13 12 4 14 5 6 14 6 7 14 13 5 15 14 7 16 7 8 16 15 7 10 8 2 10 16 8
17 15 1 0.0133474916789034
1 1.73205080756888 4 1 1.73205080756888 10 1.22460635382238e-16 2 10 0.684040286651336 1.87938524157182 10 0.347296355333856 1.96961550602442 10 1.22460635382238e-16 2 0 2 -4.89842541528951e-16 0 1.94985582436365 0.44504186791263 0 1.80193773580484 0.867767478235118 0 1.56366296493606 1.24697960371747 0 1.24697960371746 1.56366296493606 0 0.867767478235112 1.80193773580484 0 0.445041867912623 1.94985582436365 0 2 -4.89842541528951e-16 4 1.93185165257814 0.517638090205041 4 1.73205080756888 1 4 1.4142135623731 1.41421356237309 4 1.0471975511966 4 1.0471975511966 10 1.5707963267949 10 1.22173047639603 10 1.39626340159547 10 1.5707963267949 0 0 0 0.224399475256414 0 0.448798950512829 0 0.673198425769243 0 0.897597901025657 0 1.12199737628207 0 1.34639685153849 0 0 4 0.261799387799149 4 0.523598775598299 4 0.785398163397448 4 8 14 7 15 14 8 9 15 8 16 15 9 10 16 9 17 10 11 17 16 10 1 11 12 1 17 11 4 2 1 4 12 13 4 1 12 5 13 6 5 4 13 3 5 6
16 14 1 0.012575580213515
-3.67381906146713e-16 -2 0 -3.67381906146713e-16 -2 10 2 -4.89842541528951e-16 0 0.44504186791263 -1.94985582436365 0 0.867767478235119 -1.80193773580484 0 1.24697960371747 -1.56366296493606 0 1.56366296493606 -1.24697960371746 0 1.80193773580484 -0.867767478235109 0 1.94985582436365 -0.445041867912619 0 2 -4.89842541528951e-16 10 0.44504186791263 -1.94985582436365 10 0.867767478235119 -1.80193773580484 10 1.24697960371747 -1.56366296493606 10 1.56366296493606 -1.24697960371746 10 1.80193773580484 -0.867767478235109 10 1.94985582436365 -0.445041867912619 10 4.71238898038469 0 4.71238898038469 10 6.28318530717959 0 4.9367884556411 0 5.16118793089752 0 5.38558740615393 0 5.60998688141035 0 5.83438635666676 0 6.05878583192318 0 6.28318530717959 10 4.9367884556411 10 5.16118793089752 10 5.38558740615393 10 5.60998688141035 10 5.83438635666676 10 6.05878583192318 10 11 2 1 11 1 4 11 4 5 12 11 5 13 5 6 13 12 5 14 6 7 14 7 8 14 13 6 15 14 8 16 8 9 16 15 8 10 9 3 10 16 9
17 15 1 0.0133474916789028
1 -1.73205080756888 4 2 -4.89842541528951e-16 4 1.4142135623731 -1.41421356237309 4 1.73205080756888 -0.999999999999997 4 1.93185165257814 -0.517638090205036 4 2 -4.89842541528951e-16 0 -3.67381906146713e-16 -2 0 0.44504186791263 -1.94985582436365 0 0.867767478235119 -1.80193773580484 0 1.24697960371747 -1.56366296493606 0 1.56366296493606 -1.24697960371746 0 1.80193773580484 -0.867767478235109 0 1.94985582436365 -0.445041867912619 0 -3.67381906146713e-16 -2 10 1 -1.73205080756888 10 0.34729635533386 -1.96961550602442 10 0.684040286651336 -1.87938524157182 10 5.23598775598299 4 6.28318530717959 4 5.49778714378214 4 5.75958653158129 4 6.02138591938044 4 6.28318530717959 0 4.71238898038469 0 4.9367884556411 0 5.16118793089752 0 5.38558740615393 0 5.60998688141035 0 5.83438635666676 0 6.05878583192318 0 4.71238898038469 10 5.23598775598299 10 4.88692190558412 10 5.06145483078356 10 16 7 8 16 14 7 17 8 9 17 16 8 17 9 1 10 1 9 15 17 1 3 10 11 3 1 10 4 11 12 4 3 11 5 12 13 5 4 12 2 13 6 2 5 13
30 28 1 0.0125755802135152
1.22460635382238e-16 2 10 -3.67381906146713e-16 -2 10 -0.445041867912635 1.94985582436365 10 -0.867767478235122 1.80193773580484 10 -1.24697960371747 1.56366296493606 10 -1.56366296493606 1.24697960371746 10 -1.80193773580484 0.867767478235113 10 -1.94985582436365 0.445041867912626 10 -2 -1.53143556863578e-15 10 -1.94985582436365 -0.445041867912629 10 -1.80193773580484 -0.867767478235116 10 -1.56366296493606 -1.24697960371747 10 -1.24697960371747 -1.56366296493606 10 -0.867767478235118 -1.80193773580484 10 -0.445041867912631 -1.94985582436365 10 1.22460635382238e-16 2 20 -3.67381906146713e-16 -2 20 -0.445041867912635 1.94985582436365 20 -0.867767478235122 1.80193773580484 20 -1.24697960371747 1.56366296493606 20 -1.56366296493606 1.24697960371746 20 -1.80193773580484 0.867767478235113 20 -1.94985582436365 0.445041867912626 20 -2 -1.53143556863578e-15 20 -1.94985582436365 -0.445041867912629 20 -1.80193773580484 -0.867767478235116 20 -1.56366296493606 -1.24697960371747 20 -1.24697960371747 -1.56366296493606 20 -0.867767478235118 -1.80193773580484 20 -0.445041867912631 -1.94985582436365 20 1.5707963267949 0 4.71238898038469 0 1.79519580205131 0 2.01959527730773 0 2.24399475256414 0 2.46839422782055 0 2.69279370307697 0 2.91719317833338 0 3.14159265358979 0 3.36599212884621 0 3.59039160410262 0 3.81479107935903 0 4.03919055461545 0 4.26359002987186 0 4.48798950512827 0 1.5707963267949 10 4.71238898038469 10 1.79519580205131 10 2.01959527730773 10 2.24399475256414 10 2.46839422782055 10 2.69279370307697 10 2.91719317833338 10 3.14159265358979 10 3.36599212884621 10 3.59039160410262 10 3.81479107935903 10 4.03919055461545 10 4.26359002987186 10 4.48798950512827 10 18 1 3 18 3 4 18 16 1 19 4 5 19 18 4 20 19 5 21 5 6 21 20 5 22 6 7 22 7 8 22 21 6 23 8 9 23 22 8 24 23 9 25 9 10 25 10 11 25 24 9 26 25 11 27 11 12 27 12 13 27 26 11 28 13 14 28 27 13 29 14 15 29 28 14 30 15 2 30 29 15 17 30 2
7 6 1 2.22044604925031e-16
1 -1.73205080756888 4 1 1.73205080756888 4 1 -1.73205080756888 10 1 -1.73205080756888 14 1 1.73205080756888 14 1 1.73205080756888 10 1 0 9 0 -2.26794919243112 0 -5.73205080756888 6 -2.26794919243112 10 -2.26794919243112 10 -5.73205080756888 6 -5.73205080756888 5 -4 4 6 5 4 3 6 7 1 2 7 3 1 7 2 6 7 6 3
17 15 1 0.0133475079301661
1 1.73205080756888 10 1 1.73205080756888 14 2 -4.89842541528951e-16 14 1.93185165257814 0.517638090205041 14 1.73205080756888 1 14 1.4142135623731 1.41421356237309 14 2 -4.89842541528951e-16 20 1.22460635382238e-16 2 20 1.94985582436365 0.44504186791263 20 1.80193773580484 0.867767478235118 20 1.56366296493606 1.24697960371747 20 1.24697960371746 1.56366296493606 20 0.867767478235112 1.80193773580484 20 0.445041867912623 1.94985582436365 20 1.22460635382238e-16 2 10 0.684040286651336 1.87938524157182 10 0.347296355333856 1.96961550602442 10 1.0471975511966 0 1.0471975511966 4 0 4 0.261799387799149 4 0.523598775598299 4 0.785398163397448 4 0 10 1.5707963267949 10 0.224399475256414 10 0.448798950512829 10 0.673198425769243 10 0.897597901025657 10 1.12199737628207 10 1.34639685153849 10 1.5707963267949 0 1.22173047639603 0 1.39626340159547 0 9 3 4 9 7 3 10 4 5 10 9 4 11 5 6 11 10 5 12 6 2 12 11 6 16 2 1 13 2 16 13 12 2 14 16 17 14 13 16 8 17 15 8 14 17
10 9 1 3.79763494956498e-15
1 -1.73205080756888 4 2 -4.89842541528951e-16 4 1.4142135623731 -1.41421356237309 4 1.73205080756888 -0.999999999999997 4 1.93185165257814 -0.517638090205036 4 1 1.73205080756888 4 1.93185165257814 0.517638090205041 4 1.73205080756888 1 4 1.4142135623731 1.41421356237309 4 1.5 0 4 2.22044604925031e-16 2.26794919243112 1 4.00000000000001 0.414213562373096 2.58578643762691 0.732050807568879 3 0.931851652578138 3.48236190979496 0 5.73205080756888 0.931851652578137 4.51763809020504 0.732050807568877 5 0.414213562373095 5.41421356237309 0.5 4 10 1 3 10 3 4 10 4 5 10 5 2 10 6 1 10 2 7 10 7 8 10 8 9 10 9 6
17 15 1 0.0133475079301655
-3.67381906146713e-16 -2 10 1 -1.73205080756888 10 0.34729635533386 -1.96961550602442 10 0.684040286651336 -1.87938524157182 10 -3.67381906146713e-16 -2 20 2 -4.89842541528951e-16 20 0.44504186791263 -1.94985582436365 20 0.867767478235119 -1.80193773580484 20 1.24697960371747 -1.56366296493606 20 1.56366296493606 -1.24697960371746 20 1.80193773580484 -0.867767478235109 20 1.94985582436365 -0.445041867912619 20 2 -4.89842541528951e-16 14 1 -1.73205080756888 14 1.4142135623731 -1.41421356237309 14 1.73205080756888 -0.999999999999997 14 1.93185165257814 -0.517638090205036 14 4.71238898038469 0 5.23598775598299 0 4.88692190558412 0 5.06145483078356 0 4.71238898038469 10 6.28318530717959 10 4.9367884556411 10 5.16118793089752 10 5.38558740615393 10 5.60998688141035 10 5.83438635666676 10 6.05878583192318 10 6.28318530717959 4 5.23598775598299 4 5.49778714378214 4 5.75958653158129 4 6.02138591938044 4 5 1 3 7 3 4 7 5 3 14 4 2 8 7 4 8 4 14 9 14 15 9 8 14 10 15 16 10 9 15 11 10 16 17 11 16 12 11 17 13 12 17 6 12 13
16 14 1 0.012575580213515
2 -4.89842541528951e-16 10 1.22460635382238e-16 2 10 1.94985582436365 0.44504186791263 10 1.80193773580484 0.867767478235118 10 1.56366296493606 1.24697960371747 10 1.24697960371746 1.56366296493606 10 0.867767478235112 1.80193773580484 10 0.445041867912623 1.94985582436365 10 2 -4.89842541528951e-16 20 1.22460635382238e-16 2 20 1.94985582436365 0.44504186791263 20 1.80193773580484 0.867767478235118 20 1.56366296493606 1.24697960371747 20 1.24697960371746 1.56366296493606 20 0.867767478235112 1.80193773580484 20 0.445041867912623 1.94985582436365 20 0 0 1.5707963267949 0 0.224399475256414 0 0.448798950512829 0 0.673198425769243 0 0.897597901025657 0 1.12199737628207 0 1.34639685153849 0 0 10 1.5707963267949 10 0.224399475256414 10 0.448798950512829 10 0.673198425769243 10 0.897597901025657 10 1.12199737628207 10 1.34639685153849 10 11 1 3 11 9 1 12 3 4 12 11 3 13 4 5 13 12 4 14 5 6 14 6 7 14 13 5 15 14 7 16 7 8 16 15 7 10 8 2 10 16 8
16 14 1 0.012575580213515
-3.67381906146713e-16 -2 10 -3.67381906146713e-16 -2 20 2 -4.89842541528951e-16 10 0.44504186791263 -1.94985582436365 10 0.867767478235119 -1.80193773580484 10 1.24697960371747 -1.56366296493606 10 1.56366296493606 -1.24697960371746 10 1.80193773580484 -0.867767478235109 10 1.94985582436365 -0.445041867912619 10 2 -4.89842541528951e-16 20 0.44504186791263 -1.94985582436365 20 0.867767478235119 -1.80193773580484 20 1.24697960371747 -1.56366296493606 20 1.56366296493606 -1.24697960371746 20 1.80193773580484 -0.867767478235109 20 1.94985582436365 -0.445041867912619 20 4.71238898038469 0 4.71238898038469 10 6.28318530717959 0 4.9367884556411 0 5.16118793089752 0 5.38558740615393 0 5.60998688141035 0 5.83438635666676 0 6.05878583192318 0 6.28318530717959 10 4.9367884556411 10 5.16118793089752 10 5.38558740615393 10 5.60998688141035 10 5.83438635666676 10 6.05878583192318 10 11 2 1 11 1 4 11 4 5 12 11 5 13 5 6 13 12 5 14 6 7 14 7 8 14 13 6 15 14 8 16 8 9 16 15 8 10 9 3 10 16 9
16 15 1 3.1641356201817e-15
1.22460635382238e-16 2 20 -3.67381906146713e-16 -2 20 -0.445041867912635 1.94985582436365 20 -0.867767478235122 1.80193773580484 20 -1.24697960371747 1.56366296493606 20 -1.56366296493606 1.24697960371746 20 -1.80193773580484 0.867767478235113 20 -1.94985582436365 0.445041867912626 20 -2 -1.53143556863578e-15 20 -1.94985582436365 -0.445041867912629 20 -1.80193773580484 -0.867767478235116 20 -1.56366296493606 -1.24697960371747 20 -1.24697960371747 -1.56366296493606 20 -0.867767478235118 -1.80193773580484 20 -0.445041867912631 -1.94985582436365 20 -1 0 20 -6.88338275267597e-15 2 -4.44089209850063e-16 -2 -0.445041867912635 1.94985582436365 -0.867767478235122 1.80193773580484 -1.24697960371747 1.56366296493606 -1.56366296493606 1.24697960371746 -1.80193773580484 0.867767478235113 -1.94985582436365 0.445041867912626 -2 -1.55431223447522e-15 -1.94985582436365 -0.445041867912629 -1.80193773580484 -0.867767478235116 -1.56366296493606 -1.24697960371747 -1.24697960371747 -1.56366296493606 -0.867767478235118 -1.80193773580484 -0.445041867912631 -1.94985582436365 -1 0 16 1 3 16 3 4 16 4 5 16 5 6 16 6 7 16 7 8 16 8 9 16 9 10 16 10 11 16 11 12 16 12 13 16 13 14 16 14 15 16 15 2 16 2 1
10 9 1 3.79763494956498e-15
1 -1.73205080756888 14 2 -4.89842541528951e-16 14 1.4142135623731 -1.41421356237309 14 1.73205080756888 -0.999999999999997 14 1.93185165257814 -0.517638090205036 14 1 1.73205080756888 14 1.93185165257814 0.517638090205041 14 1.73205080756888 1 14 1.4142135623731 1.41421356237309 14 1.5 0 14 2.22044604925031e-16 2.26794919243112 1 4.00000000000001 0.414213562373096 2.58578643762691 0.732050807568879 3 0.931851652578138 3.48236190979496 0 5.73205080756888 0.931851652578137 4.51763809020504 0.732050807568877 5 0.414213562373095 5.41421356237309 0.5 4 10 1 3 10 3 4 10 4 5 10 5 2 10 6 1 10 2 7 10 7 8 10 8 9 10 9 6
16 15 1 3.57559034463995e-15
-3.67381906146713e-16 -2 20 1.22460635382238e-16 2 20 2 -4.89842541528951e-16 20 0.44504186791263 -1.94985582436365 20 0.867767478235119 -1.80193773580484 20 1.24697960371747 -1.56366296493606 20 1.56366296493606 -1.24697960371746 20 1.80193773580484 -0.867767478235109 20 1.94985582436365 -0.445041867912619 20 1.94985582436365 0.44504186791263 20 1.80193773580484 0.867767478235118 20 1.56366296493606 1.24697960371747 20 1.24697960371746 1.56366296493606 20 0.867767478235112 1.80193773580484 20 0.445041867912623 1.94985582436365 20 1 0 20 0 -2 0 2 2 6.66133814775094e-15 0.44504186791263 -1.94985582436365 0.867767478235119 -1.80193773580484 1.24697960371747 -1.56366296493606 1.56366296493606 -1.24697960371746 1.80193773580484 -0.867767478235109 1.94985582436365 -0.445041867912619 1.94985582436365 0.44504186791263 1.80193773580484 0.867767478235118 1.56366296493606 1.24697960371747 1.24697960371746 1.56366296493606 0.867767478235112 1.80193773580484 0.445041867912623 1.94985582436365 1 0 16 2 1 16 1 4 16 4 5 16 5 6 16 6 7 16 7 8 16 8 9 16 9 3 16 3 10 16 10 11 16 11 12 16 12 13 16 13 14 16 14 15 16 15 2
TShapes 73
Ve
2.00001e-07
1.22460635382238e-16 2 0
0 0
0101101
*
Ve
2.00001e-07
-3.67381906146713e-16 -2 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 1 0 1.5707963267949 4.71238898038469
2 1 1 0 1.5707963267949 4.71238898038469
2 2 2 0 1.5707963267949 4.71238898038469
6 1 2 7
6 2 1 7
0
0101000
+73 8 -72 8 *
Ed
1e-07 1 1 0
1 2 0 0 4
2 3 1 9 0 4
2 4 3 11 0 4
6 3 1 12
6 4 3 12
0
0101000
+72 13 -73 13 *
Wi
0101000
+71 6 +70 5 *
Fa
0 1e-07 1 6
2 1
0111000
+69 0 *
Ve
2.00001e-07
1.22460635382238e-16 2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 3 0 0 10
2 5 2 9 0 10
2 6 4 11 0 10
6 5 2 12
6 6 4 12
6 7 5 13
0
0101000
+73 13 -67 13 *
Ve
2.00001e-07
-3.67381906146713e-16 -2 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 4 0 0 10
2 7 2 9 0 10
2 8 5 11 0 10
6 8 2 12
6 9 6 12
6 10 7 13
0
0101000
+72 13 -65 13 *
Ed
1e-07 1 1 0
1 5 0 1.5707963267949 4.71238898038469
2 9 2 0 1.5707963267949 4.71238898038469
2 10 6 15 1.5707963267949 4.71238898038469
6 11 2 7
6 12 8 7
0
0101000
+67 8 -65 8 *
Wi
0101000
+71 6 -66 5 +64 5 -63 6 *
Fa
0 1e-07 2 6
2 2
0111000
+62 0 *
Ve
1e-05
2 -4.89842541528951e-16 0
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 4.71238898038469 6.28318530717959
2 11 3 0 4.71238898038469 6.28318530717959
2 12 5 0 4.71238898038469 6.28318530717959
6 13 6 17
6 14 3 17
6 15 7 18
0
0101000
+72 18 -60 18 *
Ed
1e-07 1 1 0
1 7 0 0 1.5707963267949
2 13 3 0 0 1.5707963267949
2 14 4 0 0 1.5707963267949
6 16 4 17
6 17 3 17
6 18 5 18
0
0101000
+60 18 -73 18 *
Wi
0101000
-70 5 +59 16 +58 16 *
Fa
0 1e-07 3 16
2 3
0111000
+57 0 *
Ve
2.00001e-07
1 1.73205080756888 4
0 0
0101101
*
Ve
2.00001e-07
1 1.73205080756888 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 8 0 4 10
2 15 4 19 4 10
2 16 7 20 4 10
6 19 5 0
6 20 9 0
0
0101000
+55 0 -54 0 *
Ed
1e-07 1 1 0
1 9 0 1.0471975511966 1.5707963267949
2 17 4 0 1.0471975511966 1.5707963267949
2 18 8 15 1.0471975511966 1.5707963267949
6 21 5 18
6 22 10 18
0
0101000
+54 18 -67 18 *
Ve
2.00001e-07
2 -4.89842541528951e-16 4
0 0
0101101
*
Ed
1e-07 1 1 0
1 10 0 0 4
2 19 4 0 0 4
2 20 5 0 0 4
4 CN 4 0 5 0
6 23 5 18
6 24 7 18
0
0101000
+60 18 -51 18 *
Ed
1e-07 1 1 0
1 11 0 1.5707963267949 2.61799387799149
2 21 4 19 1.5707963267949 2.61799387799149
2 22 9 20 1.5707963267949 2.61799387799149
6 25 5 0
6 26 11 0
0
0101000
+51 0 -55 0 *
Wi
0101000
-53 0 -52 19 +66 21 +58 19 -50 19 -49 0 *
Fa
0 1e-07 4 19
2 5
0111000
+48 0 *
Ve
2.00001e-07
1 -1.73205080756888 4
0 0
0101101
*
Ed
1e-07 1 1 0
1 12 0 0.523598775598299 1.5707963267949
2 23 5 19 0.523598775598299 1.5707963267949
2 24 9 20 0.523598775598299 1.5707963267949
6 27 7 0
6 28 11 0
0
0101000
+46 0 -51 0 *
Ve
2.00001e-07
1 -1.73205080756888 10
0 0
0101101
*
Ed
1e-07 1 1 0
1 13 0 4.71238898038469 5.23598775598299
2 25 5 0 4.71238898038469 5.23598775598299
2 26 10 15 4.71238898038469 5.23598775598299
6 29 7 18
6 30 12 18
0
0101000
+65 18 -44 18 *
Ed
1e-07 1 1 0
1 14 0 4 10
2 27 5 19 4 10
2 28 7 20 4 10
6 31 7 0
6 32 9 0
0
0101000
+46 0 -44 0 *
Wi
0101000
-45 0 +50 19 +59 19 -64 21 -43 19 +42 0 *
Fa
0 1e-07 5 19
2 7
0111000
+41 0 *
Ve
2.00001e-07
1.22460635382238e-16 2 20
0 0
0101101
*
Ed
1e-07 1 1 0
1 15 0 0 10
2 29 6 23 0 10
2 30 8 24 0 10
6 33 8 12
6 34 13 12
6 35 10 13
0
0101000
+67 13 -39 13 *
Ve
2.00001e-07
-3.67381906146713e-16 -2 20
0 0
0101101
*
Ed
1e-07 1 1 0
1 16 0 0 10
2 31 6 23 0 10
2 32 10 24 0 10
6 36 8 12
6 37 14 12
6 38 12 13
0
0101000
+65 13 -37 13 *
Ed
1e-07 1 1 0
1 17 0 1.5707963267949 4.71238898038469
2 33 6 0 1.5707963267949 4.71238898038469
2 34 11 0 1.5707963267949 4.71238898038469
6 39 8 25
6 40 15 25
0
0101000
+39 26 -37 26 *
Wi
0101000
+63 6 -38 5 +36 5 -35 22 *
Fa
0 1e-07 6 22
2 8
0111000
+34 0 *
Ed
1e-07 1 1 0
1 18 0 2.26794919243112 5.73205080756888
2 35 7 0 2.26794919243112 5.73205080756888
2 36 9 0 2.26794919243112 5.73205080756888
6 41 9 27
6 42 11 27
0
0101000
+46 27 -55 27 *
Ve
2.00001e-07
1 -1.73205080756888 14
0 0
0101101
*
Ed
1e-07 1 1 0
1 19 0 0 4
2 37 10 28 0 4
2 38 7 20 0 4
6 43 12 0
6 44 9 0
0
0101000
+44 0 -31 0 *
Ve
2.00001e-07
1 1.73205080756888 14
0 0
0101101
*
Ed
1e-07 1 1 0
1 20 0 2.26794919243112 5.73205080756888
2 39 7 0 2.26794919243112 5.73205080756888
2 40 12 0 2.26794919243112 5.73205080756888
6 45 9 27
6 46 16 27
0
0101000
+31 27 -29 27 *
Ed
1e-07 1 1 0
1 21 0 0 4
2 41 8 28 0 4
2 42 7 20 0 4
6 47 10 0
6 48 9 0
0
0101000
+54 0 -29 0 *
Wi
0101000
+32 20 -42 0 -30 0 -28 20 +27 0 +53 0 *
Fa
0 1e-07 7 20
2 9
0111000
+26 0 *
Ve
2.00001e-07
2 -4.89842541528951e-16 14
0 0
0101101
*
Ed
1e-07 1 1 0
1 22 0 1.5707963267949 2.61799387799149
2 43 8 28 1.5707963267949 2.61799387799149
2 44 12 20 1.5707963267949 2.61799387799149
6 49 10 0
6 50 16 0
0
0101000
+24 0 -29 0 *
Ve
1e-05
2 -4.89842541528951e-16 20
0 0
0101101
*
Ed
1e-07 1 1 0
1 23 0 4 10
2 45 8 0 4 10
2 46 10 0 4 10
4 CN 8 0 10 0
6 51 10 29
6 52 12 29
0
0101000
+24 29 -22 29 *
Ed
1e-07 1 1 0
1 24 0 0 1.5707963267949
2 47 8 0 0 1.5707963267949
2 48 13 0 0 1.5707963267949
6 53 13 30
6 54 17 30
6 55 10 29
0
0101000
+22 29 -39 29 *
Wi
0101000
-27 0 +23 0 -21 28 -20 28 +38 21 +52 19 *
Fa
0 1e-07 8 28
2 10
0111000
+19 0 *
Wi
0101000
+45 0 -32 20 +49 0 *
Fa
0 1e-07 9 20
2 11
0111000
+17 0 *
Ed
1e-07 1 1 0
1 25 0 4.71238898038469 6.28318530717959
2 49 10 0 4.71238898038469 6.28318530717959
2 50 13 0 4.71238898038469 6.28318530717959
6 56 14 30
6 57 17 30
6 58 12 29
0
0101000
+37 29 -22 29 *
Ed
1e-07 1 1 0
1 26 0 0.523598775598299 1.5707963267949
2 51 10 28 0.523598775598299 1.5707963267949
2 52 12 20 0.523598775598299 1.5707963267949
6 59 12 0
6 60 16 0
0
0101000
+31 0 -24 0 *
Wi
0101000
+43 19 -36 21 -15 28 +21 28 +14 0 +30 0 *
Fa
0 1e-07 10 28
2 12
0111000
+13 0 *
Ed
1e-07 1 1 0
1 27 0 0 4
2 53 11 23 0 4
2 54 13 24 0 4
6 61 15 12
6 62 17 12
0
0101000
+37 13 -39 13 *
Wi
0101000
+35 22 +11 5 *
Fa
0 1e-07 11 22
2 15
0111000
+10 0 *
Wi
0101000
+14 0 -28 20 +23 0 *
Fa
0 1e-07 12 20
2 16
0111000
+8 0 *
Wi
0101000
-11 5 +15 31 +20 31 *
Fa
0 1e-07 13 31
2 17
0111000
+6 0 *
Sh
0101000
-68 2 +61 2 -56 2 +47 0 +40 0 +33 2 +25 0 +18 0 +16 0 +12 0
+9 2 -7 0 +5 2 *
So
0100000
+4 0 *
Co
0100000
+3 0 *
Co
1100000
+2 1 *
+1 0
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+44
View File
@@ -0,0 +1,44 @@
as of 1/15/14, oce 0.14
aox pass
blocks144 pass
bosses pass
cylinder1 pass
cylinder3 pass
cylinder4 pass
cylinder5 pass
cylinder7_V2 pass and fail //see note below*
cylinder8 pass and fail //doesn't join faces, but doesn't corrupt model.
cylinderSeam1 pass
cylinderSeam2 pass
cylinderSeam3 pass
cylinderSeam4 pass
cylinderSeam5 pass
cylinderSeam6 pass
cylinderSeam8 pass
cylinderSeam9 pass
refine_breaks_cylinder pass
filletBox pass
holesInFace2 pass
mesh pass
shelf pass
spline pass
Y_Rod_Mount pass
ZMoterMountscripted pass
* I thought this was because of the float to double bug, but it's not....Float to double might have been a factor, but there is another problem. I rebuilt this condition from scratch and refine works with no corruption. If I save this file and re-open it, refine works, but corrupts the model. shell is open. This is true in either fcstd or brep format. weird! This is the second version of this file as to rule out any chance of the float to double bug. This is real flaky and it won't be the last time we deal with this. I keep thinking about romans comment "don't abuse shapefix". http://opencascade.blogspot.com/2009/03/topology-and-geometry-in-open-cascade.html?showComment=1236718620000#c8850560473418361068
Here are some tolerance numbers for cylinder7_V2. new is from the new construction code that uses shapefix to build missing seem edges. The old code does't consider the formation of complete cylnder and failed several tests.
Draw[11]> tolerance old
Tolerance MAX=2.0000099999999999e-07 AVG=1.2882835847679566e-07 MIN=9.9999999999999995e-08
FACE : MAX=9.9999999999999995e-08 AVG=9.9999999999999995e-08 MIN=9.9999999999999995e-08
EDGE : MAX=1.3197224981754301e-07 AVG=1.0799306245438574e-07 MIN=9.9999999999999995e-08
VERTEX : MAX=2.0000099999999999e-07 AVG=1.4375043749999997e-07 MIN=9.9999999999999995e-08
Draw[12]> tolerance new
Tolerance MAX=2.0000000000000002e-05 AVG=6.8618840877249059e-06 MIN=9.9999999999999995e-08
FACE : MAX=9.9999999999999995e-08 AVG=9.9999999999999995e-08 MIN=9.9999999999999995e-08
EDGE : MAX=1.0000000000000001e-05 AVG=2.5862406655887408e-06 MIN=9.9999999999999995e-08
VERTEX : MAX=2.0000000000000002e-05 AVG=1.0056250187500003e-05 MIN=9.9999999999999995e-08
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
+679
View File
@@ -0,0 +1,679 @@
DBRep_DrawableShape
CASCADE Topology V1, (c) Matra-Datavision
Locations 24
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 5
0 1 0 0
0 0 1 0
2 3 -1 0
2 2 -1 3 -1 0
2 1 -1 2 -1 3 -1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
2 7 1 8 1 0
2 2 -1 0
2 1 -1 2 -1 0
2 3 1 2 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
1
1 0 0 0
0 1 0 0
0 0 1 0
2 13 1 14 1 2 -1 3 -1 0
2 7 1 8 1 2 1 0
2 7 1 8 1 14 1 2 -1 0
2 13 1 14 1 0
2 14 -1 13 -1 0
2 1 -1 14 -1 13 -1 0
2 13 -1 0
2 14 -1 0
2 1 -1 14 -1 0
2 7 1 8 1 14 1 0
Curve2ds 40
1 0 0 1 0
1 0 5 1 0
7 0 0 4 8 3 6.4372286951655289 0 6.477655052278779 -1.2264444938000587 6.5170864661860932 -2.468151359293894 6.5554469820834766 -3.7257382226217302 6.6284583896486087 -6.2264960470250541 6.6631939997614218 -7.4684636093053767 6.6967666022802952 -8.7261779784543734 6.7290752130886906 -10
0 5 0.50945770884725361 3 1 5
7 0 0 4 8 3 13.124390270853777 0.083333333333333356 13.240561199818627 0.18553704115000491 13.35839305491629 0.28901261327449124 13.477958177787993 0.39381151855181074 13.716187674910781 0.60220800391875451 13.834720188519432 0.70570530077544824 13.954985958027775 0.81051483153786452 14.077035382601977 0.91666666666666674
0 5 0.50945770884725361 3 1 5
1 0 -10 1 0
1 0 5 1 0
1 0 0 0 -1
1 5 0 0 1
1 0 0 0 1
1 0 0 1 0
1 0 0 1 0
1 0 5 1 0
7 0 0 8 37 6 6.437228695165528 5 6.5802399564650447 4.7634038851144851 6.7223554075999825 4.5169034403959696 6.8635605126092383 4.2590206936169075 7.0037144891836149 3.9879459040154792 7.1425672018511133 3.701673248001569 7.2796857279501062 3.3971540622075569 7.4145039990282759 3.0708384420456039 7.6031400219363325 2.5604140943057487 7.6576936023946365 2.4055441529113333 7.7096950304017113 2.2503248967939129 7.7591443059575598 2.0947563259534858 7.8060414290621756 1.9388384403900583 7.8503863997155658 1.7825712401036231 7.8921792179177279 1.6259547250941804 7.9706605494195903 1.312023065629278 8.0073490627192925 1.1547079211738236 8.0414854235677655 0.99704346199536253 8.0730696319650104 0.83902968809389478 8.102101687911027 0.68066659946941943 8.1285815914058173 0.52195419612193827 8.1525093424493775 0.36289247805145131 8.2111102650563108 -0.074130773254121429 8.244097204596061 -0.37890923989126968 8.2694580659650967 -0.70498433054120291 8.2843990363723989 -1.0459159535635236 8.2871194767263141 -1.3942383010357964 8.2774250261743134 -1.7411068103260807 8.2571586101864938 -2.0759736855430173 8.1931717896650298 -2.8083642612334541 8.1428700727682752 -3.1936141077828033 8.0838976261588193 -3.5492434036513925 8.0190686020268132 -3.8778952694395175 7.9505897116124089 -4.1835660466578766 7.8795415381116287 -4.4695747639269898 7.8063236005014556 -4.7401755462791373 7.730463901340765 -5.0000000000000009
0 9 0.27373090199251832 7 0.39257503879511935 7 0.51141917559771621 7 0.71838467790183647 7 1 9
7 0 0 8 37 6 13.12439027085378 0.083333333333333301 12.855460786367491 0.083333333333333301 12.576262374087399 0.083333333333333301 12.285245535549379 0.083333333333333301 11.980530619135894 0.083333333333333301 11.66004783654985 0.083333333333333301 11.320658882335294 0.083333333333333301 10.958718375346596 0.083333333333333301 10.395766090930428 0.083333333333333301 10.225343695997138 0.083333333333333301 10.054921301063848 0.083333333333333301 9.8844989061305615 0.083333333333333301 9.7140765111972787 0.083333333333333301 9.5436541162639976 0.083333333333333301 9.3732317213307166 0.083333333333333301 9.0323869314641367 0.083333333333333301 8.8619645365308486 0.083333333333333301 8.6915421415975676 0.083333333333333301 8.5211197466642812 0.083333333333333301 8.3506973517309913 0.083333333333333301 8.1802749567977013 0.083333333333333301 8.0098525618644132 0.083333333333333301 7.5426418059720639 0.083333333333333301 7.2179431044415008 0.083333333333333301 6.8719828113462551 0.083333333333333301 6.5119232235848106 0.083333333333333301 6.1458607362003219 0.083333333333333301 5.7831083692556344 0.083333333333333301 5.4344744773751534 0.083333333333333301 4.6747991101991682 0.083333333333333301 4.2775884800360551 0.083333333333333301 3.912719620304534 0.083333333333333301 3.5770134022220104 0.083333333333333301 3.2659573567497064 0.083333333333333301 2.9759118743151745 0.083333333333333301 2.7023535343128775 0.083333333333333301 2.4404878596461925 0.083333333333333301
0 9 0.27373090199251832 7 0.39257503879511935 7 0.51141917559771621 7 0.71838467790183647 7 1 9
7 0 0 4 101 34 7.622158738743968 0.083333333333333315 7.6287903479993719 0.089551623150515944 7.6354243102982631 0.095771502266611977 7.6420606283814543 0.1019929722663182 7.6553661245311275 0.11446547823966971 7.662035322636692 0.12071652774360417 7.6687069020912055 0.12696918485113284 7.6820496816411996 0.13947289356918813 7.6887208780603347 0.14572394269830621 7.6953944577147011 0.15197660015535097 7.7087412375859659 0.16448030885544079 7.7154144341219633 0.17073135761485206 7.7220900157704326 0.1769840154163394 7.7354407995632348 0.18948772409852452 7.7421159980221521 0.19573877249339852 7.7487935834615946 0.20199143063419156 7.7621483747816047 0.21449513929853206 7.7688255769722803 0.22074618733410067 7.7755051680022076 0.22699884580900023 7.7888639704605129 0.23950255445555985 7.7955431781945537 0.24575360213711395 7.8022247766171233 0.25200626094086592 7.8155875938302382 0.26450996956970957 7.8222688089220398 0.27076101690259768 7.8289524165420588 0.27701367602988924 7.8423192521319356 0.28951738464108034 7.8490024763986828 0.2957684316307157 7.8556880950236101 0.30202109107617159 7.8690589526176522 0.31452479966977681 7.875744187879322 0.32077584632162998 7.8824318193192777 0.32702850607981432 7.8958067025503489 0.33953221465589872 7.9024939506297267 0.34578326097550605 7.9091835966974884 0.35203592104092057 7.9225625092039236 0.36453962959954933 7.9292517719266034 0.37079067559250489 7.9359434344376272 0.37704333595959449 7.9493263798632485 0.38954704450083588 7.9560176590576397 0.39579809017280199 7.9627113398300473 0.40205075083594372 7.9760983218241739 0.41455445935986812 7.9827916193215156 0.42080550471657052 7.9894873201761065 0.42705816567007876 8.0028783423935614 0.43956187417675419 8.0095736600279093 0.4458129192239782 8.0162713827881795 0.45206558046210754 8.0296664488893068 0.46456928895160177 8.0363637884975603 0.47082033369520521 8.0430635349896811 0.47707299521213836 8.056462648640359 0.48957670368452588 8.0631620120622536 0.49582774813042252 8.0698637841151069 0.50208040992028813 8.0832669489867488 0.51458411837563633 8.089968338064871 0.5208351625298121 8.0966721375100246 0.52708782458666614 8.1100793572796057 0.53959153302505014 8.1167827738594056 0.54584257689355664 8.1234886025311326 0.55209523921139225 8.1368998808811934 0.56459894763288454 8.1436053268109738 0.57084999122184032 8.1503131865462652 0.5771026537945827 8.1637285271649187 0.58960636219925711 8.1704360042958477 0.59585740551484301 8.1771458969344124 0.6021100683363525 8.1905653035153669 0.6146137767242833 8.1972748137014868 0.62086481977275398 8.2039867410857514 0.62711748283682622 8.2174102173283181 0.63962119120809302 8.2241217624265666 0.64587223399576632 8.2308357264016756 0.65212489729612766 8.2442632760107717 0.66462860565080106 8.2509768578809748 0.67087964818407997 8.257692860294803 0.67713231171437449 8.2711244869809804 0.68963602005253599 8.2778401074858419 0.69588706233787512 8.2845581501890138 0.70213972609169584 8.2979938576684589 0.71464343441342471 8.3047115186735958 0.72089447645735194 8.3114316035194697 0.72714714042822048 8.3248713955140126 0.73965084873359233 8.3315910988879498 0.74590189054271427 8.3383132277326322 0.75215455472407111 8.351757107969771 0.76465826301316697 8.3584788555839484 0.77090930459416285 8.365203030286299 0.77716196897938217 8.3786510024992076 0.78966567725228698 8.3853747962279783 0.79591671861189484 8.3921010186496137 0.80216938319428432 8.4055530865771413 0.81467309145107469 8.4122789282978108 0.82092413259612385 8.4190072003031027 0.82717679736890959 8.4324633676898078 0.83968050560967122 8.4391912592825911 0.84593154654704861 8.4459215827386913 0.85218421150339341 8.4593818533348362 0.86468791972820858 8.4661117966829096 0.8709389604648845 8.472844173459734 0.87719162559787467 8.488517637993521 0.89174680471830958 8.4974605809466635 0.90005055685553259 8.5064078214598577 0.90835717637842894 8.5153593657944882 0.91666666666666674
0 5 0.030234557493974881 3 0.060597286445280771 3 0.090936596633282865 3 0.12125249565790397 3 0.15154499127834578 3 0.18181409141430263 3 0.21205980414722203 3 0.2422821377215349 3 0.27248110054592906 3 0.30265670119461291 3 0.33280894840858338 3 0.36293785109691401 3 0.39304341833807271 3 0.42312565938118518 3 0.45318458364736725 3 0.48322020073105881 3 0.51323252040132428 3 0.54322155260323224 3 0.57318730745918511 3 0.60312979527026811 3 0.6330490265176264 3 0.66294501186387034 3 0.6928177621544428 3 0.72266728841898542 3 0.75249360187278869 3 0.7822967139182162 3 0.81207663614611747 3 0.84183338033725519 3 0.87156695846375176 3 0.90127738269056612 3 0.93096466537694156 3 0.9606288190779263 3 1 5
7 0 0 4 5 2 7.622158739621324 0.083333334156006508 7.8414974765327088 0.28900164086619462 8.0634102103575174 0.49640844854394217 8.2879964897490481 0.70561150605131573 8.5153593648850361 0.91666666582244605
0 5 1 5
7 0 0 8 23 4 14.077035382601977 0.91666666666666674 13.791479368343392 0.91666666666666674 13.495998661053251 0.91666666666666674 13.189249298512053 0.91666666666666674 12.869769135047301 0.91666666666666674 12.535691188255909 0.91666666666666674 12.184777226416207 0.91666666666666674 11.814049742479412 0.91666666666666674 11.137468208370755 0.91666666666666663 10.845021339158478 0.91666666666666663 10.538377659295854 0.91666666666666663 10.214903923480056 0.91666666666666663 9.8720772199945515 0.91666666666666663 9.5066796613292119 0.91666666666666663 9.115465736001692 0.91666666666666663 8.1099825131120706 0.91666666666666663 7.4104014956003432 0.91666666666666663 6.6501251935008359 0.91666666666666663 5.8744040321910234 0.91666666666666663 5.1205016702360586 0.91666666666666663 4.4191322177531109 0.91666666666666663 3.7977895161410729 0.91666666666666663 3.2841425768869628 0.91666666666666663
0 9 0.3727009732137162 7 0.63717764686443723 7 1 9
7 0 0 8 23 4 6.7290752130886906 5 6.9018443751761218 4.7516391818202628 7.0734554866507064 4.4936660433777895 7.2438347686065141 4.2247902884154485 7.4128036400551842 3.943594700098334 7.5800462108593258 3.648257638698885 7.7451135336014296 3.3365856174169561 7.9073871903615736 3.0056577534236819 8.1784265011699588 2.3982738725587938 8.2886493748022332 2.1347883850961242 8.3966357506175271 1.8574735421163151 8.5019810085105476 1.5637656517180476 8.6038911473950606 1.2511528260027021 8.7009895757694462 0.91638143480188106 8.7914801193463727 0.55611410602980094 8.9834718854019755 -0.3753860493370107 9.0873350369782955 -1.0275597126632792 9.151948259549096 -1.7429211426139406 9.1580249343991085 -2.4810065866256337 9.1071226421494202 -3.2061071689724283 9.0128189491748252 -3.8871076367528006 8.896311352435653 -4.4949172757906384 8.7808322101092102 -5
0 9 0.3727009732137162 7 0.63717764686443723 7 1 9
1 0 0 0 1
1 0 10 1 0
1 0 0 1 0
1 0 5 1 0
1 0 0 0 1
1 5 0 0 1
1 0 0 0 1
1 0 0 1 0
1 0 0 1 0
1 0 0 1 0
7 0 0 8 37 6 6.437228695165528 10 6.5802399564650447 9.7634038851144851 6.7223554075999825 9.5169034403959696 6.8635605126092383 9.2590206936169075 7.0037144891836149 8.9879459040154792 7.1425672018511133 8.701673248001569 7.2796857279501062 8.3971540622075569 7.4145039990282759 8.0708384420456039 7.6031400219363325 7.5604140943057487 7.6576936023946365 7.4055441529113333 7.7096950304017113 7.2503248967939129 7.7591443059575598 7.0947563259534858 7.8060414290621756 6.9388384403900583 7.8503863997155658 6.7825712401036231 7.8921792179177279 6.6259547250941804 7.9706605494195903 6.312023065629278 8.0073490627192925 6.1547079211738236 8.0414854235677655 5.9970434619953625 8.0730696319650104 5.8390296880938948 8.102101687911027 5.6806665994694194 8.1285815914058173 5.5219541961219383 8.1525093424493775 5.3628924780514513 8.2111102650563108 4.9258692267458786 8.244097204596061 4.6210907601087303 8.2694580659650967 4.2950156694587971 8.2843990363723989 3.9540840464364764 8.2871194767263141 3.6057616989642036 8.2774250261743134 3.2588931896739193 8.2571586101864938 2.9240263144569827 8.1931717896650298 2.1916357387665459 8.1428700727682752 1.8063858922171965 8.0838976261588193 1.4507565963486075 8.0190686020268132 1.1221047305604828 7.9505897116124089 0.8164339533421231 7.8795415381116287 0.53042523607301029 7.8063236005014556 0.25982445372086305 7.730463901340765 -5.8286708792820718e-16
0 9 0.27373090199251832 7 0.39257503879511935 7 0.51141917559771621 7 0.71838467790183647 7 1 9
7 0 0 8 37 6 13.12439027085378 0.083333333333333301 12.855460786367491 0.083333333333333301 12.576262374087399 0.083333333333333301 12.285245535549379 0.083333333333333301 11.980530619135894 0.083333333333333301 11.66004783654985 0.083333333333333301 11.320658882335294 0.083333333333333301 10.958718375346596 0.083333333333333301 10.395766090930428 0.083333333333333301 10.225343695997138 0.083333333333333301 10.054921301063848 0.083333333333333301 9.8844989061305615 0.083333333333333301 9.7140765111972787 0.083333333333333301 9.5436541162639976 0.083333333333333301 9.3732317213307166 0.083333333333333301 9.0323869314641367 0.083333333333333301 8.8619645365308486 0.083333333333333301 8.6915421415975676 0.083333333333333301 8.5211197466642812 0.083333333333333301 8.3506973517309913 0.083333333333333301 8.1802749567977013 0.083333333333333301 8.0098525618644132 0.083333333333333301 7.5426418059720639 0.083333333333333301 7.2179431044415008 0.083333333333333301 6.8719828113462551 0.083333333333333301 6.5119232235848106 0.083333333333333301 6.1458607362003219 0.083333333333333301 5.7831083692556344 0.083333333333333301 5.4344744773751534 0.083333333333333301 4.6747991101991682 0.083333333333333301 4.2775884800360551 0.083333333333333301 3.912719620304534 0.083333333333333301 3.5770134022220104 0.083333333333333301 3.2659573567497064 0.083333333333333301 2.9759118743151745 0.083333333333333301 2.7023535343128775 0.083333333333333301 2.4404878596461925 0.083333333333333301
0 9 0.27373090199251832 7 0.39257503879511935 7 0.51141917559771621 7 0.71838467790183647 7 1 9
7 0 0 4 8 3 2.4404878596461939 0.083333333333333356 2.5450888297416361 0.18711894764996326 2.6500963377183311 0.29115440486504285 2.7555160078847276 0.39544260101036011 2.9664272559309222 0.6037756671511344 3.071912820930963 0.70781685854858356 3.1778159885606878 0.81211289873083758 3.2841425768869645 0.91666666666666674
0 5 0.50181117457624846 3 1 5
7 0 0 4 8 3 7.7304639013407659 0 7.8645513035242356 -1.2454273717995588 7.9978846309840721 -2.4938528583805146 8.1304487961135017 -3.7453112121243204 8.3930555744108695 -6.2453080058136132 8.5231094793314384 -7.4938023025830045 8.6523738838317215 -8.7453547847700506 8.7808322101092102 -10
0 5 0.50181117457624846 3 1 5
7 0 0 8 23 4 14.077035382601977 0.91666666666666674 13.791479368343392 0.91666666666666674 13.495998661053251 0.91666666666666674 13.189249298512053 0.91666666666666674 12.869769135047301 0.91666666666666674 12.535691188255909 0.91666666666666674 12.184777226416207 0.91666666666666674 11.814049742479412 0.91666666666666674 11.137468208370755 0.91666666666666663 10.845021339158478 0.91666666666666663 10.538377659295854 0.91666666666666663 10.214903923480056 0.91666666666666663 9.8720772199945515 0.91666666666666663 9.5066796613292119 0.91666666666666663 9.115465736001692 0.91666666666666663 8.1099825131120706 0.91666666666666663 7.4104014956003432 0.91666666666666663 6.6501251935008359 0.91666666666666663 5.8744040321910234 0.91666666666666663 5.1205016702360586 0.91666666666666663 4.4191322177531109 0.91666666666666663 3.7977895161410729 0.91666666666666663 3.2841425768869628 0.91666666666666663
0 9 0.3727009732137162 7 0.63717764686443723 7 1 9
7 0 0 8 23 4 6.7290752130886906 10 6.9018443751761218 9.7516391818202628 7.0734554866507064 9.4936660433777895 7.2438347686065141 9.2247902884154485 7.4128036400551842 8.943594700098334 7.5800462108593258 8.648257638698885 7.7451135336014296 8.3365856174169561 7.9073871903615736 8.0056577534236819 8.1784265011699588 7.3982738725587938 8.2886493748022332 7.1347883850961242 8.3966357506175271 6.8574735421163151 8.5019810085105476 6.5637656517180476 8.6038911473950606 6.2511528260027021 8.7009895757694462 5.9163814348018811 8.7914801193463727 5.5561141060298009 8.9834718854019755 4.6246139506629893 9.0873350369782955 3.9724402873367208 9.151948259549096 3.2570788573860594 9.1580249343991085 2.5189934133743663 9.1071226421494202 1.7938928310275717 9.0128189491748252 1.1128923632471994 8.896311352435653 0.50508272420936162 8.7808322101092102 -3.3306690738754701e-16
0 9 0.3727009732137162 7 0.63717764686443723 7 1 9
1 0 0 0 1
1 0 10 1 0
1 0 0 1 0
1 0 -10 1 0
1 0 0 0 1
1 0 0 0 -1
Curves 20
1 5 0 0 0 0 1
7 0 0 4 8 3 10.000000000000002 0 6.4372286951655289 10.000000000000002 1.2264444938000587 6.477655052278779 10.000000000000002 2.468151359293894 6.5170864661860932 10.000000000000002 3.7257382226217302 6.5554469820834766 10.000000000000002 6.2264960470250541 6.6284583896486087 10 7.4684636093053767 6.6631939997614218 10.000000000000002 8.7261779784543734 6.6967666022802952 10.000000000000002 10 6.7290752130886906
0 5 0.50945770884725361 3 1 5
1 5 10 0 0 0 1
1 5 0 0 -0 1 0
1 0 0 0 1 0 -0
1 0 0 0 0 0 1
7 0 0 8 37 6 10 0 6.437228695165528 9.7634038851144851 0 6.5802399564650447 9.5169034403959696 0 6.7223554075999825 9.2590206936169075 0 6.8635605126092383 8.9879459040154792 0 7.0037144891836149 8.701673248001569 0 7.1425672018511133 8.3971540622075569 0 7.2796857279501062 8.0708384420456039 0 7.4145039990282759 7.5604140943057487 0 7.6031400219363325 7.4055441529113333 0 7.6576936023946365 7.2503248967939129 0 7.7096950304017113 7.0947563259534858 0 7.7591443059575598 6.9388384403900583 0 7.8060414290621756 6.7825712401036231 0 7.8503863997155658 6.6259547250941804 0 7.8921792179177279 6.312023065629278 0 7.9706605494195903 6.1547079211738236 0 8.0073490627192925 5.9970434619953625 0 8.0414854235677655 5.8390296880938948 0 8.0730696319650104 5.6806665994694194 0 8.102101687911027 5.5219541961219383 0 8.1285815914058173 5.3628924780514513 0 8.1525093424493775 4.9258692267458786 0 8.2111102650563108 4.6210907601087303 0 8.244097204596061 4.2950156694587971 0 8.2694580659650967 3.9540840464364764 0 8.2843990363723989 3.6057616989642036 0 8.2871194767263141 3.2588931896739193 0 8.2774250261743134 2.9240263144569827 0 8.2571586101864938 2.1916357387665459 0 8.1931717896650298 1.8063858922171965 0 8.1428700727682752 1.4507565963486075 0 8.0838976261588193 1.1221047305604828 0 8.0190686020268132 0.8164339533421231 0 7.9505897116124089 0.53042523607301029 0 7.8795415381116287 0.25982445372086305 0 7.8063236005014556 -5.8286708792820718e-16 0 7.730463901340765
0 9 0.27373090199251832 7 0.39257503879511935 7 0.51141917559771621 7 0.71838467790183647 7 1 9
7 0 0 4 101 34 5 0 8.1993218486267256 5 0.074619477806193046 8.2048191399574861 5 0.14925802719934111 8.2103132561999264 5 0.22391566719581846 8.2158041914419506 5 0.37358573887603796 8.2268029519060626 5 0.44859833292325213 8.232310750050436 5 0.52363021821359368 8.2378153281555129 5 0.67367472283025798 8.2488137889961717 5 0.74868731237967623 8.2543076767063894 5 0.82371920186421299 8.259798337266103 5 0.97376370626528974 8.2707689576063927 5 1.0487762913782213 8.2762489223748261 5 1.1238081849960739 8.281725652859917 5 1.273852689182295 8.2926684076441841 5 1.348865269920779 8.2981344369444514 5 1.4238971676102992 8.3035972248068486 5 1.5739416715823857 8.314512088941834 5 1.6489542480092094 8.3199641702287543 5 1.7239861497080042 8.3254130029015396 5 1.8740306534667184 8.3362999512563007 5 1.9490432256453669 8.3417380719658638 5 2.02407513129039 8.3471729368632239 5 2.174119634836515 8.358031944269058 5 2.2491322028311735 8.3634560918183798 5 2.3241641123586723 8.3688769763355761 5 2.474208615692965 8.3797080175859318 5 2.5492211795685922 8.3851181793732152 5 2.6242530929140599 8.3905250708865378 5 2.7742975960373215 8.4013281207369452 5 2.8493101558595564 8.406724284141438 5 2.9243420729577716 8.4121171700081696 5 3.0743865758707845 8.4228922031761577 5 3.1493991317060734 8.4282743555581074 5 3.2244310524910471 8.4336532231164831 5 3.3744755551945929 8.4444002142814938 5 3.4494881071100583 8.4497683429821269 5 3.5245200315151335 8.4551331795512823 5 3.6745645340100301 8.4658521033545977 5 3.7495770820736229 8.4712061956960625 5 3.8246090100313248 8.4765569885760179 5 3.9746535123184179 8.4872478196206789 5 4.0496660565988476 8.4925878629059994 5 4.1246979880409445 8.4979245993776047 5 4.2747424901210502 8.5085873122283235 5 4.3497550306877377 8.5139132937413731 5 4.4247869655452901 8.5192359610662596 5 4.5748314674192221 8.5298705302493438 5 4.6498440043424605 8.5351824372548073 5 4.724875942545661 8.540491022675365 5 4.874920444214311 8.5510974226786391 5 4.9499329775650729 8.5563952424219494 5 5.0249649190434589 8.5616897331612751 5 5.1750094205076369 8.5722679384339919 5 5.2500219503577457 8.5775516581413189 5 5.3250538950399937 8.582832041403174 5 5.4750983963006012 8.5933820263559397 5 5.5501109227226788 8.5986516332341267 5 5.6251428705367053 8.6039178962029048 5 5.7751873715946136 8.6144396352075923 5 5.8501998946620821 8.6196951164441256 5 5.9252318455349924 8.6249472462848065 5 6.075276346391087 8.6354407136744769 5 6.1502888661781174 8.6406820564374343 5 6.2253208200362282 8.6459200402955467 5 6.3753653206913992 8.6563852103643608 5 6.4503778372730478 8.661612401802385 5 6.5254097940419147 8.6668362268039587 5 6.6754542944971167 8.6772730738071076 5 6.7504668079491932 8.6824861010493528 5 6.8254987675535324 8.6876957543008899 5 6.9755432678096128 8.6981042524544918 5 7.0505557782089561 8.7033031026105903 5 7.1255877405724943 8.7084985711990015 5 7.2756322406304328 8.7188786946800381 5 7.3506447480544956 8.7240633548400517 5 7.4256767131003514 8.7292446258326404 5 7.5757212129610974 8.7395963487788642 5 7.6507337174882215 8.7447668060132404 5 7.7257656851386454 8.7499338664576509 5 7.8758101848031075 8.7602571629675019 5 7.9508226865125682 8.76541340432704 5 8.0258546566888533 8.7705662412512115 5 8.1758991561580032 8.7808610853837337 5 8.2509116551299471 8.7860030978995471 5 8.3259436277525847 8.7911416983116712 5 8.4759881270274438 8.8014080640864378 5 8.5510006233427358 8.8065358347698837 5 8.6260325983314097 8.8116601856583756 5 8.7760770974128963 8.8218980470553863 5 8.8510895911534835 8.827011562898063 5 8.9261215684269146 8.8321216512315068 5 9.0761660673160556 8.84233098219112 5 9.1511785585645828 8.8474302301647949 5 9.2262105380407213 8.8525260428919026 5 9.3762550367385042 8.8627068173147432 5 9.4512675255786132 8.8677917843713274 5 9.5262995071744943 8.8728733084209033 5 9.7009616566197128 8.8846911601230865 5 9.8006066822663911 8.8914248607658717 5 9.900286116541146 8.8981524694060798 5 10 8.9048739705394819
0 5 0.030234557493974881 3 0.060597286445280771 3 0.090936596633282865 3 0.12125249565790397 3 0.15154499127834578 3 0.18181409141430263 3 0.21205980414722203 3 0.2422821377215349 3 0.27248110054592906 3 0.30265670119461291 3 0.33280894840858338 3 0.36293785109691401 3 0.39304341833807271 3 0.42312565938118518 3 0.45318458364736725 3 0.48322020073105881 3 0.51323252040132428 3 0.54322155260323224 3 0.57318730745918511 3 0.60312979527026811 3 0.6330490265176264 3 0.66294501186387034 3 0.6928177621544428 3 0.72266728841898542 3 0.75249360187278869 3 0.7822967139182162 3 0.81207663614611747 3 0.84183338033725519 3 0.87156695846375176 3 0.90127738269056612 3 0.93096466537694156 3 0.9606288190779263 3 1 5
7 0 0 8 23 4 10 10 6.7290752130886906 9.7516391818202628 10 6.9018443751761218 9.4936660433777895 10 7.0734554866507064 9.2247902884154485 10 7.2438347686065141 8.943594700098334 10 7.4128036400551842 8.648257638698885 10 7.5800462108593258 8.3365856174169561 10 7.7451135336014296 8.0056577534236819 10 7.9073871903615736 7.3982738725587938 10 8.1784265011699588 7.1347883850961242 10 8.2886493748022332 6.8574735421163151 10 8.3966357506175271 6.5637656517180476 10 8.5019810085105476 6.2511528260027021 10 8.6038911473950606 5.9163814348018811 10 8.7009895757694462 5.5561141060298009 10 8.7914801193463727 4.6246139506629893 10 8.9834718854019755 3.9724402873367208 10 9.0873350369782955 3.2570788573860594 10 9.151948259549096 2.5189934133743663 10 9.1580249343991085 1.7938928310275717 10 9.1071226421494202 1.1128923632471994 10 9.0128189491748252 0.50508272420936162 10 8.896311352435653 -3.3306690738754701e-16 10 8.7808322101092102
0 9 0.3727009732137162 7 0.63717764686443723 7 1 9
1 0 10 0 1 0 -0
1 0 10 0 0 0 1
1 0 0 0 -0 1 0
1 0 0 0 1 0 -0
1 0 0 0 0 0 1
7 0 0 8 37 6 10 0 6.437228695165528 9.7634038851144851 0 6.5802399564650447 9.5169034403959696 0 6.7223554075999825 9.2590206936169075 0 6.8635605126092383 8.9879459040154792 0 7.0037144891836149 8.701673248001569 0 7.1425672018511133 8.3971540622075569 0 7.2796857279501062 8.0708384420456039 0 7.4145039990282759 7.5604140943057487 0 7.6031400219363325 7.4055441529113333 0 7.6576936023946365 7.2503248967939129 0 7.7096950304017113 7.0947563259534858 0 7.7591443059575598 6.9388384403900583 0 7.8060414290621756 6.7825712401036231 0 7.8503863997155658 6.6259547250941804 0 7.8921792179177279 6.312023065629278 0 7.9706605494195903 6.1547079211738236 0 8.0073490627192925 5.9970434619953625 0 8.0414854235677655 5.8390296880938948 0 8.0730696319650104 5.6806665994694194 0 8.102101687911027 5.5219541961219383 0 8.1285815914058173 5.3628924780514513 0 8.1525093424493775 4.9258692267458786 0 8.2111102650563108 4.6210907601087303 0 8.244097204596061 4.2950156694587971 0 8.2694580659650967 3.9540840464364764 0 8.2843990363723989 3.6057616989642036 0 8.2871194767263141 3.2588931896739193 0 8.2774250261743134 2.9240263144569827 0 8.2571586101864938 2.1916357387665459 0 8.1931717896650298 1.8063858922171965 0 8.1428700727682752 1.4507565963486075 0 8.0838976261588193 1.1221047305604828 0 8.0190686020268132 0.8164339533421231 0 7.9505897116124089 0.53042523607301029 0 7.8795415381116287 0.25982445372086305 0 7.8063236005014556 -5.8286708792820718e-16 0 7.730463901340765
0 9 0.27373090199251832 7 0.39257503879511935 7 0.51141917559771621 7 0.71838467790183647 7 1 9
7 0 0 4 8 3 -1.6653345369377348e-16 0 7.7304639013407659 -1.6653345369377348e-16 1.2454273717995588 7.8645513035242356 -4.3417514303589922e-16 2.4938528583805146 7.9978846309840721 5.5511151231257827e-16 3.7453112121243204 8.1304487961135017 5.5511151231257827e-16 6.2453080058136132 8.3930555744108695 -7.8668779101260155e-16 7.4938023025830045 8.5231094793314384 1.1102230246251565e-16 8.7453547847700506 8.6523738838317215 1.1102230246251565e-16 10 8.7808322101092102
0 5 0.50181117457624846 3 1 5
7 0 0 8 23 4 10 10 6.7290752130886906 9.7516391818202628 10 6.9018443751761218 9.4936660433777895 10 7.0734554866507064 9.2247902884154485 10 7.2438347686065141 8.943594700098334 10 7.4128036400551842 8.648257638698885 10 7.5800462108593258 8.3365856174169561 10 7.7451135336014296 8.0056577534236819 10 7.9073871903615736 7.3982738725587938 10 8.1784265011699588 7.1347883850961242 10 8.2886493748022332 6.8574735421163151 10 8.3966357506175271 6.5637656517180476 10 8.5019810085105476 6.2511528260027021 10 8.6038911473950606 5.9163814348018811 10 8.7009895757694462 5.5561141060298009 10 8.7914801193463727 4.6246139506629893 10 8.9834718854019755 3.9724402873367208 10 9.0873350369782955 3.2570788573860594 10 9.151948259549096 2.5189934133743663 10 9.1580249343991085 1.7938928310275717 10 9.1071226421494202 1.1128923632471994 10 9.0128189491748252 0.50508272420936162 10 8.896311352435653 -3.3306690738754701e-16 10 8.7808322101092102
0 9 0.3727009732137162 7 0.63717764686443723 7 1 9
1 0 10 0 1 0 -0
1 0 10 0 0 0 1
1 0 0 0 -0 1 0
Polygon3D 0
PolygonOnTriangulations 40
2 1 2
p 0.0338312033466741 1 0 6.43722869516553
2 2 4
p 0.0338312033466741 1 0 6.43722869516553
2 3 8
p 0.0338312033466741 1 0 1
2 2 3
p 0.0338312033466741 1 0 1
2 4 3
p 0.0338312033466741 1 0 6.72907521308869
2 2 4
p 0.0338312033466741 1 0 6.72907521308869
2 1 4
p 0.0338312033466741 1 0 10
2 3 4
p 0.0338312033466741 1 0 10
2 1 2
p 0.0338312033466741 1 0 5
2 1 3
p 0.0338312033466741 1 0 5
2 1 3
p 0.0338312033466741 1 0 8.19932191205508
2 2 4
p 0.0338312033466741 1 0 8.19932191205508
6 3 4 5 6 7 1
p 0.0338312033466741 1 0 0.157797308768117 0.262995514613529 0.370177138528419 0.450009477679368 0.529841816830316
6 4 5 6 7 8 3
p 0.0338312033466741 1 0 0.157797308768117 0.262995514613529 0.370177138528419 0.450009477679368 0.529841816830316
2 1 2
p 0.0338312033466741 1 0 1
2 1 7
p 0.0338312033466741 1 0 1
6 8 9 10 11 12 2
p 0.0338312033466741 1 0 0.195173449568337 0.370829554179841 0.513971444527479 0.582274804877635 0.650578165227791
6 4 5 6 7 8 3
p 0.0338312033466741 1 0 0.195173449568337 0.370829554179841 0.513971444527479 0.582274804877635 0.650578165227791
2 1 2
p 0.0338312033466741 1 0 5
2 2 4
p 0.0338312033466741 1 0 5
2 1 3
p 0.0338312033466741 1 0 8.90487399647337
2 2 4
p 0.0338312033466741 1 0 8.90487399647337
2 1 2
p 0.0338312033466741 1 0 10
2 3 4
p 0.0338312033466741 1 0 10
2 1 2
p 0.0338312033466741 1 0 5
2 1 3
p 0.0338312033466741 1 0 5
2 1 3
p 0.0338312033466741 1 0 7.73046390134076
2 1 2
p 0.0338312033466741 1 0 7.73046390134076
6 1 3 4 5 6 2
p 0.0338312033466741 1 0.529841816830316 0.628062724786546 0.726283632742775 0.835843917500507 0.917921958750254 1
6 4 5 6 7 8 3
p 0.0338312033466741 1 0.529841816830316 0.628062724786546 0.726283632742775 0.835843917500507 0.917921958750254 1
2 2 8
p 0.0338312033466741 1 0 1
2 2 3
p 0.0338312033466741 1 0 1
6 7 9 10 11 12 8
p 0.0338312033466741 1 0.650578165227791 0.730099239003302 0.809620312778812 0.890856928335456 0.945428464167728 1
6 4 5 6 7 8 3
p 0.0338312033466741 1 0.650578165227791 0.730099239003302 0.809620312778812 0.890856928335456 0.945428464167728 1
2 1 2
p 0.0338312033466741 1 0 5
2 2 4
p 0.0338312033466741 1 0 5
2 1 3
p 0.0338312033466741 1 0 8.78083221010921
2 4 3
p 0.0338312033466741 1 0 8.78083221010921
2 1 2
p 0.0338312033466741 1 0 10
2 1 4
p 0.0338312033466741 1 0 10
Surfaces 10
1 5 0 0 1 0 -0 0 0 1 0 -1 0
1 0 0 0 -0 1 0 0 0 1 1 0 -0
9 0 0 0 0 2 1 3 2 2 2 -2.3694708347320557 -1 6.7111740112304688 -3.3694708347320557 11 7.7111740112304688
6.3040766849920349 -1 10.778600889711969 5.3040766849920349 11 11.778600889711969
13.449372291564941 -1 3.6803607940673828 12.449372291564941 11 4.6803607940673828
0 3
17.042239493328594 3
0 2
1 2
1 0 10 0 -0 1 0 0 0 1 1 0 -0
1 0 0 0 0 0 1 1 0 -0 -0 1 0
1 0 0 0 -0 1 0 0 0 1 1 0 -0
9 0 0 0 0 2 1 3 2 2 2 -2.3694708347320557 -1 6.7111740112304688 -3.3694708347320557 11 7.7111740112304688
6.3040766849920349 -1 10.778600889711969 5.3040766849920349 11 11.778600889711969
13.449372291564941 -1 3.6803607940673828 12.449372291564941 11 4.6803607940673828
0 3
17.042239493328594 3
0 2
1 2
1 0 10 0 -0 1 0 0 0 1 1 0 -0
1 0 0 0 0 0 1 1 0 -0 -0 1 0
1 0 0 0 1 0 -0 0 0 1 0 -1 0
Triangulations 10
4 2 1 0
10 0 0 10 0 6.43722869516553 10 10 6.72907521308869 10 10 0 0 0 6.43722869516553 0 6.72907521308869 -10 0 -10 2 4 3 2 1 4
8 6 1 2.22044604925031e-16
5 0 0 10 0 0 5.00000000000002 0 8.19932191205528 10 0 6.43722869516553 8.79807665874094 0 7.08728891199801 7.82535091371973 0 7.50462831121173 6.70530137909227 0 7.86971791782177 5.85984283785007 0 8.06644234183498 0 0 0 5 8.19932191205508 0 6.43722869516553 5 7.08728891199801 3.79807665874094 7.50462831121173 2.82535091371973 7.86971791782177 1.70530137909227 8.06644234183498 0.859842837850067 8 1 3 7 1 8 6 1 7 5 1 6 4 2 1 4 1 5
12 10 1 0.0122249921359919
5.00000000000002 0 8.19932191205528 4.99999999999997 10 8.90487399647323 10 0 6.43722869516553 8.79807665874094 0 7.08728891199801 7.82535091371973 0 7.50462831121173 6.70530137909227 0 7.86971791782177 5.85984283785007 0 8.06644234183498 10 10 6.72907521308869 8.87417445028259 10 7.44277729236561 7.66463804731309 10 8.05955372364287 6.46057738942126 10 8.52630210854639 5.7795158176413 10 8.72781711637771 7.62215873874397 0.0833333333333333 8.51535936579449 0.916666666666667 13.1243902708538 0.0833333333333333 11.7691957308136 0.0833333333333333 10.6880538277913 0.0833333333333333 9.45975789164423 0.0833333333333333 8.5439218194732 0.0833333333333333 14.077035382602 0.916666666666667 12.7925843494021 0.916666666666667 11.4341800330082 0.916666666666667 10.1030814108977 0.916666666666667 9.35914224644899 0.916666666666667 2 1 7 12 7 6 12 2 7 11 6 5 11 12 6 10 5 4 10 11 5 9 4 3 9 10 4 8 9 3
8 6 1 4.44089209850063e-16
5 10 0 10 10 0 4.99999999999997 10 8.90487399647323 10 10 6.72907521308869 8.87417445028259 10 7.44277729236561 7.66463804731309 10 8.05955372364287 6.46057738942126 10 8.52630210854639 5.7795158176413 10 8.72781711637771 0 0 0 5 8.90487399647337 0 6.72907521308869 5 7.44277729236561 3.87417445028259 8.05955372364287 2.66463804731309 8.52630210854639 1.46057738942126 8.72781711637771 0.779515817641305 8 1 3 7 1 8 6 1 7 5 1 6 4 2 1 4 1 5
4 2 1 0
5 0 0 5 10 0 10 0 0 10 10 0 0 0 0 10 5 0 5 10 4 2 1 4 1 3
8 6 1 2.22044604925031e-16
0 0 0 5 0 0 -5.82867087928207e-16 0 7.73046390134076 5.00000000000002 0 8.19932191205528 3.77443736973052 0 8.27566756640225 2.51986035017387 0 8.22148773529173 1.36192938573186 0 8.05753010162796 0.63764217906072 0 7.90128547279649 0 0 0 5 7.73046390134076 0 8.19932191205508 5 8.27566756640225 3.77443736973052 8.22148773529173 2.51986035017387 8.05753010162796 1.36192938573186 7.90128547279649 0.63764217906072 8 1 3 7 2 1 7 1 8 6 2 7 5 2 6 4 2 5
12 10 1 0.012025438274462
5.00000000000002 0 8.19932191205528 -5.82867087928207e-16 0 7.73046390134076 3.77443736973052 0 8.27566756640225 2.51986035017387 0 8.22148773529173 1.36192938573186 0 8.05753010162796 0.63764217906072 0 7.90128547279649 4.99999999999997 10 8.90487399647323 -3.33066907387547e-16 10 8.78083221010921 3.89582285547283 10 9.06081109709954 2.67016640430995 10 9.1084382001843 1.43067453360871 10 9.02784798225935 0.667197672048854 10 8.91610573114779 7.62215872963008 0.0833333333333333 2.44048785964619 0.0833333333333333 6.3245833085434 0.0833333333333333 5.01530328036068 0.0833333333333333 3.82325679635101 0.0833333333333333 3.08534474061398 0.0833333333333333 8.51535936488504 0.916666665822446 3.28414257688696 0.916666666666667 7.33377907026458 0.916666666666667 6.04023166324346 0.916666666666667 4.75058299799029 0.916666666666667 3.96513487565986 0.916666666666667 8 6 5 8 2 6 12 8 5 11 5 4 11 12 5 10 4 3 10 11 4 9 3 1 9 10 3 7 9 1
8 6 1 4.44089209850063e-16
0 10 0 5 10 0 -3.33066907387547e-16 10 8.78083221010921 4.99999999999997 10 8.90487399647323 3.89582285547283 10 9.06081109709954 2.67016640430995 10 9.1084382001843 1.43067453360871 10 9.02784798225935 0.667197672048854 10 8.91610573114779 0 0 0 5 8.78083221010921 0 8.90487399647337 5 9.06081109709954 3.89582285547283 9.1084382001843 2.67016640430995 9.02784798225935 1.43067453360871 8.91610573114779 0.667197672048854 8 1 3 7 1 8 6 2 1 6 1 7 5 2 6 4 2 5
4 2 1 0
0 0 0 0 10 0 5 0 0 5 10 0 0 0 0 10 5 0 5 10 4 2 1 4 1 3
4 2 1 5.31176747281665e-16
0 0 0 -5.82867087928207e-16 0 7.73046390134076 -3.33066907387547e-16 10 8.78083221010921 0 10 0 0 0 7.73046390134076 0 8.78083221010921 -10 0 -10 2 4 3 2 1 4
TShapes 56
Ve
1.77597436356193e-07
10 0 0
0 0
0101101
*
Ve
1.36493352600187e-07
10 0 6.43722869516553
0 0
0101101
*
Ed
1.36493352600187e-07 1 1 0
1 1 0 0 6.43722869516553
2 1 1 0 0 6.43722869516553
2 2 2 0 0 6.43722869516553
6 1 1 4
6 2 2 5
0
0101000
+56 6 -55 6 *
Ve
4.54456527409946e-05
10 10 6.72907521308869
0 0
0101101
*
Ed
1e-07 1 1 0
1 2 0 0 1
2 3 1 3 0 1
2 4 3 9 0 1
6 3 3 10
6 4 1 0
0
0101000
+55 11 -53 11 *
Ve
1.77597436356193e-07
10 10 0
0 0
0101101
*
Ed
1.77597436356193e-07 1 1 0
1 3 0 0 6.72907521308869
2 5 1 0 0 6.72907521308869
2 6 4 0 0 6.72907521308869
6 5 1 4
6 6 4 5
0
0101000
+51 6 -53 6 *
Ed
1.77597436356193e-07 1 1 0
1 4 0 0 10
2 7 1 0 0 10
2 8 5 0 0 10
6 7 1 4
6 8 5 5
0
0101000
+56 6 -51 6 *
Wi
0101000
-54 3 -52 0 +50 3 +49 3 *
Fa
0 1e-07 1 3
2 1
0101000
+48 0 *
Ve
1.77597436356193e-07
5 0 0
0 0
0101101
*
Ed
1.77597436356193e-07 1 1 0
1 5 0 0 5
2 9 2 0 0 5
2 10 5 0 0 5
6 9 2 5
6 10 5 5
0
0101000
+46 6 -56 6 *
Ve
5e-06
5.00000000000002 0 8.19932191205528
0 0
0101101
*
Ed
1e-07 1 1 0
1 6 0 0 8.19932191205508
2 11 2 0 0 8.19932191205508
2 12 6 15 0 8.19932191205508
6 11 2 5
6 12 6 5
0
0101000
+46 6 -44 6 *
Ed
1.36493352600187e-07 1 1 0
1 7 0 0 0.529841816830316
2 13 2 3 0 0.529841816830316
2 14 3 9 0 0.529841816830316
6 13 3 10
6 14 2 10
0
0101000
+55 11 -44 11 *
Wi
0101000
-45 12 +43 12 -54 12 -42 2 *
Fa
0 1e-07 2 12
2 2
0101000
+41 0 *
Ve
5e-06
4.99999999999997 10 8.90487399647323
0 0
0101101
*
Ed
5e-06 1 1 0
1 8 0 0 1
2 15 3 9 0 1
2 16 7 17 0 1
6 15 3 10
6 16 7 10
0
0101000
+44 11 -39 11 *
Ed
1.77597436356193e-07 1 1 0
1 9 0 0 0.650578165227791
2 17 3 9 0 0.650578165227791
2 18 4 3 0 0.650578165227791
6 17 3 10
6 18 4 10
0
0101000
+53 11 -39 11 *
Wi
0101000
-38 2 -42 2 +37 2 +52 2 *
Fa
0 1e-07 3 16
2 3
0101000
+36 0 *
Ve
1.77597436356193e-07
5 10 0
0 0
0101101
*
Ed
1.77597436356193e-07 1 1 0
1 10 0 0 5
2 19 4 0 0 5
2 20 5 0 0 5
6 19 4 5
6 20 5 5
0
0101000
+34 6 -51 6 *
Ed
1e-07 1 1 0
1 11 0 0 8.90487399647337
2 21 4 0 0 8.90487399647337
2 22 8 15 0 8.90487399647337
6 21 4 5
6 22 8 5
0
0101000
+34 6 -39 6 *
Wi
0101000
-33 12 +32 12 -50 12 -37 2 *
Fa
0 1e-07 4 12
2 4
0101000
+31 0 *
Ed
1e-07 1 1 0
1 12 0 0 10
2 23 5 0 0 10
2 24 9 15 0 10
6 23 5 5
6 24 9 5
0
0101000
+46 6 -34 6 *
Wi
0101000
-29 12 +45 12 -33 12 +49 12 *
Fa
0 1e-07 5 12
2 5
0101000
+28 0 *
Ve
1.77597436356193e-07
0 0 0
0 0
0101101
*
Ed
1.77597436356193e-07 1 1 0
1 13 0 0 5
2 25 6 0 0 5
2 26 9 0 0 5
6 25 6 19
6 26 9 19
0
0101000
+26 20 -46 20 *
Ve
1.36496072480688e-07
-5.82867087928207e-16 0 7.73046390134076
0 0
0101101
*
Ed
1.36493352600187e-07 1 1 0
1 14 0 0 7.73046390134076
2 27 6 0 0 7.73046390134076
2 28 10 0 0 7.73046390134076
6 27 6 19
6 28 10 21
0
0101000
+26 20 -24 20 *
Ed
1.36496072480688e-07 1 1 0
1 15 0 0.529841816830316 1
2 29 6 13 0.529841816830316 1
2 30 7 9 0.529841816830316 1
6 29 7 22
6 30 6 22
0
0101000
+44 23 -24 23 *
Wi
0101000
-25 18 +23 18 -43 12 -22 14 *
Fa
0 1e-07 6 18
2 6
0101000
+21 0 *
Ve
4.54456527409946e-05
-3.33066907387547e-16 10 8.78083221010921
0 0
0101101
*
Ed
1e-07 1 1 0
1 16 0 0 1
2 31 7 9 0 1
2 32 10 13 0 1
6 31 7 22
6 32 10 0
0
0101000
+24 23 -19 23 *
Ed
1.77597436356193e-07 1 1 0
1 17 0 0.650578165227791 1
2 33 7 9 0.650578165227791 1
2 34 8 13 0.650578165227791 1
6 33 7 22
6 34 8 22
0
0101000
+39 23 -19 23 *
Wi
0101000
-22 14 +38 2 -18 14 +17 14 *
Fa
0 1e-07 7 24
2 7
0101000
+16 0 *
Ve
1.77597436356193e-07
0 10 0
0 0
0101101
*
Ed
1.77597436356193e-07 1 1 0
1 18 0 0 5
2 35 8 0 0 5
2 36 9 0 0 5
6 35 8 19
6 36 9 19
0
0101000
+14 20 -34 20 *
Ed
1.77597436356193e-07 1 1 0
1 19 0 0 8.78083221010921
2 37 8 0 0 8.78083221010921
2 38 10 0 0 8.78083221010921
6 37 8 19
6 38 10 21
0
0101000
+14 20 -19 20 *
Wi
0101000
-13 18 +12 18 -32 12 -17 14 *
Fa
0 1e-07 8 18
2 8
0101000
+11 0 *
Ed
1.77597436356193e-07 1 1 0
1 20 0 0 10
2 39 9 0 0 10
2 40 10 0 0 10
6 39 9 19
6 40 10 21
0
0101000
+26 20 -14 20 *
Wi
0101000
-9 18 +25 18 -13 18 +29 12 *
Fa
0 1e-07 9 18
2 9
0101000
+8 0 *
Wi
0101000
-23 13 -18 0 +12 13 +9 13 *
Fa
0 1e-07 10 13
2 10
0101000
+6 0 *
Sh
0101000
+47 2 -40 0 +35 0 +30 0 -27 0 -20 0 +15 0 +10 0 -7 0 -5 14
*
So
0100000
+4 0 *
Co
0100000
+3 0 *
Co
1100000
+2 1 *
+1 0
-111
View File
@@ -1,111 +0,0 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain
errstatus=0
dirmode=""
usage="\
Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
echo "$usage" 1>&2
exit 0
;;
-m) # -m PERM arg
shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
;;
--) # stop option processing
shift
break
;;
-*) # unknown option
echo "$usage" 1>&2
exit 1
;;
*) # first non-opt arg
break
;;
esac
done
for file
do
if test -d "$file"; then
shift
else
break
fi
done
case $# in
0) exit 0 ;;
esac
case $dirmode in
'')
if mkdir -p -- . 2>/dev/null; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
fi
;;
*)
if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
fi
;;
esac
for file
do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
for d
do
pathcomp="$pathcomp$d"
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
lasterr=""
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp="$pathcomp/"
done
done
exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# End:
# mkinstalldirs ends here
+6 -6
View File
@@ -12,12 +12,12 @@ Build-Depends: debhelper (>= 7.0.50~), cmake,
libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev,
libboost-thread-dev, libboost-python-dev, python-dev, python-support,
libqt4-dev, libxt-dev, libxext-dev, libxmu-dev, libxi-dev, libx11-dev,
libcoin60-dev, libsoqt4-dev, libeigen3-dev,
zlib1g-dev, libxerces-c2-dev, libopencascade-foundation-dev,
libopencascade-modeling-dev, libopencascade-ocaf-dev,
libopencascade-visualization-dev, python-cxx-dev, libswscale-dev,
libcoin80-dev, libsoqt4-dev, libeigen3-dev,
zlib1g-dev, libxerces-c-dev, liboce-foundation-dev,
liboce-modeling-dev, liboce-ocaf-dev,
liboce-visualization-dev, python-cxx-dev, libswscale-dev,
libzipios++-dev, swig, gfortran, f2c, libqtwebkit-dev, libspnav-dev, libfreetype6-dev,
libpyside-dev, libshiboken-dev
libpyside-dev, libshiboken-dev, pyside-tools
Standards-Version: 3.9.1
Package: freecad
@@ -62,7 +62,7 @@ Description: FreeCAD documentation
.
This package contains the FreeCAD documentation.
.
The documentation is provided in Qt's new help format;
The documentation is provided in Qt help format;
the new help format version can be viewed in conjunction with the Qt Assistant
found in the qt4-dev-tools package.
+2 -1
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
<id type="desktop">freecad.desktop</id>
<licence>LGPL</licence>
<metadata_licence>CC-BY-3.0</metadata_licence>
<project_license>LGPL-2.1+</project_license>
<name>FreeCAD</name>
<summary>An open source parametric 3D CAD modeler</summary>
<description>
+2
View File
@@ -70,6 +70,8 @@ install-stamp:
dh_install debian/freecad.desktop usr/share/applications
dh_installman debian/freecad.1 debian/mime/freecad-thumbnailer.1
dh_installchangelogs ChangeLog.txt
# install the gnome app file
df_install debian/freecad.appdata.xml debian/freecad/usr/share/appdata
# install the headers
#dh_install -pfreecad-dev debian/tmp/freecad/usr/include/* usr/include
# install the help system
+8 -8
View File
@@ -1,21 +1,21 @@
if(FREECAD_BUILD_CAM)
if(BUILD_CAM)
add_subdirectory(ANN)
endif(FREECAD_BUILD_CAM)
endif(BUILD_CAM)
if(FREECAD_BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
if(BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
if(FREECAD_LIBPACK_CHECKFILE6X)
add_subdirectory(Pivy)
elseif(FREECAD_LIBPACK_CHECKFILE7X)
add_subdirectory(Pivy-0.5)
#elseif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKCUSTOM)
#elseif(BUILD_GUI AND FREECAD_LIBPACK_CHECKCUSTOM)
# find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR})
# if (COIN_VERSION3)
# add_subdirectory(Pivy-0.5)
# else (COIN_VERSION3)
# add_subdirectory(Pivy)
# endif(COIN_VERSION3)
#endif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X)
#endif(BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X)
#if (MINGW)
# add_subdirectory(Pivy)
#endif(MINGW)
@@ -32,10 +32,10 @@ if(FREECAD_BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
endif(COIN_VERSION3)
endif (FREECAD_LIBPACK_CHECKFILE6X)
endif(FREECAD_BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
endif(BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
# Build SalomeMesh for all Platforms since heavily patched
if (FREECAD_BUILD_SMESH)
if (BUILD_SMESH AND NOT FREECAD_USE_EXTERNAL_SMESH)
add_subdirectory(salomesmesh)
endif(FREECAD_BUILD_SMESH)
endif()
+13
View File
@@ -0,0 +1,13 @@
Yanked from FreeCAD forum posts by wmayer 17 July and 22 August 2014
http://forum.freecadweb.org/viewtopic.php?f=10&t=7054
http://forum.freecadweb.org/viewtopic.php?f=17&t=7432
The CxImage is only used for a Windows thumbnailer. The utility
"ThumbnailProvider" is a DLL which can be registered to Windows as a so called
shell extension. This utility is able to create a preview image of an FCStd
project file and CxImage is needed to convert the data into a format that
Windows expects.
The format Windows accepts is a BITMAP handle for which Qt could also be used.
But this requires a dependency of two rather heavy DLLs (QtCore, QtGui) and
with a statically linked CxImage we don't have this problem.
-132
View File
@@ -1,132 +0,0 @@
#SUBDIRS=Pivy
if HAVE_OPENCASCADE
SUBDIRS=salomesmesh
endif
EXTRA_DIST = \
CMakeLists.txt \
boost/numeric/bindings/LICENSE_1_0.txt \
boost/numeric/bindings/amos/amos.h \
boost/numeric/bindings/amos/amos.hpp \
boost/numeric/bindings/amos/amos_names.h \
boost/numeric/bindings/amos/amos_overloads.hpp \
boost/numeric/bindings/atlas/cblas.hpp \
boost/numeric/bindings/atlas/cblas1.hpp \
boost/numeric/bindings/atlas/cblas1_overloads.hpp \
boost/numeric/bindings/atlas/cblas2.hpp \
boost/numeric/bindings/atlas/cblas2_overloads.hpp \
boost/numeric/bindings/atlas/cblas3.hpp \
boost/numeric/bindings/atlas/cblas3_overloads.hpp \
boost/numeric/bindings/atlas/cblas_enum.hpp \
boost/numeric/bindings/atlas/cblas_inc.hpp \
boost/numeric/bindings/atlas/clapack.hpp \
boost/numeric/bindings/atlas/clapack_inc.hpp \
boost/numeric/bindings/atlas/clapack_overloads.hpp \
boost/numeric/bindings/blas/blas.h \
boost/numeric/bindings/blas/blas.hpp \
boost/numeric/bindings/blas/blas1.hpp \
boost/numeric/bindings/blas/blas1_overloads.hpp \
boost/numeric/bindings/blas/blas2.hpp \
boost/numeric/bindings/blas/blas2_overloads.hpp \
boost/numeric/bindings/blas/blas3.hpp \
boost/numeric/bindings/blas/blas3_overloads.hpp \
boost/numeric/bindings/blas/blas_names.h \
boost/numeric/bindings/lapack/gees.hpp \
boost/numeric/bindings/lapack/geev.hpp \
boost/numeric/bindings/lapack/geqrf.hpp \
boost/numeric/bindings/lapack/gesdd.hpp \
boost/numeric/bindings/lapack/gesv.hpp \
boost/numeric/bindings/lapack/gesvd.hpp \
boost/numeric/bindings/lapack/hbev.hpp \
boost/numeric/bindings/lapack/hbevx.hpp \
boost/numeric/bindings/lapack/heev.hpp \
boost/numeric/bindings/lapack/heevd.hpp \
boost/numeric/bindings/lapack/heevx.hpp \
boost/numeric/bindings/lapack/hesv.hpp \
boost/numeric/bindings/lapack/hpsv.hpp \
boost/numeric/bindings/lapack/hseqr.hpp \
boost/numeric/bindings/lapack/ilaenv.hpp \
boost/numeric/bindings/lapack/lapack.h \
boost/numeric/bindings/lapack/lapack.hpp \
boost/numeric/bindings/lapack/lapack_names.h \
boost/numeric/bindings/lapack/orgqr.hpp \
boost/numeric/bindings/lapack/ormqr.hpp \
boost/numeric/bindings/lapack/posv.hpp \
boost/numeric/bindings/lapack/ppsv.hpp \
boost/numeric/bindings/lapack/spsv.hpp \
boost/numeric/bindings/lapack/steqr.hpp \
boost/numeric/bindings/lapack/syev.hpp \
boost/numeric/bindings/lapack/syevd.hpp \
boost/numeric/bindings/lapack/syevx.hpp \
boost/numeric/bindings/lapack/sysv.hpp \
boost/numeric/bindings/lapack/sytrd.hpp \
boost/numeric/bindings/lapack/trevc.hpp \
boost/numeric/bindings/lapack/trexc.hpp \
boost/numeric/bindings/lapack/workspace.hpp \
boost/numeric/bindings/umfpack/umfpack.hpp \
boost/numeric/bindings/umfpack/umfpack_inc.hpp \
boost/numeric/bindings/umfpack/umfpack_overloads.hpp \
boost/numeric/bindings/traits/detail/array.hpp \
boost/numeric/bindings/traits/detail/array_impl.hpp \
boost/numeric/bindings/traits/detail/generate_const.hpp \
boost/numeric/bindings/traits/detail/symm_herm_traits.hpp \
boost/numeric/bindings/traits/detail/ublas_ordering.hpp \
boost/numeric/bindings/traits/detail/ublas_uplo.hpp \
boost/numeric/bindings/traits/detail/utils.hpp \
boost/numeric/bindings/traits/algorithm.hpp \
boost/numeric/bindings/traits/boost_array.hpp \
boost/numeric/bindings/traits/c_array.hpp \
boost/numeric/bindings/traits/config.hpp \
boost/numeric/bindings/traits/fortran.h \
boost/numeric/bindings/traits/matrix_raw.hpp \
boost/numeric/bindings/traits/matrix_traits.hpp \
boost/numeric/bindings/traits/sparse_traits.hpp \
boost/numeric/bindings/traits/std_valarray.hpp \
boost/numeric/bindings/traits/std_vector.hpp \
boost/numeric/bindings/traits/symm_herm_raw.hpp \
boost/numeric/bindings/traits/tnt.hpp \
boost/numeric/bindings/traits/traits.hpp \
boost/numeric/bindings/traits/transpose.hpp \
boost/numeric/bindings/traits/type.h \
boost/numeric/bindings/traits/type.hpp \
boost/numeric/bindings/traits/type_traits.hpp \
boost/numeric/bindings/traits/ublas_banded.hpp \
boost/numeric/bindings/traits/ublas_hermitian.hpp \
boost/numeric/bindings/traits/ublas_matrix.hpp \
boost/numeric/bindings/traits/ublas_sparse.hpp \
boost/numeric/bindings/traits/ublas_symmetric.hpp \
boost/numeric/bindings/traits/ublas_vector.hpp \
boost/numeric/bindings/traits/ublas_vector2.hpp \
boost/numeric/bindings/traits/vector_raw.hpp \
boost/numeric/bindings/traits/vector_traits.hpp
# For Debian based system we don't need these sources
if MAKE_NO_DFSG_PACKAGE
EXTRA_DIST += \
Pivy/gui/__init__.py \
Pivy/gui/soqt.py \
Pivy/AUTHORS \
Pivy/CMakeLists.txt \
Pivy/coin.py \
Pivy/coin_header_includes.h \
Pivy/coin_wrap.cpp \
Pivy/__init__.py \
Pivy/LICENSE \
Pivy/README \
Pivy/sogui.py \
Pivy/soqt_wrap.cpp \
Pivy-0.5/gui/__init__.py \
Pivy-0.5/gui/soqt.py \
Pivy-0.5/AUTHORS \
Pivy-0.5/CMakeLists.txt \
Pivy-0.5/coin.py \
Pivy-0.5/coin_header_includes.h \
Pivy-0.5/coin_wrap.cpp \
Pivy-0.5/__init__.py \
Pivy-0.5/LICENSE \
Pivy-0.5/README \
Pivy-0.5/sogui.py \
Pivy-0.5/soqt.py \
Pivy-0.5/soqt_wrap.cpp
endif
+2 -45
View File
@@ -1,10 +1,9 @@
add_definitions(-DSOQT_DLL -DCOIN_DLL)
add_definitions(-DCOIN_DLL)
include_directories(
../include
${COIN3D_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH}
${SOQT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
@@ -28,8 +27,7 @@ if(MSVC)
Rpcrt4.lib
debug ${COIN3D_LIBRARY_DEBUG}
optimized ${COIN3D_LIBRARY_RELEASE}
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
${PYTHON_LIBRARY})
else(MSVC)
set(CoinPy_LIBS
${COIN3D_LIBRARY}
@@ -51,44 +49,3 @@ fc_copy_sources(coin "${CMAKE_BINARY_DIR}/bin/pivy"
install(TARGETS coin DESTINATION bin/pivy)
install(FILES __init__.py coin.py sogui.py DESTINATION bin/pivy)
########################### SoQtPy ###########################
set(SoQtPy_SRCS
soqt_wrap.cpp
)
if(MSVC)
set(SoQtPy_LIBS
debug MSVCRTD.LIB
debug MSVCPRTD.LIB
optimized MSVCRT.LIB
optimized MSVCPRT.LIB
Rpcrt4.lib
debug ${SOQT_LIBRARY_DEBUG}
optimized ${SOQT_LIBRARY_RELEASE}
debug ${COIN3D_LIBRARY_DEBUG}
optimized ${COIN3D_LIBRARY_RELEASE}
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
else(MSVC)
set(SoQtPy_LIBS
${SOQT_LIBRARIES}
${COIN3D_LIBRARY}
${PYTHON_LIBRARY})
endif(MSVC)
add_library(soqt SHARED ${SoQtPy_SRCS})
target_link_libraries(soqt ${SoQtPy_LIBS})
SET_BIN_DIR(soqt _soqt /bin/pivy/gui)
SET_PYTHON_PREFIX_SUFFIX(soqt)
fc_copy_sources(soqt "${CMAKE_BINARY_DIR}/bin/pivy"
gui/soqt.py
gui/__init__.py
)
install(TARGETS soqt DESTINATION bin/pivy/gui)
install(FILES gui/__init__.py soqt.py DESTINATION bin/pivy/gui)
+1 -43
View File
@@ -1,10 +1,9 @@
add_definitions(-DSOQT_DLL -DCOIN_DLL)
add_definitions(-DCOIN_DLL)
include_directories(
../include
${COIN3D_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH}
${SOQT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
@@ -51,44 +50,3 @@ fc_copy_sources(coin "${CMAKE_BINARY_DIR}/bin/pivy"
install(TARGETS coin DESTINATION bin/pivy)
install(FILES __init__.py coin.py sogui.py DESTINATION bin/pivy)
########################### SoQtPy ###########################
set(SoQtPy_SRCS
soqt_wrap.cpp
)
if(MSVC)
set(SoQtPy_LIBS
debug MSVCRTD.LIB
debug MSVCPRTD.LIB
optimized MSVCRT.LIB
optimized MSVCPRT.LIB
Rpcrt4.lib
debug ${SOQT_LIBRARY_DEBUG}
optimized ${SOQT_LIBRARY_RELEASE}
debug ${COIN3D_LIBRARY_DEBUG}
optimized ${COIN3D_LIBRARY_RELEASE}
debug ${PYTHON_DEBUG_LIBRARY}
optimized ${PYTHON_LIBRARY})
else(MSVC)
set(SoQtPy_LIBS
${SOQT_LIBRARIES}
${COIN3D_LIBRARY}
${PYTHON_LIBRARY})
endif(MSVC)
add_library(soqt SHARED ${SoQtPy_SRCS})
target_link_libraries(soqt ${SoQtPy_LIBS})
SET_BIN_DIR(soqt _soqt /bin/pivy/gui)
SET_PYTHON_PREFIX_SUFFIX(soqt)
fc_copy_sources(soqt "${CMAKE_BINARY_DIR}/bin/pivy"
gui/soqt.py
gui/__init__.py
)
install(TARGETS soqt DESTINATION bin/pivy/gui)
install(FILES gui/__init__.py gui/soqt.py DESTINATION bin/pivy/gui)
-73
View File
@@ -1,73 +0,0 @@
lib_LTLIBRARIES=_coin.la _soqt.la
#--------------------------------------------------------------------------------------
# Coin
_coin_la_SOURCES=\
coin_wrap.cpp \
coin_header_includes.h
# the library search path.
_coin_la_LDFLAGS = $(sim_ac_coin_ldflags) -module -avoid-version
_coin_la_CPPFLAGS = -fno-strict-aliasing
_coin_la_LIBADD = \
-l@PYTHON_LIB@ \
$(sim_ac_coin_libs)
_coindir = $(prefix)/bin/pivy
_coin_DATA = \
__init__.py \
coin.py \
sogui.py
#--------------------------------------------------------------------------------------
# SoQt
_soqt_la_SOURCES=\
soqt_wrap.cpp
# the library search path.
_soqt_la_LDFLAGS = $(sim_ac_coin_ldflags) $(sim_ac_soqt_ldflags) $(QT_LIBS) -module -avoid-version
_soqt_la_CPPFLAGS = -fno-strict-aliasing
_soqt_la_LIBADD = \
-l@PYTHON_LIB@ \
$(sim_ac_coin_libs) \
$(sim_ac_soqt_libs)
_soqt.la: $(_soqt_la_OBJECTS) $(_soqt_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir)/gui $(_soqt_la_LDFLAGS) $(_soqt_la_OBJECTS) $(_soqt_la_LIBADD) $(LIBS)
_soqtdir = $(prefix)/bin/pivy/gui
_soqt_DATA = \
__init__.py \
soqt.py
#--------------------------------------------------------------------------------------
# set the include path found by configure
AM_CXXFLAGS = $(all_includes) $(QT_CXXFLAGS) -I$(top_srcdir)/src -I$(top_builddir)/src
libdir = $(prefix)/bin/pivy
install-exec-hook:
$(mkdir_p) $(DESTDIR)$(libdir)/gui
mv $(DESTDIR)$(libdir)/_soqt.* \
$(DESTDIR)$(libdir)/gui/
uninstall-hook:
rm -r $(DESTDIR)$(libdir)/gui
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
__init__.py \
coin.py \
sogui.py \
soqt.py \
AUTHORS \
LICENSE \
README \
CMakeLists.txt
+66 -59
View File
@@ -9,13 +9,6 @@ SET(SMESH_VERSION_TWEAK 2)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
include_directories(
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${NGLIB_INCLUDE_DIR}
${NETGEN_INCLUDE_DIRS}
src/SMDS
src/Driver
src/DriverUNV
@@ -23,11 +16,19 @@ include_directories(
src/DriverSTL
src/StdMeshers
inc
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS}
${OCC_INCLUDE_DIR}
${NGLIB_INCLUDE_DIR}
${NETGEN_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)
link_directories(${OCC_LIBRARY_DIR})
if(MSVC)
if(FREECAD_BUILD_FEM_NETGEN)
if(BUILD_FEM_NETGEN)
set(SMESH_LIBS
debug MSVCRTD.LIB
debug MSVCPRTD.LIB
@@ -41,7 +42,7 @@ if(MSVC)
${OCC_OCAF_DEBUG_LIBRARIES}
${OCC_OCAF_LIBRARIES}
)
else(FREECAD_BUILD_FEM_NETGEN)
else(BUILD_FEM_NETGEN)
set(SMESH_LIBS
debug MSVCRTD.LIB
debug MSVCPRTD.LIB
@@ -53,21 +54,21 @@ if(MSVC)
${OCC_OCAF_DEBUG_LIBRARIES}
${OCC_OCAF_LIBRARIES}
)
endif(FREECAD_BUILD_FEM_NETGEN)
endif(BUILD_FEM_NETGEN)
else(MSVC)
if(FREECAD_BUILD_FEM_NETGEN)
if(BUILD_FEM_NETGEN)
set(SMESH_LIBS
${NGLIB_LIBRARIES}
${OCC_LIBRARIES}
${OCC_OCAF_LIBRARIES}
)
else(FREECAD_BUILD_FEM_NETGEN)
else(BUILD_FEM_NETGEN)
set(SMESH_LIBS
${OCC_LIBRARIES}
${OCC_OCAF_LIBRARIES}
)
endif(FREECAD_BUILD_FEM_NETGEN)
endif(BUILD_FEM_NETGEN)
endif(MSVC)
@@ -86,10 +87,6 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
#INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
#MESSAGE("Popo: ${Boost_INCLUDE_DIR}")
################
# Check Fortran#
################
INCLUDE(CMakeDetermineFortranCompiler)
########################################
# OpenCASCADE include and lib location #
@@ -109,7 +106,8 @@ INCLUDE(CMakeDetermineFortranCompiler)
IF (${CMAKE_SIZEOF_VOID_P} MATCHES "8") # It is 64bit, 32 bit systems returns 4
ADD_DEFINITIONS(-D_OCC64)
IF(CMAKE_COMPILER_IS_GNUCXX)
ADD_DEFINITIONS(-DPCLINUX64)
# 0001715: Mefisto Mesh Fails since translated by f2c
# ADD_DEFINITIONS(-DPCLINUX64)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
#MESSAGE("-- Build 64bit")
ELSE (${CMAKE_SIZEOF_VOID_P} MATCHES "8")
@@ -127,7 +125,7 @@ ELSE(UNIX)
######### Windows ###########
#MESSAGE("-- Windows system detected")
IF(MSVC)
ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4806 /wd4275)
ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4806 /wd4275 /wd4005 /wd4099 /wd4101 /wd4267 /wd4390)
ELSE(MSVC)
ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB)
ENDIF(MSVC)
@@ -268,49 +266,58 @@ endif(WIN32)
##############
# MEFISTO2 #
##############
if (MSVC)
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
# Mefisto2f.lib was built using f2c which created
# all function names with an '_' at the end.
FILE(GLOB MEFISTO2_source_files
src/MEFISTO2/*.cpp
#if (MSVC)
#IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
# # Mefisto2f.lib was built using f2c which created
# # all function names with an '_' at the end.
# FILE(GLOB MEFISTO2_source_files
# src/MEFISTO2/*.cpp
# inc/Rn.h
# inc/aptrte.h
# )
#ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
# FILE(GLOB MEFISTO2_source_files
# src/MEFISTO2/*.cpp
# src/MEFISTO2/MEFISTO2F.def
# inc/Rn.h
# inc/aptrte.h
# )
#ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(MEFISTO2_source_files
src/MEFISTO2/aptrte.cpp
src/MEFISTO2/trte.c
inc/Rn.h
inc/aptrte.h
)
ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
FILE(GLOB MEFISTO2_source_files
src/MEFISTO2/*.cpp
src/MEFISTO2/MEFISTO2F.def
inc/Rn.h
inc/aptrte.h
)
ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
else(MSVC)
FILE(GLOB MEFISTO2_source_files
src/MEFISTO2/*.cpp
src/MEFISTO2/trte.f
inc/Rn.h
inc/aptrte.h
)
endif(MSVC)
)
#else(MSVC)
# FILE(GLOB MEFISTO2_source_files
# src/MEFISTO2/*.cpp
# src/MEFISTO2/trte.f
# inc/Rn.h
# inc/aptrte.h
# )
#endif(MSVC)
ADD_LIBRARY(MEFISTO2 SHARED ${MEFISTO2_source_files})
SET_BIN_DIR(MEFISTO2 MEFISTO2)
if(MSVC)
TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS} MEFISTO2f.lib) # in case of Windows link the prebuild Fortran lib
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS")
else(CMAKE_SIZEOF_VOID_P EQUAL 8)
set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS -D__WATCOM__")
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
elseif(MINGW)
TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS} gfortran)
#if(MSVC)
TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS}) # in case of Windows link the prebuild Fortran lib
set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS")
else(MSVC)
TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS} gfortran)
set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "${MEFISTO2_CFLAGS}")
endif(MSVC)
# if(CMAKE_SIZEOF_VOID_P EQUAL 8)
# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS")
# else(CMAKE_SIZEOF_VOID_P EQUAL 8)
# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS -D__WATCOM__")
# endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
#elseif(MINGW)
# TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS} gfortran)
# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "-DMEFISTO2D_EXPORTS")
#else(MSVC)
# TARGET_LINK_LIBRARIES(MEFISTO2 ${SMESH_LIBS} gfortran)
# set_target_properties(MEFISTO2 PROPERTIES COMPILE_FLAGS "${MEFISTO2_CFLAGS}")
#endif(MSVC)
##############
@@ -337,7 +344,7 @@ endif(WIN32)
#ENDIF(MINGW)
# Disable for all other compilers but MSVC
if (FREECAD_BUILD_FEM_NETGEN)
if (BUILD_FEM_NETGEN)
################
# NETGENPlugin #
@@ -351,7 +358,7 @@ if(WIN32)
set_target_properties(NETGENPlugin PROPERTIES COMPILE_FLAGS "-DNETGENPLUGIN_EXPORTS -DNO_PARALLEL_THREADS -DOCCGEOMETRY -DNETGEN_V5")
endif(WIN32)
endif (FREECAD_BUILD_FEM_NETGEN)
endif (BUILD_FEM_NETGEN)
#IF(WIN32)
# SET_TARGET_PROPERTIES(SMESH PROPERTIES COMPILE_FLAGS "-DNETGENPluginimpl_EXPORTS ")
@@ -372,7 +379,7 @@ else(WIN32)
)
endif(WIN32)
if (FREECAD_BUILD_FEM_NETGEN)
if (BUILD_FEM_NETGEN)
if(WIN32)
INSTALL(TARGETS NETGENPlugin
RUNTIME DESTINATION bin
@@ -383,5 +390,5 @@ if (FREECAD_BUILD_FEM_NETGEN)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
endif(WIN32)
endif (FREECAD_BUILD_FEM_NETGEN)
endif (BUILD_FEM_NETGEN)
-389
View File
@@ -1,389 +0,0 @@
# dir variable for easy change of Makefile.am locations
smeshdir = ./
# copy some files
targetdir = $(prefix)
#dist_target_DATA = LICENCE.lgpl
EXTRA_DIST = CMakeLists.txt LICENCE.lgpl.txt
# set compiler flags and include directories, -fpermissive and -ffriend-injection not needed for occ6.3
AM_CPPFLAGS = -I$(OCC_INC) -I$(srcdir)/$(smeshdir)inc/ $(all_includes)
AM_CXXFLAGS = -Wno-sign-compare -Wno-switch -Wno-reorder -Wno-unused -Wno-parentheses -Wno-comment
# set library names
if NETGEN
lib_LTLIBRARIES = libNETGENPlugin.la libSMDS.la libDriver.la libDriverSTL.la libDriverDAT.la libDriverUNV.la libSMESHDS.la libSMESH.la libStdMeshers.la
else
lib_LTLIBRARIES = libDriver.la libSMDS.la libDriverSTL.la libDriverDAT.la libDriverUNV.la libSMESHDS.la libSMESH.la libStdMeshers.la
endif
# set global linker flags (remove '-Wl,--no-undefined' since this doesn't seem to work on MacOSX)
#AM_LDFLAGS = -version-info 1:0:0 -Wl,--no-undefined -L$(OCC_LIB)
AM_LDFLAGS = -version-info 1:0:0 -L$(OCC_LIB) \
-lTKernel -lTKService -lTKMath -lTKBRep -lTKTopAlgo -lTKGeomAlgo \
-lTKGeomBase -lTKG3d -lTKG2d -lTKMeshVS -lTKShHealing -lTKPrim -lTKAdvTools
#uninstall-local:
# -rm -rf $(DESTDIR)$(libdir)
# -rm -rf $(DESTDIR)$(includedir)
# -rm $(DESTDIR)$(prefix)/env_smesh.sh
#
#install-exec-local:
# test -z "$(DESTDIR)$(prefix)" || $(mkdir_p) "$(DESTDIR)$(prefix)"
# @echo "#!/bin/bash" > $(DESTDIR)$(prefix)/env_smesh.sh
# @echo "export SMESHROOT="$(prefix) >> $(DESTDIR)$(prefix)/env_smesh.sh
# @echo "if [ -z "LD_LIBRARY_PATH" ];" >> $(DESTDIR)$(prefix)/env_smesh.sh
# @echo "then LD_LIBRARY_PATH="$(libdir)";" >> $(DESTDIR)$(prefix)/env_smesh.sh
# @echo "else LD_LIBRARY_PATH="$(libdir)":\$$LD_LIBRARY_PATH;" >> $(DESTDIR)$(prefix)/env_smesh.sh
# @echo "fi" >> $(DESTDIR)$(prefix)/env_smesh.sh
# chmod a+x $(DESTDIR)$(prefix)/env_smesh.sh
# set SMDS sources
libSMDS_la_SOURCES = $(srcdir)/$(smeshdir)src/SMDS/SMDS_EdgePosition.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_FaceOfEdges.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_FaceOfNodes.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_FacePosition.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_IteratorOfElements.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_Mesh.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshEdge.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshElement.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshElementIDFactory.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshFace.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshGroup.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshIDFactory.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshNode.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshObject.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshVolume.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_PolygonalFaceOfNodes.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_PolyhedralVolumeOfNodes.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_Position.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_QuadraticEdge.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_QuadraticFaceOfNodes.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_QuadraticVolumeOfNodes.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_SpacePosition.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_VertexPosition.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_VolumeOfFaces.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_VolumeOfNodes.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_MemoryLimit.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_VolumeTool.cpp \
$(srcdir)/$(smeshdir)src/SMDS/SMDS_Mesh0DElement.cpp
# set Driver sources
libDriver_la_SOURCES = $(srcdir)/$(smeshdir)src/Driver/Driver_Document.cpp \
$(srcdir)/$(smeshdir)src/Driver/Driver_Mesh.cpp \
$(srcdir)/$(smeshdir)src/Driver/Driver_SMDS_Mesh.cpp \
$(srcdir)/$(smeshdir)src/Driver/Driver_SMESHDS_Mesh.cpp
# set DriverSTL sources
libDriverSTL_la_SOURCES = $(srcdir)/$(smeshdir)src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp \
$(srcdir)/$(smeshdir)src/DriverSTL/DriverSTL_W_SMDS_Mesh.cpp
libDriverSTL_la_LIBADD = -lSMDS -lDriver
libDriverSTL_la_DEPENDENCIES = libSMDS.la libDriver.la
# set DriverDAT sources
libDriverDAT_la_SOURCES = $(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_R_SMDS_Mesh.cpp \
$(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_R_SMESHDS_Document.cpp \
$(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.cpp \
$(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_W_SMDS_Mesh.cpp \
$(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_W_SMESHDS_Document.cpp \
$(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cpp
libDriverDAT_la_LIBADD = -lSMDS -lDriver
libDriverDAT_la_DEPENDENCIES = libSMDS.la libDriver.la
# set DriverUNV sources
libDriverUNV_la_SOURCES = $(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_R_SMDS_Mesh.cpp \
$(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_R_SMESHDS_Document.cpp \
$(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.cpp \
$(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_W_SMDS_Mesh.cpp \
$(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_W_SMESHDS_Document.cpp \
$(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cpp \
$(srcdir)/$(smeshdir)src/DriverUNV/UNV2411_Structure.cpp \
$(srcdir)/$(smeshdir)src/DriverUNV/UNV2412_Structure.cpp \
$(srcdir)/$(smeshdir)src/DriverUNV/UNV2417_Structure.cpp \
$(srcdir)/$(smeshdir)src/DriverUNV/UNV_Utilities.cpp
libDriverUNV_la_LIBADD = -lSMDS -lDriver
libDriverUNV_la_DEPENDENCIES = libSMDS.la libDriver.la
# set SMESHDS sources
libSMESHDS_la_SOURCES = $(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Command.cpp \
$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Document.cpp \
$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Group.cpp \
$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_GroupBase.cpp \
$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_GroupOnGeom.cpp \
$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Hypothesis.cpp \
$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Mesh.cpp \
$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Script.cpp \
$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_SubMesh.cpp
libSMESHDS_la_LIBADD = -lSMDS
libSMESHDS_la_DEPENDENCIES = libSMDS.la
# set SMESH sources
libSMESH_la_SOURCES = $(srcdir)/$(smeshdir)src/SMESH/SMESH_0D_Algo.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_1D_Algo.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_2D_Algo.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_3D_Algo.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_Algo.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_Block.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_Exception.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_Gen.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_Group.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_HypoFilter.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_Hypothesis.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_Mesh.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_MeshEditor.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_MesherHelper.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_Octree.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_OctreeNode.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_Pattern.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_subMesh.cpp \
$(srcdir)/$(smeshdir)src/SMESH/SMESH_MeshVSLink.cpp \
$(srcdir)/$(smeshdir)src/Controls/SMESHControls.cpp \
$(srcdir)/$(smeshdir)src/Controls/SMESH_Controls.cpp
libSMESH_la_LIBADD = -lSMDS -lSMESHDS -lDriver -lDriverSTL -lDriverUNV -lDriverDAT
libSMESH_la_DEPENDENCIES = libSMDS.la libSMESHDS.la libDriver.la \
libDriverSTL.la libDriverUNV.la libDriverDAT.la
# set StdMeshers sources
libStdMeshers_la_SOURCES = $(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Arithmetic1D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_AutomaticLength.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_CompositeSegment_1D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Deflection1D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Distribution.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_FaceSide.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Hexa_3D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_LayerDistribution.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_LengthFromEdges.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_LocalLength.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_MaxElementArea.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_MaxElementVolume.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_MEFISTO_2D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_NotConformAllowed.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_NumberOfLayers.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_NumberOfSegments.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Penta_3D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Prism_3D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_ProjectionSource1D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_ProjectionSource2D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_ProjectionSource3D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_ProjectionUtils.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Projection_1D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Projection_2D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Projection_3D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Propagation.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_QuadranglePreference.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Quadrangle_2D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_QuadraticMesh.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_RadialPrism_3D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Regular_1D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_TrianglePreference.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_UseExisting_1D2D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_MaxLength.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_StartEndLength.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_FixedPoints1D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_LayerDistribution2D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_NumberOfLayers2D.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_QuadrangleParams.cpp \
$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp \
$(srcdir)/$(smeshdir)src/MEFISTO2/aptrte.cpp \
$(srcdir)/$(smeshdir)src/MEFISTO2/trte.f
libStdMeshers_la_LIBADD = $(FCLIBS) -lSMESH -lSMDS -lSMESHDS
libStdMeshers_la_DEPENDENCIES = libSMESH.la libSMDS.la libSMESHDS.la
if STDMESHERS64BIT
libStdMeshers_la_CXXFLAGS = $(AM_CXXFLAGS) -DPCLINUX64
endif
# set NETGENPlugin sources
libNETGENPlugin_la_SOURCES = $(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp \
$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cpp \
$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_Mesher.cpp \
$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp \
$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp \
$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp \
$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cpp \
$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cpp \
$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp
# include files but do not install otherwise use include_HEADERS
#includedir = @includedir@/salomesmesh
noinst_HEADERS = \
$(srcdir)/$(smeshdir)inc/aptrte.h \
$(srcdir)/$(smeshdir)inc/DriverDAT_R_SMDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/DriverDAT_R_SMESHDS_Document.h \
$(srcdir)/$(smeshdir)inc/DriverDAT_R_SMESHDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/DriverDAT_W_SMDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/DriverDAT_W_SMESHDS_Document.h \
$(srcdir)/$(smeshdir)inc/DriverDAT_W_SMESHDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/DriverSTL_R_SMDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/DriverSTL_W_SMDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/DriverUNV_R_SMDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/DriverUNV_R_SMESHDS_Document.h \
$(srcdir)/$(smeshdir)inc/DriverUNV_R_SMESHDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/DriverUNV_W_SMDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/DriverUNV_W_SMESHDS_Document.h \
$(srcdir)/$(smeshdir)inc/DriverUNV_W_SMESHDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/Driver_Document.h \
$(srcdir)/$(smeshdir)inc/Driver_Mesh.h \
$(srcdir)/$(smeshdir)inc/Driver_SMDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/Driver_SMESHDS_Mesh.h \
$(srcdir)/$(smeshdir)inc/NETGENPlugin_Hypothesis.hxx \
$(srcdir)/$(smeshdir)inc/NETGENPlugin_Hypothesis_2D.hxx \
$(srcdir)/$(smeshdir)inc/NETGENPlugin_Mesher.hxx \
$(srcdir)/$(smeshdir)inc/NETGENPlugin_NETGEN_2D.hxx \
$(srcdir)/$(smeshdir)inc/NETGENPlugin_NETGEN_2D3D.hxx \
$(srcdir)/$(smeshdir)inc/NETGENPlugin_NETGEN_3D.hxx \
$(srcdir)/$(smeshdir)inc/Rn.h \
$(srcdir)/$(smeshdir)inc/SMDSAbs_ElementType.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_EdgePosition.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_ElemIterator.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_FaceOfEdges.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_FaceOfNodes.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_FacePosition.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_Iterator.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_IteratorOfElements.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_Mesh.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_MeshEdge.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_MeshElement.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_MeshElementIDFactory.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_MeshFace.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_MeshGroup.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_MeshIDFactory.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_MeshNode.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_MeshObject.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_MeshVolume.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_PolygonalFaceOfNodes.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_PolyhedralVolumeOfNodes.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_Position.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_QuadraticEdge.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_QuadraticFaceOfNodes.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_QuadraticVolumeOfNodes.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_SetIterator.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_SpacePosition.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_TypeOfPosition.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_VertexPosition.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_VolumeOfFaces.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_VolumeOfNodes.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_VolumeTool.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_Mesh0DElement.hxx \
$(srcdir)/$(smeshdir)inc/SMESHDS_Command.hxx \
$(srcdir)/$(smeshdir)inc/SMESHDS_CommandType.hxx \
$(srcdir)/$(smeshdir)inc/SMESHDS_Document.hxx \
$(srcdir)/$(smeshdir)inc/SMESHDS_Group.hxx \
$(srcdir)/$(smeshdir)inc/SMESHDS_GroupBase.hxx \
$(srcdir)/$(smeshdir)inc/SMESHDS_GroupOnGeom.hxx \
$(srcdir)/$(smeshdir)inc/SMESHDS_Hypothesis.hxx \
$(srcdir)/$(smeshdir)inc/SMESHDS_Mesh.hxx \
$(srcdir)/$(smeshdir)inc/SMESHDS_Script.hxx \
$(srcdir)/$(smeshdir)inc/SMESHDS_SubMesh.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_0D_Algo.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_1D_Algo.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_2D_Algo.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_3D_Algo.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Algo.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Array1.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Array2.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Block.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Comment.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_ComputeError.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Controls.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_ControlsDef.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_DefineArray2.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_DefineIndexedMap.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_ExceptHandlers.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Exception.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Gen.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Group.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_HypoFilter.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Hypothesis.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_IndexedMap.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Mesh.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_MeshEditor.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_MesherHelper.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_MeshVSLink.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_MeshVSLink.ixx \
$(srcdir)/$(smeshdir)inc/SMESH_MeshVSLink.jxx \
$(srcdir)/$(smeshdir)inc/Handle_SMESH_MeshVSLink.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Octree.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_OctreeNode.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_Pattern.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_SequenceOfElemPtr.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_SequenceOfNode.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_subMesh.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_subMeshEventListener.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Arithmetic1D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_AutomaticLength.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_CompositeSegment_1D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Deflection1D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Distribution.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_FaceSide.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Hexa_3D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_LayerDistribution.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_LengthFromEdges.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_LocalLength.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_MaxElementArea.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_MaxElementVolume.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_MEFISTO_2D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_NotConformAllowed.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_NumberOfLayers.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_NumberOfSegments.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Penta_3D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Prism_3D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_ProjectionSource1D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_ProjectionSource2D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_ProjectionSource3D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_ProjectionUtils.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Projection_1D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Projection_2D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Projection_3D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Propagation.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_QuadranglePreference.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Quadrangle_2D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_QuadraticMesh.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_RadialPrism_3D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_Regular_1D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_SegmentAroundVertex_0D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_SegmentLengthAroundVertex.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_StartEndLength.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_FixedPoints1D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_LayerDistribution2D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_NumberOfLayers2D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_QuadrangleParams.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_RadialQuadrangle_1D2D.hxx \
$(srcdir)/$(smeshdir)inc/UNV2411_Structure.hxx \
$(srcdir)/$(smeshdir)inc/UNV2412_Structure.hxx \
$(srcdir)/$(smeshdir)inc/UNV2417_Structure.hxx \
$(srcdir)/$(smeshdir)inc/UNV_Utilities.hxx \
$(srcdir)/$(smeshdir)inc/NETGENPlugin_Defs.hxx \
$(srcdir)/$(smeshdir)inc/NETGENPlugin_NETGEN_2D_ONLY.hxx \
$(srcdir)/$(smeshdir)inc/NETGENPlugin_SimpleHypothesis_2D.hxx \
$(srcdir)/$(smeshdir)inc/NETGENPlugin_SimpleHypothesis_3D.hxx \
$(srcdir)/$(smeshdir)inc/SMDS_MeshInfo.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_DriverDAT.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_DriverSTL.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_DriverUNV.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_SMDS.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_SMESH.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_SMESHDS.hxx \
$(srcdir)/$(smeshdir)inc/SMESH_StdMeshers.hxx \
$(srcdir)/$(smeshdir)inc/SMESHDS_DataMapOfShape.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_QuadToTriaAdaptor.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_TrianglePreference.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_UseExisting_1D2D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_CompositeHexa_3D.hxx \
$(srcdir)/$(smeshdir)inc/StdMeshers_MaxLength.hxx \
$(srcdir)/$(smeshdir)inc/OpUtil.hxx \
$(srcdir)/$(smeshdir)inc/Utils_ExceptHandlers.hxx \
$(srcdir)/$(smeshdir)inc/Utils_SALOME_Exception.hxx \
$(srcdir)/$(smeshdir)inc/utilities.h
@@ -26,12 +26,17 @@
#ifndef SMESH_IndexedMapOfShape_HeaderFile
#define SMESH_IndexedMapOfShape_HeaderFile
#include "Standard_Version.hxx"
#include "SMESH_SMESH.hxx"
#include "SMESHDS_DataMapOfShape.hxx"
#ifndef __BORLANDC__
#if OCC_VERSION_HEX >= 0x060703
#include <NCollection_IndexedMap.hxx>
#else
#include <NCollection_DefineIndexedMap.hxx>
#endif
#else
#include <SMESH_DefineIndexedMap.hxx>
#endif
@@ -40,27 +45,42 @@
/// Class SMESH_IndexedMapOfShape
DEFINE_BASECOLLECTION (SMESH_BaseCollectionShape, TopoDS_Shape)
#if OCC_VERSION_HEX >= 0x060703
#ifndef __BORLANDC__
DEFINE_INDEXEDMAP (SMESH_IndexedMapOfShape, SMESH_BaseCollectionShape, TopoDS_Shape)
typedef NCollection_IndexedMap<TopoDS_Shape> SMESH_IndexedMapOfShape;
#else
DEFINE_BASECOLLECTION (SMESH_BaseCollectionShape, TopoDS_Shape)
SMESH_DEFINE_INDEXEDMAP (SMESH_IndexedMapOfShape, SMESH_BaseCollectionShape, TopoDS_Shape)
#endif
#else
DEFINE_INDEXEDMAP (SMESH_IndexedMapOfShape, SMESH_BaseCollectionShape, TopoDS_Shape)
#endif
#endif
#endif
#ifndef SMESH_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
#define SMESH_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
#if OCC_VERSION_HEX >= 0x060703
#include <NCollection_IndexedDataMap.hxx>
#else
#include <NCollection_DefineIndexedDataMap.hxx>
#endif
/// Class SMESH_IndexedDataMapOfShapeIndexedMapOfShape
#if OCC_VERSION_HEX >= 0x060703
typedef NCollection_IndexedDataMap<SMESH_IndexedMapOfShape,TopoDS_Shape> SMESH_IndexedDataMapOfShapeIndexedMapOfShape;
#else
#include <NCollection_DefineIndexedDataMap.hxx>
/// Class SMESH_IndexedDataMapOfShapeIndexedMapOfShape
DEFINE_BASECOLLECTION (SMESH_BaseCollectionIndexedMapOfShape, SMESH_IndexedMapOfShape)
DEFINE_INDEXEDDATAMAP (SMESH_IndexedDataMapOfShapeIndexedMapOfShape,
SMESH_BaseCollectionIndexedMapOfShape, TopoDS_Shape,
SMESH_IndexedMapOfShape)
#endif
#endif
+2
View File
@@ -28,6 +28,8 @@
#ifndef SMESH_MeshEditor_HeaderFile
#define SMESH_MeshEditor_HeaderFile
#include "Standard_Version.hxx"
#include "SMESH_SMESH.hxx"
#include "SMDS_MeshElement.hxx"
@@ -28,13 +28,21 @@
#include "SMESH_SMESH.hxx"
#if OCC_VERSION_HEX >= 0x060703
#include <NCollection_Sequence.hxx>
#else
#include <NCollection_DefineSequence.hxx>
#endif
#include <SMDS_MeshElement.hxx>
typedef const SMDS_MeshElement* SMDS_MeshElementPtr;
#if OCC_VERSION_HEX >= 0x060703
typedef NCollection_Sequence<SMDS_MeshElementPtr> SMESH_SequenceOfElemPtr;
#else
DEFINE_BASECOLLECTION (SMESH_BaseCollectionElemPtr, SMDS_MeshElementPtr)
DEFINE_SEQUENCE (SMESH_SequenceOfElemPtr, SMESH_BaseCollectionElemPtr, SMDS_MeshElementPtr)
#endif
#endif
+8 -1
View File
@@ -29,12 +29,19 @@
#include "SMESH_SMESH.hxx"
#include <NCollection_DefineSequence.hxx>
#if OCC_VERSION_HEX >= 0x060703
#include <NCollection_IncAllocator.hxx>
#include <NCollection_Sequence.hxx>
#endif
typedef const SMDS_MeshNode* SMDS_MeshNodePtr;
#if OCC_VERSION_HEX >= 0x060703
typedef NCollection_Sequence<SMDS_MeshNodePtr> SMESH_SequenceOfNode;
#else
DEFINE_BASECOLLECTION (SMESH_BaseCollectionNodePtr, SMDS_MeshNodePtr)
DEFINE_SEQUENCE(SMESH_SequenceOfNode,
SMESH_BaseCollectionNodePtr, SMDS_MeshNodePtr)
#endif
#endif
+16 -1
View File
@@ -135,7 +135,22 @@ MEFISTO2D_EXPORT
#elif defined(WIN32) && defined (__WATCOM__)
#define MEFISTO2D_STDCALL
#define insoar insoar_
#define azeroi azeroi_
#define fasoar fasoar_
#define teajte teajte_
#define tehote tehote_
#define tetrte tetrte_
#define aisoar aisoar_
#define tedela tedela_
#define terefr terefr_
#define tesuex tesuex_
#define teamqt teamqt_
#define nusotr nusotr_
#define qutr2d qutr2d_
#define surtd2 surtd2_
#define qualitetrte qualitetrte_
#define areteideale areteideale_
#else //Lin and MacOSX use f77
#define MEFISTO2D_STDCALL
-15
View File
@@ -1,15 +0,0 @@
EXPORTS
insoar
azeroi
fasoar
teajte
tehote
tetrte
aisoar
tedela
terefr
tesuex
teamqt
qutr2d
surtd2
nusotr
+3 -1
View File
@@ -24,10 +24,12 @@
// Author : Alain PERRONNET
// Date : 13 novembre 2006
#include "Rn.h"
#include "aptrte.h"
#include "utilities.h"
using namespace std;
extern "C"
@@ -839,6 +841,6 @@ void MEFISTO2D_STDCALL qualitetrte( R3 *mnpxyd,
if( nbtrianeg>0 )
MESSAGE( "ATTENTION: "<< nbtrianeg << " TRIANGLES d'AIRE NEGATIVE" );
MESSAGE(" ");
MESSAGE("_");
return;
}
-217
View File
@@ -1,217 +0,0 @@
diff --git a/MEFISTO2F.def b/MEFISTO2F.def
new file mode 100644
index 0000000..d4a0728
--- /dev/null
+++ b/MEFISTO2F.def
@@ -0,0 +1,15 @@
+EXPORTS
+ insoar_
+ azeroi_
+ fasoar_
+ teajte_
+ tehote_
+ tetrte_
+ aisoar_
+ tedela_
+ terefr_
+ tesuex_
+ teamqt_
+ qutr2d_
+ surtd2_
+ nusotr_
diff --git a/Mefisto2.def b/Mefisto2.def
new file mode 100644
index 0000000..844f04f
--- /dev/null
+++ b/Mefisto2.def
@@ -0,0 +1,5 @@
+LIBRARY MEFISTO2.dll
+EXPORTS
+ areteideale_
+ qualitetrte_
+
diff --git a/Mefisto2d.def b/Mefisto2d.def
new file mode 100644
index 0000000..dff1325
--- /dev/null
+++ b/Mefisto2d.def
@@ -0,0 +1,5 @@
+LIBRARY MEFISTO2d.dll
+EXPORTS
+ areteideale_
+ qualitetrte_
+
diff --git a/arithchk.c b/arithchk.c
index 6a3c2a5..40f1f47 100644
--- a/arithchk.c
+++ b/arithchk.c
@@ -29,6 +29,7 @@ THIS SOFTWARE.
#include <math.h>
#include <errno.h>
#include <sys/types.h> /* another possible place for ssize_t */
+#include <stddef.h>
#ifdef NO_FPINIT
#define fpinit_ASL()
@@ -42,6 +43,8 @@ extern
#endif /*KR_headers*/
#endif /*NO_FPINIT*/
+ typedef int ssize_t;
+
static int dalign;
typedef struct
Akind {
diff --git a/derf_.c b/derf_.c
index d935d31..e757916 100644
--- a/derf_.c
+++ b/derf_.c
@@ -13,6 +13,38 @@ double derf_(doublereal *x)
{
return( erf(*x) );
}
+
+/* http://stackoverflow.com/questions/6281020/error-function-erfx-not-found-in-math-h-for-visual-studio-2005 */
+double erf(double x)
+{
+ /* constants */
+ double a1 = 0.254829592;
+ double a2 = -0.284496736;
+ double a3 = 1.421413741;
+ double a4 = -1.453152027;
+ double a5 = 1.061405429;
+ double p = 0.3275911;
+ double t;
+ double y;
+
+ /* Save the sign of x */
+ int sign = 1;
+ if (x < 0)
+ sign = -1;
+ x = fabs(x);
+
+ /* A&S formula 7.1.26 */
+ t = 1.0/(1.0 + p*x);
+ y = 1.0 - (((((a5*t + a4)*t) + a3)*t + a2)*t + a1)*t*exp(-x*x);
+
+ return sign*y;
+}
+/* http://www.boost.org/doc/libs/1_39_0/libs/math/doc/sf_and_dist/html/math_toolkit/special/sf_erf/error_function.html*/
+/* erfc(z) = 1-erf(z) */
+double erfc(double x)
+{
+ return 1.0 - erf(x);
+}
#ifdef __cplusplus
}
#endif
diff --git a/libf2c.lbc b/libf2c.lbc
index c51c0aa..b77ae3c 100644
--- a/libf2c.lbc
+++ b/libf2c.lbc
@@ -1,3 +1,4 @@
+trte.obj
abort_.obj
backspac.obj
c_abs.obj
diff --git a/main.c b/main.c
index d95fdc9..22d1011 100644
--- a/main.c
+++ b/main.c
@@ -135,7 +135,7 @@ f_init();
#ifndef NO_ONEXIT
ONEXIT(f_exit);
#endif
-MAIN__();
+/*MAIN__();*/
#ifdef NO_ONEXIT
f_exit();
#endif
diff --git a/makefile.vc b/makefile.vc
index b3dd90c..3e9c82f 100644
--- a/makefile.vc
+++ b/makefile.vc
@@ -6,12 +6,13 @@
# to the objects in the "w =" list below.
CC = cl
-CFLAGS = -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -Ot1 -DNO_My_ctype -DNO_ISATTY
+CFLAGS = -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -Ot1 -DNO_My_ctype -DNO_ISATTY -MD
.c.obj:
$(CC) -c $(CFLAGS) $*.c
w = \
+ trte.obj \
abort_.obj \
backspac.obj \
c_abs.obj \
@@ -166,7 +167,7 @@ w = \
z_sin.obj \
z_sqrt.obj
-all: f2c.h math.h signal1.h sysdep1.h vcf2c.lib
+all: f2c.h math.h signal1.h sysdep1.h MEFISTO2F.lib MEFISTO2Fd.lib
f2c.h: f2c.h0
copy f2c.h0 f2c.h
@@ -180,8 +181,17 @@ signal1.h: signal1.h0
sysdep1.h: sysdep1.h0
copy sysdep1.h0 sysdep1.h
-vcf2c.lib: $w
- lib -out:vcf2c.lib @libf2c.lbc
+MEFISTO2F.lib: $w
+ lib /DEF:Mefisto2.def /OUT:mef.lib
+ link -out:MEFISTO2F.dll @libf2c.lbc -DLL -IMPLIB:MEFISTO2F.lib -DEF:MEFISTO2F.def mef.lib
+ del mef.lib
+ del mef.exp
+
+MEFISTO2Fd.lib: $w
+ lib /DEF:Mefisto2d.def /OUT:mefd.lib
+ link -out:MEFISTO2Fd.dll @libf2c.lbc -DLL -IMPLIB:MEFISTO2Fd.lib -DEF:MEFISTO2F.def mefd.lib
+ del mefd.lib
+ del mefd.exp
open.obj: open.c
$(CC) -c $(CFLAGS) -DMSDOS open.c
@@ -189,7 +199,7 @@ open.obj: open.c
signbit.obj uninit.obj: arith.h
arith.h: arithchk.c
- comptry.bat $(CC) $(CFLAGS) -DNO_FPINIT arithchk.c
+ $(CC) -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -Ot1 -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT arithchk.c
arithchk >arith.h
del arithchk.exe
del arithchk.obj
diff --git a/open.c b/open.c
index a06428d..d1f3da7 100644
--- a/open.c
+++ b/open.c
@@ -5,7 +5,7 @@
#ifdef MSDOS
#include "io.h"
#else
-#include "unistd.h" /* for access */
+#include "unistd.h" /* for _access */
#endif
#endif
@@ -204,7 +204,7 @@ integer f_open(olist *a)
opnerr(a->oerr,errno,"open")
fclose(tf);
#else
- if (access(buf,0))
+ if (_access(buf,0))
opnerr(a->oerr,errno,"open")
#endif
break;
@@ -234,7 +234,7 @@ integer f_open(olist *a)
opnerr(a->oerr,128,"open")
}
#else
- if (!access(buf,0))
+ if (!_access(buf,0))
opnerr(a->oerr,128,"open")
#endif
/* no break */
File diff suppressed because it is too large Load Diff
@@ -211,13 +211,13 @@ istream & NETGENPlugin_Hypothesis::LoadFrom(istream & load)
int is;
double val;
isOK = (load >> val);
isOK = !(load >> val).bad();
if (isOK)
_maxSize = val;
else
load.clear(ios::badbit | load.rdstate());
isOK = (load >> is);
isOK = !(load >> is).bad();
if (isOK)
SetFineness((Fineness) is);
else
@@ -225,32 +225,32 @@ istream & NETGENPlugin_Hypothesis::LoadFrom(istream & load)
if (_fineness == UserDefined)
{
isOK = (load >> val);
isOK = !(load >> val).bad();
if (isOK)
_growthRate = val;
else
load.clear(ios::badbit | load.rdstate());
isOK = (load >> val);
isOK = !(load >> val).bad();
if (isOK)
_nbSegPerEdge = val;
else
load.clear(ios::badbit | load.rdstate());
isOK = (load >> val);
isOK = !(load >> val).bad();
if (isOK)
_nbSegPerRadius = val;
else
load.clear(ios::badbit | load.rdstate());
}
isOK = (load >> is);
isOK = !(load >> is).bad();
if (isOK)
_secondOrder = (bool) is;
else
load.clear(ios::badbit | load.rdstate());
isOK = (load >> is);
isOK = !(load >> is).bad();
if (isOK)
_optimize = (bool) is;
else
@@ -96,7 +96,7 @@ istream & NETGENPlugin_Hypothesis_2D::LoadFrom(istream & load)
bool isOK = true;
int is;
isOK = (load >> is);
isOK = !(load >> is).bad();
if (isOK)
_quadAllowed = (bool) is;
else
@@ -142,19 +142,19 @@ istream & NETGENPlugin_SimpleHypothesis_2D::LoadFrom(istream & load)
bool isOK = true;
double val;
isOK = (load >> val);
isOK = !(load >> val).bad();
if (isOK)
_nbSegments = (int) val;
else
load.clear(ios::badbit | load.rdstate());
isOK = (load >> val);
isOK = !(load >> val).bad();
if (isOK)
_segmentLength = val;
else
load.clear(ios::badbit | load.rdstate());
isOK = (load >> val);
isOK = !(load >> val).bad();
if (isOK)
_area = val;
else
@@ -108,7 +108,7 @@ istream & NETGENPlugin_SimpleHypothesis_3D::LoadFrom(istream & load)
bool isOK = true;
double val;
isOK = (load >> val);
isOK = !(load >> val).bad();
if (isOK)
_volume = val;
else
@@ -120,10 +120,10 @@ ostream & StdMeshers_Arithmetic1D::SaveTo(ostream & save)
istream & StdMeshers_Arithmetic1D::LoadFrom(istream & load)
{
bool isOK = true;
isOK = (load >> _begLength);
isOK = !(load >> _begLength).bad();
if (!isOK)
load.clear(ios::badbit | load.rdstate());
isOK = (load >> _endLength);
isOK = !(load >> _endLength).bad();
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
@@ -119,7 +119,7 @@ ostream & StdMeshers_Deflection1D::SaveTo(ostream & save)
istream & StdMeshers_Deflection1D::LoadFrom(istream & load)
{
bool isOK = (load >> _value);
bool isOK = !(load >> _value).bad();
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
@@ -106,7 +106,7 @@ istream & StdMeshers_LengthFromEdges::LoadFrom(istream & load)
{
bool isOK = true;
int a;
isOK = (load >> a);
isOK = !(load >> a).bad();
if (isOK)
this->_mode = a;
else
@@ -148,13 +148,13 @@ istream & StdMeshers_LocalLength::LoadFrom(istream & load)
bool isOK = true;
double a;
isOK = (load >> a);
isOK = !(load >> a).bad();
if (isOK)
this->_length = a;
else
load.clear(ios::badbit | load.rdstate());
isOK = (load >> a);
isOK = !(load >> a).bad();
if (isOK)
this->_precision = a;
else
@@ -114,7 +114,7 @@ istream & StdMeshers_MaxElementArea::LoadFrom(istream & load)
{
bool isOK = true;
double a;
isOK = (load >> a);
isOK = !(load >> a).bad();
if (isOK)
this->_maxArea = a;
else
@@ -116,7 +116,7 @@ istream & StdMeshers_MaxElementVolume::LoadFrom(istream & load)
{
bool isOK = true;
double a;
isOK = (load >> a);
isOK = !(load >> a).bad();
if (isOK)
this->_maxVolume = a;
else
@@ -159,20 +159,20 @@ istream & StdMeshers_MaxLength::LoadFrom(istream & load)
bool isOK = true;
double a;
isOK = (load >> a);
isOK = !(load >> a).bad();
if (isOK)
_length = a;
else
load.clear(ios::badbit | load.rdstate());
isOK = (load >> a);
isOK = !(load >> a).bad();
if (isOK)
_preestimated = a;
else
load.clear(ios::badbit | load.rdstate());
bool pre;
isOK = (load >> pre);
isOK = !(load >> pre).bad();
if ( isOK )
_preestimation = pre;
else
@@ -118,7 +118,7 @@ ostream & StdMeshers_NumberOfLayers::SaveTo(ostream & save)
istream & StdMeshers_NumberOfLayers::LoadFrom(istream & load)
{
bool isOK = true;
isOK = (load >> _nbLayers);
isOK = !(load >> _nbLayers).bad();
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
@@ -520,7 +520,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
int a;
// read number of segments
isOK = (load >> a);
isOK = !(load >> a).bad();
if (isOK)
_numberOfSegments = a;
else
@@ -533,7 +533,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
// (nb.segments, distr.type, some other params.),
// we wait here the ditribution type, which is integer
double scale_factor;
isOK = (load >> scale_factor);
isOK = !(load >> scale_factor).bad();
a = (int)scale_factor;
// try to interprete ditribution type,
@@ -554,7 +554,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
{
case DT_Scale:
{
isOK = (load >> b);
isOK = !(load >> b).bad();
if (isOK)
_scaleFactor = b;
else
@@ -568,14 +568,14 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
break;
case DT_TabFunc:
{
isOK = (load >> a);
isOK = !(load >> a).bad();
if (isOK)
{
_table.resize(a, 0.);
int i;
for (i=0; i < _table.size(); i++)
{
isOK = (load >> b);
isOK = !(load >> b).bad();
if (isOK)
_table[i] = b;
else
@@ -594,7 +594,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
case DT_ExprFunc:
{
string str;
isOK = (load >> str);
isOK = !(load >> str).bad();
if (isOK)
_func = str;
else
@@ -613,7 +613,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
if (_distrType == DT_TabFunc || _distrType == DT_ExprFunc)
{
isOK = (load >> a);
isOK = !(load >> a).bad();
if (isOK)
_convMode = a;
else
@@ -66,12 +66,17 @@
#ifndef StdMeshers_Array2OfNode_HeaderFile
#define StdMeshers_Array2OfNode_HeaderFile
typedef const SMDS_MeshNode* SMDS_MeshNodePtr;
DEFINE_BASECOLLECTION (StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr)
#ifndef __BORLANDC__
DEFINE_ARRAY2(StdMeshers_Array2OfNode,
StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr)
#if OCC_VERSION_HEX >= 0x060703
typedef NCollection_Array2<SMDS_MeshNodePtr> StdMeshers_Array2OfNode;
#else
DEFINE_BASECOLLECTION (StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr)
DEFINE_ARRAY2(StdMeshers_Array2OfNode,
StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr)
#endif
#else
DEFINE_BASECOLLECTION (StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr)
SMESH_DEFINE_ARRAY2(StdMeshers_Array2OfNode,
StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr)
#endif
@@ -117,7 +117,7 @@ istream & StdMeshers_SegmentLengthAroundVertex::LoadFrom(istream & load)
{
bool isOK = true;
double a;
isOK = (load >> a);
isOK = !(load >> a).bad();
if (isOK)
this->_length = a;
else
@@ -121,10 +121,10 @@ ostream & StdMeshers_StartEndLength::SaveTo(ostream & save)
istream & StdMeshers_StartEndLength::LoadFrom(istream & load)
{
bool isOK = true;
isOK = (load >> _begLength);
isOK = !(load >> _begLength).bad();
if (!isOK)
load.clear(ios::badbit | load.rdstate());
isOK = (load >> _endLength);
isOK = !(load >> _endLength).bad();
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
+69 -35
View File
@@ -34,6 +34,9 @@
# include <unistd.h>
# include <pwd.h>
# include <sys/types.h>
# elif defined(__MINGW32__)
# define WINVER 0x502 // needed for SetDllDirectory
# include <Windows.h>
# endif
# include <ctime>
# include <csignal>
@@ -42,10 +45,6 @@
#ifdef FC_OS_WIN32
# include <Shlobj.h>
// Doesn't seem to work with VS2010
# if (defined(_MSC_VER) && (_MSC_VER < 1600))
# include <Shfolder.h>
# endif
#endif
@@ -126,10 +125,6 @@ using namespace boost::program_options;
# include <new>
#endif
#ifdef MemDebugOn
# define new DEBUG_CLIENTBLOCK
#endif
//using Base::GetConsole;
using namespace Base;
@@ -147,6 +142,7 @@ Base::ConsoleObserverStd *Application::_pConsoleObserverStd =0;
Base::ConsoleObserverFile *Application::_pConsoleObserverFile =0;
AppExport std::map<std::string,std::string> Application::mConfig;
BaseExport extern PyObject* Base::BaseExceptionFreeCADError;
//**************************************************************************
@@ -220,6 +216,11 @@ Application::Application(ParameterManager * /*pcSysParamMngr*/,
PyObject* pBaseModule = Py_InitModule3("__FreeCADBase__", NULL,
"The Base module contains the classes for the geometric basics\n"
"like vector, matrix, bounding box, placement, rotation, axis, ...");
Base::BaseExceptionFreeCADError = PyErr_NewException(
"Base.FreeCADError", PyExc_RuntimeError, NULL);
Py_INCREF(Base::BaseExceptionFreeCADError);
PyModule_AddObject(pBaseModule, "FreeCADError",
Base::BaseExceptionFreeCADError);
Base::Interpreter().addType(&Base::VectorPy ::Type,pBaseModule,"Vector");
Base::Interpreter().addType(&Base::MatrixPy ::Type,pBaseModule,"Matrix");
Base::Interpreter().addType(&Base::BoundBoxPy ::Type,pBaseModule,"BoundBox");
@@ -237,6 +238,8 @@ Application::Application(ParameterManager * /*pcSysParamMngr*/,
PyObject* pUnitsModule = Py_InitModule3("Units", Base::UnitsApi::Methods,
"The Unit API");
Base::Interpreter().addType(&Base::QuantityPy ::Type,pUnitsModule,"Quantity");
// make sure to set the 'nb_true_divide' slot
Base::QuantityPy::Type.tp_as_number->nb_true_divide = Base::QuantityPy::Type.tp_as_number->nb_divide;
Base::Interpreter().addType(&Base::UnitPy ::Type,pUnitsModule,"Unit");
Py_INCREF(pUnitsModule);
@@ -279,6 +282,23 @@ Document* Application::newDocument(const char * Name, const char * UserName)
Name = "Unnamed";
string name = getUniqueDocumentName(Name);
std::string userName;
if (UserName && UserName[0] != '\0') {
userName = UserName;
}
else {
userName = Name;
std::vector<std::string> names;
names.reserve(DocMap.size());
std::map<string,Document*>::const_iterator pos;
for (pos = DocMap.begin();pos != DocMap.end();++pos) {
names.push_back(pos->second->Label.getValue());
}
if (!names.empty())
userName = Base::Tools::getUniqueName(userName, names);
}
// create the FreeCAD document
auto_ptr<Document> newDoc(new Document() );
@@ -306,10 +326,7 @@ Document* Application::newDocument(const char * Name, const char * UserName)
signalNewDocument(*_pActiveDoc);
// set the UserName after notifying all observers
if (UserName)
_pActiveDoc->Label.setValue(UserName);
else
_pActiveDoc->Label.setValue(name);
_pActiveDoc->Label.setValue(userName);
return _pActiveDoc;
}
@@ -476,7 +493,7 @@ void Application::setActiveDocument(const char *Name)
}
}
const char* Application::GetHomePath(void) const
const char* Application::getHomePath(void) const
{
return _mConfig["AppHomePath"].c_str();
}
@@ -895,7 +912,7 @@ void Application::destructObserver(void)
if ( _pConsoleObserverStd ) {
Console().DetachObserver(_pConsoleObserverStd);
delete _pConsoleObserverStd;
_pConsoleObserverFile = 0;
_pConsoleObserverStd = 0;
}
}
@@ -922,30 +939,34 @@ void segmentation_fault_handler(int sig)
switch (sig) {
case SIGSEGV:
std::cerr << "Illegal storage access..." << std::endl;
#if !defined(_DEBUG)
throw Base::Exception("Illegal storage access! Please save your work under a new file name and restart the application!");
#endif
break;
case SIGABRT:
std::cerr << "Abnormal program termination..." << std::endl;
#if !defined(_DEBUG)
throw Base::Exception("Break signal occoured");
#endif
break;
default:
std::cerr << "Unknown error occurred..." << std::endl;
break;
}
}
void my_terminate_handler()
{
std::cerr << "Terminating..." << std::endl;
}
void unexpection_error_handler()
{
std::cerr << "Unexpected error occurred..." << std::endl;
// try to throw to give the user evantually a change to save
#if !defined(_DEBUG)
throw Base::Exception("Unexpected error occurred! Please save your work under a new file name and restart the application!");
#endif
terminate();
}
@@ -1206,6 +1227,10 @@ void Application::initApplication(void)
("User parameter:BaseApp/Preferences/Units");
UnitsApi::setSchema((UnitSystem)hGrp->GetInt("UserSchema",0));
#if defined (_DEBUG)
Console().Log("Application is built with debug information\n");
#endif
// starting the init script
Console().Log("Run App init script\n");
Interpreter().runString(Base::ScriptFactory().ProduceScript("FreeCADInit"));
@@ -1253,10 +1278,12 @@ void Application::processCmdLineFiles(void)
else {
std::vector<std::string> mods = App::GetApplication().getImportModules(Ext.c_str());
if (!mods.empty()) {
std::string escapedstr = Base::Tools::escapedUnicodeFromUtf8(File.filePath().c_str());
Base::Interpreter().loadModule(mods.front().c_str());
Base::Interpreter().runStringArg("import %s",mods.front().c_str());
Base::Interpreter().runStringArg("%s.open(\"%s\")",mods.front().c_str(),File.filePath().c_str());
Base::Console().Log("Command line open: %s.Open(\"%s\")\n",mods.front().c_str(),File.filePath().c_str());
Base::Interpreter().runStringArg("%s.open(u\"%s\")",mods.front().c_str(),
escapedstr.c_str());
Base::Console().Log("Command line open: %s.open(u\"%s\")\n",mods.front().c_str(),escapedstr.c_str());
}
else {
Console().Warning("File format not supported: %s \n", File.filePath().c_str());
@@ -1363,7 +1390,7 @@ void Application::LoadParameters(void)
catch (const Base::Exception& e) {
// try to proceed with an empty XML document
Base::Console().Error("%s in file %s.\n"
"Continue with an empty configuration.",
"Continue with an empty configuration.\n",
e.what(), mConfig["SystemParameter"].c_str());
_pcSysParamMngr->CreateDocument();
}
@@ -1382,7 +1409,7 @@ void Application::LoadParameters(void)
catch (const Base::Exception& e) {
// try to proceed with an empty XML document
Base::Console().Error("%s in file %s.\n"
"Continue with an empty configuration.",
"Continue with an empty configuration.\n",
e.what(), mConfig["UserParameter"].c_str());
_pcUserParamMngr->CreateDocument();
}
@@ -1983,31 +2010,38 @@ std::string Application::FindHomePath(const char* sCall)
// We have three ways to start this application either use one of the both executables or
// import the FreeCAD.pyd module from a running Python session. In the latter case the
// Python interpreter is already initialized.
char szFileName [MAX_PATH] ;
wchar_t szFileName [MAX_PATH];
if (Py_IsInitialized()) {
GetModuleFileName(GetModuleHandle(sCall),szFileName, MAX_PATH-1);
GetModuleFileNameW(GetModuleHandle(sCall),szFileName, MAX_PATH-1);
}
else {
GetModuleFileName(0, szFileName, MAX_PATH-1);
GetModuleFileNameW(0, szFileName, MAX_PATH-1);
}
std::string Call(szFileName), TempHomePath;
std::string::size_type pos = Call.find_last_of(PATHSEP);
TempHomePath.assign(Call,0,pos);
pos = TempHomePath.find_last_of(PATHSEP);
TempHomePath.assign(TempHomePath,0,pos+1);
std::wstring Call(szFileName), homePath;
std::wstring::size_type pos = Call.find_last_of(PATHSEP);
homePath.assign(Call,0,pos);
pos = homePath.find_last_of(PATHSEP);
homePath.assign(homePath,0,pos+1);
// switch to posix style
for (std::string::iterator i=TempHomePath.begin();i!=TempHomePath.end();++i) {
if (*i == '\\')
*i = '/';
for (std::wstring::iterator it = homePath.begin(); it != homePath.end(); ++it) {
if (*it == '\\')
*it = '/';
}
// fixes #0001638 to avoid to load DLLs from Windows' system directories before FreeCAD's bin folder
std::string binPath = TempHomePath;
binPath += "bin";
SetDllDirectory(binPath.c_str());
return TempHomePath;
std::wstring binPath = homePath;
binPath += L"bin";
SetDllDirectoryW(binPath.c_str());
// http://stackoverflow.com/questions/5625884/conversion-of-stdwstring-to-qstring-throws-linker-error
#ifdef _MSC_VER
QString str = QString::fromUtf16(reinterpret_cast<const ushort *>(homePath.c_str()));
#else
QString str = QString::fromStdWString(homePath);
#endif
return str.toStdString();
}
#else
+1 -1
View File
@@ -223,7 +223,7 @@ public:
static char** GetARGV(void){return _argv;}
//@}
const char* GetHomePath(void) const;
const char* getHomePath(void) const;
const char* getExecutableName(void) const;
static std::string getUserAppDataDir();
static std::string getResourceDir();
+11 -10
View File
@@ -45,7 +45,6 @@
#include <Base/FileInfo.h>
#include <Base/UnitsApi.h>
#define new DEBUG_CLIENTBLOCK
//using Base::GetConsole;
using namespace Base;
using namespace App;
@@ -180,12 +179,14 @@ PyObject* Application::sLoadFile(PyObject * /*self*/, PyObject *args,PyObject *
PyObject* Application::sOpenDocument(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
{
char *pstr;
if (!PyArg_ParseTuple(args, "s", &pstr)) // convert args: Python->C
return NULL; // NULL triggers exception
char* Name;
if (!PyArg_ParseTuple(args, "et","utf-8",&Name))
return NULL;
std::string EncodedName = std::string(Name);
PyMem_Free(Name);
try {
// return new document
return (GetApplication().openDocument(pstr)->getPyObject());
return (GetApplication().openDocument(EncodedName.c_str())->getPyObject());
}
catch (const Base::Exception& e) {
PyErr_SetString(PyExc_IOError, e.what());
@@ -193,7 +194,7 @@ PyObject* Application::sOpenDocument(PyObject * /*self*/, PyObject *args,PyObjec
}
catch (const std::exception& e) {
// might be subclass from zipios
PyErr_Format(PyExc_IOError, "Invalid project file %s: %s\n", pstr, e.what());
PyErr_Format(PyExc_IOError, "Invalid project file %s: %s\n", EncodedName.c_str(), e.what());
return 0L;
}
}
@@ -220,7 +221,7 @@ PyObject* Application::sSetActiveDocument(PyObject * /*self*/, PyObject *args,Py
GetApplication().setActiveDocument(pstr);
}
catch (const Base::Exception& e) {
PyErr_SetString(PyExc_Exception, e.what());
PyErr_SetString(Base::BaseExceptionFreeCADError, e.what());
return NULL;
}
@@ -260,7 +261,7 @@ PyObject* Application::sSaveDocument(PyObject * /*self*/, PyObject *args,PyObjec
Document* doc = GetApplication().getDocument(pDoc);
if ( doc ) {
if ( doc->save() == false ) {
PyErr_Format(PyExc_Exception, "Cannot save document '%s'", pDoc);
PyErr_Format(Base::BaseExceptionFreeCADError, "Cannot save document '%s'", pDoc);
return 0L;
}
}
@@ -520,7 +521,7 @@ PyObject* Application::sGetResourceDir(PyObject * /*self*/, PyObject *args,PyObj
if (!PyArg_ParseTuple(args, "")) // convert args: Python->C
return NULL; // NULL triggers exception
Py::String datadir(Application::getResourceDir());
Py::String datadir(Application::getResourceDir(),"utf-8");
return Py::new_reference_to(datadir);
}
@@ -529,7 +530,7 @@ PyObject* Application::sGetHomePath(PyObject * /*self*/, PyObject *args,PyObject
if (!PyArg_ParseTuple(args, "")) // convert args: Python->C
return NULL; // NULL triggers exception
Py::String homedir(GetApplication().GetHomePath());
Py::String homedir(GetApplication().getHomePath(),"utf-8");
return Py::new_reference_to(homedir);
}
+4 -2
View File
@@ -77,7 +77,8 @@ SET(Document_CPP_SRCS
Plane.cpp
Transactions.cpp
VRMLObject.cpp
MaterialObject.cpp
MaterialObject.cpp
MergeDocuments.cpp
)
SET(Document_HPP_SRCS
@@ -99,7 +100,8 @@ SET(Document_HPP_SRCS
Plane.h
Transactions.h
VRMLObject.h
MaterialObject.h
MaterialObject.h
MergeDocuments.h
)
SET(Document_SRCS
${Document_CPP_SRCS}
+1
View File
@@ -48,6 +48,7 @@ class AppExport Segment: public Base::BaseClass
TYPESYSTEM_HEADER();
public:
virtual ~Segment(){}
virtual std::string getName() const=0;
};
+163 -109
View File
@@ -75,6 +75,7 @@ recompute path. Also enables more complicated dependencies beyond trees.
#include "Application.h"
#include "DocumentObject.h"
#include "PropertyLinks.h"
#include "MergeDocuments.h"
#include <Base/Console.h>
#include <Base/Exception.h>
@@ -105,10 +106,6 @@ using namespace std;
using namespace boost;
using namespace zipios;
#ifdef MemDebugOn
# define new DEBUG_CLIENTBLOCK
#endif
#if FC_DEBUG
# define FC_LOGFEATUREUPDATE
#endif
@@ -214,6 +211,22 @@ void Document::exportGraphviz(std::ostream& out)
VertexObjectList[It->second] = add_vertex(DepList);
names.push_back(It->second->Label.getValue());
}
// Add external document objects
for (std::map<std::string,DocumentObject*>::const_iterator It = d->objectMap.begin(); It != d->objectMap.end();++It) {
std::vector<DocumentObject*> OutList = It->second->getOutList();
for (std::vector<DocumentObject*>::const_iterator It2=OutList.begin();It2!=OutList.end();++It2) {
if (*It2) {
std::map<DocumentObject*,Vertex>::const_iterator item = VertexObjectList.find(*It2);
if (item == VertexObjectList.end()) {
VertexObjectList[*It2] = add_vertex(DepList);
names.push_back(std::string((*It2)->getDocument()->getName()) + "#" + (*It2)->Label.getValue());
}
}
}
}
// add the edges
for (std::map<std::string,DocumentObject*>::const_iterator It = d->objectMap.begin(); It != d->objectMap.end();++It) {
std::vector<DocumentObject*> OutList = It->second->getOutList();
@@ -597,14 +610,18 @@ Document::Document(void)
#ifdef FC_LOGUPDATECHAIN
Console().Log("+App::Document: %p\n",this);
#endif
std::string CreationDateString = Base::TimeInfo::currentDateTimeString();
std::string Author = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/Document")->GetASCII("prefAuthor","");
std::string AuthorComp = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/Document")->GetASCII("prefCompany","");
ADD_PROPERTY_TYPE(Label,("Unnamed"),0,Prop_None,"The name of the document");
ADD_PROPERTY_TYPE(FileName,(""),0,Prop_ReadOnly,"The path to the file where the document is saved to");
ADD_PROPERTY_TYPE(CreatedBy,(""),0,Prop_None,"The creator of the document");
ADD_PROPERTY_TYPE(CreationDate,(Base::TimeInfo::currentDateTimeString()),0,Prop_ReadOnly,"Date of creation");
ADD_PROPERTY_TYPE(CreatedBy,(Author.c_str()),0,Prop_None,"The creator of the document");
ADD_PROPERTY_TYPE(CreationDate,(CreationDateString.c_str()),0,Prop_ReadOnly,"Date of creation");
ADD_PROPERTY_TYPE(LastModifiedBy,(""),0,Prop_None,0);
ADD_PROPERTY_TYPE(LastModifiedDate,("Unknown"),0,Prop_ReadOnly,"Date of last modification");
ADD_PROPERTY_TYPE(Company,(""),0,Prop_None,"Additional tag to save the the name of the company");
ADD_PROPERTY_TYPE(Company,(AuthorComp.c_str()),0,Prop_None,"Additional tag to save the the name of the company");
ADD_PROPERTY_TYPE(Comment,(""),0,Prop_None,"Additional tag to save a comment");
ADD_PROPERTY_TYPE(Meta,(),0,Prop_None,"Map with additional meta information");
ADD_PROPERTY_TYPE(Material,(),0,Prop_None,"Map with material properties");
@@ -614,8 +631,44 @@ Document::Document(void)
ADD_PROPERTY_TYPE(Uid,(id),0,Prop_ReadOnly,"UUID of the document");
// license stuff
ADD_PROPERTY_TYPE(License,("CC-BY 3.0"),0,Prop_None,"License string of the Item");
ADD_PROPERTY_TYPE(LicenseURL,("http://creativecommons.org/licenses/by/3.0/"),0,Prop_None,"URL to the license text/contract");
int licenseId = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/Document")->GetInt("prefLicenseType",0);
std::string license;
switch (licenseId) {
case 0:
license = "All rights reserved";
break;
case 1:
license = "CreativeCommons Attribution";
break;
case 2:
license = "CreativeCommons Attribution-ShareAlike";
break;
case 3:
license = "CreativeCommons Attribution-NoDerivatives";
break;
case 4:
license = "CreativeCommons Attribution-NonCommercial";
break;
case 5:
license = "CreativeCommons Attribution-NonCommercial-ShareAlike";
break;
case 6:
license = "CreativeCommons Attribution-NonCommercial-NoDerivatives";
break;
case 7:
license = "Public Domain";
break;
case 8:
license = "FreeArt";
break;
default:
license = "Other";
}
std::string licenseUrl = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/Document")->GetASCII("prefLicenseUrl","http://en.wikipedia.org/wiki/All_rights_reserved");
ADD_PROPERTY_TYPE(License,(license.c_str()),0,Prop_None,"License string of the Item");
ADD_PROPERTY_TYPE(LicenseURL,(licenseUrl.c_str()),0,Prop_None,"URL to the license text/contract");
// this creates and sets 'TransientDir' in onChanged()
ADD_PROPERTY_TYPE(TransientDir,(""),0,PropertyType(Prop_Transient|Prop_ReadOnly),
@@ -949,9 +1002,19 @@ bool Document::save (void)
{
int compression = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/Document")->GetInt("CompressionLevel",3);
compression = Base::clamp<int>(compression, Z_NO_COMPRESSION, Z_BEST_COMPRESSION);
if (*(FileName.getValue()) != '\0') {
LastModifiedDate.setValue(Base::TimeInfo::currentDateTimeString());
std::string LastModifiedDateString = Base::TimeInfo::currentDateTimeString();
LastModifiedDate.setValue(LastModifiedDateString.c_str());
// set author if needed
bool saveAuthor = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/Document")->GetBool("prefSetAuthorOnSave",false);
if (saveAuthor) {
std::string Author = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/Document")->GetASCII("prefAuthor","");
LastModifiedBy.setValue(Author.c_str());
}
// make a tmp. file where to save the project data first and then rename to
// the actual file name. This may be useful if overwriting an existing file
// fails so that the data of the work up to now isn't lost.
@@ -1177,6 +1240,20 @@ std::vector<App::DocumentObject*> Document::getInList(const DocumentObject* me)
return result;
}
namespace boost {
// recursive helper function to get all dependencies
void out_edges_recursive(const Vertex& v, const DependencyList& g, std::set<Vertex>& out)
{
DependencyList::out_edge_iterator j, jend;
for (boost::tie(j, jend) = boost::out_edges(v, g); j != jend; ++j) {
Vertex n = boost::target(*j, g);
std::pair<std::set<Vertex>::iterator, bool> i = out.insert(n);
if (i.second)
out_edges_recursive(n, g, out);
}
}
}
std::vector<App::DocumentObject*>
Document::getDependencyList(const std::vector<App::DocumentObject*>& objs) const
{
@@ -1185,18 +1262,36 @@ Document::getDependencyList(const std::vector<App::DocumentObject*>& objs) const
std::map<Vertex,DocumentObject*> VertexMap;
// Filling up the adjacency List
for (std::map<std::string,DocumentObject*>::const_iterator It = d->objectMap.begin(); It != d->objectMap.end();++It) {
for (std::vector<DocumentObject*>::const_iterator it = d->objectArray.begin(); it != d->objectArray.end();++it) {
// add the object as Vertex and remember the index
Vertex v = add_vertex(DepList);
ObjectMap[It->second] = v;
VertexMap[v] = It->second;
ObjectMap[*it] = v;
VertexMap[v] = *it;
}
for (std::vector<DocumentObject*>::const_iterator it = d->objectArray.begin(); it != d->objectArray.end();++it) {
std::vector<DocumentObject*> outList = (*it)->getOutList();
for (std::vector<DocumentObject*>::const_iterator jt = outList.begin(); jt != outList.end();++jt) {
if (*jt) {
std::map<DocumentObject*,Vertex>::const_iterator i = ObjectMap.find(*jt);
if (i == ObjectMap.end()) {
Vertex v = add_vertex(DepList);
ObjectMap[*jt] = v;
VertexMap[v] = *jt;
}
}
}
}
// add the edges
for (std::map<std::string,DocumentObject*>::const_iterator It = d->objectMap.begin(); It != d->objectMap.end();++It) {
std::vector<DocumentObject*> OutList = It->second->getOutList();
for (std::vector<DocumentObject*>::const_iterator It2=OutList.begin();It2!=OutList.end();++It2) {
if (*It2)
add_edge(ObjectMap[It->second],ObjectMap[*It2],DepList);
for (std::vector<DocumentObject*>::const_iterator it = d->objectArray.begin(); it != d->objectArray.end();++it) {
std::vector<DocumentObject*> outList = (*it)->getOutList();
for (std::vector<DocumentObject*>::const_iterator jt = outList.begin(); jt != outList.end();++jt) {
if (*jt) {
add_edge(ObjectMap[*it],ObjectMap[*jt],DepList);
}
}
}
@@ -1211,21 +1306,20 @@ Document::getDependencyList(const std::vector<App::DocumentObject*>& objs) const
return std::vector<App::DocumentObject*>();
}
//std::vector<App::DocumentObject*> out;
boost::unordered_set<App::DocumentObject*> out;
std::set<Vertex> out;
for (std::vector<App::DocumentObject*>::const_iterator it = objs.begin(); it != objs.end(); ++it) {
std::map<DocumentObject*,Vertex>::iterator jt = ObjectMap.find(*it);
// ok, object is part of this graph
if (jt != ObjectMap.end()) {
for (boost::tie(j, jend) = boost::out_edges(jt->second, DepList); j != jend; ++j) {
out.insert(VertexMap[boost::target(*j, DepList)]);
}
out.insert(*it);
out.insert(jt->second);
out_edges_recursive(jt->second, DepList, out);
}
}
std::vector<App::DocumentObject*> ary;
ary.insert(ary.end(), out.begin(), out.end());
ary.reserve(out.size());
for (std::set<Vertex>::iterator it = out.begin(); it != out.end(); ++it)
ary.push_back(VertexMap[*it]);
return ary;
}
@@ -1238,6 +1332,20 @@ void Document::_rebuildDependencyList(void)
// add the object as Vertex and remember the index
d->VertexObjectList[It->second] = add_vertex(d->DepList);
}
// add the edges
for (std::map<std::string,DocumentObject*>::const_iterator It = d->objectMap.begin(); It != d->objectMap.end();++It) {
std::vector<DocumentObject*> OutList = It->second->getOutList();
for (std::vector<DocumentObject*>::const_iterator It2=OutList.begin();It2!=OutList.end();++It2) {
if (*It2) {
std::map<DocumentObject*,Vertex>::iterator i = d->VertexObjectList.find(*It2);
if (i == d->VertexObjectList.end())
d->VertexObjectList[*It2] = add_vertex(d->DepList);
}
}
}
// add the edges
for (std::map<std::string,DocumentObject*>::const_iterator It = d->objectMap.begin(); It != d->objectMap.end();++It) {
std::vector<DocumentObject*> OutList = It->second->getOutList();
@@ -1462,10 +1570,11 @@ DocumentObject * Document::addObject(const char* sType, const char* pObjectName)
void Document::_addObject(DocumentObject* pcObject, const char* pObjectName)
{
d->objectMap[pObjectName] = pcObject;
std::string ObjectName = getUniqueObjectName(pObjectName);
d->objectMap[ObjectName] = pcObject;
d->objectArray.push_back(pcObject);
// cache the pointer to the name string in the Object (for performance of DocumentObject::getNameInDocument())
pcObject->pcNameInDocument = &(d->objectMap.find(pObjectName)->first);
pcObject->pcNameInDocument = &(d->objectMap.find(ObjectName)->first);
// do no transactions if we do a rollback!
if(!d->rollback){
@@ -1478,6 +1587,9 @@ void Document::_addObject(DocumentObject* pcObject, const char* pObjectName)
}
// send the signal
signalNewObject(*pcObject);
d->activeObject = pcObject;
signalActivatedObject(*pcObject);
}
/// Remove an object out of the document
@@ -1643,92 +1755,34 @@ void Document::breakDependency(DocumentObject* pcObject, bool clear)
}
}
DocumentObject* Document::_copyObject(DocumentObject* obj, std::map<DocumentObject*,
DocumentObject*>& copy_map, bool recursive,
bool keepdigitsatend)
DocumentObject* Document::copyObject(DocumentObject* obj, bool recursive, bool /*keepdigitsatend*/)
{
if (!obj) return 0;
// remove number from end to avoid lengthy names
std::string objname = obj->getNameInDocument();
if (!keepdigitsatend) {
size_t lastpos = objname.length()-1;
while (objname[lastpos] >= 48 && objname[lastpos] <= 57)
lastpos--;
objname = objname.substr(0, lastpos+1);
}
DocumentObject* copy = addObject(obj->getTypeId().getName(),objname.c_str());
if (!copy) return 0;
copy->addDynamicProperties(obj);
std::vector<DocumentObject*> objs;
objs.push_back(obj);
copy_map[obj] = copy;
std::map<std::string,App::Property*> props;
copy->getPropertyMap(props);
for (std::map<std::string,App::Property*>::iterator it = props.begin(); it != props.end(); ++it) {
App::Property* prop = obj->getPropertyByName(it->first.c_str());
if (prop && prop->getTypeId() == it->second->getTypeId()) {
if (prop->getTypeId() == PropertyLink::getClassTypeId()) {
DocumentObject* link = static_cast<PropertyLink*>(prop)->getValue();
std::map<DocumentObject*, DocumentObject*>::iterator pt = copy_map.find(link);
if (pt != copy_map.end()) {
// the object has already been copied
static_cast<PropertyLink*>(it->second)->setValue(pt->second);
}
else if (recursive) {
DocumentObject* link_copy = _copyObject(link, copy_map, recursive, keepdigitsatend);
copy_map[link] = link_copy;
static_cast<PropertyLink*>(it->second)->setValue(link_copy);
}
else if (link && link->getDocument() == this) {
//static_cast<PropertyLink*>(it->second)->setValue(link);
}
}
else if (prop->getTypeId() == PropertyLinkList::getClassTypeId()) {
std::vector<DocumentObject*> links = static_cast<PropertyLinkList*>(prop)->getValues();
if (recursive) {
std::vector<DocumentObject*> links_copy;
for (std::vector<DocumentObject*>::iterator jt = links.begin(); jt != links.end(); ++jt) {
std::map<DocumentObject*, DocumentObject*>::iterator pt = copy_map.find(*jt);
if (pt != copy_map.end()) {
// the object has already been copied
links_copy.push_back(pt->second);
}
else {
links_copy.push_back(_copyObject(*jt, copy_map, recursive, keepdigitsatend));
copy_map[*jt] = links_copy.back();
}
}
static_cast<PropertyLinkList*>(it->second)->setValues(links_copy);
}
else {
std::vector<DocumentObject*> links_ref;
//for (std::vector<DocumentObject*>::iterator jt = links.begin(); jt != links.end(); ++jt) {
// if ((*jt)->getDocument() == this)
// links_ref.push_back(*jt);
//}
static_cast<PropertyLinkList*>(it->second)->setValues(links_ref);
}
}
else {
std::auto_ptr<Property> data(prop->Copy());
if (data.get()) {
it->second->Paste(*data);
}
}
}
MergeDocuments md(this);
if (recursive) {
objs = getDependencyList(objs);
}
// unmark to be not re-computed later
copy->onFinishDuplicating();
copy->purgeTouched();
return copy;
}
unsigned int memsize=1000; // ~ for the meta-information
for (std::vector<App::DocumentObject*>::iterator it = objs.begin(); it != objs.end(); ++it)
memsize += (*it)->getMemSize();
DocumentObject* Document::copyObject(DocumentObject* obj, bool recursive, bool keepdigitsatend)
{
std::map<DocumentObject*, DocumentObject*> copy_map;
DocumentObject* copy = _copyObject(obj, copy_map, recursive, keepdigitsatend);
return copy;
QByteArray res;
res.reserve(memsize);
Base::ByteArrayOStreambuf obuf(res);
std::ostream ostr(&obuf);
this->exportObjects(objs, ostr);
Base::ByteArrayIStreambuf ibuf(res);
std::istream istr(0);
istr.rdbuf(&ibuf);
std::vector<App::DocumentObject*> newObj = md.importObjects(istr);
if (newObj.empty())
return 0;
else
return newObj.back();
}
DocumentObject* Document::moveObject(DocumentObject* obj, bool recursive)
+4 -2
View File
@@ -123,8 +123,12 @@ public:
boost::signal<void (Base::XMLReader&)> signalRestoreDocument;
boost::signal<void (const std::vector<App::DocumentObject*>&,
Base::Writer &)> signalExportObjects;
boost::signal<void (const std::vector<App::DocumentObject*>&,
Base::Writer &)> signalExportViewObjects;
boost::signal<void (const std::vector<App::DocumentObject*>&,
Base::XMLReader&)> signalImportObjects;
boost::signal<void (const std::vector<App::DocumentObject*>&, Base::Reader&,
const std::map<std::string, std::string>&)> signalImportViewObjects;
//@}
/** @name File handling of the document */
@@ -290,8 +294,6 @@ protected:
void _remObject(DocumentObject* pcObject);
void _addObject(DocumentObject* pcObject, const char* pObjectName);
DocumentObject* _copyObject(DocumentObject* obj, std::map<DocumentObject*,
DocumentObject*>&, bool recursive=false, bool keepdigitsatend=false);
/// checks if a valid transaction is open
void _checkTransaction(DocumentObject* pcObject);
void breakDependency(DocumentObject* pcObject, bool clear);
+1 -1
View File
@@ -33,7 +33,7 @@
#include "DocumentObjectPy.h"
#include "DocumentObjectGroup.h"
#include "PropertyLinks.h"
#define new DEBUG_CLIENTBLOCK
using namespace App;
-2
View File
@@ -196,8 +196,6 @@ protected:
virtual void onChanged(const Property* prop);
/// get called after a document has been fully restored
virtual void onDocumentRestored() {}
/// get called after duplicating an object
virtual void onFinishDuplicating() {}
/// get called after setting the document
virtual void onSettingDocument() {}
+23 -17
View File
@@ -50,7 +50,7 @@ PyObject* DocumentObjectGroupPy::newObject(PyObject *args)
return object->getPyObject();
}
else {
PyErr_Format(PyExc_Exception, "Cannot create object of type '%s'", sType);
PyErr_Format(Base::BaseExceptionFreeCADError, "Cannot create object of type '%s'", sType);
return NULL;
}
}
@@ -63,21 +63,21 @@ PyObject* DocumentObjectGroupPy::addObject(PyObject *args)
DocumentObjectPy* docObj = static_cast<DocumentObjectPy*>(object);
if (!docObj->getDocumentObjectPtr() || !docObj->getDocumentObjectPtr()->getNameInDocument()) {
PyErr_SetString(PyExc_Exception, "Cannot add an invalid object");
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot add an invalid object");
return NULL;
}
if (docObj->getDocumentObjectPtr()->getDocument() != getDocumentObjectGroupPtr()->getDocument()) {
PyErr_SetString(PyExc_Exception, "Cannot add an object from another document to this group");
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot add an object from another document to this group");
return NULL;
}
if (docObj->getDocumentObjectPtr() == this->getDocumentObjectGroupPtr()) {
PyErr_SetString(PyExc_Exception, "Cannot add a group object to itself");
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot add a group object to itself");
return NULL;
}
if (docObj->getDocumentObjectPtr()->getTypeId().isDerivedFrom(DocumentObjectGroup::getClassTypeId())) {
App::DocumentObjectGroup* docGrp = static_cast<DocumentObjectGroup*>(docObj->getDocumentObjectPtr());
if (this->getDocumentObjectGroupPtr()->isChildOf(docGrp)) {
PyErr_SetString(PyExc_Exception, "Cannot add a group object to a child group");
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot add a group object to a child group");
return NULL;
}
}
@@ -91,10 +91,13 @@ PyObject* DocumentObjectGroupPy::addObject(PyObject *args)
Py::Object vp = static_cast<App::PropertyPythonObject*>(proxy)->getValue();
if (vp.hasAttr(std::string("addObject"))) {
Py::Callable method(vp.getAttr(std::string("addObject")));
Py::Tuple args(1);
args[0] = Py::Object(object);
method.apply(args);
Py_Return;
// check which this method belongs to to avoid an infinite recursion
if (method.getAttr(std::string("__self__")) != Py::Object(this)) {
Py::Tuple args(1);
args[0] = Py::Object(object);
method.apply(args);
Py_Return;
}
}
}
}
@@ -111,11 +114,11 @@ PyObject* DocumentObjectGroupPy::removeObject(PyObject *args)
DocumentObjectPy* docObj = static_cast<DocumentObjectPy*>(object);
if (!docObj->getDocumentObjectPtr() || !docObj->getDocumentObjectPtr()->getNameInDocument()) {
PyErr_SetString(PyExc_Exception, "Cannot remove an invalid object");
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot remove an invalid object");
return NULL;
}
if (docObj->getDocumentObjectPtr()->getDocument() != getDocumentObjectGroupPtr()->getDocument()) {
PyErr_SetString(PyExc_Exception, "Cannot remove an object from another document from this group");
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot remove an object from another document from this group");
return NULL;
}
@@ -128,10 +131,13 @@ PyObject* DocumentObjectGroupPy::removeObject(PyObject *args)
Py::Object vp = static_cast<App::PropertyPythonObject*>(proxy)->getValue();
if (vp.hasAttr(std::string("removeObject"))) {
Py::Callable method(vp.getAttr(std::string("removeObject")));
Py::Tuple args(1);
args[0] = Py::Object(object);
method.apply(args);
Py_Return;
// check which this method belongs to to avoid an infinite recursion
if (method.getAttr(std::string("__self__")) != Py::Object(this)) {
Py::Tuple args(1);
args[0] = Py::Object(object);
method.apply(args);
Py_Return;
}
}
}
}
@@ -171,11 +177,11 @@ PyObject* DocumentObjectGroupPy::hasObject(PyObject *args)
DocumentObjectPy* docObj = static_cast<DocumentObjectPy*>(object);
if (!docObj->getDocumentObjectPtr() || !docObj->getDocumentObjectPtr()->getNameInDocument()) {
PyErr_SetString(PyExc_Exception, "Cannot check an invalid object");
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot check an invalid object");
return NULL;
}
if (docObj->getDocumentObjectPtr()->getDocument() != getDocumentObjectGroupPtr()->getDocument()) {
PyErr_SetString(PyExc_Exception, "Cannot check an object from another document with this group");
PyErr_SetString(Base::BaseExceptionFreeCADError, "Cannot check an object from another document with this group");
return NULL;
}
+20 -1
View File
@@ -88,6 +88,14 @@ Py::List DocumentObjectPy::getState(void) const
uptodate = false;
list.append(Py::String("Invalid"));
}
if (object->isRecomputing()) {
uptodate = false;
list.append(Py::String("Recompute"));
}
if (object->isRestoring()) {
uptodate = false;
list.append(Py::String("Restore"));
}
if (uptodate) {
list.append(Py::String("Up-to-date"));
}
@@ -98,6 +106,10 @@ Py::Object DocumentObjectPy::getViewObject(void) const
{
try {
Py::Module module(PyImport_ImportModule("FreeCADGui"),true);
if (!module.hasAttr("getDocument")) {
// in v0.14+, the GUI module can be loaded in console mode (but doesn't have all its document methods)
return Py::None();
}
Py::Callable method(module.getAttr("getDocument"));
Py::Tuple arg(1);
arg.setItem(0, Py::String(getDocumentObjectPtr()->getDocument()->getName()));
@@ -158,7 +170,14 @@ int DocumentObjectPy::setCustomAttributes(const char* attr, PyObject *obj)
throw Py::AttributeError(s.str());
}
prop->setPyObject(obj);
try {
prop->setPyObject(obj);
}
catch (const Base::TypeError& e) {
std::stringstream s;
s << "Property '" << prop->getName() << "': " << e.what();
throw Py::TypeError(s.str());
}
return 1;
}
+41 -1
View File
@@ -67,6 +67,10 @@ DocumentObserverPython::DocumentObserverPython(const Py::Object& obj) : inst(obj
(&DocumentObserverPython::slotRelabelDocument, this, _1));
this->connectApplicationActivateDocument = App::GetApplication().signalActiveDocument.connect(boost::bind
(&DocumentObserverPython::slotActivateDocument, this, _1));
this->connectApplicationUndoDocument = App::GetApplication().signalUndoDocument.connect(boost::bind
(&DocumentObserverPython::slotUndoDocument, this, _1));
this->connectApplicationRedoDocument = App::GetApplication().signalRedoDocument.connect(boost::bind
(&DocumentObserverPython::slotRedoDocument, this, _1));
this->connectDocumentCreatedObject = App::GetApplication().signalNewObject.connect(boost::bind
(&DocumentObserverPython::slotCreatedObject, this, _1));
@@ -82,6 +86,8 @@ DocumentObserverPython::~DocumentObserverPython()
this->connectApplicationDeletedDocument.disconnect();
this->connectApplicationRelabelDocument.disconnect();
this->connectApplicationActivateDocument.disconnect();
this->connectApplicationUndoDocument.disconnect();
this->connectApplicationRedoDocument.disconnect();
this->connectDocumentCreatedObject.disconnect();
this->connectDocumentDeletedObject.disconnect();
@@ -156,6 +162,40 @@ void DocumentObserverPython::slotActivateDocument(const App::Document& Doc)
}
}
void DocumentObserverPython::slotUndoDocument(const App::Document& Doc)
{
Base::PyGILStateLocker lock;
try {
if (this->inst.hasAttr(std::string("slotUndoDocument"))) {
Py::Callable method(this->inst.getAttr(std::string("slotUndoDocument")));
Py::Tuple args(1);
args.setItem(0, Py::Object(const_cast<App::Document&>(Doc).getPyObject(), true));
method.apply(args);
}
}
catch (Py::Exception&) {
Base::PyException e; // extract the Python error text
e.ReportException();
}
}
void DocumentObserverPython::slotRedoDocument(const App::Document& Doc)
{
Base::PyGILStateLocker lock;
try {
if (this->inst.hasAttr(std::string("slotRedoDocument"))) {
Py::Callable method(this->inst.getAttr(std::string("slotRedoDocument")));
Py::Tuple args(1);
args.setItem(0, Py::Object(const_cast<App::Document&>(Doc).getPyObject(), true));
method.apply(args);
}
}
catch (Py::Exception&) {
Base::PyException e; // extract the Python error text
e.ReportException();
}
}
void DocumentObserverPython::slotCreatedObject(const App::DocumentObject& Obj)
{
Base::PyGILStateLocker lock;
@@ -199,7 +239,7 @@ void DocumentObserverPython::slotChangedObject(const App::DocumentObject& Obj,
Py::Callable method(this->inst.getAttr(std::string("slotChangedObject")));
Py::Tuple args(2);
args.setItem(0, Py::Object(const_cast<App::DocumentObject&>(Obj).getPyObject(), true));
std::string prop_name = Obj.getName(&Prop);
std::string prop_name = Obj.getPropertyName(&Prop);
args.setItem(1, Py::String(prop_name));
method.apply(args);
}
+6
View File
@@ -65,6 +65,10 @@ private:
void slotDeletedObject(const App::DocumentObject& Obj);
/** The property of an observed object has changed */
void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop);
/** Undoes the last transaction of the document */
void slotUndoDocument(const App::Document& Doc);
/** Redoes the last undone transaction of the document */
void slotRedoDocument(const App::Document& Doc);
private:
Py::Object inst;
@@ -75,6 +79,8 @@ private:
Connection connectApplicationDeletedDocument;
Connection connectApplicationRelabelDocument;
Connection connectApplicationActivateDocument;
Connection connectApplicationUndoDocument;
Connection connectApplicationRedoDocument;
Connection connectDocumentCreatedObject;
Connection connectDocumentDeletedObject;
Connection connectDocumentChangedObject;
+5
View File
@@ -33,6 +33,11 @@
<UserDocu>Restore the document from disk</UserDocu>
</Documentation>
</Methode>
<Methode Name="mergeProject">
<Documentation>
<UserDocu>Merges this document with another project file</UserDocu>
</Documentation>
</Methode>
<Methode Name="exportGraphviz">
<Documentation>
<UserDocu>Export the dependencies of the objects as graph</UserDocu>
+23 -7
View File
@@ -29,9 +29,9 @@
#include "Document.h"
#include <Base/FileInfo.h>
#include <Base/PyTools.h>
#include "DocumentObject.h"
#include "DocumentObjectPy.h"
#include "MergeDocuments.h"
// inclusion of the generated files (generated By DocumentPy.xml)
#include "DocumentPy.h"
@@ -136,6 +136,22 @@ PyObject* DocumentPy::restore(PyObject * args)
Py_Return;
}
PyObject* DocumentPy::mergeProject(PyObject * args)
{
char* filename;
if (!PyArg_ParseTuple(args, "s", &filename)) // convert args: Python->C
return NULL; // NULL triggers exception
PY_TRY {
Base::FileInfo fi(filename);
Base::ifstream str(fi, std::ios::in | std::ios::binary);
App::Document* doc = getDocumentPtr();
MergeDocuments md(doc);
md.importObjects(str);
Py_Return;
} PY_CATCH;
}
PyObject* DocumentPy::exportGraphviz(PyObject * args)
{
char* fn=0;
@@ -202,7 +218,7 @@ PyObject* DocumentPy::addObject(PyObject *args)
else {
std::stringstream str;
str << "No document object found of type '" << sType << "'" << std::ends;
throw Py::Exception(PyExc_Exception,str.str());
throw Py::Exception(Base::BaseExceptionFreeCADError,str.str());
}
}
@@ -220,7 +236,7 @@ PyObject* DocumentPy::removeObject(PyObject *args)
} else {
std::stringstream str;
str << "No document object found with name '" << sName << "'" << std::ends;
throw Py::Exception(PyExc_Exception,str.str());
throw Py::Exception(Base::BaseExceptionFreeCADError,str.str());
}
}
@@ -239,7 +255,7 @@ PyObject* DocumentPy::copyObject(PyObject *args)
}
else {
std::string str("Failed to copy the object");
throw Py::Exception(PyExc_Exception,str);
throw Py::Exception(Base::BaseExceptionFreeCADError,str);
}
}
@@ -256,7 +272,7 @@ PyObject* DocumentPy::moveObject(PyObject *args)
}
else {
std::string str("Failed to move the object");
throw Py::Exception(PyExc_Exception,str);
throw Py::Exception(Base::BaseExceptionFreeCADError,str);
}
}
@@ -358,12 +374,12 @@ PyObject* DocumentPy::findObjects(PyObject *args)
Base::Type type = Base::Type::fromName(sType);
if (type == Base::Type::badType()) {
PyErr_Format(PyExc_Exception, "'%s' is not a valid type", sType);
PyErr_Format(Base::BaseExceptionFreeCADError, "'%s' is not a valid type", sType);
return NULL;
}
if (!type.isDerivedFrom(App::DocumentObject::getClassTypeId())) {
PyErr_Format(PyExc_Exception, "Type '%s' does not inherit from 'App::DocumentObject'", sType);
PyErr_Format(Base::BaseExceptionFreeCADError, "Type '%s' does not inherit from 'App::DocumentObject'", sType);
return NULL;
}
+2 -2
View File
@@ -106,13 +106,13 @@ void DynamicProperty::addDynamicProperties(const PropertyContainer* cont)
}
}
const char* DynamicProperty::getName(const Property* prop) const
const char* DynamicProperty::getPropertyName(const Property* prop) const
{
for (std::map<std::string,PropData>::const_iterator it = props.begin(); it != props.end(); ++it) {
if (it->second.property == prop)
return it->first.c_str();
}
return this->pc->PropertyContainer::getName(prop);
return this->pc->PropertyContainer::getPropertyName(prop);
}
unsigned int DynamicProperty::getMemSize (void) const

Some files were not shown because too many files have changed in this diff Show More