Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 5ae6be04 由 LN
选项

界面调整

1 个父辈 3bf33da4
内嵌 并排
正在显示 4 个修改的文件 包含 10 行增加 和 9 行删除
DLL/CodeLibrary.dll
此文件类型无法预览
DeviceLibrary/DeviceLibrary/CodeManager.cs
...@@ -550,7 +550,7 @@ namespace DeviceLibrary ...@@ -550,7 +550,7 @@ namespace DeviceLibrary
public static string SaveIoFile(string deviceName, string cameraName, Bitmap bitmap) public static string SaveIoFile(string deviceName, string cameraName, Bitmap bitmap)
{ {
string date = DateTime.Now.ToString("HH-mm-ss-") + DateTime.Now.Millisecond; string date = DateTime.Now.ToString("HH-mm-ss-") + DateTime.Now.Millisecond;
string dire = Application.StartupPath + @"\image\" + deviceName.Trim().Replace('_', '-') + @"\" + cameraName.Trim().Replace('_', '-').Replace(':', '-') + @"\"; string dire = Application.StartupPath + @"\img\" + deviceName.Trim().Replace('_', '-') + @"\" + cameraName.Trim().Replace('_', '-').Replace(':', '-') + @"\";
string iamgeName = date + ".bmp"; string iamgeName = date + ".bmp";
try try
{ {
......
TheMachineNView/Form1.cs
...@@ -686,9 +686,10 @@ namespace TheMachineNView ...@@ -686,9 +686,10 @@ namespace TheMachineNView
if (Camera._cam != null) if (Camera._cam != null)
{ {
Camera._cam.CloseAll(); Camera._cam.CloseAll();
} }
CodeLibrary.CodeResourceControl.CurrLanguage = CodeLibrary.CodeResourceControl.English;
CodeLibrary.CodeResourceControl.GetLanguageEvent += Crc_GetLanguageEvent; CodeLibrary.CodeResourceControl.GetLanguageEvent += Crc_GetLanguageEvent;
CodeLibrary.FrmCodeDecode frm = new CodeLibrary.FrmCodeDecode(); CodeLibrary.FrmCodeDecodeNW frm = new CodeLibrary.FrmCodeDecodeNW();
frm.CurrLanguage = Crc_GetLanguageEvent(); frm.CurrLanguage = Crc_GetLanguageEvent();
frm.chbZxing.Checked = false; frm.chbZxing.Checked = false;
......
TheMachineNView/UC/uc_boxdebug.Designer.cs
...@@ -77,7 +77,7 @@ namespace TheMachineNView ...@@ -77,7 +77,7 @@ namespace TheMachineNView
// cb_inoutdebugmode // cb_inoutdebugmode
// //
this.cb_inoutdebugmode.AutoSize = true; this.cb_inoutdebugmode.AutoSize = true;
this.cb_inoutdebugmode.Location = new System.Drawing.Point(27, 30); this.cb_inoutdebugmode.Location = new System.Drawing.Point(16, 30);
this.cb_inoutdebugmode.Name = "cb_inoutdebugmode"; this.cb_inoutdebugmode.Name = "cb_inoutdebugmode";
this.cb_inoutdebugmode.Size = new System.Drawing.Size(108, 16); this.cb_inoutdebugmode.Size = new System.Drawing.Size(108, 16);
this.cb_inoutdebugmode.TabIndex = 103; this.cb_inoutdebugmode.TabIndex = 103;
...@@ -89,7 +89,7 @@ namespace TheMachineNView ...@@ -89,7 +89,7 @@ namespace TheMachineNView
// //
this.cb_fixpos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_fixpos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_fixpos.FormattingEnabled = true; this.cb_fixpos.FormattingEnabled = true;
this.cb_fixpos.Location = new System.Drawing.Point(437, 28); this.cb_fixpos.Location = new System.Drawing.Point(435, 67);
this.cb_fixpos.Name = "cb_fixpos"; this.cb_fixpos.Name = "cb_fixpos";
this.cb_fixpos.Size = new System.Drawing.Size(121, 20); this.cb_fixpos.Size = new System.Drawing.Size(121, 20);
this.cb_fixpos.TabIndex = 226; this.cb_fixpos.TabIndex = 226;
...@@ -114,7 +114,7 @@ namespace TheMachineNView ...@@ -114,7 +114,7 @@ namespace TheMachineNView
"72"}); "72"});
this.cb_plateheight.Location = new System.Drawing.Point(72, 66); this.cb_plateheight.Location = new System.Drawing.Point(72, 66);
this.cb_plateheight.Name = "cb_plateheight"; this.cb_plateheight.Name = "cb_plateheight";
this.cb_plateheight.Size = new System.Drawing.Size(54, 20); this.cb_plateheight.Size = new System.Drawing.Size(63, 20);
this.cb_plateheight.TabIndex = 227; this.cb_plateheight.TabIndex = 227;
// //
// btn_autoinout // btn_autoinout
...@@ -123,7 +123,7 @@ namespace TheMachineNView ...@@ -123,7 +123,7 @@ namespace TheMachineNView
this.btn_autoinout.Enabled = false; this.btn_autoinout.Enabled = false;
this.btn_autoinout.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_autoinout.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_autoinout.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_autoinout.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_autoinout.Location = new System.Drawing.Point(141, 60); this.btn_autoinout.Location = new System.Drawing.Point(235, 58);
this.btn_autoinout.Name = "btn_autoinout"; this.btn_autoinout.Name = "btn_autoinout";
this.btn_autoinout.Size = new System.Drawing.Size(173, 32); this.btn_autoinout.Size = new System.Drawing.Size(173, 32);
this.btn_autoinout.TabIndex = 102; this.btn_autoinout.TabIndex = 102;
...@@ -137,7 +137,7 @@ namespace TheMachineNView ...@@ -137,7 +137,7 @@ namespace TheMachineNView
this.btnInStore.Enabled = false; this.btnInStore.Enabled = false;
this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(141, 22); this.btnInStore.Location = new System.Drawing.Point(235, 20);
this.btnInStore.Name = "btnInStore"; this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(117, 32); this.btnInStore.Size = new System.Drawing.Size(117, 32);
this.btnInStore.TabIndex = 102; this.btnInStore.TabIndex = 102;
...@@ -151,7 +151,7 @@ namespace TheMachineNView ...@@ -151,7 +151,7 @@ namespace TheMachineNView
this.btnOutStore.Enabled = false; this.btnOutStore.Enabled = false;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(272, 22); this.btnOutStore.Location = new System.Drawing.Point(366, 20);
this.btnOutStore.Name = "btnOutStore"; this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(117, 32); this.btnOutStore.Size = new System.Drawing.Size(117, 32);
this.btnOutStore.TabIndex = 101; this.btnOutStore.TabIndex = 101;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!