From 01da3b3a7006a9f6cd10d74b280c98d9b6fedb17 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 16 Jan 2025 23:44:17 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B3=D0=B0=D0=BB=D0=BE=D1=87=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=B0=D0=B7=D0=BD=D0=B0=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  9 ++++-
 properties                                    | 38 +++++++++----------
 src/_VisualDVM/GlobalData/GlobalDatabase.java |  1 +
 .../SapforProfile/SapforProfile.java          | 14 +++++++
 .../SapforProfile/UI/SapforProfilesForm.java  | 24 ++++++++++++
 .../Passes/All/SetDefaultSapforProfile.java   | 37 ++++++++++++++++++
 src/_VisualDVM/Passes/PassCode.java           |  3 ++
 .../Visual/Tables/RendererProfileAuto.java    | 12 ++++++
 .../Visual/Tables/SwitcherProfileAuto.java    | 22 +++++++++++
 9 files changed, 139 insertions(+), 21 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java
 create mode 100644 src/_VisualDVM/Visual/Tables/RendererProfileAuto.java
 create mode 100644 src/_VisualDVM/Visual/Tables/SwitcherProfileAuto.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 556a228d..76113978 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererProfileAuto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/SwitcherProfileAuto.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/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/SapforProperties.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 1a84eefd..aad50d7a 100644
--- a/properties
+++ b/properties
@@ -3,7 +3,7 @@
   "ServerAddress": "alex-freenas.ddns.net",
   "ServerUserName": "testuser",
   "ServerUserSHHPort": 2000,
-  "ComponentsServerPort": 7996,
+  "ComponentsServerPort": 7995,
   "TestingServerPort": 7998,
   "SocketTimeout": 5000,
   "OldServer": false,
@@ -15,48 +15,48 @@
   "collapseFileMessages": false,
   "collapseProjectTrees": false,
   "BackupWorkspace": "_sapfor_x64_backups",
-  "Workspace": "E:\\Workspace",
+  "Workspace": "",
   "ProjectsSearchDirectory": "E:\\BUG",
-  "EditorFontSize": 16,
+  "EditorFontSize": 14,
   "BackupHour": 5,
   "BackupMinute": 0,
   "EmailAdminsOnStart": false,
-  "AutoUpdateSearch": true,
-  "AutoBugReportsLoad": false,
-  "AutoTestsLoad": false,
+  "AutoUpdateSearch": false,
+  "AutoBugReportsLoad": true,
+  "AutoTestsLoad": true,
   "ConfirmPassesStart": true,
   "ShowPassesDone": true,
   "FocusPassesResult": true,
   "ProjectDBName": "new_project_base.sqlite",
   "BugReportsDBName": "bug_reports.sqlite",
   "TestsDBName": "tests.sqlite",
-  "ComponentsWindowWidth": 943,
-  "ComponentsWindowHeight": 310,
+  "ComponentsWindowWidth": 843,
+  "ComponentsWindowHeight": 250,
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
   "InstructionPath": "",
   "PerformanceAnalyzerPath": "",
   "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
-  "Kernels": 8,
+  "Kernels": 4,
   "ComponentsBackUpsCount": 10,
-  "AutoCheckTesting": false,
+  "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
-  "EmailOnTestingProgress": true,
+  "EmailOnTestingProgress": false,
   "eraseTestingWorkspaces": true,
-  "lastMachineId": 13,
-  "lastUserId": 34,
-  "lastCompilerId": 52,
+  "lastMachineId": -1,
+  "lastUserId": -1,
+  "lastCompilerId": -1,
   "RegisterOn": false,
   "SpacesOn": false,
   "EmptyLinesOn": false,
   "FortranWrapsOn": false,
   "ExtensionsOn": false,
-  "ComparsionDiffMergeOn": true,
-  "ShowFullArraysDeclarations": true,
+  "ComparsionDiffMergeOn": false,
+  "ShowFullArraysDeclarations": false,
   "ShowFullTabsNames": true,
   "SmallScreen": false,
-  "BugReportsAgeLimit": 8,
-  "FastAccessPassesCount": 5,
-  "LastOpenedProjectsCount": 25
+  "BugReportsAgeLimit": 2,
+  "FastAccessPassesCount": 10,
+  "LastOpenedProjectsCount": 10
 }
\ No newline at end of file
diff --git a/src/_VisualDVM/GlobalData/GlobalDatabase.java b/src/_VisualDVM/GlobalData/GlobalDatabase.java
index 011a3877..a9154527 100644
--- a/src/_VisualDVM/GlobalData/GlobalDatabase.java
+++ b/src/_VisualDVM/GlobalData/GlobalDatabase.java
@@ -31,6 +31,7 @@ import _VisualDVM.Passes.PassCode;
 import java.nio.file.Paths;
 import java.util.Date;
 import java.util.LinkedHashMap;
+import java.util.Vector;
 public class GlobalDatabase extends VisualiserDatabase {
     //---------СЕАНС----------------------------------------------
     public MachinesDBTable machines;
diff --git a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java
index 7b9ee3fc..36357105 100644
--- a/src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java
+++ b/src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java
@@ -1,9 +1,23 @@
 package _VisualDVM.GlobalData.SapforProfile;
 import Common.Database.Objects.iDBObject;
+import Common.Utils.Utils_;
 import com.sun.org.glassfish.gmbal.Description;
+
+import javax.swing.*;
 public class SapforProfile extends iDBObject {
     @Description("DEFAULT ''")
     public String description = "";
     @Description("DEFAULT 0")
     public long creationDate = 0;
+    @Description("DEFAULT 0")
+    public int isAuto = 0;
+    public ImageIcon GetAutoIcon() {
+        return Utils_.getIcon("/Common/icons/" + (isAuto == 1 ? "RedPick" : "NotPick") + ".png");
+    }
+    public String printAuto() {
+        return isAuto > 0 ? "Да" : "Нет";
+    }
+    public void SwitchAuto() {
+        isAuto = (isAuto == 0) ? 1 : 0;
+    }
 }
diff --git a/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java b/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
index e6fd678d..a7fdcbde 100644
--- a/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
+++ b/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java
@@ -8,6 +8,8 @@ import Common.Visual.Windows.Dialog.DBObjectDialog;
 import Common.Visual.Windows.Dialog.DialogFields;
 import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Visual.Tables.RendererProfileAuto;
+import _VisualDVM.Visual.Tables.SwitcherProfileAuto;
 
 import javax.swing.*;
 import java.util.Date;
@@ -29,6 +31,28 @@ public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
                     public Object getFieldAt(SapforProfile object) {
                         return new Date(object.creationDate);
                     }
+                },
+                new ColumnInfo<SapforProfile>("") {
+                    @Override
+                    public Object getFieldAt(SapforProfile object) {
+                        return object.printAuto();
+                    }
+                    @Override
+                    public Class getRendererClass() {
+                        return RendererProfileAuto.class;
+                    }
+                    @Override
+                    public Class getEditorClass() {
+                        return SwitcherProfileAuto.class;
+                    }
+                    @Override
+                    public int getMinWidth() {
+                        return 25;
+                    }
+                    @Override
+                    public int getMaxWidth() {
+                        return 25;
+                    }
                 }
         );
     }
diff --git a/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java b/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java
new file mode 100644
index 00000000..c405b26b
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/SetDefaultSapforProfile.java
@@ -0,0 +1,37 @@
+package _VisualDVM.Passes.All;
+import Common.Passes.Pass;
+import Common.Utils.Utils_;
+import Common.Visual.UI;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
+import _VisualDVM.Utils;
+
+import java.util.Vector;
+public class SetDefaultSapforProfile extends Pass<SapforProfile> {
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        target = (SapforProfile) args[0];
+        return UI.Question("Назначить профиль "+ Utils_.Brackets(target.description)+" профилем по умолчанию");
+    }
+    @Override
+    protected void body() throws Exception {
+        Vector<SapforProfile> toDrop = new Vector<>();
+        for (SapforProfile sapforProfile : Global.mainModule.getDb().sapforProfiles.Data.values()) {
+            if (sapforProfile.id!=target.id) {
+                if (sapforProfile.isAuto != 0) {
+                    sapforProfile.isAuto = 0;
+                    toDrop.add(sapforProfile);
+                }
+            }
+        }
+        for (SapforProfile sapforProfile : toDrop)
+            Global.mainModule.getDb().Update(sapforProfile);
+        //--
+        target.SwitchAuto();
+        Global.mainModule.getDb().Update(target);
+    }
+    @Override
+    protected void showFinish() throws Exception {
+        Global.mainModule.getDb().sapforProfiles.getUI().RedrawControl();
+    }
+}
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index 3e8ad71d..f3538876 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -6,6 +6,7 @@ public enum PassCode implements PassCode_ {
     UpdateSapforProperty,
     ShowAllParallelVariants,
     ShowParallelVariantsCoverage,
+    SetDefaultSapforProfile,
     //-
     DeleteServerSapfor,
     SaveProfile,
@@ -356,6 +357,8 @@ public enum PassCode implements PassCode_ {
     @Override
     public String getDescription() {
         switch (this) {
+            case SetDefaultSapforProfile:
+                return "Установить профиль SAPFOR по умолчанию";
             case UpdateSapforProperty:
                 return "Изменить настройку SAPFOR";
             case Email:
diff --git a/src/_VisualDVM/Visual/Tables/RendererProfileAuto.java b/src/_VisualDVM/Visual/Tables/RendererProfileAuto.java
new file mode 100644
index 00000000..cc2fcca0
--- /dev/null
+++ b/src/_VisualDVM/Visual/Tables/RendererProfileAuto.java
@@ -0,0 +1,12 @@
+package _VisualDVM.Visual.Tables;
+import Common.Visual.Tables.RendererDBObject;
+import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
+import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
+public class RendererProfileAuto extends RendererDBObject {
+    @Override
+    public void Display() {
+        if (value != null) {
+            setIcon(((SapforProfile) value).GetAutoIcon());
+        }
+    }
+}
diff --git a/src/_VisualDVM/Visual/Tables/SwitcherProfileAuto.java b/src/_VisualDVM/Visual/Tables/SwitcherProfileAuto.java
new file mode 100644
index 00000000..87cda9cc
--- /dev/null
+++ b/src/_VisualDVM/Visual/Tables/SwitcherProfileAuto.java
@@ -0,0 +1,22 @@
+package _VisualDVM.Visual.Tables;
+import Common.Passes.Pass;
+import Common.Visual.Tables.EditorDBObject;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
+import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Passes.Server.EditServerObject;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
+import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
+import _VisualDVM.TestingSystem.Common.TestingServer;
+import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+public class SwitcherProfileAuto extends EditorDBObject<SapforProfile> {
+    @Override
+    public void Action() {
+        Global.mainModule.getPass(PassCode.SetDefaultSapforProfile).Do(value);
+        setIcon(value.GetAutoIcon());
+    }
+    @Override
+    public Object getCellEditorValue() {
+        return value;
+    }
+}