no message

This commit is contained in:
2025-04-13 20:14:25 +03:00
parent dc17b7d741
commit 9303839e8e
5 changed files with 39 additions and 29 deletions

8
.idea/workspace.xml generated
View File

@@ -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" />

View File

@@ -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);

View File

@@ -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;
}

View File

@@ -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<>();
}

View File

@@ -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<>();
}