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

SetStandardCoords с параметрами

Browse source
This commit is contained in:
miks1965 2017-09-29 20:49:56 +03:00
parent 7b5d548c6d
commit 429d47271a
9 changed files with 1630 additions and 1632 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 = "3";
public const string Build = "0";
public const string Revision = "1540";
public const string Revision = "1541";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=3
%REVISION%=1540
%COREVERSION%=0
%REVISION%=1541
%MINOR%=3
%MAJOR%=3

BIN
Localization/DefaultLang.resources
View file

Binary file not shown.

2
Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
View file

@ -2,7 +2,7 @@
// This CSharp output file generated by Gardens Point LEX
// Version: 1.1.3.301
// Machine: DESKTOP-A6LT9RI
// DateTime: 28.09.2017 8:51:06
// DateTime: 29.09.2017 13:47:41
// UserName: ?????????
// GPLEX input file <ABCPascal.lex>
// GPLEX frame file <embedded resource>

8
Parsers/PascalABCParserNewSaushkin/ABCPascal.y
View file

@ -650,14 +650,14 @@ var_decl_sect
{
$$ = ($1 as variable_definitions).Add($2 as var_def_statement, @$);
}
| tkVar tkRoundOpen identifier tkComma ident_list tkRoundClose tkAssign expr tkSemiColon
/* | tkVar tkRoundOpen identifier tkComma ident_list tkRoundClose tkAssign expr tkSemiColon
{
if ($7.type != Operators.Assignment)
parsertools.AddErrorFromResource("ONLY_BASE_ASSIGNMENT_FOR_TUPLE",@6);
($5 as ident_list).Insert(0,$3);
$5.source_context = LexLocation.MergeAll(@1,@2,@3,@4,@5,@6);
$$ = new assign_var_tuple($5 as ident_list, $8, @$);
}
}*/
;
const_decl
@ -2346,12 +2346,12 @@ var_stmt
($5 as syntax_tree_node).source_context = LexLocation.MergeAll(@1,@2,@3,@4,@5,@6);
$$ = new assign_var_tuple($5 as ident_list, $8, @$);
}
/* | tkVar tkRoundOpen identifier tkComma ident_list tkRoundClose tkAssign expr
| tkVar tkRoundOpen identifier tkComma ident_list tkRoundClose tkAssign expr
{
($5 as ident_list).Insert(0,$3);
$5.source_context = LexLocation.MergeAll(@1,@2,@3,@4,@5,@6);
$$ = new assign_var_tuple($5 as ident_list, $8, @$);
}*/
}
;
assignment

3233
Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
View file

File diff suppressed because it is too large Load diff

1
Parsers/PascalABCParserNewSaushkin/PABC.ymc
View file

@ -175,5 +175,6 @@ script=

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.3.0.1540'
!define VERSION '3.3.0.1541'

10
bin/Lib/GraphWPF.pas
View file

@ -391,7 +391,7 @@ procedure DrawGraph(f: real -> real);
procedure SetMathematicCoords(x1: real := -10; x2: real := 10; drawcoords: boolean := true);
procedure SetMathematicCoords(x1,x2,ymin: real; drawcoords: boolean := true);
procedure SetStandardCoords(scale: real := 1.0);
procedure SetStandardCoords(scale: real := 1.0; x0: real := 0; y0: real := 0);
procedure DrawGrid;
function XMin: real;
@ -1228,18 +1228,18 @@ end;
procedure SetMathematicCoords(x1: real; x2: real; drawcoords: boolean) := Invoke(SetMathematicCoordsP,x1,x2,drawcoords);
procedure SetMathematicCoords(x1,x2,ymin: real; drawcoords: boolean) := Invoke(SetMathematicCoordsP1,x1,x2,ymin,drawcoords);
procedure SetStandardCoordsP(scale: real := 1.0);
procedure SetStandardCoordsP(scale: real := 1.0; x0: real := 0; y0: real := 0);
begin
Window.Clear;
CurrentCoordType := ScreenCoords;
XOrigin := 0;
YOrigin := 0;
GlobalScale := scale;
var m: Transform := new MatrixTransform(scale,0,0,scale,0,0);
var m: Transform := new MatrixTransform(scale,0,0,scale,x0,y0);
Host.RenderTransform := m;
Pen.Width := Pen.Width / scale;
Pen.Width := Pen.Width * scale;
end;
procedure SetStandardCoords(scale: real) := Invoke(SetStandardCoordsP,scale);
procedure SetStandardCoords(scale,x0,y0: real) := Invoke(SetStandardCoordsP,scale,x0,y0);
/// --- SystemMouseEvents