From 9303839e8ef6920cd2f7677773a0fba365c988b4 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 13 Apr 2025 20:14:25 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  8 ++---
 .../All/SPF_GetGraphFunctionPositions.java    | 31 ++++---------------
 .../Json/FunctionGraphPositionJson.java       | 10 ++++++
 .../Json/FunctionsGraphPositionsJson.java     |  9 ++++++
 .../Json/FunctionsGraphSettingsJson.java      | 10 ++++++
 5 files changed, 39 insertions(+), 29 deletions(-)
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionGraphPositionJson.java
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsGraphPositionsJson.java
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsGraphSettingsJson.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 65b71131..32a2802f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionGraphPositionJson.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsGraphPositionsJson.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsGraphSettingsJson.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FileWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FileWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java b/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java
index b09d3fd8..2ea5cfce 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Passes.All;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SilentSapforPass;
@@ -6,6 +7,8 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
 import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
+import _VisualDVM.ProjectData.SapforData.Functions.Json.FunctionGraphPositionJson;
+import _VisualDVM.ProjectData.SapforData.Functions.Json.FunctionsGraphPositionsJson;
 import javafx.util.Pair;
 
 import java.util.Vector;
@@ -209,31 +212,9 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
     }
      */
     protected void unpack(String packed) throws Exception {
-        String[] splited = packed.split("\\|");
-        int j = 0;
-        //-
-        String currentFuncName = "";
-        double x = 0;
-        double y = 0;
-        //-
-        for (int i = 1; i < splited.length; ++i) {
-            switch (j) {
-                case 0:
-                    currentFuncName = splited[i];
-                    target.functionsGraph.addVertex(currentFuncName);
-                    j++;
-                    break;
-                case 1:
-                    x = Double.parseDouble(splited[i]);
-                    j++;
-                    break;
-                case 2:
-                    y = Double.parseDouble(splited[i]);
-                    target.functionsGraph.vertexCoordinates.put(currentFuncName, new Pair<>(x, y));
-                    j = 0;
-                    break;
-            }
-        }
+        FunctionsGraphPositionsJson positionsJson = Utils_.gson.fromJson(packed, FunctionsGraphPositionsJson.class);
+        for (FunctionGraphPositionJson positionJson: positionsJson.allPositions)
+            target.functionsGraph.vertexCoordinates.put(positionJson.functionName, new Pair<>(positionJson.x, positionJson.y));
         //теперь добавить ребер.
         for (String funcName : target.functionsGraph.vertexMap.keySet()) {
             FuncInfo fi = target.allFunctions.get(funcName);
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionGraphPositionJson.java b/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionGraphPositionJson.java
new file mode 100644
index 00000000..9da0ca79
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionGraphPositionJson.java
@@ -0,0 +1,10 @@
+package _VisualDVM.ProjectData.SapforData.Functions.Json;
+import com.google.gson.annotations.Expose;
+public class FunctionGraphPositionJson {
+    @Expose
+    public String functionName;
+    @Expose
+    public double x;
+    @Expose
+    public double y;
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsGraphPositionsJson.java b/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsGraphPositionsJson.java
new file mode 100644
index 00000000..b7cd158c
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsGraphPositionsJson.java
@@ -0,0 +1,9 @@
+package _VisualDVM.ProjectData.SapforData.Functions.Json;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Vector;
+public class FunctionsGraphPositionsJson {
+    @Expose
+    public List<FunctionGraphPositionJson> allPositions = new Vector<>();
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsGraphSettingsJson.java b/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsGraphSettingsJson.java
new file mode 100644
index 00000000..1483a2e6
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsGraphSettingsJson.java
@@ -0,0 +1,10 @@
+package _VisualDVM.ProjectData.SapforData.Functions.Json;
+import java.util.List;
+import java.util.Vector;
+public class FunctionsGraphSettingsJson {
+    public int x;
+    public int y;
+    public int iterations;
+    public int resistance;
+    public List<String> visibleFunctionsNames = new Vector<>();
+}