优化

Src/FrmMain.Designer.cs

@@ -48,6 +48,7 @@
             this.cbxResolution = new System.Windows.Forms.ComboBox();
             this.btnSwitch = new System.Windows.Forms.Button();
             this.plVsp = new System.Windows.Forms.Panel();
+            this.vspCamView = new Kivii.Sample.ImageUploader.Controls.VideoSourcePlayer();
             this.plRight = new System.Windows.Forms.Panel();
             this.gbPhotoList = new System.Windows.Forms.GroupBox();
             this.flpPhotos = new System.Windows.Forms.FlowLayoutPanel();
@@ -57,15 +58,14 @@
             this.gbPhotoView = new System.Windows.Forms.GroupBox();
             this.ptbPhotoDisplay = new System.Windows.Forms.PictureBox();
             this.plDisplay = new System.Windows.Forms.Panel();
+            this.cbxTurn = new System.Windows.Forms.ComboBox();
+            this.btnEditor = new System.Windows.Forms.Button();
             this.btnCamearTurn = new System.Windows.Forms.Button();
             this.lbDisplay = new System.Windows.Forms.Label();
             this.gbOperating = new System.Windows.Forms.GroupBox();
             this.btnShot = new System.Windows.Forms.Button();
             this.btnCanon = new System.Windows.Forms.Button();
             this.btnDelete = new System.Windows.Forms.Button();
-            this.btnEditor = new System.Windows.Forms.Button();
-            this.cbxTurn = new System.Windows.Forms.ComboBox();
-            this.vspCamView = new Kivii.Sample.ImageUploader.Controls.VideoSourcePlayer();
             this.plLeft.SuspendLayout();
             this.gbSample.SuspendLayout();
             this.plSearchReport.SuspendLayout();
@@ -89,9 +89,8 @@
             this.plLeft.Controls.Add(this.gbCamView);
             this.plLeft.Dock = System.Windows.Forms.DockStyle.Left;
             this.plLeft.Location = new System.Drawing.Point(0, 0);
-            this.plLeft.Margin = new System.Windows.Forms.Padding(4);
             this.plLeft.Name = "plLeft";
-            this.plLeft.Size = new System.Drawing.Size(378, 1022);
+            this.plLeft.Size = new System.Drawing.Size(252, 681);
             this.plLeft.TabIndex = 0;
             // 
             // gbSample
@@ -99,11 +98,9 @@
             this.gbSample.Controls.Add(this.rtbMessage);
             this.gbSample.Controls.Add(this.plSearchReport);
             this.gbSample.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gbSample.Location = new System.Drawing.Point(0, 423);
-            this.gbSample.Margin = new System.Windows.Forms.Padding(4);
+            this.gbSample.Location = new System.Drawing.Point(0, 282);
             this.gbSample.Name = "gbSample";
-            this.gbSample.Padding = new System.Windows.Forms.Padding(4);
-            this.gbSample.Size = new System.Drawing.Size(378, 356);
+            this.gbSample.Size = new System.Drawing.Size(252, 237);
             this.gbSample.TabIndex = 3;
             this.gbSample.TabStop = false;
             this.gbSample.Text = "查询样品";
@@ -112,9 +109,10 @@
             // 
             this.rtbMessage.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rtbMessage.Font = new System.Drawing.Font("宋体", 14F);
-            this.rtbMessage.Location = new System.Drawing.Point(4, 81);
+            this.rtbMessage.Location = new System.Drawing.Point(3, 54);
+            this.rtbMessage.Margin = new System.Windows.Forms.Padding(2);
             this.rtbMessage.Name = "rtbMessage";
-            this.rtbMessage.Size = new System.Drawing.Size(370, 271);
+            this.rtbMessage.Size = new System.Drawing.Size(246, 180);
             this.rtbMessage.TabIndex = 20;
             this.rtbMessage.Text = "";
             // 
@@ -123,10 +121,9 @@
             this.plSearchReport.Controls.Add(this.tbxReportId);
             this.plSearchReport.Controls.Add(this.btnReportId);
             this.plSearchReport.Dock = System.Windows.Forms.DockStyle.Top;
-            this.plSearchReport.Location = new System.Drawing.Point(4, 25);
-            this.plSearchReport.Margin = new System.Windows.Forms.Padding(4);
+            this.plSearchReport.Location = new System.Drawing.Point(3, 17);
             this.plSearchReport.Name = "plSearchReport";
-            this.plSearchReport.Size = new System.Drawing.Size(370, 56);
+            this.plSearchReport.Size = new System.Drawing.Size(246, 37);
             this.plSearchReport.TabIndex = 19;
             // 
             // tbxReportId
@@ -134,10 +131,9 @@
             this.tbxReportId.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tbxReportId.Font = new System.Drawing.Font("宋体", 12F);
             this.tbxReportId.Location = new System.Drawing.Point(0, 0);
-            this.tbxReportId.Margin = new System.Windows.Forms.Padding(4);
             this.tbxReportId.Multiline = true;
             this.tbxReportId.Name = "tbxReportId";
-            this.tbxReportId.Size = new System.Drawing.Size(282, 56);
+            this.tbxReportId.Size = new System.Drawing.Size(187, 37);
             this.tbxReportId.TabIndex = 7;
             this.tbxReportId.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tbxReportId_KeyPress);
             // 
@@ -146,10 +142,9 @@
             this.btnReportId.BackColor = System.Drawing.SystemColors.ButtonHighlight;
             this.btnReportId.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnReportId.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnReportId.Location = new System.Drawing.Point(282, 0);
-            this.btnReportId.Margin = new System.Windows.Forms.Padding(4);
+            this.btnReportId.Location = new System.Drawing.Point(187, 0);
             this.btnReportId.Name = "btnReportId";
-            this.btnReportId.Size = new System.Drawing.Size(88, 56);
+            this.btnReportId.Size = new System.Drawing.Size(59, 37);
             this.btnReportId.TabIndex = 8;
             this.btnReportId.Text = "查询";
             this.btnReportId.UseVisualStyleBackColor = false;
@@ -166,11 +161,9 @@
             this.gbLogin.Controls.Add(this.tbxServiceUrl);
             this.gbLogin.Controls.Add(this.lblUrl);
             this.gbLogin.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.gbLogin.Location = new System.Drawing.Point(0, 779);
-            this.gbLogin.Margin = new System.Windows.Forms.Padding(4);
+            this.gbLogin.Location = new System.Drawing.Point(0, 519);
             this.gbLogin.Name = "gbLogin";
-            this.gbLogin.Padding = new System.Windows.Forms.Padding(4);
-            this.gbLogin.Size = new System.Drawing.Size(378, 243);
+            this.gbLogin.Size = new System.Drawing.Size(252, 162);
             this.gbLogin.TabIndex = 2;
             this.gbLogin.TabStop = false;
             this.gbLogin.Text = "系统登录";
@@ -180,10 +173,9 @@
             this.btnLogout.BackColor = System.Drawing.Color.LavenderBlush;
             this.btnLogout.Font = new System.Drawing.Font("宋体", 15F);
             this.btnLogout.ForeColor = System.Drawing.Color.Crimson;
-            this.btnLogout.Location = new System.Drawing.Point(220, 171);
-            this.btnLogout.Margin = new System.Windows.Forms.Padding(4);
+            this.btnLogout.Location = new System.Drawing.Point(147, 114);
             this.btnLogout.Name = "btnLogout";
-            this.btnLogout.Size = new System.Drawing.Size(144, 60);
+            this.btnLogout.Size = new System.Drawing.Size(96, 40);
             this.btnLogout.TabIndex = 31;
             this.btnLogout.Text = "退  出";
             this.btnLogout.UseVisualStyleBackColor = false;
@@ -194,10 +186,9 @@
             this.btnLogin.BackColor = System.Drawing.Color.MintCream;
             this.btnLogin.Font = new System.Drawing.Font("宋体", 15F);
             this.btnLogin.ForeColor = System.Drawing.Color.DarkGreen;
-            this.btnLogin.Location = new System.Drawing.Point(4, 170);
-            this.btnLogin.Margin = new System.Windows.Forms.Padding(4);
+            this.btnLogin.Location = new System.Drawing.Point(3, 113);
             this.btnLogin.Name = "btnLogin";
-            this.btnLogin.Size = new System.Drawing.Size(204, 60);
+            this.btnLogin.Size = new System.Drawing.Size(136, 40);
             this.btnLogin.TabIndex = 30;
             this.btnLogin.Text = "登  录";
             this.btnLogin.UseVisualStyleBackColor = false;
@@ -206,11 +197,10 @@
             // tbxPassword
             // 
             this.tbxPassword.Font = new System.Drawing.Font("宋体", 12F);
-            this.tbxPassword.Location = new System.Drawing.Point(96, 117);
-            this.tbxPassword.Margin = new System.Windows.Forms.Padding(4);
+            this.tbxPassword.Location = new System.Drawing.Point(64, 78);
             this.tbxPassword.Name = "tbxPassword";
             this.tbxPassword.PasswordChar = '*';
-            this.tbxPassword.Size = new System.Drawing.Size(266, 35);
+            this.tbxPassword.Size = new System.Drawing.Size(179, 26);
             this.tbxPassword.TabIndex = 29;
             this.tbxPassword.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tbxPassword_KeyPress);
             // 
@@ -218,30 +208,27 @@
             // 
             this.lblPassword.AutoSize = true;
             this.lblPassword.Font = new System.Drawing.Font("宋体", 12F);
-            this.lblPassword.Location = new System.Drawing.Point(3, 122);
-            this.lblPassword.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblPassword.Location = new System.Drawing.Point(2, 81);
             this.lblPassword.Name = "lblPassword";
-            this.lblPassword.Size = new System.Drawing.Size(94, 24);
+            this.lblPassword.Size = new System.Drawing.Size(63, 16);
             this.lblPassword.TabIndex = 28;
             this.lblPassword.Text = "密  码:";
             // 
             // tbxUserName
             // 
             this.tbxUserName.Font = new System.Drawing.Font("宋体", 12F);
-            this.tbxUserName.Location = new System.Drawing.Point(96, 69);
-            this.tbxUserName.Margin = new System.Windows.Forms.Padding(4);
+            this.tbxUserName.Location = new System.Drawing.Point(64, 46);
             this.tbxUserName.Name = "tbxUserName";
-            this.tbxUserName.Size = new System.Drawing.Size(266, 35);
+            this.tbxUserName.Size = new System.Drawing.Size(179, 26);
             this.tbxUserName.TabIndex = 27;
             // 
             // lblUser
             // 
             this.lblUser.AutoSize = true;
             this.lblUser.Font = new System.Drawing.Font("宋体", 12F);
-            this.lblUser.Location = new System.Drawing.Point(3, 74);
-            this.lblUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblUser.Location = new System.Drawing.Point(2, 49);
             this.lblUser.Name = "lblUser";
-            this.lblUser.Size = new System.Drawing.Size(94, 24);
+            this.lblUser.Size = new System.Drawing.Size(63, 16);
             this.lblUser.TabIndex = 26;
             this.lblUser.Text = "用户名:";
             // 
@@ -249,20 +236,18 @@
             // 
             this.tbxServiceUrl.BackColor = System.Drawing.SystemColors.Window;
             this.tbxServiceUrl.Font = new System.Drawing.Font("宋体", 12F);
-            this.tbxServiceUrl.Location = new System.Drawing.Point(96, 21);
-            this.tbxServiceUrl.Margin = new System.Windows.Forms.Padding(4);
+            this.tbxServiceUrl.Location = new System.Drawing.Point(64, 14);
             this.tbxServiceUrl.Name = "tbxServiceUrl";
-            this.tbxServiceUrl.Size = new System.Drawing.Size(266, 35);
+            this.tbxServiceUrl.Size = new System.Drawing.Size(179, 26);
             this.tbxServiceUrl.TabIndex = 25;
             // 
             // lblUrl
             // 
             this.lblUrl.AutoSize = true;
             this.lblUrl.Font = new System.Drawing.Font("宋体", 12F);
-            this.lblUrl.Location = new System.Drawing.Point(3, 26);
-            this.lblUrl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblUrl.Location = new System.Drawing.Point(2, 17);
             this.lblUrl.Name = "lblUrl";
-            this.lblUrl.Size = new System.Drawing.Size(94, 24);
+            this.lblUrl.Size = new System.Drawing.Size(63, 16);
             this.lblUrl.TabIndex = 22;
             this.lblUrl.Text = "地  址:";
             // 
@@ -274,10 +259,8 @@
             this.gbCamView.Dock = System.Windows.Forms.DockStyle.Top;
             this.gbCamView.Font = new System.Drawing.Font("宋体", 10F);
             this.gbCamView.Location = new System.Drawing.Point(0, 0);
-            this.gbCamView.Margin = new System.Windows.Forms.Padding(4);
             this.gbCamView.Name = "gbCamView";
-            this.gbCamView.Padding = new System.Windows.Forms.Padding(4);
-            this.gbCamView.Size = new System.Drawing.Size(378, 423);
+            this.gbCamView.Size = new System.Drawing.Size(252, 282);
             this.gbCamView.TabIndex = 0;
             this.gbCamView.TabStop = false;
             this.gbCamView.Text = "相机视图";
@@ -287,10 +270,9 @@
             this.cbxResolution.Dock = System.Windows.Forms.DockStyle.Fill;
             this.cbxResolution.Font = new System.Drawing.Font("宋体", 18F);
             this.cbxResolution.FormattingEnabled = true;
-            this.cbxResolution.Location = new System.Drawing.Point(4, 377);
-            this.cbxResolution.Margin = new System.Windows.Forms.Padding(4);
+            this.cbxResolution.Location = new System.Drawing.Point(3, 252);
             this.cbxResolution.Name = "cbxResolution";
-            this.cbxResolution.Size = new System.Drawing.Size(282, 44);
+            this.cbxResolution.Size = new System.Drawing.Size(187, 32);
             this.cbxResolution.TabIndex = 5;
             this.cbxResolution.SelectedIndexChanged += new System.EventHandler(this.cbxResolution_SelectedIndexChanged);
             // 
@@ -299,10 +281,9 @@
             this.btnSwitch.BackColor = System.Drawing.SystemColors.ButtonHighlight;
             this.btnSwitch.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnSwitch.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSwitch.Location = new System.Drawing.Point(286, 377);
-            this.btnSwitch.Margin = new System.Windows.Forms.Padding(4);
+            this.btnSwitch.Location = new System.Drawing.Point(190, 252);
             this.btnSwitch.Name = "btnSwitch";
-            this.btnSwitch.Size = new System.Drawing.Size(88, 42);
+            this.btnSwitch.Size = new System.Drawing.Size(59, 27);
             this.btnSwitch.TabIndex = 4;
             this.btnSwitch.Text = "切换";
             this.btnSwitch.UseVisualStyleBackColor = false;
@@ -312,21 +293,29 @@
             // 
             this.plVsp.Controls.Add(this.vspCamView);
             this.plVsp.Dock = System.Windows.Forms.DockStyle.Top;
-            this.plVsp.Location = new System.Drawing.Point(4, 27);
-            this.plVsp.Margin = new System.Windows.Forms.Padding(4);
+            this.plVsp.Location = new System.Drawing.Point(3, 19);
             this.plVsp.Name = "plVsp";
-            this.plVsp.Size = new System.Drawing.Size(370, 350);
+            this.plVsp.Size = new System.Drawing.Size(246, 233);
             this.plVsp.TabIndex = 0;
             // 
+            // vspCamView
+            // 
+            this.vspCamView.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.vspCamView.Location = new System.Drawing.Point(0, 0);
+            this.vspCamView.Name = "vspCamView";
+            this.vspCamView.Size = new System.Drawing.Size(246, 233);
+            this.vspCamView.TabIndex = 0;
+            this.vspCamView.Text = "vspCamView";
+            this.vspCamView.VideoSource = null;
+            // 
             // plRight
             // 
             this.plRight.Controls.Add(this.gbPhotoList);
             this.plRight.Controls.Add(this.gbUploading);
             this.plRight.Dock = System.Windows.Forms.DockStyle.Right;
-            this.plRight.Location = new System.Drawing.Point(1190, 0);
-            this.plRight.Margin = new System.Windows.Forms.Padding(4);
+            this.plRight.Location = new System.Drawing.Point(793, 0);
             this.plRight.Name = "plRight";
-            this.plRight.Size = new System.Drawing.Size(226, 1022);
+            this.plRight.Size = new System.Drawing.Size(151, 681);
             this.plRight.TabIndex = 1;
             // 
             // gbPhotoList
@@ -335,10 +324,8 @@
             this.gbPhotoList.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbPhotoList.Font = new System.Drawing.Font("宋体", 10F);
             this.gbPhotoList.Location = new System.Drawing.Point(0, 0);
-            this.gbPhotoList.Margin = new System.Windows.Forms.Padding(4);
             this.gbPhotoList.Name = "gbPhotoList";
-            this.gbPhotoList.Padding = new System.Windows.Forms.Padding(4);
-            this.gbPhotoList.Size = new System.Drawing.Size(226, 904);
+            this.gbPhotoList.Size = new System.Drawing.Size(151, 602);
             this.gbPhotoList.TabIndex = 2;
             this.gbPhotoList.TabStop = false;
             this.gbPhotoList.Text = "已拍照片";
@@ -349,21 +336,19 @@
             this.flpPhotos.BackColor = System.Drawing.SystemColors.ButtonHighlight;
             this.flpPhotos.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.flpPhotos.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.flpPhotos.Location = new System.Drawing.Point(4, 27);
+            this.flpPhotos.Location = new System.Drawing.Point(3, 19);
             this.flpPhotos.Margin = new System.Windows.Forms.Padding(0);
             this.flpPhotos.Name = "flpPhotos";
-            this.flpPhotos.Size = new System.Drawing.Size(218, 873);
+            this.flpPhotos.Size = new System.Drawing.Size(145, 580);
             this.flpPhotos.TabIndex = 2;
             // 
             // gbUploading
             // 
             this.gbUploading.Controls.Add(this.btnUpload);
             this.gbUploading.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.gbUploading.Location = new System.Drawing.Point(0, 904);
-            this.gbUploading.Margin = new System.Windows.Forms.Padding(4);
+            this.gbUploading.Location = new System.Drawing.Point(0, 602);
             this.gbUploading.Name = "gbUploading";
-            this.gbUploading.Padding = new System.Windows.Forms.Padding(4);
-            this.gbUploading.Size = new System.Drawing.Size(226, 118);
+            this.gbUploading.Size = new System.Drawing.Size(151, 79);
             this.gbUploading.TabIndex = 1;
             this.gbUploading.TabStop = false;
             this.gbUploading.Text = "操作台";
@@ -373,10 +358,9 @@
             this.btnUpload.BackColor = System.Drawing.SystemColors.ButtonHighlight;
             this.btnUpload.Dock = System.Windows.Forms.DockStyle.Fill;
             this.btnUpload.Font = new System.Drawing.Font("宋体", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnUpload.Location = new System.Drawing.Point(4, 25);
-            this.btnUpload.Margin = new System.Windows.Forms.Padding(4);
+            this.btnUpload.Location = new System.Drawing.Point(3, 17);
             this.btnUpload.Name = "btnUpload";
-            this.btnUpload.Size = new System.Drawing.Size(218, 89);
+            this.btnUpload.Size = new System.Drawing.Size(145, 59);
             this.btnUpload.TabIndex = 3;
             this.btnUpload.Text = "上传";
             this.btnUpload.UseVisualStyleBackColor = false;
@@ -388,10 +372,9 @@
             this.plMain.Controls.Add(this.gbPhotoView);
             this.plMain.Controls.Add(this.gbOperating);
             this.plMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.plMain.Location = new System.Drawing.Point(378, 0);
-            this.plMain.Margin = new System.Windows.Forms.Padding(4);
+            this.plMain.Location = new System.Drawing.Point(252, 0);
             this.plMain.Name = "plMain";
-            this.plMain.Size = new System.Drawing.Size(812, 1022);
+            this.plMain.Size = new System.Drawing.Size(541, 681);
             this.plMain.TabIndex = 2;
             // 
             // gbPhotoView
@@ -401,10 +384,8 @@
             this.gbPhotoView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbPhotoView.Font = new System.Drawing.Font("宋体", 10F);
             this.gbPhotoView.Location = new System.Drawing.Point(0, 0);
-            this.gbPhotoView.Margin = new System.Windows.Forms.Padding(4);
             this.gbPhotoView.Name = "gbPhotoView";
-            this.gbPhotoView.Padding = new System.Windows.Forms.Padding(4);
-            this.gbPhotoView.Size = new System.Drawing.Size(812, 904);
+            this.gbPhotoView.Size = new System.Drawing.Size(541, 602);
             this.gbPhotoView.TabIndex = 1;
             this.gbPhotoView.TabStop = false;
             this.gbPhotoView.Text = "选中照片";
@@ -413,10 +394,9 @@
             // 
             this.ptbPhotoDisplay.BackColor = System.Drawing.SystemColors.ButtonHighlight;
             this.ptbPhotoDisplay.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ptbPhotoDisplay.Location = new System.Drawing.Point(4, 27);
-            this.ptbPhotoDisplay.Margin = new System.Windows.Forms.Padding(4);
+            this.ptbPhotoDisplay.Location = new System.Drawing.Point(3, 19);
             this.ptbPhotoDisplay.Name = "ptbPhotoDisplay";
-            this.ptbPhotoDisplay.Size = new System.Drawing.Size(804, 831);
+            this.ptbPhotoDisplay.Size = new System.Drawing.Size(535, 552);
             this.ptbPhotoDisplay.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.ptbPhotoDisplay.TabIndex = 4;
             this.ptbPhotoDisplay.TabStop = false;
@@ -428,20 +408,48 @@
             this.plDisplay.Controls.Add(this.btnCamearTurn);
             this.plDisplay.Controls.Add(this.lbDisplay);
             this.plDisplay.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.plDisplay.Location = new System.Drawing.Point(4, 858);
-            this.plDisplay.Margin = new System.Windows.Forms.Padding(4);
+            this.plDisplay.Location = new System.Drawing.Point(3, 571);
             this.plDisplay.Name = "plDisplay";
-            this.plDisplay.Size = new System.Drawing.Size(804, 42);
+            this.plDisplay.Size = new System.Drawing.Size(535, 28);
             this.plDisplay.TabIndex = 3;
             // 
+            // cbxTurn
+            // 
+            this.cbxTurn.Dock = System.Windows.Forms.DockStyle.Right;
+            this.cbxTurn.Font = new System.Drawing.Font("宋体", 16F);
+            this.cbxTurn.FormattingEnabled = true;
+            this.cbxTurn.Items.AddRange(new object[] {
+            "不旋转",
+            "顺时针90°",
+            "顺时针180°",
+            "顺时针270°"});
+            this.cbxTurn.Location = new System.Drawing.Point(229, 0);
+            this.cbxTurn.Name = "cbxTurn";
+            this.cbxTurn.Size = new System.Drawing.Size(122, 29);
+            this.cbxTurn.TabIndex = 33;
+            this.cbxTurn.SelectedIndexChanged += new System.EventHandler(this.cbxTurn_SelectedIndexChanged);
+            // 
+            // btnEditor
+            // 
+            this.btnEditor.BackColor = System.Drawing.SystemColors.ButtonHighlight;
+            this.btnEditor.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btnEditor.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Bold);
+            this.btnEditor.Location = new System.Drawing.Point(351, 0);
+            this.btnEditor.Name = "btnEditor";
+            this.btnEditor.Size = new System.Drawing.Size(96, 28);
+            this.btnEditor.TabIndex = 32;
+            this.btnEditor.Text = "裁剪";
+            this.btnEditor.UseVisualStyleBackColor = false;
+            this.btnEditor.EnabledChanged += new System.EventHandler(this.btnEnabled_EnabledChanged);
+            this.btnEditor.Click += new System.EventHandler(this.btnEditor_Click);
+            // 
             // btnCamearTurn
             // 
             this.btnCamearTurn.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnCamearTurn.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCamearTurn.Location = new System.Drawing.Point(672, 0);
-            this.btnCamearTurn.Margin = new System.Windows.Forms.Padding(4);
+            this.btnCamearTurn.Location = new System.Drawing.Point(447, 0);
             this.btnCamearTurn.Name = "btnCamearTurn";
-            this.btnCamearTurn.Size = new System.Drawing.Size(132, 42);
+            this.btnCamearTurn.Size = new System.Drawing.Size(88, 28);
             this.btnCamearTurn.TabIndex = 31;
             this.btnCamearTurn.Text = "旋转";
             this.btnCamearTurn.UseVisualStyleBackColor = true;
@@ -453,9 +461,8 @@
             this.lbDisplay.AutoSize = true;
             this.lbDisplay.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lbDisplay.Location = new System.Drawing.Point(0, 0);
-            this.lbDisplay.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbDisplay.Name = "lbDisplay";
-            this.lbDisplay.Size = new System.Drawing.Size(89, 20);
+            this.lbDisplay.Size = new System.Drawing.Size(63, 14);
             this.lbDisplay.TabIndex = 0;
             this.lbDisplay.Text = "照片名称";
             // 
@@ -465,11 +472,9 @@
             this.gbOperating.Controls.Add(this.btnCanon);
             this.gbOperating.Controls.Add(this.btnDelete);
             this.gbOperating.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.gbOperating.Location = new System.Drawing.Point(0, 904);
-            this.gbOperating.Margin = new System.Windows.Forms.Padding(4);
+            this.gbOperating.Location = new System.Drawing.Point(0, 602);
             this.gbOperating.Name = "gbOperating";
-            this.gbOperating.Padding = new System.Windows.Forms.Padding(4);
-            this.gbOperating.Size = new System.Drawing.Size(812, 118);
+            this.gbOperating.Size = new System.Drawing.Size(541, 79);
             this.gbOperating.TabIndex = 0;
             this.gbOperating.TabStop = false;
             this.gbOperating.Text = "操作台";
@@ -480,10 +485,9 @@
             this.btnShot.Dock = System.Windows.Forms.DockStyle.Fill;
             this.btnShot.Font = new System.Drawing.Font("宋体", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnShot.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.btnShot.Location = new System.Drawing.Point(4, 25);
-            this.btnShot.Margin = new System.Windows.Forms.Padding(4);
+            this.btnShot.Location = new System.Drawing.Point(3, 17);
             this.btnShot.Name = "btnShot";
-            this.btnShot.Size = new System.Drawing.Size(516, 89);
+            this.btnShot.Size = new System.Drawing.Size(343, 59);
             this.btnShot.TabIndex = 7;
             this.btnShot.Text = "拍照";
             this.btnShot.UseVisualStyleBackColor = false;
@@ -495,14 +499,12 @@
             this.btnCanon.BackColor = System.Drawing.SystemColors.ButtonHighlight;
             this.btnCanon.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnCanon.Font = new System.Drawing.Font("宋体", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCanon.Location = new System.Drawing.Point(520, 25);
-            this.btnCanon.Margin = new System.Windows.Forms.Padding(4);
+            this.btnCanon.Location = new System.Drawing.Point(346, 17);
             this.btnCanon.Name = "btnCanon";
-            this.btnCanon.Size = new System.Drawing.Size(144, 89);
+            this.btnCanon.Size = new System.Drawing.Size(96, 59);
             this.btnCanon.TabIndex = 6;
             this.btnCanon.Text = "佳能";
             this.btnCanon.UseVisualStyleBackColor = false;
-            this.btnCanon.Visible = false;
             this.btnCanon.EnabledChanged += new System.EventHandler(this.btnEnabled_EnabledChanged);
             this.btnCanon.Click += new System.EventHandler(this.btnCanon_Click);
             // 
@@ -511,69 +513,24 @@
             this.btnDelete.BackColor = System.Drawing.SystemColors.ButtonHighlight;
             this.btnDelete.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnDelete.Font = new System.Drawing.Font("宋体", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnDelete.Location = new System.Drawing.Point(664, 25);
-            this.btnDelete.Margin = new System.Windows.Forms.Padding(4);
+            this.btnDelete.Location = new System.Drawing.Point(442, 17);
             this.btnDelete.Name = "btnDelete";
-            this.btnDelete.Size = new System.Drawing.Size(144, 89);
+            this.btnDelete.Size = new System.Drawing.Size(96, 59);
             this.btnDelete.TabIndex = 2;
             this.btnDelete.Text = "删除";
             this.btnDelete.UseVisualStyleBackColor = false;
             this.btnDelete.EnabledChanged += new System.EventHandler(this.btnEnabled_EnabledChanged);
             this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
             // 
-            // btnEditor
-            // 
-            this.btnEditor.BackColor = System.Drawing.SystemColors.ButtonHighlight;
-            this.btnEditor.Dock = System.Windows.Forms.DockStyle.Right;
-            this.btnEditor.Font = new System.Drawing.Font("宋体", 10F, System.Drawing.FontStyle.Bold);
-            this.btnEditor.Location = new System.Drawing.Point(528, 0);
-            this.btnEditor.Margin = new System.Windows.Forms.Padding(4);
-            this.btnEditor.Name = "btnEditor";
-            this.btnEditor.Size = new System.Drawing.Size(144, 42);
-            this.btnEditor.TabIndex = 32;
-            this.btnEditor.Text = "裁剪";
-            this.btnEditor.UseVisualStyleBackColor = false;
-            this.btnEditor.EnabledChanged += new System.EventHandler(this.btnEnabled_EnabledChanged);
-            this.btnEditor.Click += new System.EventHandler(this.btnEditor_Click);
-            // 
-            // cbxTurn
-            // 
-            this.cbxTurn.Dock = System.Windows.Forms.DockStyle.Right;
-            this.cbxTurn.Font = new System.Drawing.Font("宋体", 16F);
-            this.cbxTurn.FormattingEnabled = true;
-            this.cbxTurn.Items.AddRange(new object[] {
-            "不旋转",
-            "顺时针90°",
-            "顺时针180°",
-            "顺时针270°"});
-            this.cbxTurn.Location = new System.Drawing.Point(347, 0);
-            this.cbxTurn.Margin = new System.Windows.Forms.Padding(4);
-            this.cbxTurn.Name = "cbxTurn";
-            this.cbxTurn.Size = new System.Drawing.Size(181, 41);
-            this.cbxTurn.TabIndex = 33;
-            this.cbxTurn.SelectedIndexChanged += new System.EventHandler(this.cbxTurn_SelectedIndexChanged);
-            // 
-            // vspCamView
-            // 
-            this.vspCamView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.vspCamView.Location = new System.Drawing.Point(0, 0);
-            this.vspCamView.Margin = new System.Windows.Forms.Padding(4);
-            this.vspCamView.Name = "vspCamView";
-            this.vspCamView.Size = new System.Drawing.Size(370, 350);
-            this.vspCamView.TabIndex = 0;
-            this.vspCamView.Text = "vspCamView";
-            this.vspCamView.VideoSource = null;
-            // 
             // FrmMain
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1416, 1022);
+            this.ClientSize = new System.Drawing.Size(944, 681);
             this.Controls.Add(this.plMain);
             this.Controls.Add(this.plRight);
             this.Controls.Add(this.plLeft);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "FrmMain";
             this.Text = "样品拍照采集";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing);

Src/FrmMain.cs

@@ -38,7 +38,7 @@ namespace Kivii.Sample.ImageUploader
         private List<DbFile> photos = new List<DbFile>();
         private Report currentReport = null;
         private DbFile currentPhoto = null;
-        private CanonForm canonForm = null;
+        //private CanonForm canonForm = null;
 
         public FrmMain()
         {
@@ -993,11 +993,9 @@ namespace Kivii.Sample.ImageUploader
 
         private void btnCanon_Click(object sender, EventArgs e)
         {
-            if (canonForm == null)
-            {
-                canonForm = new CanonForm();
-                canonForm.DownloadCompletely += CanonForm_DownloadCompletely;
-            }
+            var canonForm = new CanonForm();
+            canonForm.DownloadCompletely += CanonForm_DownloadCompletely;
+
             canonForm.ShowDialog();
         }
 
@@ -1013,7 +1011,7 @@ namespace Kivii.Sample.ImageUploader
             // 捕获当前帧
             Bitmap bitmap = System.Drawing.Image.FromFile(filePath) as Bitmap;
             if (bitmap == null) return;
-            var picName = fileInfo.Name;
+            var picName = $"{DateTime.Now.ToString("mmssfff")}_{fileInfo.Name}";
             string reportId = string.Empty;
             if (currentReport != null)
             {

Src/Kivii.Client.Sample.ImageUploader.V4.5.csproj

@@ -136,7 +136,7 @@
     <Content Include="Camera.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Kivii.Client.Canon.V4.5\Src\Kivii.Client.Canon.V4.5.csproj">
+    <ProjectReference Include="..\..\Kivii.Client.Canon\Src\Kivii.Client.Canon.V4.5.csproj">
       <Project>{08fa5081-59f1-4e6a-b44c-309ef67159e6}</Project>
       <Name>Kivii.Client.Canon.V4.5</Name>
     </ProjectReference>