Added stack amount error calculating

ALTracer · Oct 16, 2015 · 7cca75c · 7cca75c
1 parent 1393e95
commit 7cca75c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 24 deletions.
diff --git a/ream.lpi b/ream.lpi
@@ -8,7 +8,6 @@
       <Title Value="ream"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
-      <Icon Value="0"/>
     </General>
     <i18n>
       <EnableI18N LFM="False"/>

diff --git a/ream.res b/ream.res
diff --git a/unit1.lfm b/unit1.lfm
@@ -9,65 +9,65 @@ object Form1: TForm1
   LCLVersion = '1.4.4.0'
   object Edit1: TEdit
     Left = 72
-    Height = 27
+    Height = 23
     Top = 64
     Width = 40
     TabOrder = 0
     Text = '39.7'
   end
   object LabelZ: TLabel
     Left = 16
-    Height = 17
+    Height = 15
     Top = 64
-    Width = 49
+    Width = 47
     Caption = 'Замеры:'
     ParentColor = False
   end
   object Edit2: TEdit
     Left = 120
-    Height = 27
+    Height = 23
     Top = 64
     Width = 40
     TabOrder = 1
     Text = '40.1'
   end
   object Edit3: TEdit
     Left = 168
-    Height = 27
+    Height = 23
     Top = 64
     Width = 40
     TabOrder = 2
     Text = '40.1'
   end
   object Edit4: TEdit
     Left = 216
-    Height = 27
+    Height = 23
     Top = 64
     Width = 40
     TabOrder = 3
     Text = '40.2'
   end
   object Edit5: TEdit
     Left = 264
-    Height = 27
+    Height = 23
     Top = 64
     Width = 40
     TabOrder = 4
     Text = '40.5'
   end
   object Edit6: TEdit
     Left = 168
-    Height = 27
+    Height = 23
     Top = 160
     Width = 40
     TabOrder = 5
     Text = '0.1'
   end
   object LabelD: TLabel
     Left = 8
-    Height = 17
+    Height = 15
     Top = 160
-    Width = 151
+    Width = 143
     Caption = 'Приборная погрешность:'
     ParentColor = False
   end
@@ -82,59 +82,59 @@ object Form1: TForm1
   end
   object Label1: TLabel
     Left = 16
-    Height = 17
+    Height = 15
     Top = 192
-    Width = 67
+    Width = 63
     Caption = '-результат-'
     ParentColor = False
   end
   object EditN: TEdit
     Left = 168
-    Height = 27
+    Height = 23
     Top = 99
     Width = 40
     TabOrder = 7
     Text = '500'
   end
   object Labelmm: TLabel
     Left = 311
-    Height = 17
+    Height = 15
     Top = 72
     Width = 18
     Caption = 'мм'
     ParentColor = False
   end
   object RBtn_N: TRadioButton
     Left = 50
-    Height = 22
+    Height = 19
     Top = 104
-    Width = 67
+    Width = 59
     Caption = 'Листов'
     TabOrder = 8
   end
   object RBtn_T: TRadioButton
     Left = 50
-    Height = 22
+    Height = 19
     Top = 128
-    Width = 109
+    Width = 102
     Caption = 'Толщина, мкм'
     Checked = True
     TabOrder = 9
     TabStop = True
   end
   object EditT: TEdit
     Left = 168
-    Height = 27
+    Height = 23
     Top = 128
     Width = 40
     TabOrder = 10
     Text = '105.0'
   end
   object LabelWat: TLabel
     Left = 16
-    Height = 17
+    Height = 15
     Top = 8
-    Width = 321
+    Width = 302
     Caption = 'Вычисляет кол-во листов в стопке или толщину листа'
     ParentColor = False
   end

diff --git a/unit1.pas b/unit1.pas
@@ -42,7 +42,7 @@   TForm1 = class(TForm)
   ad:array of Double;
   ie,t:Single;
   d:Double;
-  amount:LongInt;
+  amount,a_abs:LongInt;
 
 implementation
 
@@ -121,7 +121,9 @@ procedure TForm1.Button1Click(Sender: TObject);
   begin
     amount:=Round(d*1000000/t);
     Str(amount,sd);
-    Label1.Caption:='В пачке '+sd+' листов';
+    a_abs:=Round(d*eps*1000000);
+    Str(a_abs,sabs);
+    Label1.Caption:='В пачке '+sd+'~'+sabs+' листов';
   end;
 end;