solve button

pluginas · Apr 16, 2023 · 3bb1f5f · 3bb1f5f
1 parent 904c615
commit 3bb1f5f
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 100 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/main/java/app/Task.java b/src/main/java/app/Task.java
@@ -17,9 +17,7 @@
 import java.util.ArrayList;
 import java.util.concurrent.ThreadLocalRandom;
 
-/**
- * Класс задачи
- */
+
 
 /**
  * Класс задачи
@@ -55,6 +53,11 @@ public class Task {
      */
     protected CoordinateSystem2i lastWindowCS;
 
+    /**
+     * Флаг, решена ли задача
+     */
+    private boolean solved;
+
     /**
      * Задача
      *
@@ -116,16 +119,17 @@ public void click(Vector2i pos, MouseButton mouseButton) {
         }
     }
 
+
     /**
      * Добавить точку
      *
      * @param pos      положение
      * @param pointSet множество
      */
     public void addPoint(Vector2d pos, Point.PointSet pointSet) {
+        solved = false;
         Point newPoint = new Point(pos, pointSet);
         points.add(newPoint);
-        // Добавляем в лог запись информации
         PanelLog.info("точка " + newPoint + " добавлена в " + newPoint.getSetName());
     }
 
@@ -165,19 +169,29 @@ public void addRandomPoints(int cnt) {
      */
     public void clear() {
         points.clear();
+        solved = false;
     }
 
     /**
      * Решить задачу
      */
     public void solve() {
+        solved = true;
         PanelLog.warning("Вызван метод solve()\n Пока что решения нет");
     }
     /**
      * Отмена решения задачи
      */
     public void cancel() {
-
+        solved = false;
+    }
+    /**
+     * проверка, решена ли задача
+     *
+     * @return флаг
+     */
+    public boolean isSolved() {
+        return solved;
     }
 
 

diff --git a/src/main/java/panels/PanelControl.java b/src/main/java/panels/PanelControl.java
@@ -180,9 +180,17 @@ public PanelControl(
                 window, false, backgroundColor, PANEL_PADDING,
                 6, 7, 3, 6, 3, 1, "Решить",
                 true, true);
+
         solve.setOnClick(() -> {
-            PanelRendering.task.solve();
+            if (!PanelRendering.task.isSolved()) {
+                PanelRendering.task.solve();
+                solve.text = "Сбросить";
+            } else {
+                cancelTask();
+            }
+            window.requestFrame();
         });
+
         buttons.add(solve);
 
 

diff --git a/src/main/resources/conf.json b/src/main/resources/conf.json
@@ -1,85 +1 @@
-{
-  "@class": "app.Task",
-  "ownCS": {
-    "min": {
-      "x": -10.0,
-      "y": -10.0
-    },
-    "max": {
-      "x": 10.0,
-      "y": 10.0
-    }
-  },
-  "points": [
-    {
-      "pos": {
-        "x": 0.3448275862068968,
-        "y": -9.310344827586206
-      },
-      "setType": "FIRST_SET"
-    },
-    {
-      "pos": {
-        "x": -10.0,
-        "y": -6.551724137931035
-      },
-      "setType": "FIRST_SET"
-    },
-    {
-      "pos": {
-        "x": -10.0,
-        "y": 1.7241379310344822
-      },
-      "setType": "FIRST_SET"
-    },
-    {
-      "pos": {
-        "x": -5.172413793103448,
-        "y": 6.551724137931036
-      },
-      "setType": "FIRST_SET"
-    },
-    {
-      "pos": {
-        "x": -3.1034482758620694,
-        "y": 1.7241379310344822
-      },
-      "setType": "SECOND_SET"
-    },
-    {
-      "pos": {
-        "x": -1.0344827586206904,
-        "y": 0.3448275862068968
-      },
-      "setType": "FIRST_SET"
-    },
-    {
-      "pos": {
-        "x": 5.862068965517242,
-        "y": -7.931034482758621
-      },
-      "setType": "SECOND_SET"
-    },
-    {
-      "pos": {
-        "x": -4.482758620689655,
-        "y": -4.482758620689655
-      },
-      "setType": "FIRST_SET"
-    },
-    {
-      "pos": {
-        "x": -9.310344827586206,
-        "y": 0.3448275862068968
-      },
-      "setType": "FIRST_SET"
-    },
-    {
-      "pos": {
-        "x": 5.172413793103448,
-        "y": 2.413793103448276
-      },
-      "setType": "SECOND_SET"
-    }
-  ]
-}
+{"@class":"app.Task","ownCS":{"min":{"x":-10.0,"y":-10.0},"max":{"x":10.0,"y":10.0}},"points":[],"solved":false}