a6.8.1

Mararsh · May 10, 2024 · 0b5b4cf · 0b5b4cf
1 parent 36730cd
commit 0b5b4cf
Show file tree

Hide file tree

Showing 9 changed files with 186 additions and 459 deletions.
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlData2DRowExpression.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlData2DRowExpression.java
@@ -8,11 +8,11 @@
 import javafx.event.Event;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
+import mara.mybox.calculation.ExpressionCalculator;
 import mara.mybox.data2d.Data2D;
 import mara.mybox.db.data.Data2DColumn;
 import mara.mybox.db.table.TableStringValues;
 import mara.mybox.dev.MyBoxLog;
-import mara.mybox.calculation.ExpressionCalculator;
 import mara.mybox.fxml.HelpTools;
 import mara.mybox.fxml.PopTools;
 import static mara.mybox.value.Languages.message;
@@ -103,18 +103,10 @@ public void setPlaceholders() {
         }
     }
 
+    @FXML
     @Override
-    protected void moreExampleButtons(MenuController controller) {
-        try {
-            if (data2D == null || !data2D.isValidDefinition()) {
-                return;
-            }
-            String col1 = data2D.columnNames().get(0);
-            PopTools.rowExpressionButtons(controller, scriptInput, col1);
-
-        } catch (Exception e) {
-            MyBoxLog.error(e);
-        }
+    protected void showScriptExamples(Event event) {
+        PopTools.popRowExpressionExamples(this, event, scriptInput, interfaceName + "Examples", data2D);
     }
 
     public boolean checkExpression(boolean allPages) {

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlJavaScriptRefer.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlJavaScriptRefer.java
@@ -116,17 +116,7 @@ protected void popScriptExamples(Event event) {
 
     @FXML
     protected void showScriptExamples(Event event) {
-        try {
-            MenuController controller
-                    = PopTools.popJavaScriptExamples(this, event, scriptInput, interfaceName + "Examples");
-            moreExampleButtons(controller);
-        } catch (Exception e) {
-            MyBoxLog.error(e);
-        }
-    }
-
-    protected void moreExampleButtons(MenuController controller) {
-
+        PopTools.popJavaScriptExamples(this, event, scriptInput, interfaceName + "Examples", null);
     }
 
     @FXML

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlRowFilterRefer.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlRowFilterRefer.java
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/JavaScriptEditor.java b/alpha/MyBox/src/main/java/mara/mybox/controller/JavaScriptEditor.java
@@ -1,6 +1,5 @@
 package mara.mybox.controller;
 
-import java.util.Arrays;
 import javafx.event.Event;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -66,28 +65,7 @@ protected void popExamplesMenu(MouseEvent event) {
 
     @FXML
     protected void showExamplesMenu(Event event) {
-        try {
-            String menuName = interfaceName + "Examples";
-            MenuController controller = PopTools.popJavaScriptExamples(this, event, valueInput, menuName);
-
-            PopTools.addButtonsPane(controller, valueInput, Arrays.asList(
-                    "''.search(//ig) >= 0", "''.length > 0", "''.indexOf('') >= 0",
-                    "''.startsWith('')", "''.endsWith('')", "''.replace(//ig,'')"
-            ), 4);
-            PopTools.addButtonsPane(controller, valueInput, Arrays.asList(
-                    "Math.PI", "Math.E", "Math.abs(-5.47)", "Math.random()",
-                    "Math.trunc(3.51)", "Math.round(3.51)", "Math.ceil(3.15)", "Math.floor(3.51)",
-                    "Math.pow(3, 4)", "Math.sqrt(9)", "Math.exp(2)", "Math.log(5)",
-                    "Math.min(1,2,-3)", "Math.max(1,2,-3)", "Math.sin(Math.PI/2)", "Math.cos(0)", "Math.tan(2)"
-            ), 5);
-            PopTools.addButtonsPane(controller, valueInput, Arrays.asList(
-                    "var array = [ 'A', 'B', 'C', 'D' ];\narray[3]",
-                    "var object = { name1:'value1', name2:'value2', name3:'value3'}; \nobject.name2"
-            ), 6);
-
-        } catch (Exception e) {
-            MyBoxLog.error(e);
-        }
+        PopTools.popJavaScriptExamples(this, event, valueInput, interfaceName + "Examples", null);
     }
 
     @Override

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/MathFunctionEditor.java b/alpha/MyBox/src/main/java/mara/mybox/controller/MathFunctionEditor.java
@@ -19,6 +19,7 @@
 import static mara.mybox.db.data.InfoNode.ValueSeparater;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.PopTools;
+import static mara.mybox.fxml.PopTools.javaScriptExamples;
 import mara.mybox.tools.StringTools;
 import static mara.mybox.value.Languages.message;
 import mara.mybox.value.UserConfig;
@@ -252,20 +253,7 @@ protected void popScriptExamples(MouseEvent event) {
 
     @FXML
     protected void showScriptExamples(Event event) {
-        try {
-            String menuName = "FunctionScriptExamples";
-            MenuController controller = PopTools.popJavaScriptExamples(this, event, valueInput, menuName);
-
-            PopTools.addButtonsPane(controller, valueInput, Arrays.asList(
-                    "Math.PI", "Math.E", "Math.random()", "Math.abs(x)",
-                    "Math.pow(x,2)", "Math.pow(x,3)", "Math.sqrt(x)", "Math.pow(x,1d/3)",
-                    "Math.pow(3, x)", "Math.exp(x)",
-                    "Math.log(x)", "Math.sin(x)", "Math.cos(x)", "Math.tan(x)"
-            ), 4);
-
-        } catch (Exception e) {
-            MyBoxLog.error(e);
-        }
+        PopTools.popJavaScriptExamples(this, event, valueInput, "FunctionScriptExamples", null);
     }
 
     @FXML
@@ -299,13 +287,14 @@ protected void showDomainExamples(ActionEvent event) {
 
     protected void domainExamples(Event event) {
         try {
-            String menuName = "FunctionDomainExamples";
-            MenuController controller = PopTools.popJavaScriptExamples(this, event, moreInput, menuName);
-
-            PopTools.addButtonsPane(controller, moreInput, Arrays.asList(
+            List<List<String>> preValues = new ArrayList<>();
+            preValues.add(Arrays.asList(
                     "x > 0", "x >= 0", "x < 0", "x <= 0", "x != 0", "x != 1",
                     "x >= -1 && x <= 1", "( x - Math.PI / 2 ) % Math.PI != 0"
-            ), 4);
+            ));
+            preValues.addAll(javaScriptExamples("x", "stringV", "dateV"));
+
+            PopTools.popJavaScriptExamples(this, event, moreInput, "FunctionDomainExamples", preValues);
 
         } catch (Exception e) {
             MyBoxLog.error(e);

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/RowFilterEditor.java b/alpha/MyBox/src/main/java/mara/mybox/controller/RowFilterEditor.java
@@ -16,7 +16,6 @@
 import mara.mybox.fxml.HelpTools;
 import mara.mybox.fxml.PopTools;
 import mara.mybox.tools.StringTools;
-import static mara.mybox.value.Languages.message;
 import mara.mybox.value.UserConfig;
 
 /**
@@ -162,12 +161,7 @@ protected void popScriptExamples(MouseEvent mouseEvent) {
 
     @FXML
     protected void showScriptExamples(Event event) {
-        try {
-            MenuController controller = PopTools.popJavaScriptExamples(this, event, valueInput, interfaceName + "Examples");
-            PopTools.rowExpressionButtons(controller, valueInput, message("Column") + "1");
-        } catch (Exception e) {
-            MyBoxLog.error(e);
-        }
+        PopTools.popJavaScriptExamples(this, event, valueInput, interfaceName + "Examples", null);
     }
 
     @FXML