Set PathParameter default to "None" when not required

medengineer · medengineer · commit 7373fdd35db9 · 2025-01-10T14:35:20.000-08:00
diff --git a/Source/Processors/Parameter/Parameter.cpp b/Source/Processors/Parameter/Parameter.cpp
@@ -1198,7 +1198,9 @@ PathParameter::PathParameter (ParameterOwner* owner,
       isDirectory (isDirectory_),
       isRequired (isRequired_)
 {
-    currentValue = defaultValue;
+    currentValue = "None";
+    if (isRequired)
+        currentValue = defaultValue;
 }
 
 void PathParameter::setNextValue (var newValue_, bool undoable)
@@ -1248,7 +1250,10 @@ bool PathParameter::isValid()
 {
     if (currentValue.toString() == "default")
     {
-        currentValue = defaultValue;
+        if (isRequired)
+            currentValue = defaultValue;
+        else
+            currentValue = "None";
         return true;
     }
     else if (! isDirectory && File (currentValue.toString()).existsAsFile())

Original file line number	Diff line number	Diff line change
`@@ -1198,7 +1198,9 @@ PathParameter::PathParameter (ParameterOwner* owner,`
`1198`	`1198`	`isDirectory (isDirectory_),`
`1199`	`1199`	`isRequired (isRequired_)`
`1200`	`1200`	`{`
`1201`		`- currentValue = defaultValue;`
	`1201`	`+ currentValue = "None";`
	`1202`	`+ if (isRequired)`
	`1203`	`+ currentValue = defaultValue;`
`1202`	`1204`	`}`
`1203`	`1205`
`1204`	`1206`	`void PathParameter::setNextValue (var newValue_, bool undoable)`
`@@ -1248,7 +1250,10 @@ bool PathParameter::isValid()`
`1248`	`1250`	`{`
`1249`	`1251`	`if (currentValue.toString() == "default")`
`1250`	`1252`	`{`
`1251`		`- currentValue = defaultValue;`
	`1253`	`+ if (isRequired)`
	`1254`	`+ currentValue = defaultValue;`
	`1255`	`+ else`
	`1256`	`+ currentValue = "None";`
`1252`	`1257`	`return true;`
`1253`	`1258`	`}`
`1254`	`1259`	`else if (! isDirectory && File (currentValue.toString()).existsAsFile())`