From 581b672fbafc258f05aae700debfbfab5a515408 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期四, 27 五月 2021 08:25:05 +0800
Subject: [PATCH] 1. 更改灰点相机dll版本
---
MainForm.cs | 7 +++++--
Properties/AssemblyInfo.cs | 4 ++--
libs/FlyCapture2Managed_v100.dll | 0
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/MainForm.cs b/MainForm.cs
index dd776ae..19f79e4 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -1647,8 +1647,11 @@
private void btnPlcOperation_Click(object sender, EventArgs e)
{
- FormPlcOperation frm = new FormPlcOperation(opc);
- frm.ShowDialog();
+ //if (new ConfigPassword("").ShowDialog() == DialogResult.OK)
+ {
+ FormPlcOperation frm = new FormPlcOperation(opc);
+ frm.ShowDialog();
+ }
}
private void btnCheck_Click(object sender, EventArgs e)
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 8de10e7..8f75b42 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
// 鍙互鎸囧畾鎵�鏈夎繖浜涘�硷紝涔熷彲浠ヤ娇鐢ㄢ�滃唴閮ㄧ増鏈彿鈥濆拰鈥滀慨璁㈠彿鈥濈殑榛樿鍊硷紝
// 鏂规硶鏄寜濡備笅鎵�绀轰娇鐢ㄢ��*鈥�:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.1")]
-[assembly: AssemblyFileVersion("1.0.1.1")]
+[assembly: AssemblyVersion("1.0.1.2")]
+[assembly: AssemblyFileVersion("1.0.1.2")]
diff --git a/libs/FlyCapture2Managed_v100.dll b/libs/FlyCapture2Managed_v100.dll
index b4efa3c..b49074c 100644
--- a/libs/FlyCapture2Managed_v100.dll
+++ b/libs/FlyCapture2Managed_v100.dll
Binary files differ
--
Gitblit v1.8.0