FormMain UI Optimization
This commit is contained in:
1314
精工涂胶检测项目/精工涂胶检测项目/Form/FormMain.Designer.cs
generated
1314
精工涂胶检测项目/精工涂胶检测项目/Form/FormMain.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
@@ -167,8 +167,6 @@ namespace 精工涂胶检测项目
|
|||||||
// HslCommunication.Authorization.SetAuthorizationCode("163b691b-ba10-44a1-9070-cac594d67965");
|
// HslCommunication.Authorization.SetAuthorizationCode("163b691b-ba10-44a1-9070-cac594d67965");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
string ip;
|
string ip;
|
||||||
int port;
|
int port;
|
||||||
if (Properties.Settings.Default.ModbusIP != "")
|
if (Properties.Settings.Default.ModbusIP != "")
|
||||||
@@ -664,14 +662,11 @@ namespace 精工涂胶检测项目
|
|||||||
{
|
{
|
||||||
process.Kill();
|
process.Kill();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
e.Cancel = true;
|
e.Cancel = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
private void checkBox1_CheckedChanged_1(object sender, EventArgs e)
|
private void checkBox1_CheckedChanged_1(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
@@ -1383,7 +1378,10 @@ namespace 精工涂胶检测项目
|
|||||||
AddLog("数据写入成功", 1);
|
AddLog("数据写入成功", 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
catch (Exception ex) { AddLog($"数据写入失败:{ex.Message}", 1); ; }
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
AddLog($"数据写入失败:{ex.Message}", 1);
|
||||||
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
if (workbook != null)
|
if (workbook != null)
|
||||||
@@ -1469,7 +1467,10 @@ namespace 精工涂胶检测项目
|
|||||||
AddLog("数据写入成功", 1);
|
AddLog("数据写入成功", 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
catch (Exception ex) { AddLog("数据写入成功", 1); ; }
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
AddLog("数据写入成功", 1);
|
||||||
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
if (workbook != null)
|
if (workbook != null)
|
||||||
@@ -1489,13 +1490,11 @@ namespace 精工涂胶检测项目
|
|||||||
GC.WaitForPendingFinalizers();
|
GC.WaitForPendingFinalizers();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show(ex.ToString());
|
MessageBox.Show(ex.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1567,7 +1566,6 @@ namespace 精工涂胶检测项目
|
|||||||
/// <param name="e"></param>
|
/// <param name="e"></param>
|
||||||
private void btn_Auto_Click(object sender, System.EventArgs e)
|
private void btn_Auto_Click(object sender, System.EventArgs e)
|
||||||
{
|
{
|
||||||
|
|
||||||
//显示部分
|
//显示部分
|
||||||
if (this.btn_Auto.Text == "自动模式")
|
if (this.btn_Auto.Text == "自动模式")
|
||||||
{
|
{
|
||||||
@@ -1618,6 +1616,7 @@ namespace 精工涂胶检测项目
|
|||||||
FormCommunication formCommunication = new FormCommunication();
|
FormCommunication formCommunication = new FormCommunication();
|
||||||
formCommunication.ShowDialog();
|
formCommunication.ShowDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 实时LOG
|
/// 实时LOG
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -1636,6 +1635,8 @@ namespace 精工涂胶检测项目
|
|||||||
lvw_Log.Items.Add(list);
|
lvw_Log.Items.Add(list);
|
||||||
lvw_Log.Items[lvw_Log.Items.Count - 1].EnsureVisible();
|
lvw_Log.Items[lvw_Log.Items.Count - 1].EnsureVisible();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void Label数据重置()
|
private void Label数据重置()
|
||||||
{
|
{
|
||||||
lbl_Volume1.Text = "0";
|
lbl_Volume1.Text = "0";
|
||||||
|
|||||||
@@ -117,12 +117,6 @@
|
|||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<metadata name="btn_LoadImage.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<value>True</value>
|
|
||||||
</metadata>
|
|
||||||
<metadata name="btn_ManulTrigger.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<value>True</value>
|
|
||||||
</metadata>
|
|
||||||
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
<value>252, 17</value>
|
<value>252, 17</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
@@ -134,7 +128,7 @@
|
|||||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAw
|
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAw
|
||||||
CQAAAk1TRnQBSQFMAgEBAwEAAUABAgFAAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
CQAAAk1TRnQBSQFMAgEBAwEAAVABAgFQAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||||
@@ -176,23 +170,20 @@
|
|||||||
AX8B8AEHAgAE/wH+AT8CAAs=
|
AX8B8AEHAgAE/wH+AT8CAAs=
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
<metadata name="btn_Auto.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
<value>True</value>
|
<value>17, 17</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
<data name="cogRecordDisplay1.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
|
<data name="cogRecordDisplay1.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
<value>
|
<value>
|
||||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
|
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
|
||||||
ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAtwAAAAIB
|
ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAtwAAAAIB
|
||||||
AAAAAQAAAAAAAAAAAAAAAKIAAAAAAQAAiRIAAH4bAAATAAAAAAALAP//CwD//wsA//8DAAAAAAADAAEA
|
AAAAAQAAAAAAAAAAAAAAAKIAAAAAAQAAHB8AAHAyAAATAAAAAAALAP//CwD//wsA//8DAAAAAAADAAEA
|
||||||
AAAFAAAAAAAAAAAABQAAAAAAAAAAAAUAAAAAAAAA8D8TAAAA/wALAP//CwD//xMAAIAAAAMAAwAAAAsA
|
AAAFAAAAAAAAAAAABQAAAAAAAAAAAAUAAAAAAAAA8D8TAAAA/wALAP//CwD//xMAAIAAAAMAAwAAAAsA
|
||||||
//8LAAAAAAAAAAAA4D8AAAAAAADgPwAAAAAAAOA/AAAAAAAA4D8BAAAAAQAAAAsA//8LAAAACwAAAAsA
|
//8LAAAAAAAAAAAA4D8AAAAAAADgPwAAAAAAAOA/AAAAAAAA4D8BAAAAAQAAAAsA//8LAAAACwAAAAsA
|
||||||
//8L
|
//8L
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
|
||||||
<value>17, 17</value>
|
|
||||||
</metadata>
|
|
||||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>25</value>
|
<value>25</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|||||||
Reference in New Issue
Block a user