From f9623afb8161f603b14493bea20f6c640152d1ea Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 월, 23 8월 2021 11:08:01 +0900
Subject: [PATCH] 머지간 오류 수정
---
ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
index 3c4fe43..95d0eb1 100644
--- a/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewProcessor_CPJT.cpp
@@ -1232,7 +1232,7 @@
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
- if (dFocusValue < nDefocusValueMin && dFocusValue > nDefocusValueMax)
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
{
m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
}
@@ -1247,7 +1247,7 @@
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
- if (dFocusValue < nDefocusValueMin && dFocusValue > nDefocusValueMax)
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
{
m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
}
@@ -1282,7 +1282,7 @@
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
- if (dFocusValue < nDefocusValueMin && dFocusValue > nDefocusValueMax)
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
{
m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
}
@@ -1298,7 +1298,7 @@
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
- if (dFocusValue < nDefocusValueMin && dFocusValue > nDefocusValueMax)
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
{
m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
}
@@ -1416,7 +1416,7 @@
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
- if (dFocusValue < nDefocusValueMin && dFocusValue > nDefocusValueMax)
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
{
m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
}
@@ -1431,7 +1431,7 @@
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
- if (dFocusValue < nDefocusValueMin && dFocusValue > nDefocusValueMax)
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
{
m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
}
@@ -1487,7 +1487,7 @@
m_pRP2P->IRP2P_SetFirstReviewLeft(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewLeft FDC FocusValue = %.2f "), dFocusValue);
- if (dFocusValue < nDefocusValueMin && dFocusValue > nDefocusValueMax)
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
{
m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
}
@@ -1502,7 +1502,7 @@
m_pRP2P->IRP2P_SetFirstReviewRight(FALSE);
m_pRP2P->IRP2P_DisplayMessage(_T("FirstReviewRight FDC FocusValue = %.2f "), dFocusValue);
- if (dFocusValue < nDefocusValueMin && dFocusValue > nDefocusValueMax)
+ if (dFocusValue < nDefocusValueMin || dFocusValue > nDefocusValueMax)
{
m_pRP2P->IRP2P_GetSequenceProcessor()->SendSignalToSignalControl(0, 3, 1000);
}
--
Gitblit v1.9.3