From b99a22f6e7e27e01a22a4db9107108972d20597b Mon Sep 17 00:00:00 2001
From: doom4ster <doom4ster@gmail.com>
Date: 星期三, 05 七月 2017 14:11:41 +0800
Subject: [PATCH] CB_IMGPSScan.cab ver2.0.1.19 匯入影像有條碼就轉正
---
CB_IMGPSScanImp.dcu | 0
CB_IMGPSScan.ocx | 0
CB_IMGPSScan.dproj | 4 ++--
CB_IMGPSScan.res | 0
CB_IMGPSScanImp.pas | 28 ++++++++++++++++++++++++++--
5 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/CB_IMGPSScan.dproj b/CB_IMGPSScan.dproj
index 7141ba5..f4de06c 100644
--- a/CB_IMGPSScan.dproj
+++ b/CB_IMGPSScan.dproj
@@ -94,7 +94,7 @@
<VersionInfo Name="MajorVer">2</VersionInfo>
<VersionInfo Name="MinorVer">0</VersionInfo>
<VersionInfo Name="Release">1</VersionInfo>
- <VersionInfo Name="Build">18</VersionInfo>
+ <VersionInfo Name="Build">19</VersionInfo>
<VersionInfo Name="Debug">False</VersionInfo>
<VersionInfo Name="PreRelease">False</VersionInfo>
<VersionInfo Name="Special">False</VersionInfo>
@@ -106,7 +106,7 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName"/>
<VersionInfoKeys Name="FileDescription"/>
- <VersionInfoKeys Name="FileVersion">2.0.1.18</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">2.0.1.19</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"/>
<VersionInfoKeys Name="LegalCopyright"/>
<VersionInfoKeys Name="LegalTrademarks"/>
diff --git a/CB_IMGPSScan.ocx b/CB_IMGPSScan.ocx
index 422b399..1386deb 100644
--- a/CB_IMGPSScan.ocx
+++ b/CB_IMGPSScan.ocx
Binary files differ
diff --git a/CB_IMGPSScan.res b/CB_IMGPSScan.res
index 4873e5f..edb6b81 100644
--- a/CB_IMGPSScan.res
+++ b/CB_IMGPSScan.res
Binary files differ
diff --git a/CB_IMGPSScanImp.dcu b/CB_IMGPSScanImp.dcu
index 82baff9..b37c18c 100644
--- a/CB_IMGPSScanImp.dcu
+++ b/CB_IMGPSScanImp.dcu
Binary files differ
diff --git a/CB_IMGPSScanImp.pas b/CB_IMGPSScanImp.pas
index e17222c..08dbec7 100644
--- a/CB_IMGPSScanImp.pas
+++ b/CB_IMGPSScanImp.pas
@@ -2593,12 +2593,14 @@
ShowText :=_Msg('檔案加入中,請稍候('+inttostr(i)+'/'+inttostr(P)+')');
DataLoading(True,True);
ISB.LoadFromFile(FName,i);
+//ISB.SaveToFile('C:\OCX\aaaaaa'+IntToStr(i)+'.tif');
DeskewImg(ISB.Graphic);
+//ISB.SaveToFile('C:\OCX\bbbbbb'+IntToStr(i)+'.tif');
if (TreeView1.Selected = NewTreeNode) or (TreeView1.Selected = MyTreeNode1) then
begin
SaveFilename := '';
MpsGetBarcode(ISB.Graphic,MpsBarcodeinf);
- for n := 1 to MpsBarcodeinf.Count-1 do
+ for n := 1 to MpsBarcodeinf.Count do
begin
if MpsBarcodeinf.r180[n] <> 0 then //依條碼角度轉影像
begin
@@ -2663,6 +2665,17 @@
SaveFilename:= Add_Zoo(ContextList.Count+1,3)+ext
Else
SaveFilename := Add_Zoo(ContextList.Count+1,3)+'_'+SaveFilename+ext;
+
+ for n := 1 to MpsBarcodeinf.Count do
+ begin
+ if MpsBarcodeinf.r180[n] <> 0 then //依條碼角度轉影像
+ begin
+ Rotate(ISB.Graphic,MpsBarcodeinf.r180[n]);
+ MpsGetBarcode(ISB.Graphic,MpsBarcodeinf);
+ Break;
+ end;
+ end;
+ //Rotate(ISB.Graphic,MpsBarcodeinf.r180[n]); //20170705 加入有條碼就轉正
ISB.SaveToFile(SavePath+SaveFilename);
SetContextList('A',-1,CaseID,DocDir,SaveFilename);
@@ -2691,6 +2704,17 @@
SaveFilename := Add_Zoo(ContextList.Count+1,3)+'_'+NowFormCode+ext
else
SaveFilename := Add_Zoo(ContextList.Count+1,3)+ext;
+
+ for n := 1 to MpsBarcodeinf.Count do
+ begin
+ if MpsBarcodeinf.r180[n] <> 0 then //依條碼角度轉影像
+ begin
+ Rotate(ISB.Graphic,MpsBarcodeinf.r180[n]);
+ MpsGetBarcode(ISB.Graphic,MpsBarcodeinf);
+ Break;
+ end;
+ end;
+ //Rotate(ISB.Graphic,MpsBarcodeinf.r180[n]); //20170705 加入有條碼就轉正
ISB.SaveToFile(SavePath+SaveFilename);
ContextList.Add(SaveFilename);
ContextList.SaveToFile(SavePath+'Context.dat');
@@ -13593,7 +13617,7 @@
ShowText := CaseID+_Msg('資料上傳中,請稍候');
DataLoading(True,True);
//ShowMessage('NNNNN');
-ShowMessage('退出');DataLoading(False,False);Exit;
+//ShowMessage('退出');DataLoading(False,False);Exit;
If Not TransCaseID(TransPath,CaseID,True) Then //傳送案件
begin
DataLoading(False,False);
--
Gitblit v1.8.0