From 1fd49a571338b6c946bb05dcdf59ec1468df5c50 Mon Sep 17 00:00:00 2001
From: SWK <sungwk82@diteam.co.kr>
Date: 목, 22 12월 2022 12:31:43 +0900
Subject: [PATCH] ongoing50 #4403 CF AOI Reveiw TACT 지연 개선 1. 일정 시간 유지 신호 처리 시 동기화로 인한 불합리 개선 - 일정 시간 유지 필요 시 스래드풀 작업큐를 이용하여 루프처리 방식으로 변경 - 유지 신호 처리 중 출력 신호 발생 시 작업큐에 등록하여 유지 신호와 결합하여 출력 처리 2. FDC 보고 항목 중 SW 버전 체크 루프 불합리 개선 - 프로그램 시작 시 연동 프로그램 버전 체크 간 실행되지 않는 프로그램이 있는 경우 무한 루프 발생 - 무한 루프로 인한 CPU 점유 상승->루프 중간 Sleep추가 및 코드 간소화 3. 로그 메시지에 시간 ms단위 추가(황만수SM 작업 내역 병합)
---
ReviewSystem/ReviewSystemSetting/DlgNetwork.cpp | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/ReviewSystem/ReviewSystemSetting/DlgNetwork.cpp b/ReviewSystem/ReviewSystemSetting/DlgNetwork.cpp
index 9b844a5..6ea4a78 100644
--- a/ReviewSystem/ReviewSystemSetting/DlgNetwork.cpp
+++ b/ReviewSystem/ReviewSystemSetting/DlgNetwork.cpp
@@ -29,6 +29,9 @@
, m_strUploadDefectMapImagePath(_T(""))
, m_dUpdateImageScale(1.0)
, m_strWsiImagePath(_T(""))
+ , m_nZeroReviewAlarm(0)
+ , m_strZeroReviewAlarmExcept(_T(""))
+ , m_nResultFileUploadFailAlarmCondition(3)
{
m_nUpdateImageWidth = 1224;
m_nUpdateImageHeight = 1024;
@@ -61,11 +64,11 @@
DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_PATH, m_strUploadImagePath);
DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_DEFECTMAP_IMAGE_PATH, m_strUploadDefectMapImagePath);
- DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_WIDTH, m_nUpdateImageWidth);
- DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_HEIGHT, m_nUpdateImageHeight);
- DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_SIZE, m_nUpdateImageSize);
- DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_START_QUALTY, m_nUpdateImageQuality);
- DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_STEP_QUALTY, m_nUpdateImageStep);
+ DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_WIDTH, m_nUpdateImageWidth);
+ DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_HEIGHT, m_nUpdateImageHeight);
+ DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_SIZE, m_nUpdateImageSize);
+ DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_START_QUALTY, m_nUpdateImageQuality);
+ DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_STEP_QUALTY, m_nUpdateImageStep);
DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_IMAGE_SCALE, m_dUpdateImageScale);
@@ -77,6 +80,9 @@
DDX_Control(pDX, IDC_COMBO2, m_ctrlComboImageFlip);
DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_WSI_IMAGE_PATH, m_strWsiImagePath);
DDV_MaxChars(pDX, m_strWsiImagePath, 255);
+ DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_ZERO_COUNT_ALARM_CONDITION, m_nZeroReviewAlarm);
+ DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_ZERO_COUNT_ALARM_CONDITION_2, m_strZeroReviewAlarmExcept);
+ DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_FAIL_ALARM_CONDITION, m_nResultFileUploadFailAlarmCondition);
}
BEGIN_MESSAGE_MAP(CDlgNetwork, CDialog)
@@ -133,6 +139,10 @@
m_nImageRotate = pNetworkInfo->m_nImageRotate;
m_nImageFlip = pNetworkInfo->m_nImageFlip;
+ m_nZeroReviewAlarm = pNetworkInfo->m_nZeroReviewAlarm;
+ m_strZeroReviewAlarmExcept = pNetworkInfo->m_strZeroReviewAlarmExcept;
+ m_nResultFileUploadFailAlarmCondition = pNetworkInfo->m_nResultFileUploadFailAlarmCondition;
+
m_ctrlButtonUseSaveOrignalImage.SetCheck(m_bUpdateImageOriginal);
m_ctrlComboImageRotate.SetCurSel(m_nImageRotate);
m_ctrlComboImageFlip.SetCurSel(m_nImageFlip);
@@ -184,6 +194,10 @@
m_nImageRotate = 0;
m_nImageFlip = -1;
+ m_nZeroReviewAlarm = 0;
+ m_strZeroReviewAlarmExcept = _T("");
+ m_nResultFileUploadFailAlarmCondition = 3;
+
UpdateData(FALSE);
}
@@ -218,6 +232,10 @@
pNetworkInfo->m_bUpdateImageOriginal = m_bUpdateImageOriginal;
pNetworkInfo->m_nImageRotate = m_nImageRotate;
pNetworkInfo->m_nImageFlip = m_nImageFlip;
+
+ pNetworkInfo->m_nZeroReviewAlarm = m_nZeroReviewAlarm;
+ pNetworkInfo->m_strZeroReviewAlarmExcept = m_strZeroReviewAlarmExcept;
+ pNetworkInfo->m_nResultFileUploadFailAlarmCondition = m_nResultFileUploadFailAlarmCondition;
}
}
m_ctrlEditImageHeight.EnableWindow(TRUE);
--
Gitblit v1.9.3