From cff8a04370046750eafa6f556e041358d4cf4d16 Mon Sep 17 00:00:00 2001
From: doom4ster <doom4ster@gmail.com>
Date: 星期一, 12 六月 2017 09:16:35 +0800
Subject: [PATCH] scan ocx ver2.0.1.14 修正image resize的問題

---
 CB_IMGPSScanImp.pas |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CB_IMGPSScanImp.pas b/CB_IMGPSScanImp.pas
index a18e5ee..46a1807 100644
--- a/CB_IMGPSScanImp.pas
+++ b/CB_IMGPSScanImp.pas
@@ -678,7 +678,7 @@
     Function FindFormCodePages(CaseID,FormCode:String):Integer;  //計算案件裡FormID的頁數
     Function GetDataFormCodePages(FormCode:String):Integer;   //取記錄的FormcID的頁數
     Procedure CaseReSize(CaseID:String); //案件的影像縮放
-    Procedure ImageReSize(CaseID,FileName:String);  //依十字定位點做縮放
+    Procedure ImageReSize_FormID(CaseID,FileName:String);  //依十字定位點做縮放
     Procedure ImageReSize_tmp(FormID,FileName:String);  //依十字定位點做縮放(暫存檔)
     Function TransCaseID(Path,CaseID:String;MainCase:Boolean):Boolean; //傳送案件
     Procedure NewTreeNodeRefresh;
@@ -5419,14 +5419,14 @@
     For i := 0 to S.Count -1 do
     begin
       FileName := S.Strings[i];
-      ImageReSize(CaseID,FileName);  //依十字定位點做縮放
+      ImageReSize_FormID(CaseID,FileName);  //依十字定位點做縮放
     end;
   finally
   S.Free;
   end;
 end;
 
-Procedure TCB_IMGPSScanX.ImageReSize(CaseID,FileName:String);  //依十字定位點做縮放
+Procedure TCB_IMGPSScanX.ImageReSize_FormID(CaseID,FileName:String);  //依十字定位點做縮放
 var
   FormID : String;
   DH,DW : String;
@@ -5445,17 +5445,27 @@
     DW := GetFindResult('T1.FORM_WIDTH');
     ANCHOR := UpperCase(GetFindResult('T1.ANCHOR'));
     ANCHOR := Index2Anchor(ANCHOR);
+//showmessage(FormID+#13+DH+#13+DW+#13);
+//ShowMessage('AAAAAAAAA');
     if ((ANCHOR = 'ANCHOR') or (ANCHOR = 'FRAME')) and (DH <> '') and (DW <> '') then  //有十字定位點
     begin
+//ShowMessage('BBBBBBB');
       ImageScrollBox1.LoadFromFile(ImageSavePath+CaseID+'\Upload\'+FileName,1);
       //FindPoint(ImageScrollBox1.Graphic,UpLPoint,UpRPoint,DownLPoint,NowW,NowH);
       FindPoint(ISB_BW.Graphic,UpLPoint,UpRPoint,DownLPoint,NowW,NowH,ANCHOR);
+
       SizeStr := CheckSize(ISB_BW,UpLPoint,UpRPoint,DownLPoint,DW,DH);
+      ImageResize(ImageScrollBox1.Graphic,ISB_BW.Graphic.Width,ISB_BW.Graphic.Height);
+
+      FindPoint(ISB_BW.Graphic,UpLPoint,UpRPoint,DownLPoint,NowW,NowH,ANCHOR);
       v := 5;
       v1 := length(SizeStr);
       IF (SizeStr <> '') and (Copy(SizeStr,1,v) <> 'ERROR') then
       begin
+//ShowMessage('CCCCC');
+
         ImageScrollBox1.SaveToFile(ImageSavePath+CaseID+'\Upload\'+FileName);
+//showmessage(ImageSavePath+CaseID+'\Upload\'+FileName);
         S := TStringlist.Create;                     ///20110422拿掉 換成上傳才做
         if FileExists(ImageSavePath+CaseID+'\Upload\ReSize.dat') then
           S.LoadFromFile(ImageSavePath+CaseID+'\Upload\ReSize.dat');
@@ -10747,7 +10757,7 @@
           OMRFormName := FormCode2FormName(CaseID,OMRFormCode);
           Anchor := FormID2Anchor(OMRFormCode);
           ///依十字定位點縮放////
-          ImageReSize(CaseID,OMRFile);
+          ImageReSize_FormID(CaseID,OMRFile);
           ////依十字定位點縮放////
           if not FileExists(CheckXmlPath+OMRFormCode+'.xml') then  //沒有Xml就不用檢核
             Continue;

--
Gitblit v1.8.0