Skip to content

张东亮 / NS100

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 0405e96a 由 刘韬
选项

优化ns100后台运行界面

1 个父辈 c5ee0a04
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 20 行增加 和 20 行删除
SmartScan/Form/FrmCodeExtract.Designer.cs
...@@ -71,7 +71,7 @@ namespace SmartScan ...@@ -71,7 +71,7 @@ namespace SmartScan
this.BtnOK.BorderWidth = 2; this.BtnOK.BorderWidth = 2;
this.BtnOK.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnOK.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnOK.HoldPress = false; this.BtnOK.HoldPress = false;
this.BtnOK.Location = new System.Drawing.Point(1184, 737); this.BtnOK.Location = new System.Drawing.Point(1184, 689);
this.BtnOK.Name = "BtnOK"; this.BtnOK.Name = "BtnOK";
this.BtnOK.Padding = new System.Windows.Forms.Padding(3); this.BtnOK.Padding = new System.Windows.Forms.Padding(3);
this.BtnOK.Size = new System.Drawing.Size(120, 40); this.BtnOK.Size = new System.Drawing.Size(120, 40);
...@@ -87,7 +87,7 @@ namespace SmartScan ...@@ -87,7 +87,7 @@ namespace SmartScan
this.BtnCancel.BorderWidth = 2; this.BtnCancel.BorderWidth = 2;
this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnCancel.HoldPress = false; this.BtnCancel.HoldPress = false;
this.BtnCancel.Location = new System.Drawing.Point(1310, 737); this.BtnCancel.Location = new System.Drawing.Point(1310, 689);
this.BtnCancel.Name = "BtnCancel"; this.BtnCancel.Name = "BtnCancel";
this.BtnCancel.Padding = new System.Windows.Forms.Padding(3); this.BtnCancel.Padding = new System.Windows.Forms.Padding(3);
this.BtnCancel.Size = new System.Drawing.Size(120, 40); this.BtnCancel.Size = new System.Drawing.Size(120, 40);
...@@ -102,11 +102,11 @@ namespace SmartScan ...@@ -102,11 +102,11 @@ namespace SmartScan
this.PnlTemp.BorderWidth = 2; this.PnlTemp.BorderWidth = 2;
this.PnlTemp.Dock = System.Windows.Forms.DockStyle.Bottom; this.PnlTemp.Dock = System.Windows.Forms.DockStyle.Bottom;
this.PnlTemp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.PnlTemp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.PnlTemp.Location = new System.Drawing.Point(3, 202); this.PnlTemp.Location = new System.Drawing.Point(3, 188);
this.PnlTemp.Name = "PnlTemp"; this.PnlTemp.Name = "PnlTemp";
this.PnlTemp.Padding = new System.Windows.Forms.Padding(3); this.PnlTemp.Padding = new System.Windows.Forms.Padding(3);
this.PnlTemp.ShowText = false; this.PnlTemp.ShowText = false;
this.PnlTemp.Size = new System.Drawing.Size(698, 461); this.PnlTemp.Size = new System.Drawing.Size(698, 427);
this.PnlTemp.TabIndex = 28; this.PnlTemp.TabIndex = 28;
this.PnlTemp.Text = "facePanel1"; this.PnlTemp.Text = "facePanel1";
this.PnlTemp.TitleFont = new System.Drawing.Font("宋体", 12F); this.PnlTemp.TitleFont = new System.Drawing.Font("宋体", 12F);
...@@ -117,7 +117,7 @@ namespace SmartScan ...@@ -117,7 +117,7 @@ namespace SmartScan
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 6); this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 6);
this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(692, 184); this.flowLayoutPanel1.Size = new System.Drawing.Size(692, 170);
this.flowLayoutPanel1.TabIndex = 29; this.flowLayoutPanel1.TabIndex = 29;
// //
// pnlMatch // pnlMatch
...@@ -128,7 +128,7 @@ namespace SmartScan ...@@ -128,7 +128,7 @@ namespace SmartScan
this.pnlMatch.Controls.Add(this.tableLayoutPanel1); this.pnlMatch.Controls.Add(this.tableLayoutPanel1);
this.pnlMatch.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlMatch.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnlMatch.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.pnlMatch.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.pnlMatch.Location = new System.Drawing.Point(3, 392); this.pnlMatch.Location = new System.Drawing.Point(3, 344);
this.pnlMatch.Name = "pnlMatch"; this.pnlMatch.Name = "pnlMatch";
this.pnlMatch.Padding = new System.Windows.Forms.Padding(3); this.pnlMatch.Padding = new System.Windows.Forms.Padding(3);
this.pnlMatch.Size = new System.Drawing.Size(697, 271); this.pnlMatch.Size = new System.Drawing.Size(697, 271);
...@@ -419,7 +419,7 @@ namespace SmartScan ...@@ -419,7 +419,7 @@ namespace SmartScan
this.pnlRawCode.Location = new System.Drawing.Point(3, 3); this.pnlRawCode.Location = new System.Drawing.Point(3, 3);
this.pnlRawCode.Name = "pnlRawCode"; this.pnlRawCode.Name = "pnlRawCode";
this.pnlRawCode.Padding = new System.Windows.Forms.Padding(3); this.pnlRawCode.Padding = new System.Windows.Forms.Padding(3);
this.pnlRawCode.Size = new System.Drawing.Size(697, 383); this.pnlRawCode.Size = new System.Drawing.Size(697, 335);
this.pnlRawCode.TabIndex = 31; this.pnlRawCode.TabIndex = 31;
this.pnlRawCode.Text = "原始条码信息"; this.pnlRawCode.Text = "原始条码信息";
this.pnlRawCode.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.pnlRawCode.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
...@@ -433,7 +433,7 @@ namespace SmartScan ...@@ -433,7 +433,7 @@ namespace SmartScan
this.richTextBox1.ForeColor = System.Drawing.SystemColors.Menu; this.richTextBox1.ForeColor = System.Drawing.SystemColors.Menu;
this.richTextBox1.Location = new System.Drawing.Point(3, 3); this.richTextBox1.Location = new System.Drawing.Point(3, 3);
this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(691, 377); this.richTextBox1.Size = new System.Drawing.Size(691, 329);
this.richTextBox1.TabIndex = 7; this.richTextBox1.TabIndex = 7;
this.richTextBox1.Text = "weqw"; this.richTextBox1.Text = "weqw";
// //
...@@ -448,7 +448,7 @@ namespace SmartScan ...@@ -448,7 +448,7 @@ namespace SmartScan
this.pnlKeywords.Location = new System.Drawing.Point(3, 3); this.pnlKeywords.Location = new System.Drawing.Point(3, 3);
this.pnlKeywords.Name = "pnlKeywords"; this.pnlKeywords.Name = "pnlKeywords";
this.pnlKeywords.Padding = new System.Windows.Forms.Padding(3); this.pnlKeywords.Padding = new System.Windows.Forms.Padding(3);
this.pnlKeywords.Size = new System.Drawing.Size(698, 193); this.pnlKeywords.Size = new System.Drawing.Size(698, 179);
this.pnlKeywords.TabIndex = 32; this.pnlKeywords.TabIndex = 32;
this.pnlKeywords.Text = "关键字"; this.pnlKeywords.Text = "关键字";
this.pnlKeywords.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.pnlKeywords.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
...@@ -468,7 +468,7 @@ namespace SmartScan ...@@ -468,7 +468,7 @@ namespace SmartScan
this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowCount = 1;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(1419, 672); this.tableLayoutPanel2.Size = new System.Drawing.Size(1419, 624);
this.tableLayoutPanel2.TabIndex = 33; this.tableLayoutPanel2.TabIndex = 33;
// //
// tableLayoutPanel3 // tableLayoutPanel3
...@@ -483,7 +483,7 @@ namespace SmartScan ...@@ -483,7 +483,7 @@ namespace SmartScan
this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 70F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 70F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(704, 666); this.tableLayoutPanel3.Size = new System.Drawing.Size(704, 618);
this.tableLayoutPanel3.TabIndex = 32; this.tableLayoutPanel3.TabIndex = 32;
// //
// tableLayoutPanel4 // tableLayoutPanel4
...@@ -498,14 +498,13 @@ namespace SmartScan ...@@ -498,14 +498,13 @@ namespace SmartScan
this.tableLayoutPanel4.RowCount = 2; this.tableLayoutPanel4.RowCount = 2;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 277F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 277F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(703, 666); this.tableLayoutPanel4.Size = new System.Drawing.Size(703, 618);
this.tableLayoutPanel4.TabIndex = 33; this.tableLayoutPanel4.TabIndex = 33;
// //
// FrmCodeExtract // FrmCodeExtract
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1441, 740);
this.ClientSize = new System.Drawing.Size(1441, 788);
this.Controls.Add(this.tableLayoutPanel2); this.Controls.Add(this.tableLayoutPanel2);
this.Controls.Add(this.BtnCancel); this.Controls.Add(this.BtnCancel);
this.Controls.Add(this.BtnOK); this.Controls.Add(this.BtnOK);
......
SmartScan/PlusSettingFrm/FrmSetPlus.Designer.cs
...@@ -80,7 +80,7 @@ namespace SmartScan ...@@ -80,7 +80,7 @@ namespace SmartScan
this.BtnOK.BorderWidth = 2; this.BtnOK.BorderWidth = 2;
this.BtnOK.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnOK.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnOK.HoldPress = false; this.BtnOK.HoldPress = false;
this.BtnOK.Location = new System.Drawing.Point(641, 689); this.BtnOK.Location = new System.Drawing.Point(641, 679);
this.BtnOK.Name = "BtnOK"; this.BtnOK.Name = "BtnOK";
this.BtnOK.Padding = new System.Windows.Forms.Padding(3); this.BtnOK.Padding = new System.Windows.Forms.Padding(3);
this.BtnOK.Size = new System.Drawing.Size(120, 40); this.BtnOK.Size = new System.Drawing.Size(120, 40);
...@@ -96,7 +96,7 @@ namespace SmartScan ...@@ -96,7 +96,7 @@ namespace SmartScan
this.BtnCancel.BorderWidth = 2; this.BtnCancel.BorderWidth = 2;
this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnCancel.HoldPress = false; this.BtnCancel.HoldPress = false;
this.BtnCancel.Location = new System.Drawing.Point(767, 689); this.BtnCancel.Location = new System.Drawing.Point(767, 679);
this.BtnCancel.Name = "BtnCancel"; this.BtnCancel.Name = "BtnCancel";
this.BtnCancel.Padding = new System.Windows.Forms.Padding(3); this.BtnCancel.Padding = new System.Windows.Forms.Padding(3);
this.BtnCancel.Size = new System.Drawing.Size(120, 40); this.BtnCancel.Size = new System.Drawing.Size(120, 40);
...@@ -116,7 +116,7 @@ namespace SmartScan ...@@ -116,7 +116,7 @@ namespace SmartScan
this.PnlTemp.Location = new System.Drawing.Point(142, 55); this.PnlTemp.Location = new System.Drawing.Point(142, 55);
this.PnlTemp.Name = "PnlTemp"; this.PnlTemp.Name = "PnlTemp";
this.PnlTemp.Padding = new System.Windows.Forms.Padding(3); this.PnlTemp.Padding = new System.Windows.Forms.Padding(3);
this.PnlTemp.Size = new System.Drawing.Size(871, 628); this.PnlTemp.Size = new System.Drawing.Size(871, 618);
this.PnlTemp.TabIndex = 11; this.PnlTemp.TabIndex = 11;
this.PnlTemp.Text = "facePanel1"; this.PnlTemp.Text = "facePanel1";
this.PnlTemp.TitleFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.PnlTemp.TitleFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -130,7 +130,7 @@ namespace SmartScan ...@@ -130,7 +130,7 @@ namespace SmartScan
this.BtnApply.BorderWidth = 2; this.BtnApply.BorderWidth = 2;
this.BtnApply.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnApply.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnApply.HoldPress = false; this.BtnApply.HoldPress = false;
this.BtnApply.Location = new System.Drawing.Point(893, 689); this.BtnApply.Location = new System.Drawing.Point(893, 679);
this.BtnApply.Name = "BtnApply"; this.BtnApply.Name = "BtnApply";
this.BtnApply.Padding = new System.Windows.Forms.Padding(3); this.BtnApply.Padding = new System.Windows.Forms.Padding(3);
this.BtnApply.Size = new System.Drawing.Size(120, 40); this.BtnApply.Size = new System.Drawing.Size(120, 40);
...@@ -230,7 +230,7 @@ namespace SmartScan ...@@ -230,7 +230,7 @@ namespace SmartScan
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoSize = true; this.AutoSize = true;
this.ClientSize = new System.Drawing.Size(1024, 740); this.ClientSize = new System.Drawing.Size(1024, 730);
this.Controls.Add(this.but_Labeling); this.Controls.Add(this.but_Labeling);
this.Controls.Add(this.Keywordlabeling); this.Controls.Add(this.Keywordlabeling);
this.Controls.Add(this.BtnWorkMode); this.Controls.Add(this.BtnWorkMode);
...@@ -245,6 +245,7 @@ namespace SmartScan ...@@ -245,6 +245,7 @@ namespace SmartScan
this.Icon = global::SmartScan.Properties.Resources.NEO_64; this.Icon = global::SmartScan.Properties.Resources.NEO_64;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "FrmSetPlus"; this.Name = "FrmSetPlus";
this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
this.Text = "FrmSet"; this.Text = "FrmSet";
this.Load += new System.EventHandler(this.FrmSet_Load); this.Load += new System.EventHandler(this.FrmSet_Load);
this.Controls.SetChildIndex(this.BtnMaterial, 0); this.Controls.SetChildIndex(this.BtnMaterial, 0);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!