From 02a029b4c2501a6f8aed433259d200abec15e1d0 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 14 Jul 2024 13:58:33 +0000 Subject: [PATCH] Materials: Trim trailing newlines --- src/Mod/Material/Gui/MaterialDelegate.cpp | 2 +- src/Mod/Material/Gui/MaterialTreeWidget.cpp | 2 +- src/Mod/Material/materialtests/TestMaterialFilter.py | 2 +- src/Mod/Material/materialtools/Tools/ConvertFCMat.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mod/Material/Gui/MaterialDelegate.cpp b/src/Mod/Material/Gui/MaterialDelegate.cpp index b3e2788001..ffd5a979c7 100644 --- a/src/Mod/Material/Gui/MaterialDelegate.cpp +++ b/src/Mod/Material/Gui/MaterialDelegate.cpp @@ -66,7 +66,7 @@ bool MaterialDelegate::newRow(const QAbstractItemModel* model, const QModelIndex { Q_UNUSED(model) Q_UNUSED(index) - + // New rows are for lists and arrays return false; } diff --git a/src/Mod/Material/Gui/MaterialTreeWidget.cpp b/src/Mod/Material/Gui/MaterialTreeWidget.cpp index f4f056ba69..b1e1c5ddeb 100644 --- a/src/Mod/Material/Gui/MaterialTreeWidget.cpp +++ b/src/Mod/Material/Gui/MaterialTreeWidget.cpp @@ -361,7 +361,7 @@ void MaterialTreeWidget::setActiveFilter(const QString& name) // Save the library/folder expansion state saveMaterialTree(); - + updateMaterialTree(); return; } diff --git a/src/Mod/Material/materialtests/TestMaterialFilter.py b/src/Mod/Material/materialtests/TestMaterialFilter.py index 0e9789cd46..7005ed867e 100644 --- a/src/Mod/Material/materialtests/TestMaterialFilter.py +++ b/src/Mod/Material/materialtests/TestMaterialFilter.py @@ -102,7 +102,7 @@ class MaterialFilterTestCases(unittest.TestCase): self.assertIsNotNone(material) self.assertEqual(material.Name, "TestBrassAppearance") self.assertEqual(material.UUID, UUIDBrassAppearance) - + # Create an empty filter filter = Materials.MaterialFilter() self.assertEqual(len(self.MaterialManager.MaterialLibraries), 1) diff --git a/src/Mod/Material/materialtools/Tools/ConvertFCMat.py b/src/Mod/Material/materialtools/Tools/ConvertFCMat.py index 26e85f46ba..9d07fe2fd9 100644 --- a/src/Mod/Material/materialtools/Tools/ConvertFCMat.py +++ b/src/Mod/Material/materialtools/Tools/ConvertFCMat.py @@ -171,7 +171,7 @@ def yamMechanical(card): useDensity = True elif param in ["BulkModulus", "PoissonRatio", "ShearModulus", "YoungsModulus"]: useIso = True - elif param in ["AngleOfFriction", "CompressiveStrength", "FractureToughness", + elif param in ["AngleOfFriction", "CompressiveStrength", "FractureToughness", "UltimateStrain", "UltimateTensileStrength", "YieldStrength", "Stiffness", "Hardness"]: useLinearElastic = True @@ -191,7 +191,7 @@ def yamFluid(card): for param in card: if param not in ["Density"]: return yamSection(card, 'Fluid', '1ae66d8c-1ba1-4211-ad12-b9917573b202') - + return yamSection(card, 'Density', '454661e5-265b-4320-8e6f-fcf6223ac3af') def yamThermal(card):