From 411e97abb8693aeb487c7b8e702d1a56bff47663 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 7 Apr 2025 18:08:59 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B0=D0=B7=D0=BB=D0=B8=D1=87=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20=D1=81?=
 =?UTF-8?q?=D0=B0=D0=BF=D1=84=D0=BE=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  7 +++++-
 properties                                    |  6 ++---
 src/_VisualDVM/Constants.java                 |  2 +-
 .../TestingSystem/Common/TestsDatabase.java   |  3 +--
 .../DVM/DVMPackage/UI/DVMPackagesForm.java    |  2 +-
 .../SAPFOR/SapforPackage/SapforPackage.java   |  2 +-
 .../SapforPackage/UI/SapforPackagesForm.java  | 12 +++++-----
 .../Visual/Tables/RendererDiff.java           | 22 +++++++++++++++++++
 8 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 src/_VisualDVM/Visual/Tables/RendererDiff.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3a035696..fa68ac8e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererDiff.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/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index f484dbee..5891669f 100644
--- a/properties
+++ b/properties
@@ -32,9 +32,9 @@
   "CompleteRunEnvironments": true,
   "CreateEthalonTasks": true,
   "ErasePackageWorkspace": true,
-  "lastMachineId": 28,
-  "lastUserId": 36,
-  "lastCompilerId": 109,
+  "lastMachineId": 1,
+  "lastUserId": 17,
+  "lastCompilerId": 15,
   "RegisterOn": false,
   "SpacesOn": false,
   "EmptyLinesOn": false,
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 7436ba6a..62a8599b 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1233;
+    public static final int version = 1234;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
index 65f9762c..f4eba66c 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
@@ -692,6 +692,5 @@ public class TestsDatabase extends SQLiteDatabase {
         }
         return res;
     }
-    public void Patch() throws Exception {
-    }
+    public void Patch() throws Exception {}
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index 45e1261a..c6c4d345 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -152,7 +152,7 @@ public class DVMPackagesForm extends RDataSetControlForm<DVMPackage> {
                 addPasses(PassCode.PauseDVMPackage, PassCode.ResumeDVMPackage, PassCode.AbortDVMPackage);
                 addSeparator();
                 addPasses(PassCode.DownloadDVMPackage,
-                        PassCode.RefreshDVMPackageResults,
+                     //   PassCode.RefreshDVMPackageResults,
                         PassCode.ExportDVMPackageToExcel,
                         PassCode.DeleteDVMPackage);
             }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
index e821d5be..2c6cc8a4 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java
@@ -122,7 +122,7 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
             //--
         }
         saveJson();
-        state = ((bad > 0) ||(mismatchesCount>0))  ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
+        state = (bad > 0)  ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
         double percent = (((double) (good)) / tasksCount) * 100.0;
         description = "Выполнено на " + ((int) percent) + "%\n" +
                 "Всего задач: " + tasksCount + ", из них с ошибками " + bad;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index 9957e997..16e44886 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -4,10 +4,7 @@ import Common.Passes.PassCode_;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.FilterFlag;
 import Common.Visual.Menus.DataMenuBar;
-import Common.Visual.Tables.ColumnInfo;
-import Common.Visual.Tables.RendererDate;
-import Common.Visual.Tables.RendererMilliseconds;
-import Common.Visual.Tables.RendererProgressBar;
+import Common.Visual.Tables.*;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.SapforPackageCache;
@@ -15,6 +12,7 @@ import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.Visual.RDataSetControlForm;
+import _VisualDVM.Visual.Tables.RendererDiff;
 import _VisualDVM.Visual.Tables.RendererTestingPackageStatus;
 
 import javax.swing.*;
@@ -101,6 +99,10 @@ public class SapforPackagesForm extends RDataSetControlForm<SapforPackage> {
                     public Object getFieldAt(SapforPackage object) {
                         return object.mismatchesCount;
                     }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererDiff.class;
+                    }
                 },
                 new ColumnInfo<SapforPackage>("статус") {
                     @Override
@@ -131,7 +133,7 @@ public class SapforPackagesForm extends RDataSetControlForm<SapforPackage> {
                 addPasses(PassCode.AbortSapforPackage);
                 addSeparator();
                 addPasses(PassCode.CompareSapforPackageToEthalon, PassCode.JoinSapforTestingVersionsToGroup
-                      //  PassCode.RefreshSapforPackageResults
+                     //   ,PassCode.RefreshSapforPackageResults
                 );
                 addSeparator();
                 addPasses(PassCode.DeleteSapforPackage);
diff --git a/src/_VisualDVM/Visual/Tables/RendererDiff.java b/src/_VisualDVM/Visual/Tables/RendererDiff.java
new file mode 100644
index 00000000..9c921fe8
--- /dev/null
+++ b/src/_VisualDVM/Visual/Tables/RendererDiff.java
@@ -0,0 +1,22 @@
+package _VisualDVM.Visual.Tables;
+import Common.MainModule_;
+import Common.Visual.Fonts.VisualiserFonts;
+import Common.Visual.Tables.RendererCell;
+
+import javax.swing.*;
+import java.awt.*;
+public class RendererDiff extends RendererCell<Integer> {
+    @Override
+    public Integer Init(JTable table, Object value, int row, int column) {
+        return (Integer) value;
+    }
+    public void Display() {
+        if (value != null){
+            Font font_ =  MainModule_.instance.getUI().getTheme().Fonts.get(
+                    value>0? VisualiserFonts.BadState: VisualiserFonts.TreePlain
+            );
+            setFont(font_ );
+            setText(String.valueOf(value));
+        }
+    }
+}