201 Commits

Author SHA1 Message Date
Wayne Stambaugh
cfde5300d7 Fix wxWidgets 3.1 and later deprecated build warnings.
wxWidgets 3.1 has deprecated wxPATH_NORM_ALL when normalizing file
paths when calling wxFileName::Normalize().  This change keeps the
existing behavior except in places where our own internal
ExpandEnvVarSubstitutions() to expand environment variables.

(cherry picked from commit 898ec0d094c1b7b71918e3ad25cc73183a29b447)
2022-08-17 14:07:06 -04:00
Marek Roszko
012a9bb7cb Don't forget to cache bust oce
(cherry picked from commit 25507ad6cf8e82172cbf0d001c0109c2b2150b33)
2022-03-10 02:39:42 +00:00
Marek Roszko
563aa3ed74 Avoid loading duplicate shapes due to hierarchy structure
Fix https://gitlab.com/kicad/code/kicad/-/issues/9416
Fix https://gitlab.com/kicad/code/kicad/-/issues/6107


(cherry picked from commit 2de4906d659adfcd4beb87407b62bc59306a220e)
2022-03-10 02:39:35 +00:00
Marek Roszko
9367b7f309 Fix double parsing solids from step models resulting in triangle z-fighting
Fix https://gitlab.com/kicad/code/kicad/-/issues/9416
Fix https://gitlab.com/kicad/code/kicad/-/issues/9835
Fix https://gitlab.com/kicad/code/kicad/-/issues/10554


(cherry picked from commit b438810b6ba83453e995f1d95ba37237c0dabdf5)
2022-02-20 23:52:29 +00:00
Marek Roszko
aa5b6c70a7 Ensure we close the occt document at the end of loading
(cherry picked from commit d211ef1ea3fd5417f35b5a717bc9dcd3a28f8b80)
2022-02-06 16:18:31 +00:00
Jeff Young
471c0c4c1d More wide-string declarations. 2022-02-05 13:29:00 +00:00
Wayne Stambaugh
26047615bd Fix X3D model parser.
Fixes https://gitlab.com/kicad/code/kicad/-/issues/10385

(cherry picked from commit 44e4abde0e18e71d7cda0b21906c65beaca7e533)
2022-01-12 19:00:27 -05:00
Ian McInerney
e57bde6582 Remove last vestiges of the KICAD_USE_OCE build flag
This build flag was removed in a previous commit, but some last uses
remained.
2021-12-01 15:53:00 +00:00
Christoph Moench-Tegeder
8f87638de5 remove references to old OpenCascade API
@mroszko figured out that the "new" API exists in all supported
OpenCascade versions (>=7.3 for KiCad 6), so just remove the old
code.
2021-11-18 04:38:50 +00:00
Christoph Moench-Tegeder
12152d4331 Adapt OCE 3D plugin to OpenCascade 7.6.0
In line with
https://dev.opencascade.org/doc/overview/html/occt__upgrade.html#upgrade_occt760_poly
the Poly_Triangulation does not provide direct access to the internal
arrays anymore - use the accessor functions instead.
2021-11-18 04:38:50 +00:00
Marek Roszko
8baea9004f Bump oce plugin version to cache bust I think
Fixes https://gitlab.com/kicad/code/kicad/-/issues/9458
2021-11-07 09:29:21 -05:00
Marek Roszko
d3e5739364 Restore ability to process compound step shapes correctly
Fix #9458
2021-11-06 00:55:52 -04:00
Marek Roszko
f2783a86e0 On second thought, make the label dump runtime based on enabled log masks 2021-10-15 22:35:47 -04:00
Marek Roszko
0acd707650 Add step label dumping helper 2021-10-11 19:29:15 -04:00
Marek Roszko
4a3658027e Simplify getting the absolute string tag for a label
It actually is roughly equivalent as TagList() does a loop to build the list but this is a bit cleaner to read
2021-10-10 20:47:35 -04:00
Marek Roszko
e77cdad6fa Add useful helper function for getting label name 2021-10-10 20:43:57 -04:00
Marek Roszko
e81b516a82 Process step components by labels rather than shapes.
Labels are the true structure. Extracting purely just shapes won't get you instances of shapes that are virtually placed by reference labels.

Note, this may break the 3d placement of existing user models but they were most likely wrong loaded in the first place and losing any location data as simple as a boring offset from 0. There's no way to preserve the broken behavior and still allow complex step assemblies to locate correctly.

Fixes https://gitlab.com/kicad/code/kicad/issues/4181
2021-10-09 20:52:00 -04:00
Marek Roszko
8c8d66a181 Add some wxLogTrace to the oce loader 2021-10-07 22:48:19 -04:00
Seth Hillbrand
9a8d1246cc We don't keep a CHANGELOG.TXT
Direct interested readers to AUTHORS.TXT instead.
2021-10-05 19:46:53 -07:00
jean-pierre charras
4670309ec1 kicad2step: fix broken handing of UTF8 filenames.
the conversion between UTF8 std::strings and wxString were missing in some places.
3D model: fix management of file having double ext .stp.gz
Fixes #9038
https://gitlab.com/kicad/code/kicad/issues/9038
2021-08-27 16:58:23 +02:00
Wayne Stambaugh
d36fbb864f KiCad2Step code cleaning. 2021-07-29 07:10:58 -04:00
Wayne Stambaugh
11becc5a68 Fix 3D view format specifiers for all platforms (hopefully). 2021-07-27 21:06:24 -04:00
Wayne Stambaugh
c71ab17892 Fix 3D view format specifiers and remove overly aggressive assertion. 2021-07-27 10:07:23 -04:00
Wayne Stambaugh
728b160719 3D plugin debugging output fixes. 2021-07-24 13:27:35 -04:00
Wayne Stambaugh
4c457b5ed3 More NULL expunging. 2021-07-18 14:31:55 -04:00
Marek Roszko
c794a6ce7a Add pdb install option for msvc 2021-07-14 23:42:45 -04:00
luz paz
f968fc8719 Fix source comment / documentation typos 2021-06-09 19:32:58 +00:00
Marek Roszko
dc28a91e16 Remove wx includes in x3d.h 2021-06-06 09:33:51 -04:00
Marek Roszko
c7345096f8 Use wxFFileInputStream explicitly when loading xml documents
wxFFile (FILE, buffered) is better than wxFile (syscalls)
2021-05-03 19:39:56 -04:00
Ian McInerney
ecd9bf696e Be consistent about using nullptr instead of 0
0 can be too easily overloaded into an int, so ensure we use nullptr
when we mean pointers.
2021-04-22 22:20:34 +01:00
Marek Roszko
56c4c845e8 Enum class WRL1NODES 2021-03-10 19:02:39 -05:00
Marek Roszko
88179ec52d Bump version 2021-03-10 18:56:28 -05:00
Marek Roszko
130d64df48 enum class WRL1_ORDER 2021-03-10 18:54:49 -05:00
Marek Roszko
737a23f7e6 enum class WRL1_BINDING 2021-03-10 18:52:21 -05:00
Marek Roszko
57dbb7def0 enum class WRL2NODES 2021-03-10 18:49:09 -05:00
Seth Hillbrand
01426d914a Fix merge error in stpz import
Don't exit early when loading files.  Also adds a busy cursor as STEP
loading can take a while.
2021-03-02 10:34:28 -08:00
Seth Hillbrand
1d3159c1cb Add support for PKZIP-based stpZ files
FreeCAD uses gzip-based stpZ files but many programs will compress using
the archive format of PKZIP (e.g. WinZIP).  This handles the archive
format, taking the first file from the archive, which by the standard
should be the STEP file

Fixes https://gitlab.com/kicad/code/kicad/issues/5376
2021-02-27 16:44:54 -08:00
Marek Roszko
404eb535be Correct fix to the TranslateToSG empty matindex case 2021-02-02 00:25:51 -05:00
Marek Roszko
22aa9132a3 Replace crash path in vrml1_faceset with pink! 2021-02-01 20:13:49 -05:00
Marek Roszko
7565f60a03 Swap wxFileInputStream/wxFileOutputStream for the buffered kind 2020-12-12 18:52:02 -05:00
Seth Hillbrand
cce11e40a1 Remove errant printf 2020-10-23 12:36:53 -07:00
Seth Hillbrand
75c2d1a0bf Be diligent in our search for color information
Just because we find a label reference does not mean that is where the
color is stored.  We do an exhaustive search through the hierarchy for
the correct color data

Fixes https://gitlab.com/kicad/code/kicad/issues/6107
2020-10-21 15:40:19 -07:00
Seth Hillbrand
4085757aeb Remove beginning/ending spaces in translations
Adding space padding makes translations more difficult by increasing
string counts
2020-10-20 12:08:04 -07:00
Ian McInerney
b59c7e8632 Add stp.gz as a valid compressed step extension in the chooser dialog
Fixes https://gitlab.com/kicad/code/kicad/issues/5429
2020-10-17 23:20:13 +01:00
Seth Hillbrand
b51ca1ab0e Bump OCE Plugin version
We modified how we search for color information.  Changing the version
data will for models to reload instead of keeping the cached data with
(possibly) missing color information
2020-10-14 08:47:49 -07:00
Seth Hillbrand
a2168c6add Seach full model for color information
Assemblies may not have their face information in the top level of the
file.  Search recurses to get the explicit shape in sub assemblies as
well.

Fixes https://gitlab.com/kicad/code/kicad/issues/5163
2020-10-13 13:47:59 -07:00
Mark Roszko
a28a0e14ba Fix conversion warnings 2020-10-05 10:41:14 +00:00
Seth Hillbrand
f1b1e59cf0 Catch error when decompressing
Make sure we catch errors when thrown by zlib

Fixes https://gitlab.com/kicad/code/kicad/issues/5376
2020-08-26 14:19:46 -07:00
Seth Hillbrand
17de78d1dd 3D: fix typo including extension '.'
Fixes https://gitlab.com/kicad/code/kicad/issues/5360
2020-08-25 14:19:27 -07:00
Seth Hillbrand
ccdcdf5071 Deal with case-sensitive extensions
Standards that specify differing case in the extension were designed by
marketing departments and should be rejected on sight.  But here we are.
2020-08-25 12:38:45 -07:00