From 3e4863abf614c6b65a05c803dce23bea2de4b1d1 Mon Sep 17 00:00:00 2001
From: doom4ster <doom4ster@gmail.com>
Date: 星期四, 01 二月 2018 17:25:30 +0800
Subject: [PATCH] 65 修正匯入轉向問題

---
 ErrList.pas |   60 +++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/ErrList.pas b/ErrList.pas
index 0947599..a7ef3c0 100644
--- a/ErrList.pas
+++ b/ErrList.pas
@@ -180,27 +180,37 @@
   S := TStringlist.Create;
   S1 := TStringlist.Create;
   ini := Tinifile.Create(iniPath+'Checkerr.ini');
+
   try
     if FileExists(iniPath+'RemoveMemo.dat') then
       S.LoadFromFile(iniPath+'RemoveMemo.dat');
-    ini.WriteBool(NowIndex,'Del',True);
-    S.Add(ini.ReadString(NowIndex,'Reason',''));
-    S.SaveToFile(iniPath+'RemoveMemo.dat');
-    i := ErrListLV.ItemIndex;
-    ErrListLV.Items.Delete(ErrListLV.ItemIndex);
-    if ErrListLV.Items.Count = 0 then
+
+    Ingnore := ini.ReadBool(NowIndex,'Ingnore',False);
+    if True then
     begin
-      ImmediateBt.Enabled := True;
-      S1.Add('Y');
-      S1.SaveToFile(iniPath+'OMRCheckOk.dat');
+      ini.WriteBool(NowIndex,'Del',True);
+      S.Add(ini.ReadString(NowIndex,'Reason',''));
+      S.SaveToFile(iniPath+'RemoveMemo.dat');
+      i := ErrListLV.ItemIndex;
+      ErrListLV.Items.Delete(ErrListLV.ItemIndex);
+      if ErrListLV.Items.Count = 0 then
+      begin
+        ImmediateBt.Enabled := True;
+        S1.Add('Y');
+        S1.SaveToFile(iniPath+'OMRCheckOk.dat');
+      end
+      else
+      begin
+        if i <= ErrListLV.Items.Count -1 then
+        begin
+          ErrListLV.ItemIndex := i;
+          ErrListLVclick(nil);
+        end;
+      end;
     end
     else
     begin
-      if i <= ErrListLV.Items.Count -1 then
-      begin
-        ErrListLV.ItemIndex := i;
-        ErrListLVclick(nil);
-      end;
+      Showmessage(Format(_msg('%s�����i�������صL�k�j���e��'),['']));
     end;
 
   finally
@@ -239,7 +249,7 @@
         ErrListLV.Items.Delete(i);
         if ErrListLV.Items.Count = 0 then
         begin
-          //ImmediateBt.Enabled := True;
+          ImmediateBt.Enabled := True;
           S1.Add('Y');
           S1.SaveToFile(iniPath+'OMRCheckOk.dat');
         end;
@@ -454,10 +464,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;
 
@@ -511,12 +523,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