From d3ab24126a18f667222c706ffaf7c720eaa3cc54 Mon Sep 17 00:00:00 2001 From: Laentir Valetov Date: Fri, 23 May 2014 11:02:53 +0400 Subject: [PATCH] Refactoring Signed-off-by: Laentir Valetov --- .../cCameraCapture/cCameraCapture.dproj | 5 +++-- .../cCameraCapture/cCameraCapture.res | Bin 62784 -> 62784 bytes .../Components/cCameraCapture/uMainForm.dfm | 8 +++++--- .../cFFmpegIPCamSource.dproj | 2 +- .../cFFmpegIPCamSource/cFFmpegIPCamSource.res | Bin 62784 -> 62784 bytes .../cFFmpegIPCamSource/uMainForm.dfm | 18 +++++++++--------- .../cFFmpegIPCamSource/uMainForm.pas | 2 ++ source/component/Delphi20/OpenCV200.dproj | 2 +- source/component/Delphi20/OpenCV200.res | Bin 672 -> 672 bytes source/component/Delphi20/dclOpenCV200.dproj | 2 +- source/component/Delphi20/dclOpenCV200.res | Bin 672 -> 672 bytes 11 files changed, 22 insertions(+), 17 deletions(-) diff --git a/samples/Components/cCameraCapture/cCameraCapture.dproj b/samples/Components/cCameraCapture/cCameraCapture.dproj index ca4a3dd..8bd4d7a 100644 --- a/samples/Components/cCameraCapture/cCameraCapture.dproj +++ b/samples/Components/cCameraCapture/cCameraCapture.dproj @@ -5,7 +5,7 @@ VCL cCameraCapture.dpr True - Release + Debug Win32 3 Application @@ -93,6 +93,7 @@ true + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 10:59:06 1033 true false @@ -108,7 +109,7 @@ 0 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=22.05.2014 23:26:02 + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 10:54:28 true true 1033 diff --git a/samples/Components/cCameraCapture/cCameraCapture.res b/samples/Components/cCameraCapture/cCameraCapture.res index 9e1c0e60387a09c161f39087ffd656254d15bbec..7797e1b5f514affd6c35d9315ba1142e1f334e16 100644 GIT binary patch delta 50 xcmX@`iuu4R<_&3#%Ek^ delta 50 zcmX@`iuu4R<_&3#%0>)&3 + OperationsEnabled = False OnAfterEachOperation = ocvmgprtn1AfterEachOperation Left = 36 Top = 392 @@ -146,7 +149,6 @@ object MainForm: TMainForm Top = 40 end object ocvpcmsrc1: TocvIPCamSource - Enabled = True UserName = 'admin' Password = 'admin' IP = '10.1.1.202' diff --git a/samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.dproj b/samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.dproj index b985271..ab96d63 100644 --- a/samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.dproj +++ b/samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.dproj @@ -83,7 +83,7 @@ true - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 0:25:10 + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 10:58:12 true 1033 false diff --git a/samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.res b/samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.res index 4f7b3b830fc0c2e96e0fee43c4cc7418141ba393..aa69f950ca67d1d021a6328c9549b1b764b1f8bb 100644 GIT binary patch delta 47 zcmX@`iuu4R<_U8cKTMpf%y?$v!D{9J29e43jMn^y3te+ diff --git a/samples/Components/cFFmpegIPCamSource/uMainForm.dfm b/samples/Components/cFFmpegIPCamSource/uMainForm.dfm index 5af41d8..230681e 100644 --- a/samples/Components/cFFmpegIPCamSource/uMainForm.dfm +++ b/samples/Components/cFFmpegIPCamSource/uMainForm.dfm @@ -2,8 +2,8 @@ object Form1: TForm1 Left = 0 Top = 0 Caption = 'FFMpeg IP Camera source' - ClientHeight = 273 - ClientWidth = 356 + ClientHeight = 194 + ClientWidth = 229 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -13,21 +13,21 @@ object Form1: TForm1 OldCreateOrder = False PixelsPerInch = 96 TextHeight = 13 - object ocvw1: TocvView + object ocvView1: TocvView Left = 0 Top = 0 - Width = 356 - Height = 273 - VideoSource = ocvfmpgpcmsrc1 + Width = 229 + Height = 194 + VideoSource = ocvFFMpegIPCamSource1 Align = alClient end - object ocvfmpgpcmsrc1: TocvFFMpegIPCamSource + object ocvFFMpegIPCamSource1: TocvFFMpegIPCamSource Enabled = True UserName = 'admin' Password = 'admin' IP = '10.1.1.202' URI = '/cam/realmonitor?channel=1&subtype=0' - Left = 76 - Top = 40 + Left = 104 + Top = 96 end end diff --git a/samples/Components/cFFmpegIPCamSource/uMainForm.pas b/samples/Components/cFFmpegIPCamSource/uMainForm.pas index f03e4c1..c152c5d 100644 --- a/samples/Components/cFFmpegIPCamSource/uMainForm.pas +++ b/samples/Components/cFFmpegIPCamSource/uMainForm.pas @@ -10,6 +10,8 @@ type TForm1 = class(TForm) ocvfmpgpcmsrc1: TocvFFMpegIPCamSource; ocvw1: TocvView; + ocvFFMpegIPCamSource1: TocvFFMpegIPCamSource; + ocvView1: TocvView; private { Private declarations } public diff --git a/source/component/Delphi20/OpenCV200.dproj b/source/component/Delphi20/OpenCV200.dproj index 0cfc9f8..d2d31ea 100644 --- a/source/component/Delphi20/OpenCV200.dproj +++ b/source/component/Delphi20/OpenCV200.dproj @@ -190,7 +190,7 @@ ..;$(DCC_UnitSearchPath) true 1033 - CompanyName=;FileDescription=OpenCV Component;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=OpenCV Component;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 0:24:38 + CompanyName=;FileDescription=OpenCV Component;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=OpenCV Component;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 10:55:14 .\$(Platform)\$(Config) diff --git a/source/component/Delphi20/OpenCV200.res b/source/component/Delphi20/OpenCV200.res index eb9cf89552d6d93aab14d7be924448ac39645991..d63d66890789099db9eaa901d91374746a6d9277 100644 GIT binary patch delta 45 zcmZ3$x`1`U9L9!;bCnrmHXh_=WDZ~unS7qnn%|JYfWeBv6bP*t3>l0kOER?s04^L0 A5C8xG delta 45 zcmZ3$x`1`U9LBndbCnsRHXh_=WcFhao_wCsn%{uIiouA%1V|b)STHb5mSk!N04#e7 A+W-In diff --git a/source/component/Delphi20/dclOpenCV200.dproj b/source/component/Delphi20/dclOpenCV200.dproj index fb7abdd..478f07d 100644 --- a/source/component/Delphi20/dclOpenCV200.dproj +++ b/source/component/Delphi20/dclOpenCV200.dproj @@ -123,7 +123,7 @@ true 1033 - CompanyName=;FileDescription=OpenCV Component;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=OpenCV Component;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 0:24:42 + CompanyName=;FileDescription=OpenCV Component;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=OpenCV Component;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=23.05.2014 10:55:17 .\$(Platform)\$(Config) diff --git a/source/component/Delphi20/dclOpenCV200.res b/source/component/Delphi20/dclOpenCV200.res index 1b115c5f01dff06931177873a7e8e9a9724bf2d4..62a78dc0d5c5ff76658a051857c25c0d71f8b00c 100644 GIT binary patch delta 45 zcmZ3$x`1`U9L9!;bCnrmHXh_=WDZ~unS7qnn%|JYfWeBvl)(&08Za17mSk!N04^X4 A5C8xG delta 45 zcmZ3$x`1`U9LBndbCnsRHXh_=WcFhao_wCsn%{uIiouA%1W1}N7&0(SmSk!N04!4q A)c^nh