a6.8.1

Mararsh · Apr 17, 2024 · fee34d7 · fee34d7
1 parent 651ac43
commit fee34d7
Show file tree

Hide file tree

Showing 26 changed files with 129 additions and 385 deletions.
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DChartController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DChartController.java
@@ -272,19 +272,16 @@ protected boolean handle() {
 
             @Override
             protected void whenSucceeded() {
+                outputData();
+                if (rightPane != null) {
+                    rightPane.setDisable(false);
+                }
             }
 
             @Override
             protected void finalAction() {
                 super.finalAction();
-                data2D.stopTask();
                 closeTask();
-                if (ok) {
-                    outputData();
-                    if (rightPane != null) {
-                        rightPane.setDisable(false);
-                    }
-                }
             }
 
         };
@@ -450,20 +447,17 @@ protected boolean handle() {
 
             @Override
             protected void whenSucceeded() {
+                loadChartData();
+                playController.play(framesNumber);
+                if (rightPane != null) {
+                    rightPane.setDisable(false);
+                }
             }
 
             @Override
             protected void finalAction() {
                 super.finalAction();
-                data2D.stopTask();
                 closeTask();
-                if (ok) {
-                    loadChartData();
-                    playController.play(framesNumber);
-                    if (rightPane != null) {
-                        rightPane.setDisable(false);
-                    }
-                }
             }
 
         };

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DTaskController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DTaskController.java
@@ -875,6 +875,14 @@ public void cloneOptions(BaseData2DTaskController controller) {
         scaleSelector.getSelectionModel().select(controller.scale + "");
     }
 
+    @Override
+    public void closeTask() {
+        if (data2D != null) {
+            data2D.stopTask();
+        }
+        super.closeTask();
+    }
+
     @Override
     public void cleanPane() {
         try {

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DTaskTargetsController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseData2DTaskTargetsController.java
@@ -153,20 +153,15 @@ protected boolean handle() {
             protected void whenSucceeded() {
                 popDone();
                 writer.showResult();
+                if (targetController != null) {
+                    targetController.refreshControls();
+                }
             }
 
             @Override
             protected void finalAction() {
                 super.finalAction();
-                data2D.stopTask();
                 closeTask();
-                if (ok) {
-                    if (closeAfterCheck != null && closeAfterCheck.isSelected()) {
-                        close();
-                    } else if (targetController != null) {
-                        targetController.refreshControls();
-                    }
-                }
             }
 
         };
@@ -198,16 +193,13 @@ protected boolean handle() {
 
             @Override
             protected void whenSucceeded() {
+                ouputRows();
             }
 
             @Override
             protected void finalAction() {
                 super.finalAction();
-                data2D.stopTask();
                 closeTask();
-                if (ok) {
-                    ouputRows();
-                }
             }
 
         };
@@ -276,9 +268,7 @@ public boolean updateTable() {
             dataController.tableChanged(true);
             dataController.requestMouse();
             dataController.popDone();
-            if (closeAfterCheck != null && closeAfterCheck.isSelected()) {
-                close();
-            } else if (targetController != null) {
+            if (targetController != null) {
                 targetController.refreshControls();
             }
             return true;
@@ -344,11 +334,7 @@ protected void whenSucceeded() {
             @Override
             protected void finalAction() {
                 super.finalAction();
-                data2D.stopTask();
                 closeTask();
-                if (ok && closeAfterCheck != null && closeAfterCheck.isSelected()) {
-                    close();
-                }
             }
 
         };

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseTaskController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseTaskController.java
@@ -175,6 +175,9 @@ public void closeTask() {
             updateLogs(message("Completed") + " " + message("Cost")
                     + " " + DateTools.datetimeMsDuration(endTime, startTime), true);
         }
+        if (task != null) {
+            successed = task.isOk();
+        }
         afterTask();
     }
 
@@ -186,6 +189,9 @@ public void afterTask() {
         if (openCheck != null && openCheck.isSelected()) {
             openTarget();
         }
+        if (successed && closeAfterCheck != null && closeAfterCheck.isSelected()) {
+            close();
+        }
     }
 
     public void cancelTask() {

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlData2DPaste.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlData2DPaste.java
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/Data2DChartXYZController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/Data2DChartXYZController.java
@@ -255,21 +255,14 @@ protected boolean handle() {
 
             @Override
             protected void whenSucceeded() {
+                browse(chartFile);
+                browse(chartFile.getParentFile());
             }
 
             @Override
             protected void finalAction() {
                 super.finalAction();
-                data2D.stopTask();
                 closeTask();
-                if (!ok) {
-                    return;
-                }
-                browse(chartFile);
-                browse(chartFile.getParentFile());
-                if (closeAfterCheck.isSelected()) {
-                    close();
-                }
             }
 
         };

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/Data2DDeleteController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/Data2DDeleteController.java
@@ -102,6 +102,7 @@ protected void whenSucceeded() {
                     dataController.requestMouse();
                     dataController.alertInformation(message("DeletedRowsNumber") + ": " + filteredRowsIndices.size());
                     sourceController.selectedRowsIndices = null;
+                    tabPane.getSelectionModel().select(sourceTab);
                 } catch (Exception e) {
                     MyBoxLog.error(e);
                 }
@@ -110,15 +111,7 @@ protected void whenSucceeded() {
             @Override
             protected void finalAction() {
                 super.finalAction();
-                data2D.stopTask();
                 closeTask();
-                if (ok) {
-                    if (closeAfterCheck.isSelected()) {
-                        close();
-                    } else {
-                        tabPane.getSelectionModel().select(sourceTab);
-                    }
-                }
             }
 
         };
@@ -171,7 +164,6 @@ protected void whenSucceeded() {
             @Override
             protected void finalAction() {
                 super.finalAction();
-                data2D.stopTask();
                 closeTask();
             }