From b560268757d86e99634d086eb25bf886a7e21dcc Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Sat, 20 Apr 2019 16:25:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?= =?UTF-8?q?=20=D1=81=20Autoreverse=20=D0=BF=D1=80=D0=B8=20Scale=20=D0=B2?= =?UTF-8?q?=20Graph3D.pas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- VisualPascalABCNET/Program.cs | 1 + .../Workbench/RunnerManagerHandlers.cs | 37 ++++++++++--------- bin/Lib/Graph3D.pas | 32 +++++++++++----- 6 files changed, 45 insertions(+), 31 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 5b18fb1b1..56209c7fa 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 = "4"; public const string Build = "2"; - public const string Revision = "2034"; + public const string Revision = "2036"; 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 79a1272bc..07d41d42d 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %MINOR%=4 -%REVISION%=2034 +%REVISION%=2036 %COREVERSION%=2 %MAJOR%=3 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 20441394b..550bb8e17 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.4.2.2034' +!define VERSION '3.4.2.2036' diff --git a/VisualPascalABCNET/Program.cs b/VisualPascalABCNET/Program.cs index 2f12c0713..5013eb7dc 100644 --- a/VisualPascalABCNET/Program.cs +++ b/VisualPascalABCNET/Program.cs @@ -107,6 +107,7 @@ namespace VisualPascalABC } catch (Exception e) { + // Это ужасно! Надо обрабатывать все исключения раньше - чтобы оболочка не закрывалась! MessageBox.Show(e.ToString()); } } diff --git a/VisualPascalABCNET/Workbench/RunnerManagerHandlers.cs b/VisualPascalABCNET/Workbench/RunnerManagerHandlers.cs index 7cb1fe743..2fae7412b 100644 --- a/VisualPascalABCNET/Workbench/RunnerManagerHandlers.cs +++ b/VisualPascalABCNET/Workbench/RunnerManagerHandlers.cs @@ -24,6 +24,21 @@ namespace VisualPascalABC Workbench.BeginInvoke(new SetTextDelegate(RunnerManager_Started_Sync), fileName); } + void ButtonsEnableDisable_RunStart() + { + Workbench.WidgetController.SetStopEnabled(true); + Workbench.WidgetController.SetCompilingButtonsEnabled(false); + Workbench.WidgetController.SetDebugButtonsEnabled(false); + Workbench.WidgetController.SetOptionsEnabled(false); + } + + void ButtonsEnableDisable_RunStop() + { + Workbench.WidgetController.SetStopEnabled(false); + Workbench.WidgetController.SetCompilingButtonsEnabled(true); + Workbench.WidgetController.SetDebugButtonsEnabled(true); + Workbench.WidgetController.SetOptionsEnabled(true); + } void RunnerManager_Started_Sync(string fileName) { if (!ProjectFactory.Instance.ProjectLoaded) @@ -31,10 +46,7 @@ namespace VisualPascalABC fileName = Tools.FileNameToLower(fileName); if (Tools.FileNameToLower(Workbench.CurrentEXEFileName) == fileName) { - Workbench.WidgetController.SetStopEnabled(true); - Workbench.WidgetController.SetCompilingButtonsEnabled(false); - Workbench.WidgetController.SetDebugButtonsEnabled(false); - Workbench.WidgetController.SetOptionsEnabled(false); + ButtonsEnableDisable_RunStart(); } RunTabs[fileName].Run = true; WorkbenchServiceFactory.DocumentService.SetTabPageText(RunTabs[fileName]); @@ -42,10 +54,7 @@ namespace VisualPascalABC else { fileName = Tools.FileNameToLower(fileName); - Workbench.WidgetController.SetStopEnabled(true); - Workbench.WidgetController.SetCompilingButtonsEnabled(false); - Workbench.WidgetController.SetDebugButtonsEnabled(false); - Workbench.WidgetController.SetOptionsEnabled(false); + ButtonsEnableDisable_RunStart(); RunTabs[fileName].Run = true; } } @@ -74,20 +83,12 @@ namespace VisualPascalABC { if (Tools.FileNameToLower(WorkbenchServiceFactory.Workbench.CurrentEXEFileName) == fileName) { - Workbench.WidgetController.SetStopEnabled(false); - Workbench.WidgetController.SetCompilingButtonsEnabled(true); - Workbench.WidgetController.SetDebugButtonsEnabled(true); - //if (IsOneProgramStarted()) - Workbench.WidgetController.SetOptionsEnabled(true); + ButtonsEnableDisable_RunStop(); } } else { - Workbench.WidgetController.SetStopEnabled(false); - Workbench.WidgetController.SetCompilingButtonsEnabled(true); - Workbench.WidgetController.SetDebugButtonsEnabled(true); - //if (IsOneProgramStarted()) - Workbench.WidgetController.SetOptionsEnabled(true); + ButtonsEnableDisable_RunStop(); } RunTabs[fileName].Run = false; WorkbenchServiceFactory.DocumentService.SetTabPageText(RunTabs[fileName]); diff --git a/bin/Lib/Graph3D.pas b/bin/Lib/Graph3D.pas index 0610ede88..00c1ae28b 100644 --- a/bin/Lib/Graph3D.pas +++ b/bin/Lib/Graph3D.pas @@ -1130,10 +1130,13 @@ type el: ScaleTransform3D; procedure Hand(o: object; e: System.EventArgs); begin - var el0 := Element.scaletransform; - el0.ScaleX += el.ScaleX; - el0.ScaleY += el.ScaleY; - el0.ScaleZ += el.ScaleZ; + if not dax.AutoReverse then + begin + var el0 := Element.scaletransform; + el0.ScaleX += el.ScaleX; + el0.ScaleY += el.ScaleY; + el0.ScaleZ += el.ScaleZ; + end; Element.transfgroup.Children.Remove(el); if Completed <> nil then Completed(); @@ -1164,8 +1167,11 @@ type el: ScaleTransform3D; procedure Hand(o: object; e: System.EventArgs); begin - var el0 := Element.scaletransform; - el0.ScaleX += el.ScaleX; + if not da.AutoReverse then + begin + var el0 := Element.scaletransform; + el0.ScaleX += el.ScaleX; + end; Element.transfgroup.Children.Remove(el); if Completed <> nil then Completed(); @@ -1192,8 +1198,11 @@ type private procedure Hand(o: object; e: System.EventArgs); begin - var el0 := Element.scaletransform; - el0.ScaleY += el.ScaleY; + if not da.AutoReverse then + begin + var el0 := Element.scaletransform; + el0.ScaleY += el.ScaleY; + end; Element.transfgroup.Children.Remove(el); if Completed <> nil then Completed(); @@ -1214,8 +1223,11 @@ type private procedure Hand(o: object; e: System.EventArgs); begin - var el0 := Element.scaletransform; - el0.ScaleZ += el.ScaleZ; + if not da.AutoReverse then + begin + var el0 := Element.scaletransform; + el0.ScaleZ += el.ScaleZ; + end; Element.transfgroup.Children.Remove(el); if Completed <> nil then Completed();