M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

исправлен баг с переводом на json, не изменялись в формат виндовс имена файлов при распаковке регионов

Browse Source
This commit is contained in:
02090095
2025-09-18 20:28:59 +03:00
parent 1329bb3038
commit bedb5eefd1
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/workspace.xml generated
View File

@@ -7,12 +7,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/VersionInfo_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforResult_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforResult_json.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -4,7 +4,7 @@
"ServerUserPassword": "mprit_2011", "ServerUserPassword": "mprit_2011",
"OfferRegistrationOnStart": true, "OfferRegistrationOnStart": true,
"Workspace": "E:\\Tests", "Workspace": "E:\\Tests",
"ProjectsSearchDirectory": "E:\\Tests\\Downloads", "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests\\BT_inserted",
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system", "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
"VisualiserPath": "C:\\Users\\misha\\Downloads", "VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F", "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",

2
src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
View File

@@ -504,10 +504,8 @@ public abstract class Sapfor extends OSDComponent {
} }
public void decodeString(String runResult) throws Exception { public void decodeString(String runResult) throws Exception {
System.out.println("String="+runResult); System.out.println("String="+runResult);
SapforResult_json resultJson = Utils_.gson.fromJson(runResult, SapforResult_json.class); SapforResult_json resultJson = Utils_.gson.fromJson(runResult, SapforResult_json.class);
resultJson.Print(); resultJson.Print();
UI.Info("+");
//--- //---
setErrorCode(resultJson.errorCode); setErrorCode(resultJson.errorCode);
setOutput(resultJson.output); setOutput(resultJson.output);

3
src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
View File

@@ -2,6 +2,7 @@ package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Database.Objects.DBObject; import Common.Database.Objects.DBObject;
import Common.Utils.IntegerPairJson; import Common.Utils.IntegerPairJson;
import Common.Utils.Pair; import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Arrays.AlignRule; import _VisualDVM.ProjectData.SapforData.Arrays.AlignRule;
@@ -85,6 +86,7 @@ public class ParallelRegion extends DBObject {
} }
//--- //---
for (FileRegionLinesJson fr : regionsLines) { for (FileRegionLinesJson fr : regionsLines) {
fr.file = Utils_.toW(fr.file);
lines.put(fr.file, fr.lines); lines.put(fr.file, fr.lines);
for (IntegerPairJson l : fr.lines) { for (IntegerPairJson l : fr.lines) {
fragments.add(fr.file + ": " + l.getKey() + "-" + l.getKey()); fragments.add(fr.file + ": " + l.getKey() + "-" + l.getKey());
@@ -100,6 +102,7 @@ public class ParallelRegion extends DBObject {
for (IntegerPairJson L : lines.get(FKey)) { for (IntegerPairJson L : lines.get(FKey)) {
lines_count += (L.getValue() - L.getKey()); lines_count += (L.getValue() - L.getKey());
DBProjectFile f = Global.mainModule.getProject().db.files.Data.get(FKey); DBProjectFile f = Global.mainModule.getProject().db.files.Data.get(FKey);
loops_count += f.FragmentLoopCount(L.getKey(), L.getValue()); loops_count += f.FragmentLoopCount(L.getKey(), L.getValue());
fc_count += f.FragmentFunctionCallsCount(L.getKey(), L.getValue()); fc_count += f.FragmentFunctionCallsCount(L.getKey(), L.getValue());
fd_count += f.FragmentFunctionDeclsCount(L.getKey(), L.getValue()); fd_count += f.FragmentFunctionDeclsCount(L.getKey(), L.getValue());