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

Add property models for FEM

Browse Source
This commit is contained in:
David Carter
2024-03-04 00:50:32 -05:00
parent 6db79f02c4
commit de168aae27
23 changed files with 984 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,17 +49,20 @@ protected:
{
// 2D Properties
modelProp = Materials::ModelProperty(QString::fromStdString("Density"), // Name
QString::fromStdString("D"), // Header
QString::fromStdString("2DArray"), // Type
QString::fromStdString(""), // Units
QString::fromStdString(""), // URL
QString::fromStdString("desc")); // Description
modelProp1 = Materials::ModelProperty(QString::fromStdString("Temperature"),
QString::fromStdString("T"),
QString::fromStdString("Quantity"),
QString::fromStdString("C"),
QString::fromStdString(""),
QString::fromStdString("desc1"));
modelProp2 = Materials::ModelProperty(
QString::fromStdString("Density"),
QString::fromStdString("D"),
QString::fromStdString("Quantity"),
QString::fromStdString("kg/m^3"),
QString::fromStdString("https://en.wikipedia.org/wiki/Density"),
@@ -70,23 +73,27 @@ protected:
// 3D properties
model3DProp = Materials::ModelProperty(
QString::fromStdString("StressStrain"), // Name
QString::fromStdString("3DArray"), // Type
QString::fromStdString(""), // Units
QString::fromStdString(""), // URL
QString::fromStdString("StressStrain"), // Name
QString::fromStdString("Stress / Strain"), // Header
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("T"),
QString::fromStdString("Quantity"),
QString::fromStdString("C"),
QString::fromStdString(""),
QString::fromStdString("desc1"));
model3DProp2 = Materials::ModelProperty(QString::fromStdString("Stress"),
QString::fromStdString("Stress"),
QString::fromStdString("Quantity"),
QString::fromStdString("MPa"),
QString::fromStdString(""),
QString::fromStdString("desc2"));
model3DProp3 = Materials::ModelProperty(QString::fromStdString("Strain"),
QString::fromStdString("Strain"),
QString::fromStdString("Quantity"),
QString::fromStdString("MPa"),
QString::fromStdString(""),

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

@@ -64,12 +64,14 @@ TEST_F(TestModelProperties, TestBasic)
QString::fromStdString("2"),
QString::fromStdString("3"),
QString::fromStdString("4"),
QString::fromStdString("5"));
QString::fromStdString("5"),
QString::fromStdString("6"));
EXPECT_EQ(prop.getName(), QString::fromStdString("1"));
EXPECT_EQ(prop.getPropertyType(), QString::fromStdString("2"));
EXPECT_EQ(prop.getUnits(), QString::fromStdString("3"));
EXPECT_EQ(prop.getURL(), QString::fromStdString("4"));
EXPECT_EQ(prop.getDescription(), QString::fromStdString("5"));
EXPECT_EQ(prop.getDisplayName(), QString::fromStdString("2"));
EXPECT_EQ(prop.getPropertyType(), QString::fromStdString("3"));
EXPECT_EQ(prop.getUnits(), QString::fromStdString("4"));
EXPECT_EQ(prop.getURL(), QString::fromStdString("5"));
EXPECT_EQ(prop.getDescription(), QString::fromStdString("6"));
EXPECT_TRUE(prop.getInheritance().isNull());
EXPECT_FALSE(prop.isInherited());
EXPECT_EQ(prop.columns(), 0);
@@ -85,17 +87,20 @@ TEST_F(TestModelProperties, TestAddColumns)
QString::fromStdString("2"),
QString::fromStdString("3"),
QString::fromStdString("4"),
QString::fromStdString("5"));
QString::fromStdString("5"),
QString::fromStdString("6"));
auto prop1 = Materials::ModelProperty(QString::fromStdString("10"),
QString::fromStdString("9"),
QString::fromStdString("8"),
QString::fromStdString("7"),
QString::fromStdString("6"));
QString::fromStdString("6"),
QString::fromStdString("5"));
auto prop2 = Materials::ModelProperty(QString::fromStdString("a"),
QString::fromStdString("b"),
QString::fromStdString("c"),
QString::fromStdString("d"),
QString::fromStdString("e"));
QString::fromStdString("e"),
QString::fromStdString("f"));
EXPECT_EQ(prop.columns(), 0);
prop.addColumn(prop1);
@@ -106,20 +111,22 @@ TEST_F(TestModelProperties, TestAddColumns)
auto columns = prop.getColumns();
auto entry1 = columns.at(0);
EXPECT_EQ(entry1.getName(), QString::fromStdString("10"));
EXPECT_EQ(entry1.getPropertyType(), QString::fromStdString("9"));
EXPECT_EQ(entry1.getUnits(), QString::fromStdString("8"));
EXPECT_EQ(entry1.getURL(), QString::fromStdString("7"));
EXPECT_EQ(entry1.getDescription(), QString::fromStdString("6"));
EXPECT_EQ(entry1.getDisplayName(), QString::fromStdString("9"));
EXPECT_EQ(entry1.getPropertyType(), QString::fromStdString("8"));
EXPECT_EQ(entry1.getUnits(), QString::fromStdString("7"));
EXPECT_EQ(entry1.getURL(), QString::fromStdString("6"));
EXPECT_EQ(entry1.getDescription(), QString::fromStdString("5"));
EXPECT_TRUE(entry1.getInheritance().isNull());
EXPECT_FALSE(entry1.isInherited());
EXPECT_EQ(entry1.columns(), 0);
auto entry2 = columns.at(1);
EXPECT_EQ(entry2.getName(), QString::fromStdString("a"));
EXPECT_EQ(entry2.getPropertyType(), QString::fromStdString("b"));
EXPECT_EQ(entry2.getUnits(), QString::fromStdString("c"));
EXPECT_EQ(entry2.getURL(), QString::fromStdString("d"));
EXPECT_EQ(entry2.getDescription(), QString::fromStdString("e"));
EXPECT_EQ(entry2.getDisplayName(), QString::fromStdString("b"));
EXPECT_EQ(entry2.getPropertyType(), QString::fromStdString("c"));
EXPECT_EQ(entry2.getUnits(), QString::fromStdString("d"));
EXPECT_EQ(entry2.getURL(), QString::fromStdString("e"));
EXPECT_EQ(entry2.getDescription(), QString::fromStdString("f"));
EXPECT_TRUE(entry2.getInheritance().isNull());
EXPECT_FALSE(entry2.isInherited());
EXPECT_EQ(entry2.columns(), 0);