From 8adb8e488b9e773cc8506682bfbb436468e1fdfb Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 22 Jan 2016 19:53:06 +0100 Subject: Kommaanpassung --- filterBruteForce.lpi | 7 ------- filterBruteForce.res | Bin 138128 -> 138696 bytes unit1.lfm | 16 ++++++++++------ unit2.pas | 7 +++++++ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/filterBruteForce.lpi b/filterBruteForce.lpi index 177d4c1..468913d 100644 --- a/filterBruteForce.lpi +++ b/filterBruteForce.lpi @@ -37,7 +37,6 @@ - @@ -71,12 +70,6 @@ - - - - - - diff --git a/filterBruteForce.res b/filterBruteForce.res index 7c6cf3e..e994dfa 100644 Binary files a/filterBruteForce.res and b/filterBruteForce.res differ diff --git a/unit1.lfm b/unit1.lfm index 8f28e14..218c186 100644 --- a/unit1.lfm +++ b/unit1.lfm @@ -1,7 +1,7 @@ object Form1: TForm1 - Left = 222 + Left = 270 Height = 544 - Top = 140 + Top = 334 Width = 1018 Caption = 'Form1' ClientHeight = 544 @@ -10,7 +10,7 @@ object Form1: TForm1 OnCreate = FormCreate OnDestroy = FormDestroy OnResize = FormResize - LCLVersion = '1.2.2.0' + LCLVersion = '1.4.4.0' object Memo1: TMemo Left = 0 Height = 528 @@ -33,7 +33,7 @@ object Form1: TForm1 Left = 0 Height = 13 Top = 0 - Width = 77 + Width = 98 Caption = 'Kondensatoren:' ParentColor = False end @@ -56,7 +56,7 @@ object Form1: TForm1 Left = 152 Height = 13 Top = 0 - Width = 72 + Width = 98 Caption = 'Potentiometer:' ParentColor = False end @@ -75,7 +75,7 @@ object Form1: TForm1 Left = 303 Height = 13 Top = 0 - Width = 61 + Width = 77 Caption = 'Frequenzen:' ParentColor = False end @@ -95,7 +95,9 @@ object Form1: TForm1 Width = 76 ItemHeight = 0 OnClick = ListBox1Click + ScrollWidth = 72 TabOrder = 4 + TopIndex = -1 end object ListBox2: TListBox Left = 534 @@ -103,6 +105,8 @@ object Form1: TForm1 Top = 0 Width = 484 ItemHeight = 0 + ScrollWidth = 480 TabOrder = 5 + TopIndex = -1 end end diff --git a/unit2.pas b/unit2.pas index c88b14b..984a849 100644 --- a/unit2.pas +++ b/unit2.pas @@ -206,7 +206,14 @@ const fak: array[0..13] of extended = (1e3,1e6,1e9,1e12,1e15,1e18,1e-3,1e-6,1e-9,1e-12,1e-15,1e-18,1e-21,1e-24); var i: longint; + c: char; begin + if decimalseparator='.' then + c:=',' + else + c:='.'; + while pos(c,x)>0 do + x[pos(c,x)]:=decimalseparator; for i:=0 to length(edg)-1 do if pos(edg[i],x)>0 then begin add(strtofloat(trim(leftStr(x,pos(edg[i],x)-1)))*fak[i],cnt); -- cgit v1.2.3-54-g00ecf