From a587c3fef521ccf454716f4eeccadaca7fb77f86 Mon Sep 17 00:00:00 2001
From: jace.tang <1536884497@qq.com>
Date: 星期一, 13 六月 2022 11:33:03 +0800
Subject: [PATCH] 1.merge（上次更新内容未发全，下为补充） 2.补偿配置界面设置隐藏，无法通过界面修改 3.标准块模式默认保存图片，和图片保存开关脱钩 4.增加标准块补偿CSV数据输出 5.修改原有OPC输出事件，新的输出事件添加触发值输出。版本号升级到1.0.2022.0613
---
CommonUtil.cs | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/CommonUtil.cs b/CommonUtil.cs
index 0e7b920..b9ed9bd 100644
--- a/CommonUtil.cs
+++ b/CommonUtil.cs
@@ -6,6 +6,7 @@
using System.Runtime.InteropServices;
using System.Windows;
using System.Windows.Forms;
+using System.Threading;
namespace M423project
{
@@ -46,22 +47,22 @@
private static object lockObj = new object();
private static object logObj = new object();
- private static bool uploadDataEnable = true;
+ //private static bool uploadDataEnable = true;
- public static bool UploadDataEnable
- {
- get
- {
- lock (lockObj) { return uploadDataEnable; }
- }
- set
- {
- lock (lockObj)
- {
- uploadDataEnable = value;
- }
- }
- }
+ //public static bool UploadDataEnable
+ //{
+ // get
+ // {
+ // lock (lockObj) { return uploadDataEnable; }
+ // }
+ // set
+ // {
+ // lock (lockObj)
+ // {
+ // uploadDataEnable = value;
+ // }
+ // }
+ //}
private static DetectionOption detectionOption = DetectionOption.doProduct;
@@ -118,7 +119,11 @@
/// 涓荤獥浣撳紩鐢�
/// </summary>
public static MainForm mainForm { get; set; }
-
+
+ public static ManualResetEvent UploadDoneHandle = new ManualResetEvent(true);
+ public static object UploadDataLock = new object();
+ public static bool UploadDataEnable = true;
+
static CommonUtil()
{
CurrentDir = Directory.GetCurrentDirectory();
--
Gitblit v1.8.0