kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Material: Material editor enhancements (#11764)

Browse Source 
Continues the work of the material subsystem improvements.

Add support for embedded SVG files. These are not the same
as image files so need to be handled differently.

Add the ability to filter materials in the editor when called from
code. This allows programs to select objects supporting specific
models, complete models, older models, etc.

Updated tests, and refactored code.

New models and materials supporting patterns such as used by the
TechDraw workbench.

fixes #11686 - checks for the presense of a model property before
assinging a value. This can happen when a required model definition is
not available.

---------

Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org>
This commit is contained in:
David Carter
2024-01-06 19:11:53 -05:00
committed by GitHub
parent 08612d4489
commit d9017bcca3
87 changed files with 3894 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/src/Mod/Material/App/TestMaterialCards.cpp
View File

@@ -32,6 +32,7 @@
#include <App/Application.h>
#include <Base/Quantity.h>
#include <Gui/MetaTypes.h>
#include <src/App/InitApplication.h>
#include <Mod/Material/App/MaterialLibrary.h>
#include <Mod/Material/App/MaterialManager.h>
@@ -46,10 +47,7 @@ class TestMaterialCards : public ::testing::Test {
protected:
static void SetUpTestSuite() {
if (App::Application::GetARGC() == 0) {
constexpr int argc = 1;
std::array<char*, argc> argv {"FreeCAD"};
App::Application::Config()["ExeName"] = "FreeCAD";
App::Application::init(argc, argv.data());
tests::initApplication();
}
}
@@ -78,8 +76,8 @@ protected:
TEST_F(TestMaterialCards, TestCopy)
{
EXPECT_NE(_modelManager, nullptr);
EXPECT_TRUE(_library);
ASSERT_NE(_modelManager, nullptr);
ASSERT_TRUE(_library);
// FAIL() << "Test library " << _library->getDirectoryPath().toStdString() << "\n";
auto testMaterial = _materialManager->getMaterial(_testMaterialUUID);
@@ -181,25 +179,25 @@ TEST_F(TestMaterialCards, TestCopy)
TEST_F(TestMaterialCards, TestColumns)
{
EXPECT_NE(_modelManager, nullptr);
EXPECT_TRUE(_library);
ASSERT_NE(_modelManager, nullptr);
ASSERT_TRUE(_library);
auto testMaterial = _materialManager->getMaterial(_testMaterialUUID);
EXPECT_TRUE(testMaterial->hasPhysicalProperty(QString::fromStdString("TestArray2D")));
auto array2d = testMaterial->getPhysicalProperty(QString::fromStdString("TestArray2D"))->getMaterialValue();
EXPECT_TRUE(array2d);
EXPECT_EQ(static_cast<Materials::Material2DArray &>(*array2d).columns(), 2);
EXPECT_EQ(dynamic_cast<Materials::Material2DArray &>(*array2d).columns(), 2);
EXPECT_TRUE(testMaterial->hasPhysicalProperty(QString::fromStdString("TestArray2D3Column")));
auto array2d3Column = testMaterial->getPhysicalProperty(QString::fromStdString("TestArray2D3Column"))->getMaterialValue();
EXPECT_TRUE(array2d3Column);
EXPECT_EQ(static_cast<Materials::Material2DArray &>(*array2d3Column).columns(), 3);
EXPECT_EQ(dynamic_cast<Materials::Material2DArray &>(*array2d3Column).columns(), 3);
EXPECT_TRUE(testMaterial->hasPhysicalProperty(QString::fromStdString("TestArray3D")));
auto array3d = testMaterial->getPhysicalProperty(QString::fromStdString("TestArray3D"))->getMaterialValue();
EXPECT_TRUE(array3d);
EXPECT_EQ(static_cast<Materials::Material3DArray &>(*array3d).columns(), 2);
EXPECT_EQ(dynamic_cast<Materials::Material3DArray &>(*array3d).columns(), 2);
}
// clang-format on

15
tests/src/Mod/Material/App/TestMaterialValue.cpp
View File

@@ -42,22 +42,7 @@
class TestMaterialValue : public ::testing::Test {
protected:
static void SetUpTestSuite() {
// if (App::Application::GetARGC() == 0) {
// constexpr int argc = 1;
// std::array<char*, argc> argv {"FreeCAD"};
// App::Application::Config()["ExeName"] = "FreeCAD";
// App::Application::init(argc, argv.data());
// }
}
// void SetUp() override {
// _modelManager = new Materials::ModelManager();
// _materialManager = new Materials::MaterialManager();
// }
// void TearDown() override {}
// Materials::ModelManager* _modelManager;
// Materials::MaterialManager* _materialManager;
};
TEST_F(TestMaterialValue, TestNoneType)

24
tests/src/Mod/Material/App/TestMaterials.cpp
View File

@@ -32,6 +32,7 @@
#include <App/Application.h>
#include <Base/Quantity.h>
#include <Gui/MetaTypes.h>
#include <src/App/InitApplication.h>
#include <Mod/Material/App/MaterialManager.h>
#include <Mod/Material/App/Model.h>
@@ -48,10 +49,7 @@ class TestMaterial : public ::testing::Test {
protected:
static void SetUpTestSuite() {
if (App::Application::GetARGC() == 0) {
constexpr int argc = 1;
std::array<char*, argc> argv {"FreeCAD"};
App::Application::Config()["ExeName"] = "FreeCAD";
App::Application::init(argc, argv.data());
tests::initApplication();
}
}
@@ -67,7 +65,7 @@ class TestMaterial : public ::testing::Test {
TEST_F(TestMaterial, TestInstallation)
{
EXPECT_NE(_modelManager, nullptr);
ASSERT_NE(_modelManager, nullptr);
// We should have loaded at least the system library
auto libraries = _materialManager->getMaterialLibraries();
@@ -80,6 +78,8 @@ TEST_F(TestMaterial, TestInstallation)
TEST_F(TestMaterial, TestMaterialsWithModel)
{
ASSERT_NE(_materialManager, nullptr);
auto materials = _materialManager->materialsWithModel(
QString::fromStdString("f6f9e48c-b116-4e82-ad7f-3659a9219c50")); // IsotropicLinearElastic
EXPECT_GT(materials->size(), 0);
@@ -93,14 +93,16 @@ TEST_F(TestMaterial, TestMaterialsWithModel)
// All LinearElastic models should be in IsotropicLinearElastic since it is inherited
EXPECT_LE(materialsLinearElastic->size(), materials->size());
for (auto itp = materialsLinearElastic->begin(); itp != materialsLinearElastic->end(); itp++) {
auto mat = itp->first;
for (auto itp : *materialsLinearElastic) {
auto mat = itp.first;
EXPECT_NO_THROW(materials->at(mat));
}
}
TEST_F(TestMaterial, TestMaterialByPath)
{
ASSERT_NE(_materialManager, nullptr);
auto steel = _materialManager->getMaterialByPath(
QString::fromStdString("Standard/Metal/Steel/CalculiX-Steel.FCMat"),
QString::fromStdString("System"));
@@ -223,6 +225,8 @@ QString parseQuantity(const char *string)
TEST_F(TestMaterial, TestCalculiXSteel)
{
ASSERT_NE(_materialManager, nullptr);
auto steel = _materialManager->getMaterial(QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d"));
EXPECT_EQ(steel->getName(), QString::fromStdString("CalculiX-Steel"));
EXPECT_EQ(steel->getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d"));
@@ -356,17 +360,17 @@ TEST_F(TestMaterial, TestColumns)
EXPECT_TRUE(testMaterial.hasPhysicalProperty(QString::fromStdString("TestArray2D")));
auto array2d = testMaterial.getPhysicalProperty(QString::fromStdString("TestArray2D"))->getMaterialValue();
EXPECT_TRUE(array2d);
EXPECT_EQ(static_cast<Materials::Material2DArray &>(*array2d).columns(), 2);
EXPECT_EQ(dynamic_cast<Materials::Material2DArray &>(*array2d).columns(), 2);
EXPECT_TRUE(testMaterial.hasPhysicalProperty(QString::fromStdString("TestArray2D3Column")));
auto array2d3Column = testMaterial.getPhysicalProperty(QString::fromStdString("TestArray2D3Column"))->getMaterialValue();
EXPECT_TRUE(array2d3Column);
EXPECT_EQ(static_cast<Materials::Material2DArray &>(*array2d3Column).columns(), 3);
EXPECT_EQ(dynamic_cast<Materials::Material2DArray &>(*array2d3Column).columns(), 3);
EXPECT_TRUE(testMaterial.hasPhysicalProperty(QString::fromStdString("TestArray3D")));
auto array3d = testMaterial.getPhysicalProperty(QString::fromStdString("TestArray3D"))->getMaterialValue();
EXPECT_TRUE(array3d);
EXPECT_EQ(static_cast<Materials::Material3DArray &>(*array3d).columns(), 2);
EXPECT_EQ(dynamic_cast<Materials::Material3DArray &>(*array3d).columns(), 2);
}
// clang-format on

12
tests/src/Mod/Material/App/TestModel.cpp
View File

@@ -29,6 +29,7 @@
#include <QString>
#include <App/Application.h>
#include <src/App/InitApplication.h>
#include <Mod/Material/App/MaterialManager.h>
#include <Mod/Material/App/Model.h>
@@ -40,10 +41,7 @@ class TestModel : public ::testing::Test {
protected:
static void SetUpTestSuite() {
if (App::Application::GetARGC() == 0) {
constexpr int argc = 1;
std::array<char*, argc> argv {"FreeCAD"};
App::Application::Config()["ExeName"] = "FreeCAD";
App::Application::init(argc, argv.data());
tests::initApplication();
}
}
@@ -75,7 +73,7 @@ TEST_F(TestModel, TestResources)
TEST_F(TestModel, TestInstallation)
{
EXPECT_NE(_modelManager, nullptr);
ASSERT_NE(_modelManager, nullptr);
// We should have loaded at least the system library
auto libraries = _modelManager->getModelLibraries();
@@ -88,7 +86,7 @@ TEST_F(TestModel, TestInstallation)
TEST_F(TestModel, TestModelLoad)
{
EXPECT_NE(_modelManager, nullptr);
ASSERT_NE(_modelManager, nullptr);
auto density = _modelManager->getModel(QString::fromStdString("454661e5-265b-4320-8e6f-fcf6223ac3af"));
EXPECT_EQ(density->getName(), QString::fromStdString("Density"));
@@ -100,6 +98,8 @@ TEST_F(TestModel, TestModelLoad)
TEST_F(TestModel, TestModelByPath)
{
ASSERT_NE(_modelManager, nullptr);
auto linearElastic = _modelManager->getModelByPath(
QString::fromStdString("Mechanical/LinearElastic.yml"),
QString::fromStdString("System"));

15
tests/src/Mod/Material/App/TestModelProperties.cpp
View File

@@ -42,22 +42,7 @@
class TestModelProperties : public ::testing::Test {
protected:
static void SetUpTestSuite() {
// if (App::Application::GetARGC() == 0) {
// constexpr int argc = 1;
// std::array<char*, argc> argv {"FreeCAD"};
// App::Application::Config()["ExeName"] = "FreeCAD";
// App::Application::init(argc, argv.data());
// }
}
// void SetUp() override {
// _modelManager = new Materials::ModelManager();
// _materialManager = new Materials::MaterialManager();
// }
// void TearDown() override {}
// Materials::ModelManager* _modelManager;
// Materials::MaterialManager* _materialManager;
};
TEST_F(TestModelProperties, TestEmpty)