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

++

Browse Source
This commit is contained in:
02090095
2025-09-18 21:13:08 +03:00
parent bedb5eefd1
commit 9cadbef661
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/workspace.xml generated
View File

@@ -8,8 +8,9 @@
<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 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$/src/_VisualDVM/ComponentsServer/Component/Json/VersionInfo_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/VersionInfo_json.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/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.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" />

4
src/_VisualDVM/ComponentsServer/Component/Json/VersionInfo_json.java
View File

@@ -4,5 +4,7 @@ public class VersionInfo_json {
@Expose @Expose
public int version; public int version;
@Expose @Expose
public String date; public String build_date;
@Expose
public String build_time;
} }

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

@@ -4,6 +4,7 @@ import Common.Passes.PassException;
import Common.Utils.Pair; import Common.Utils.Pair;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.UI; import Common.Visual.UI;
import _VisualDVM.ComponentsServer.Component.Json.VersionInfo_json;
import _VisualDVM.ComponentsServer.Component.OSDComponent; import _VisualDVM.ComponentsServer.Component.OSDComponent;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -416,12 +417,9 @@ public abstract class Sapfor extends OSDComponent {
public void GetVersionInfo() { public void GetVersionInfo() {
try { try {
RunAnalysis("SPF_GetVersionAndBuildDate", -1, "", ""); RunAnalysis("SPF_GetVersionAndBuildDate", -1, "", "");
//заглушка. VersionInfo_json versionInfo_json = Utils_.gson.fromJson(getResult(),VersionInfo_json.class);
version = 6666; version = versionInfo_json.version;
date_text = new Date().toString(); date_text = versionInfo_json.build_date+" "+ versionInfo_json.build_time;
// VersionInfo_json versionInfo_json =
// UI.Info("sapfor version info");
// Visualizer_2.UnpackVersionInfo(this, getResult());
} catch (Exception e) { } catch (Exception e) {
Utils_.MainLog.PrintException(e); Utils_.MainLog.PrintException(e);
UI.Error("Не удалось получить версию компонента " + Utils_.DQuotes(getComponentType().getDescription())); UI.Error("Не удалось получить версию компонента " + Utils_.DQuotes(getComponentType().getDescription()));
@@ -503,9 +501,7 @@ public abstract class Sapfor extends OSDComponent {
this.predictorStats = predictorStats; this.predictorStats = predictorStats;
} }
public void decodeString(String runResult) throws Exception { public void decodeString(String runResult) throws Exception {
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();
//--- //---
setErrorCode(resultJson.errorCode); setErrorCode(resultJson.errorCode);
setOutput(resultJson.output); setOutput(resultJson.output);

2
src/_VisualDVM/Constants.java
View File

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
import java.util.Vector; import java.util.Vector;
public class Constants { public class Constants {
public static final int version = 1257; public static final int version = 1258;
public static final int planner_version = 24; public static final int planner_version = 24;
public static final int testingMaxKernels = 64; public static final int testingMaxKernels = 64;
//-- //--