From ef8675b8cf493c2b08c428b8f9f5e35a5c52e51c Mon Sep 17 00:00:00 2001
From: Hong-Dell\Hong <chlin1022@i-mps.com>
Date: 星期二, 08 十一月 2022 12:04:52 +0800
Subject: [PATCH] Ver 2,0,1,77

---
 ErrList.pas |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/ErrList.pas b/ErrList.pas
index f4b82eb..ed4543d 100644
--- a/ErrList.pas
+++ b/ErrList.pas
@@ -5,7 +5,8 @@
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, OleCtrls, Menus, StdCtrls, Buttons, ComCtrls, ExtCtrls,inifiles,
-  iisUnit,iis_ImageProcess, EnImgScr,mpsBarco,BarcodesFinder, EnMisc, EnDiGrph;
+  iisUnit,iis_ImageProcess, EnImgScr,mpsBarco,BarcodesFinder, EnMisc, EnDiGrph,
+  LogFile;
 
 type
   TErrlistForm = class(TForm)
@@ -39,6 +40,7 @@
     ImageScrollBox2: TImageScrollBox;
     ImageScrollBox3: TImageScrollBox;
     Button1: TButton;
+    LogFile1: TLogFile;
     procedure ExitBtClick(Sender: TObject);
     procedure ImmediateBtClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -103,7 +105,8 @@
     Procedure ShowRelaOMRErr(Relaidx:Integer); //�e���W�q�X���YOMR�ˮ֥���
     Procedure GetOMRErrini(Index:String); //���ˮ֥���ini
     Procedure InitialData;
-    procedure ImageScrollBox1NewGraphic(const Graphic: TDibGraphic);  //��_����������A
+    procedure ImageScrollBox1NewGraphic(const Graphic: TDibGraphic);
+    function logTimeString: String;  //��_����������A
   public
     { Public declarations }
     iniPath : String;
@@ -348,6 +351,12 @@
 procedure TErrlistForm.ImmediateBtClick(Sender: TObject);
 begin
   ModalResult := mrOK;
+  LogFile1.LogToFile(logTimeString+'�ߧY�e��');
+end;
+
+function TErrlistForm.logTimeString: String;
+begin
+Result:=FormatDateTime('yyyymmdd hh:mm:ss',now)+'  ';
 end;
 
 procedure TErrlistForm.RelaNextBtClick(Sender: TObject);
@@ -464,10 +473,12 @@
       //if MpsViewX2.FileName <> RelaFileName then
       //begin
         ImageScrollBox2.LoadFromFile(RelaFileName,1);
-        FindPoint(ImageScrollBox2.Graphic,UpLPoint_Rela,UpRPoint_Rela,DownLPoint_Rela,'');
+        //FindPoint(ImageScrollBox2.Graphic,UpLPoint_Rela,UpRPoint_Rela,DownLPoint_Rela,'');
+        FindPoint(ImageScrollBox2.Graphic,UpLPoint,UpRPoint,DownLPoint,NowW,NowH,ANCHOR);
         //GetFFPoint(MpsViewX2,RelaFileName); //��FreeForm���Q�r�I���
 
       //end;
+
       ShowRelaOMRErr(RelaSiteIdx);
     end;
 
@@ -521,12 +532,26 @@
 var
   Site : String;
   iRect : TRect;
+  SP:TShape;
 begin
   if RelaIdx > RelaSiteList.Count then Exit;
 
+  SP := TShape(FindComponent('SP'+inttostr(RelaIdx+1))); //20170327 �b�j�餤�n�ϥΦh�վB�n
+  SP.Brush.Color :=$00FEFAAD;
+  SP.Parent := ImageScrollBox1;
+  SP.Pen.Style := psSolid;
+  SP.Pen.Color := $00FEFAAD;
+  SP.Pen.Width := 1;
+  SP.Pen.Mode := pmMask;
+  SP.Left := iRect.Left;
+  SP.Top := iRect.Top;
+  SP.Width := iRect.Right-iRect.Left;
+  SP.Height := iRect.Bottom-iRect.Top;
+
   Site := RelaSiteList.Strings[RelaIdx-1];
   iRect := CM_Str2Rect(Site,ImageScrollBox1.Graphic.XDotsPerInch,UpLPoint_Rela);
-  ShowKeyinRect(ImageScrollBox2,iRect);
+  //ShowKeyinRect(ImageScrollBox2,iRect);
+  SetKeyinRect_New(ImageScrollBox2,Site,'','',UpLPoint,UpRPoint,sp);
 end;
 
 procedure TErrlistForm.SiteNextBtClick(Sender: TObject);

--
Gitblit v1.8.0