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.
This commit is contained in:
David Carter
226
tests/src/Mod/Material/App/TestMaterialProperties.cpp
Normal file
226
tests/src/Mod/Material/App/TestMaterialProperties.cpp
Normal file
@@ -0,0 +1,226 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
/***************************************************************************
|
||||
* Copyright (c) 2023 David Carter <dcarter@david.carter.ca> *
|
||||
* *
|
||||
* This file is part of FreeCAD. *
|
||||
* *
|
||||
* FreeCAD 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.1 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* FreeCAD 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 FreeCAD. If not, see *
|
||||
* <https://www.gnu.org/licenses/>. *
|
||||
* *
|
||||
**************************************************************************/
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
#include <Mod/Material/App/PreCompiled.h>
|
||||
#ifndef _PreComp_
|
||||
#endif
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
|
||||
#include <App/Application.h>
|
||||
#include <Gui/MetaTypes.h>
|
||||
|
||||
#include <Mod/Material/App/MaterialManager.h>
|
||||
#include <Mod/Material/App/Model.h>
|
||||
#include <Mod/Material/App/ModelManager.h>
|
||||
#include <Mod/Material/App/ModelUuids.h>
|
||||
|
||||
class TestMaterialProperties: public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
static void SetUpTestSuite()
|
||||
{}
|
||||
|
||||
void SetUp() override
|
||||
{
|
||||
// 2D Properties
|
||||
modelProp = Materials::ModelProperty(QString::fromStdString("Density"), // Name
|
||||
QString::fromStdString("2DArray"), // Type
|
||||
QString::fromStdString(""), // Units
|
||||
QString::fromStdString(""), // URL
|
||||
QString::fromStdString("desc")); // Description
|
||||
modelProp1 = Materials::ModelProperty(QString::fromStdString("Temperature"),
|
||||
QString::fromStdString("Quantity"),
|
||||
QString::fromStdString("C"),
|
||||
QString::fromStdString(""),
|
||||
QString::fromStdString("desc1"));
|
||||
modelProp2 = Materials::ModelProperty(
|
||||
QString::fromStdString("Density"),
|
||||
QString::fromStdString("Quantity"),
|
||||
QString::fromStdString("kg/m^3"),
|
||||
QString::fromStdString("https://en.wikipedia.org/wiki/Density"),
|
||||
QString::fromStdString("desc2"));
|
||||
|
||||
modelProp.addColumn(modelProp1);
|
||||
modelProp.addColumn(modelProp2);
|
||||
|
||||
// 3D properties
|
||||
model3DProp = Materials::ModelProperty(
|
||||
QString::fromStdString("StressStrain"), // Name
|
||||
QString::fromStdString("3DArray"), // Type
|
||||
QString::fromStdString(""), // Units
|
||||
QString::fromStdString(""), // URL
|
||||
QString::fromStdString("3 Dimensional array showing stress and strain as a function of "
|
||||
"temperature")); // Description
|
||||
model3DProp1 = Materials::ModelProperty(QString::fromStdString("Temperature"),
|
||||
QString::fromStdString("Quantity"),
|
||||
QString::fromStdString("C"),
|
||||
QString::fromStdString(""),
|
||||
QString::fromStdString("desc1"));
|
||||
model3DProp2 = Materials::ModelProperty(QString::fromStdString("Stress"),
|
||||
QString::fromStdString("Quantity"),
|
||||
QString::fromStdString("MPa"),
|
||||
QString::fromStdString(""),
|
||||
QString::fromStdString("desc2"));
|
||||
model3DProp3 = Materials::ModelProperty(QString::fromStdString("Strain"),
|
||||
QString::fromStdString("Quantity"),
|
||||
QString::fromStdString("MPa"),
|
||||
QString::fromStdString(""),
|
||||
QString::fromStdString("desc3"));
|
||||
|
||||
model3DProp.addColumn(model3DProp1);
|
||||
model3DProp.addColumn(model3DProp2);
|
||||
model3DProp.addColumn(model3DProp3);
|
||||
}
|
||||
|
||||
// void TearDown() override {}
|
||||
|
||||
Materials::ModelProperty modelProp;
|
||||
Materials::ModelProperty modelProp1;
|
||||
Materials::ModelProperty modelProp2;
|
||||
Materials::ModelProperty model3DProp;
|
||||
Materials::ModelProperty model3DProp1;
|
||||
Materials::ModelProperty model3DProp2;
|
||||
Materials::ModelProperty model3DProp3;
|
||||
};
|
||||
|
||||
TEST_F(TestMaterialProperties, TestEmpty)
|
||||
{
|
||||
Materials::MaterialProperty prop;
|
||||
EXPECT_EQ(prop.getType(), Materials::MaterialValue::None);
|
||||
EXPECT_TRUE(prop.isNull());
|
||||
auto variant = prop.getValue();
|
||||
EXPECT_TRUE(variant.isNull());
|
||||
EXPECT_FALSE(variant.canConvert<QString>());
|
||||
EXPECT_TRUE(variant.toString().isNull());
|
||||
EXPECT_TRUE(variant.toString().isEmpty());
|
||||
EXPECT_EQ(variant.toString().size(), 0);
|
||||
}
|
||||
|
||||
TEST_F(TestMaterialProperties, TestSingle)
|
||||
{
|
||||
Materials::MaterialProperty prop(modelProp1);
|
||||
EXPECT_EQ(prop.getType(), Materials::MaterialValue::Quantity);
|
||||
EXPECT_TRUE(prop.isNull());
|
||||
auto variant = prop.getValue();
|
||||
EXPECT_TRUE(variant.canConvert<Base::Quantity>());
|
||||
EXPECT_FALSE(variant.value<Base::Quantity>().isValid());
|
||||
EXPECT_FALSE(variant.canConvert<QString>());
|
||||
EXPECT_TRUE(variant.toString().isNull());
|
||||
EXPECT_TRUE(variant.toString().isEmpty());
|
||||
EXPECT_EQ(variant.toString().size(), 0);
|
||||
}
|
||||
|
||||
void check2DArray(Materials::MaterialProperty& prop)
|
||||
{
|
||||
EXPECT_EQ(prop.getType(), Materials::MaterialValue::Array2D);
|
||||
EXPECT_TRUE(prop.isNull());
|
||||
auto array = std::static_pointer_cast<Materials::Material2DArray>(prop.getMaterialValue());
|
||||
EXPECT_FALSE(array->defaultSet());
|
||||
EXPECT_EQ(array->rows(), 0);
|
||||
auto variant = prop.getValue(); // Throw an error?
|
||||
// Getting a default value is not yet defined or implemented
|
||||
// EXPECT_TRUE(variant.canConvert<Base::Quantity>());
|
||||
// EXPECT_TRUE(variant.isNull());
|
||||
// EXPECT_FALSE(variant.value<Base::Quantity>().isValid()); -- the variant is null
|
||||
EXPECT_FALSE(variant.canConvert<QString>());
|
||||
EXPECT_TRUE(variant.toString().isNull());
|
||||
EXPECT_TRUE(variant.toString().isEmpty());
|
||||
EXPECT_EQ(variant.toString().size(), 0);
|
||||
|
||||
// Check the columns
|
||||
EXPECT_EQ(prop.columns(), 2);
|
||||
}
|
||||
|
||||
TEST_F(TestMaterialProperties, Test2DArray)
|
||||
{
|
||||
Materials::MaterialProperty prop(modelProp);
|
||||
check2DArray(prop);
|
||||
}
|
||||
|
||||
TEST_F(TestMaterialProperties, Test2DArrayCopy)
|
||||
{
|
||||
Materials::MaterialProperty propBase(modelProp);
|
||||
Materials::MaterialProperty prop(propBase);
|
||||
check2DArray(prop);
|
||||
}
|
||||
|
||||
TEST_F(TestMaterialProperties, Test2DArrayAssignment)
|
||||
{
|
||||
Materials::MaterialProperty propBase(modelProp);
|
||||
Materials::MaterialProperty prop;
|
||||
|
||||
prop = propBase;
|
||||
check2DArray(prop);
|
||||
}
|
||||
|
||||
void check3DArray(Materials::MaterialProperty& prop)
|
||||
{
|
||||
EXPECT_EQ(prop.getType(), Materials::MaterialValue::Array3D);
|
||||
EXPECT_TRUE(prop.isNull());
|
||||
auto array = std::static_pointer_cast<Materials::Material3DArray>(prop.getMaterialValue());
|
||||
EXPECT_FALSE(array->defaultSet());
|
||||
EXPECT_EQ(array->depth(), 0);
|
||||
auto variant = prop.getValue(); // Throw an error?
|
||||
// Getting a default value is not yet defined or implemented
|
||||
// EXPECT_TRUE(variant.canConvert<Base::Quantity>());
|
||||
// EXPECT_TRUE(variant.isNull());
|
||||
// EXPECT_FALSE(variant.value<Base::Quantity>().isValid()); -- the variant is null
|
||||
EXPECT_FALSE(variant.canConvert<QString>());
|
||||
EXPECT_TRUE(variant.toString().isNull());
|
||||
EXPECT_TRUE(variant.toString().isEmpty());
|
||||
EXPECT_EQ(variant.toString().size(), 0);
|
||||
|
||||
// Check the columns
|
||||
EXPECT_EQ(prop.columns(), 3);
|
||||
}
|
||||
|
||||
TEST_F(TestMaterialProperties, Test3DArray)
|
||||
{
|
||||
Materials::MaterialProperty prop(model3DProp);
|
||||
check3DArray(prop);
|
||||
}
|
||||
|
||||
TEST_F(TestMaterialProperties, Test3DArrayCopy)
|
||||
{
|
||||
Materials::MaterialProperty propBase(model3DProp);
|
||||
Materials::MaterialProperty prop(propBase);
|
||||
check3DArray(prop);
|
||||
}
|
||||
|
||||
TEST_F(TestMaterialProperties, Test3DArrayAssignment)
|
||||
{
|
||||
Materials::MaterialProperty propBase(model3DProp);
|
||||
Materials::MaterialProperty prop;
|
||||
|
||||
prop = propBase;
|
||||
check3DArray(prop);
|
||||
}
|
||||
|
||||
// clang-format off
|
||||
|
||||
// clang-format on
|
||||
Reference in New Issue
Block a user