From 2dcce6285ccfe123f768339d17efe546cc2b5d7b Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Sat, 31 Oct 2020 22:18:30 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=B7=D0=B0=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B2=D1=8B=D1=87=D0=B8?= =?UTF-8?q?=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B4=D0=BE=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D1=8C=D1=8F=20=D0=BA=D0=BE=D0=B4=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 +-- Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- VisualPascalABCNET/Form1.cs | 30 ++-------------------- 5 files changed, 7 insertions(+), 33 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index e1c38fb67..74c87c2cd 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "7"; public const string Build = "1"; - public const string Revision = "2732"; + public const string Revision = "2733"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index fe731406e..e1bd1f4f7 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=1 -%REVISION%=2732 %MINOR%=7 +%REVISION%=2733 +%COREVERSION%=1 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 26c91c771..40f8daf4d 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.7.1.2732 +3.7.1.2733 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 96ec33b4e..2c114140f 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.7.1.2732' +!define VERSION '3.7.1.2733' diff --git a/VisualPascalABCNET/Form1.cs b/VisualPascalABCNET/Form1.cs index aeb7c3eee..c373ab403 100644 --- a/VisualPascalABCNET/Form1.cs +++ b/VisualPascalABCNET/Form1.cs @@ -840,7 +840,7 @@ namespace VisualPascalABC private void StartMenuItem_Click(object sender, EventArgs e) { WorkbenchServiceFactory.RunService.Run(true); - if (VisualEnvironmentCompiler.Compiler != null && VisualEnvironmentCompiler.Compiler.ErrorsList.Count == 0) + /*if (VisualEnvironmentCompiler.Compiler != null && VisualEnvironmentCompiler.Compiler.ErrorsList.Count == 0) { var Percent = VisualEnvironmentCompiler.Compiler.PABCCodeHealth; if (Percent > 0) @@ -856,33 +856,7 @@ namespace VisualPascalABC var PM100 = 100 - Percent; HealthLabel.BackColor = Color.FromArgb(c.R - PM100 - 20, c.G - PM100 - 20, c.B - PM100 - 20); } - } - - - /*if (VisualEnvironmentCompiler.StandartCompiler != null && - VisualEnvironmentCompiler.StandartCompiler.LinesCompiled > 1000) - return; - var root = VisualEnvironmentCompiler?.StandartCompiler?.CurrentCompilationUnit?.SyntaxTree; - - if (root == null) - return; - if (VisualEnvironmentCompiler.StandartCompiler.CurrentCompilationUnit.SemanticTree == null) - return; - var stat = new SyntaxVisitors.ABCStatisticsVisitor(); - stat.ProcessNode(root); - var Percent = stat.CalcHealth(out int n, out int p); - - if (Percent >= 100) - { - HealthLabel.Text = ""; - return; - } - HealthLabel.Text = $"{Percent}%"; - - var c = SystemColors.Control; - var PM100 = 100 - Percent; - HealthLabel.BackColor = Color.FromArgb(c.R - PM100 - 20, c.G - PM100 - 20, c.B - PM100 - 20); - */ + }*/ } private void Form1_KeyUp(object sender, KeyEventArgs e)