added macro to read Optional Args

Unidata · Nov 14, 2024 · 383032b · 383032b
1 parent 03e5ceb
commit 383032b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/ucar/unidata/idv/ui/ImageGenerator.java b/src/ucar/unidata/idv/ui/ImageGenerator.java
@@ -3984,7 +3984,15 @@ private String applyMacros(String s, Hashtable props, boolean doTime) {
         s = StringUtil.applyMacros(s, getStateManager().getProperties(),
                                    false);
         if (s.indexOf("${") >= 0) {
-            throw new BadIslException("Undefined macro in: " + s);
+            Hashtable optionArgs = getIdv().getArgsManager().getOptionalArgs();
+            if(optionArgs.size() > 0){
+                s = StringUtil.applyMacros(s, optionArgs,
+                        false);
+                if(s.indexOf("${") >= 0) {
+                    throw new BadIslException("Undefined macro in: " + s);
+                }
+            } else
+                throw new BadIslException("Undefined macro in: " + s);
         }
 
         if (s.startsWith("jython:")) {