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

fix #1003

Browse source
This commit is contained in:
miks1965 2018-08-02 12:00:51 +03:00
parent ab59b0e33b
commit 753759b888
5 changed files with 24 additions and 6 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 = "0";
public const string Revision = "1721";
public const string Revision = "1723";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

2
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=0
%REVISION%=1721
%REVISION%=1723
%MINOR%=4
%MAJOR%=3

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.4.0.1721'
!define VERSION '3.4.0.1723'

17
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -1455,6 +1455,8 @@ function UpperCase(s: string): string;
function StringOfChar(ch: char; count: integer): string;
/// Возвращает инвертированную строку
function ReverseString(s: string): string;
/// Возвращает инвертированную строку в диапазоне длины length начиная с индекса index
function ReverseString(s: string; index,length: integer): string;
/// Сравнивает строки. Возвращает значение < 0 если s1<s2, > 0 если s1>s2 и = 0 если s1=s2
function CompareStr(s1, s2: string): integer;
/// Возвращает первые count символов строки s
@ -7627,6 +7629,13 @@ begin
Result := new string(ca);
end;
function ReverseString(s: string; index,length: integer): string;
begin
var ca := s.ToCharArray;
&Array.Reverse(ca,index,length);
Result := new string(ca);
end;
function CompareStr(s1, s2: string): Integer;
begin
Result := string.CompareOrdinal(s1, s2);
@ -11218,6 +11227,14 @@ begin
System.Threading.Thread.CurrentThread.CurrentUICulture := System.Globalization.CultureInfo.GetCultureInfo(locale_str);
nfi := new System.Globalization.NumberFormatInfo();
nfi.NumberGroupSeparator := '.';
// SSM 1.08.18 только в текущем потоке будет точка в вещетвенных
// В Net 4.6 System.Globalization.CultureInfo.DefaultThreadCurrentCulture := ci
// Но как сделать чтобы работало и в младших NET - не знаю
var ci := (System.Globalization.CultureInfo.CurrentCulture.Clone as System.Globalization.CultureInfo);
ci.NumberFormat := nfi;
System.Globalization.CultureInfo.CurrentCulture := ci;
// System.Threading.Thread.CurrentThread.CurrentCulture := new System.Globalization.CultureInfo('en-US');
//rnd := new System.Random;
StartTime := DateTime.Now;

7
bin/Lib/Graph3D.pas
View file

@ -1066,9 +1066,10 @@ type
Element.transfgroup.Children.Add(el);
var ttname := 't' + el.GetHashCode;
if not RegisterName(sb, el, ttname) then;
dax := AddDoubleAnimByNameUsingKeyframes(sb, a.Select(p -> p.x-Element.x), seconds, ttname, TranslateTransform3D.OffsetXProperty);
day := AddDoubleAnimByNameUsingKeyframes(sb, a.Select(p -> p.y-Element.y), seconds, ttname, TranslateTransform3D.OffsetYProperty);
daz := AddDoubleAnimByNameUsingKeyframes(sb, a.Select(p -> p.z-Element.z), seconds, ttname, TranslateTransform3D.OffsetZProperty);
var aa := a.ToArray;
dax := AddDoubleAnimByNameUsingKeyframes(sb, aa.Select(p -> p.x-Element.x), seconds, ttname, TranslateTransform3D.OffsetXProperty);
day := AddDoubleAnimByNameUsingKeyframes(sb, aa.Select(p -> p.y-Element.y), seconds, ttname, TranslateTransform3D.OffsetYProperty);
daz := AddDoubleAnimByNameUsingKeyframes(sb, aa.Select(p -> p.z-Element.z), seconds, ttname, TranslateTransform3D.OffsetZProperty);
daz.Completed += Hand;
end;