a6.8.1

Mararsh · May 10, 2024 · 36730cd · 36730cd
1 parent 9f3b7eb
commit 36730cd
Show file tree

Hide file tree

Showing 36 changed files with 421 additions and 281 deletions.
diff --git a/...mara/mybox/fxml/ExpressionCalculator.java → ...box/calculation/ExpressionCalculator.java b/...mara/mybox/fxml/ExpressionCalculator.java → ...box/calculation/ExpressionCalculator.java
@@ -1,4 +1,4 @@
-package mara.mybox.fxml;
+package mara.mybox.calculation;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -76,18 +76,23 @@ private boolean executeScript() {
         }
     }
 
-    public String calculate(String script) {
+    public String calculate(String script, Map<String, Object> variables) {
         reset();
         this.expression = script;
+        if (variables != null) {
+            for (String v : variables.keySet()) {
+                variableValues.put(v, variables.get(v));
+            }
+        }
         if (executeScript()) {
             return result;
         } else {
             return null;
         }
     }
 
-    public boolean condition(String script) {
-        calculate(script);
+    public boolean condition(String script, Map<String, Object> variables) {
+        calculate(script, variables);
         return "true".equals(result);
     }
 
@@ -210,7 +215,8 @@ public boolean validateExpression(Data2D data2D, String script, boolean allPages
             }
             List<String> row = new ArrayList<>();
             for (int i = 0; i < data2D.columnsNumber(); i++) {
-                row.add("0");
+                Data2DColumn column = data2D.columns.get(i);
+                row.add(column.makeDefaultValue());
             }
             String filledScript = replaceDummyStatistic(data2D, script);
             if (allPages) {

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseController_Attributes.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseController_Attributes.java
@@ -123,8 +123,6 @@ public static enum SaveAsType {
     protected ComboBox<String> dpiSelector;
     @FXML
     protected TabPane tabPane;
-    @FXML
-    protected CheckBox errorContinueCheck;
 
     public void setFileType() {
         setFileType(FileType.All);