administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Исправление ошибки с Autoreverse при Scale в Graph3D.pas

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2019-04-20 16:25:39 +03:00
parent 07c75ca30a
commit b560268757
6 changed files with 45 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -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;

2
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=4
%REVISION%=2034
%REVISION%=2036
%COREVERSION%=2
%MAJOR%=3

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.4.2.2034'
!define VERSION '3.4.2.2036'

1
VisualPascalABCNET/Program.cs
View file

@ -107,6 +107,7 @@ namespace VisualPascalABC
}
catch (Exception e)
{
// Это ужасно! Надо обрабатывать все исключения раньше - чтобы оболочка не закрывалась!
MessageBox.Show(e.ToString());
}
}

37
VisualPascalABCNET/Workbench/RunnerManagerHandlers.cs
View file

@ -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]);

32
bin/Lib/Graph3D.pas
View file

@ -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();