From 23a9be440db7609fb64d98c225a63cc041352780 Mon Sep 17 00:00:00 2001
From: doom4ster <doom4ster@gmail.com>
Date: 星期四, 13 七月 2017 16:53:10 +0800
Subject: [PATCH] CB_IMGPSView.cab ver2.0.0.11 修正放大鏡問題
---
CB_IMGPSScanImp.dfm | 12 +++++++++---
CB_IMGPSScanImp.dcu | 0
CB_IMGPSScan.ocx | 0
CB_IMGPSScan.dproj | 4 ++--
CB_IMGPSScan.res | 0
CB_IMGPSScanImp.pas | 26 ++++++++++++++++++++------
6 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/CB_IMGPSScan.dproj b/CB_IMGPSScan.dproj
index 934c22f..42e7593 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">20</VersionInfo>
+ <VersionInfo Name="Build">21</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.20</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">2.0.1.21</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"/>
<VersionInfoKeys Name="LegalCopyright"/>
<VersionInfoKeys Name="LegalTrademarks"/>
diff --git a/CB_IMGPSScan.ocx b/CB_IMGPSScan.ocx
index b62c434..69e9629 100644
--- a/CB_IMGPSScan.ocx
+++ b/CB_IMGPSScan.ocx
Binary files differ
diff --git a/CB_IMGPSScan.res b/CB_IMGPSScan.res
index 49215ca..db5ebbb 100644
--- a/CB_IMGPSScan.res
+++ b/CB_IMGPSScan.res
Binary files differ
diff --git a/CB_IMGPSScanImp.dcu b/CB_IMGPSScanImp.dcu
index b37c18c..d6e9801 100644
--- a/CB_IMGPSScanImp.dcu
+++ b/CB_IMGPSScanImp.dcu
Binary files differ
diff --git a/CB_IMGPSScanImp.dfm b/CB_IMGPSScanImp.dfm
index 140b892..16d107d 100644
--- a/CB_IMGPSScanImp.dfm
+++ b/CB_IMGPSScanImp.dfm
@@ -47,8 +47,7 @@
Layout = tlCenter
Visible = False
WordWrap = True
- ExplicitLeft = 703
- ExplicitWidth = 248
+ ExplicitWidth = 234
end
object TransBtn: TBitBtn
Left = 57
@@ -5155,7 +5154,6 @@
HorzScrollBar.Visible = False
VertScrollBar.Tracking = True
VertScrollBar.Visible = False
- AntiAliased = True
ZoomPercent = 100.000000000000000000
OnImageMouseMove = ISB1ImageMouseMove
OnImageMouseDown = ISB1ImageMouseDown
@@ -5592,6 +5590,14 @@
BevelOuter = bvNone
TabOrder = 1
OnDblClick = Panel11DblClick
+ object Label3: TLabel
+ Left = 6
+ Top = 2
+ Width = 24
+ Height = 13
+ Caption = 'oooo'
+ Visible = False
+ end
end
end
end
diff --git a/CB_IMGPSScanImp.pas b/CB_IMGPSScanImp.pas
index 08dbec7..91d21bb 100644
--- a/CB_IMGPSScanImp.pas
+++ b/CB_IMGPSScanImp.pas
@@ -145,7 +145,6 @@
ISB2: TImageScrollBox;
imgp1: TPanel;
lb1: TLabel;
- ISB1: TImageScrollBox;
Memo1: TMemo;
Display1: TMemo;
Panel22: TPanel;
@@ -255,6 +254,8 @@
ISB_BW: TImageScrollBox;
N1: TMenuItem;
N2: TMenuItem;
+ ISB1: TImageScrollBox;
+ Label3: TLabel;
procedure ActiveFormCreate(Sender: TObject);
procedure Panel9Resize(Sender: TObject);
procedure ISB1Click(Sender: TObject);
@@ -1261,7 +1262,7 @@
procedure TCB_IMGPSScanX.ISB1Enter(Sender: TObject);
begin
- ISB1.SetFocus;
+ //ISB1.SetFocus;
end;
procedure TCB_IMGPSScanX.ISB1ImageMouseDown(Sender: TObject; Button: TMouseButton;
@@ -1270,7 +1271,7 @@
p : Integer;
begin
DisplayISB := TImageScrollBox(Sender);
- DisplayISB.SetFocus;
+ //DisplayISB.SetFocus;
Shape1.Left := TPanel(TImageScrollBox(Sender).Parent).Left - Seg;
Shape1.Top := TPanel(TImageScrollBox(Sender).Parent).Top - Seg;
P := strtoint(copy(DisplayISB.Name,4,1)) + ScrollBar1.Position-2;
@@ -1303,12 +1304,19 @@
procedure TCB_IMGPSScanX.ISB1ImageMouseMove(Sender: TObject; Shift: TShiftState;
X, Y: Integer);
begin
- Edit1.SetFocus;
+ //Edit1.SetFocus;
//TImageScrollBox(Sender).SetFocus;
if TImageScrollBox(Sender).FileName = '' then
+ begin
+//ShowMessage('AAA');
+Label3.Caption:='FileName='+TImageScrollBox(Sender).FileName+' time='+FormatDateTime('yyyy/mm/dd HH:MM:SS', now);
TImageScrollBox(Sender).MouseMode := mmUser
+ end
Else
+ begin
+Label3.Caption:='FileName='+TImageScrollBox(Sender).FileName;
ViewMouseMode(NowClick);
+ end;
end;
procedure TCB_IMGPSScanX.ISB1ImageMouseUp(Sender: TObject; Button: TMouseButton;
@@ -3681,7 +3689,7 @@
//CreateFormID_FormName(DisplayPath); //產生FormID_FormName.dat
//CreateDocNo_DocName(DisplayPath); //產生DocNo_Name.dat
//Showmessage(CreateDocNo_Info(DisplayPath)); //產生 Docno,份數,頁數;Docno,份數,頁數 的回傳字串
-
+ lb1.Caption:='AAAAAAAAAAA';
//Showmessage(CreateDocnoFrom_Info(NowCaseno));
//Showmessage(self.CreateCustDocNoFrom_Info(NowCaseno));
@@ -3732,7 +3740,9 @@
//Showmessage(self.Doc_Inf_List.Text);
//LoadImgFile;
//LoadImgFile1;
- str:='';
+ ISB1.MouseMode:=mmAmplifier;
+
+ { str:='';
for I := 1 to 11 do // 看 OMRErrInfo 的內容
begin
str:=str+BoolToStr(OMRErrInfo[i].Display,true)+','
@@ -3748,6 +3758,7 @@
ShowMessage('WORK_INF_List='+WORK_INF_List.Text) ;
ShowMessage('LASTEST_FORM_INF_List='+LASTEST_FORM_INF_List.Text) ;
ShowMessage('SampleFormIDList='+SampleFormIDList.Text);
+ }
// SampleFormIDList.Add('31A00101011706A');
// SampleFormIDList.Add('31A00101021706A');
// SampleFormIDList.Add('31A00101031706A');
@@ -4819,6 +4830,7 @@
Md : TMouseMode;
ISB : TImageScrollBox;
begin
+//ShowMessage(IntToStr(v));
case v of
-1 : Md := TMouseMode(mmUser);
0 : Md := TMouseMode(mmAmplifier);
@@ -4833,6 +4845,7 @@
begin
ISB := TImageScrollBox(FindComponent('ISB'+inttostr(i)));
ISB.MouseMode := TMouseMode(Md);
+ //Label3.Caption:='v='+IntToStr(v)+' time'+FormatDateTime('yyyy/mm/dd HH:MM:SS', now);
end;
end;
@@ -13132,6 +13145,7 @@
i: Integer;
begin
Timer1.Enabled := False;
+
//Showmessage('a');
//self.FIs_OldCase := 'Y';
PageLVclear := True;
--
Gitblit v1.8.0