From 3eee691affae3ca6ae2bbe82a8eb371e21dba2eb Mon Sep 17 00:00:00 2001
From: doom4ster <doom4ster@gmail.com>
Date: 星期一, 11 十二月 2017 15:25:00 +0800
Subject: [PATCH] CB_IMGPSScan.cab ver2.0.1.59   接 jpg壓縮參數, 修改匯入訊息

---
 CB_IMGPSScanImp.dcu |    0 
 CB_IMGPSScan.ocx    |    0 
 CB_IMGPSScan.dproj  |    4 ++--
 CB_IMGPSScan.res    |    0 
 CB_IMGPSScanImp.pas |   17 ++++++++++++++---
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/CB_IMGPSScan.dproj b/CB_IMGPSScan.dproj
index af0a31e..d44b410 100644
--- a/CB_IMGPSScan.dproj
+++ b/CB_IMGPSScan.dproj
@@ -95,7 +95,7 @@
 						<VersionInfo Name="MajorVer">2</VersionInfo>
 						<VersionInfo Name="MinorVer">0</VersionInfo>
 						<VersionInfo Name="Release">1</VersionInfo>
-						<VersionInfo Name="Build">58</VersionInfo>
+						<VersionInfo Name="Build">59</VersionInfo>
 						<VersionInfo Name="Debug">False</VersionInfo>
 						<VersionInfo Name="PreRelease">False</VersionInfo>
 						<VersionInfo Name="Special">False</VersionInfo>
@@ -107,7 +107,7 @@
 					<VersionInfoKeys>
 						<VersionInfoKeys Name="CompanyName"/>
 						<VersionInfoKeys Name="FileDescription"/>
-						<VersionInfoKeys Name="FileVersion">2.0.1.58</VersionInfoKeys>
+						<VersionInfoKeys Name="FileVersion">2.0.1.59</VersionInfoKeys>
 						<VersionInfoKeys Name="InternalName"/>
 						<VersionInfoKeys Name="LegalCopyright"/>
 						<VersionInfoKeys Name="LegalTrademarks"/>
diff --git a/CB_IMGPSScan.ocx b/CB_IMGPSScan.ocx
index c6f3c5b..bba8f47 100644
--- a/CB_IMGPSScan.ocx
+++ b/CB_IMGPSScan.ocx
Binary files differ
diff --git a/CB_IMGPSScan.res b/CB_IMGPSScan.res
index 8f4ac8e..ec61a0a 100644
--- a/CB_IMGPSScan.res
+++ b/CB_IMGPSScan.res
Binary files differ
diff --git a/CB_IMGPSScanImp.dcu b/CB_IMGPSScanImp.dcu
index 8491957..33fcc31 100644
--- a/CB_IMGPSScanImp.dcu
+++ b/CB_IMGPSScanImp.dcu
Binary files differ
diff --git a/CB_IMGPSScanImp.pas b/CB_IMGPSScanImp.pas
index 934e990..a02ce81 100644
--- a/CB_IMGPSScanImp.pas
+++ b/CB_IMGPSScanImp.pas
@@ -565,6 +565,7 @@
 
     FirstDocDir : String;
     FMaxUploadSize:String;// 上傳zip大小限制
+    FJpgCompression:integer;// 20171211 jpg to tif 的壓縮率
 
     Draging : Boolean;
 
@@ -2689,6 +2690,7 @@
   SaveStream     : TFileStream;
   SaveStreamA:TFileStream;
   SaveStreamB:TFileStream;
+  cooom:integer;
 Begin
   OpenDialog1.Filter := 'Image files|*.TIF;*.JPG';
   If OpenDialog1.Execute Then
@@ -2712,11 +2714,14 @@
     If FileRec.Size > FFileSizeLimit * 1024 Then // 檢查檔案大小
     Begin
       ShowMessage(Format('目前檔案大小為 %.3f MB', [FileRec.Size / (1024*1024)]) +
-        '已超過單一檔案匯入限制'+Format('%.1f',[FFileSizeLimit/1024])+'MB');
+        ',已超過單一檔案匯入限制'+Format('%.1f',[FFileSizeLimit/1024])+'MB');
       FindClose(FileRec);
       DataLoading(false, false);
       Exit;
     End;
+    //MessageDlg()
+    //cooom:=StrToInt(InputBox('輸入百分比','輸入百分比',''));
+    cooom:=FJpgCompression;//20171211彩色tif採jpg壓縮的比例
 
     FindClose(FileRec);
     CaseID := NowCaseno;
@@ -2847,7 +2852,7 @@
           if iGraphic.Palette.palNumEntries = 0 then  //20171130 彩色 會為0  黑白 為2
           begin
             iGraphic.Compression:=tcJPEG;
-            iGraphic.JpegQuality:=70;
+            iGraphic.JpegQuality:=cooom;
           end;
 
           If LowerCase(ExtractFileExt(SavePath + SaveFilename)) = '.tif' Then
@@ -2927,7 +2932,7 @@
           if iGraphic.Palette.palNumEntries = 0 then  //20171130 彩色 會為0  黑白 為2
           begin
             iGraphic.Compression:=tcJPEG;
-            iGraphic.JpegQuality:=70;
+            iGraphic.JpegQuality:=cooom;
           end;
 
           If LowerCase(ExtractFileExt(SavePath + SaveFilename)) = '.tif' Then
@@ -5156,6 +5161,11 @@
     begin
       PARA_CONTENT := GetSQLData(WORK_INF_List,'PARA_CONTENT',i);
       DivPageFormIDList.CommaText := PARA_CONTENT;
+    end
+    Else if UpperCase(GetSQLData(WORK_INF_List,'PARA_NO',i)) = 'FILE_COMPRESSION' Then     //20171211 jpg to tif 壓縮比
+    begin
+      PARA_CONTENT := GetSQLData(WORK_INF_List,'PARA_CONTENT',i);
+      FJpgCompression := StrToInt(PARA_CONTENT);
     end
     Else if UpperCase(GetSQLData(WORK_INF_List,'PARA_NO',i)) = 'MAX_UPLOAD_SIZE' Then     //取得 上傳大小的限制(MB)
     begin
@@ -14053,6 +14063,7 @@
   InitialOk := False;
 
   FMaxUploadSize:='10';
+  FJpgCompression:=50;
   //FMode := 'DSCAN' ;
   //FIs_In_Wh := 'Y';
   if FIs_In_Wh = 'Y' then

--
Gitblit v1.8.0