refactor: Size factor configuration and display (#1738)

disorderedmaterials · Apr 8, 2024 · 7040697 · 7040697
1 parent 51d04d4
commit 7040697
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/src/classes/configuration_io.cpp b/src/classes/configuration_io.cpp
@@ -100,7 +100,10 @@ bool Configuration::deserialise(LineParser &parser, const CoreData &coreData, do
      */
     if (parser.getArgsDelim(LineParser::Defaults) != LineParser::Success)
         return false;
-    appliedSizeFactor_ = parser.argd(3);
+    if (parser.argd(3) > 1.0)
+        appliedSizeFactor_ = parser.argd(3);
+    else
+        appliedSizeFactor_ = std::nullopt;
     requestedSizeFactor_ = parser.argd(4);
     auto nonPeriodic = parser.argb(5);
     const auto lengths = parser.arg3d(0) / appliedSizeFactor_.value_or(defaultSizeFactor_);

diff --git a/src/procedure/nodes/sizeFactor.cpp b/src/procedure/nodes/sizeFactor.cpp
@@ -12,13 +12,6 @@ SizeFactorProcedureNode::SizeFactorProcedureNode()
     keywords_.add<NodeValueKeyword>("SizeFactor", "Size factor scaling to apply to configuration", sizeFactor_, this);
 }
 
-/*
- * Identity
- */
-
-// Return whether a name for the node must be provided
-bool SizeFactorProcedureNode::mustBeNamed() const { return true; }
-
 /*
  * Execute
  */

diff --git a/src/procedure/nodes/sizeFactor.h b/src/procedure/nodes/sizeFactor.h
@@ -10,13 +10,6 @@ class SizeFactorProcedureNode : public ProcedureNode
     SizeFactorProcedureNode();
     ~SizeFactorProcedureNode() override = default;
 
-    /*
-     * Identity
-     */
-    public:
-    // Return whether a name for the node must be provided
-    bool mustBeNamed() const override;
-
     /*
      * Node Data
      */