Commit Graph

24 Commits

Author SHA1 Message Date
Chris Hennes
fa65438556 Core: Enable compiling with MSVC /permissive- (#11014)
* Base: Fixes for MSVC permissive-

* App: Fixes for MSVC permissive-

* Gui: Fixes for MSVC permissive-

* Main: Fixes for MSVC permissive-

* Fem: Fixes for MSVC permissive-

* Material: Fixes for MSVC permissive-

* Part: Fixes for MSVC permissive-

* Mesh: Fixes for MSVC permissive-

* Points: Fixes for MSVC permissive-

* Robot: Fixes for MSVC permissive-

* TechDraw: Fixes for MSVC permissive-

* Path: Fixes for MSVC permissive-

* Core; Changes per review comments

* TD: Revision from wandererfan

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-11-27 17:37:29 +01:00
wmayer
b9899b2dd8 Material: add QRegularExpression to PCH 2023-11-27 00:34:43 +01:00
wmayer
ab8be62f2f Material: fix Qt6 build failure and minor optimizations 2023-11-22 01:48:07 +01:00
wmayer
de7c598b33 MSVC: fix warnings about unused variable 2023-11-21 23:10:03 +01:00
David Carter
0a094d4872 Material: Continued Material enahncements
Continues the work of the material subsystem improvements.

Several important items are included in this merge. In terms of new
capabilities, this merge adds List and MultiLineString as valid
property types, complete with editing dialogs. This will help with
backwards compatibility for external workbenches, such as Render.

Stability has been a big focus. New unit tests help to verify features
work as expected. Bugs have been fixed and crashes avoided.

Material cards have had a renaming to their tree structure. For
example, 'StandardMeterials' is redundant, so this was renamed to
'Standard'. The cards themselves are more compliant fully passing the
yamllint tests.

More soon.
2023-11-20 12:19:29 -06:00
wmayer
2645242bc7 Material: fix Python bindings
* fix reference counting of Python objects
* fix crashes in several methods
2023-11-03 16:41:11 +01:00
wmayer
6eb95ca73c Material: fix compiler warning with Qt6
QVariant::Type is deprecated since Qt 6.0 and shouldn't be used in new code
2023-11-03 16:41:11 +01:00
wmayer
b55aca0501 Material: fix compiler warnings
* unused parameter 'parent' [-Wunused-parameter]
* reference cannot be bound to dereferenced null pointer in well-defined C++ code; comparison may be assumed to always evaluate to false [-Wtautological-undefined-compare]
2023-11-03 16:41:11 +01:00
wmayer
d48ae99424 Material: fix 'explicitly defaulted copy constructor is implicitly deleted [-Wdefaulted-function-deleted]' 2023-11-03 16:41:11 +01:00
wmayer
015c84066d Material: single-argument constructors must be marked as explicit 2023-11-03 16:41:11 +01:00
wmayer
d8d6783152 Material: fix diagnostic errors with the clang code model 2023-11-03 16:41:11 +01:00
wmayer
2e017ac45a Material: remove several unreferenced variables 2023-11-03 16:41:11 +01:00
wmayer
7173463ae6 Material: QMetaType::type(const char*) is deprecatred and shouldn't be used in new code
And it looks like that QMetaType::type("Base::Quantity") neither works with Qt5 nor with Qt6 because it returns 0 as id that means the type is unknown.
2023-11-03 16:41:11 +01:00
wmayer
d99658b3da Material: fix build failure with Qt6
setCodec() has been removed from QTextStream
2023-11-03 16:41:11 +01:00
wmayer
54c4ee4b78 Material: fix -Winconsistent-missing-override 2023-11-03 16:41:11 +01:00
David Carter
58bacb6b40 Material: Material editor enhancements
Continues the work of the material subsystem improvements.

This merge covers the continued development of the material editor. The
primary improvements are in the handling of 2D and 3D array properties.
These properties are now fully editable, and can be saved and restored.

The cards now separate the author and license. These were previously
saved as a single item. Future support will be provided for standard
open source licenses.

Saving operations validate the cards to ensure UUIDs of materials are
considered. Warnings are given when a save could potentially impact the
models, such as saving over a material instead of creating a new
instance.

The editor is still not complete. There are a number of functional
elements, such as drag/drop operations, folder creation, and deletion
operations that need to be added to the main tree. State needs to be
saved and restored to improve the user experience. The appearance
preview also needs significant work. This will be handled in a future
PR.
2023-10-24 12:36:36 -04:00
wmayer
a6ff03d54b Material: remove several unreferenced variables 2023-10-11 12:04:26 +02:00
wmayer
367e0b756e Material: QMetaType::type(const char*) is deprecatred and shouldn't be used in new code 2023-09-29 11:05:07 +02:00
wmayer
e3306cc11e Material: fix build failure with Qt6 2023-09-29 10:09:39 +02:00
wmayer
e6e8c64cba Material: include some more required header files
as otherwise the parser of the clang code model raises a lot of error messages
2023-09-28 15:33:03 -05:00
marioalexis
2494411147 Material: Include needed header file 2023-09-28 14:55:55 +02:00
wmayer
0d7880a902 Mat: fix several compiler warnings:
* -Winconsistent-missing-override
* -Wtautological-undefined-compare
2023-09-27 21:38:56 -05:00
David Carter
442bca834e Material: Material handling enhancements
Rework of the material handling system.

This first part concntrates on a rework of the material cards.
Rather than use a fixed list of possible properties, properties can
be defined separately in their own files and mixed to provide a
complete list of possible properties. Properties can be inherited.

The cards then provide values for the properties. These can also
be inherited allowing for small changes in cards as required.

The new property definitions are more extensive than previously.
2 and 3 dimensional arrays of properties can be defined. Values
are obtained by calling an API instead of reading from a dictionary.

For compatibility, a Python dictionary of values can be obtained
similar to how it was done previously, but this is considered a
deprecated API and won't support the newer advanced features.

The editor is completely reworked. It will be able to edit older format
material cards, but can only save them in the new format.

For testing during the development phase, a system preference can
specifiy wether the old or new material editors are to be used. This
option will be removed before release.
2023-09-25 11:04:15 -04:00
David Carter
6624fa3775 Material: Material handling enhancements
Rework of the material handling system.

This first part concntrates on a rework of the material cards.
Rather than use a fixed list of possible properties, properties can
be defined separately in their own files and mixed to provide a
complete list of possible properties. Properties can be inherited.

The cards then provide values for the properties. These can also
be inherited allowing for small changes in cards as required.

The new property definitions are more extensive than previously.
2 and 3 dimensional arrays of properties can be defined. Values
are obtained by calling an API instead of reading from a dictionary.

For compatibility, a Python dictionary of values can be obtained
similar to how it was done previously, but this is considered a
deprecated API and won't support the newer advanced features.

The editor is completely reworked. It will be able to edit older format
material cards, but can only save them in the new format.

For testing during the development phase, a system preference can
specifiy wether the old or new material editors are to be used. This
option will be removed before release.
2023-09-25 11:04:01 -04:00