From 3ce48f6dbeb537e252edb0d62c88a28796e36674 Mon Sep 17 00:00:00 2001 From: SWK <sungwk82@diteam.co.kr> Date: 월, 26 12월 2022 15:04:42 +0900 Subject: [PATCH] ongoing60 #4403 CF AOI Review TACT 지연 개선 1. 신호 출력 방식 재개선 - 유지 시간이 없는 신호는 바로 출력 진행하도록 변경 2. 불필요 Delay 제거 및 시퀀스 변경 - 얼라인 측정 종료 처리 간 제어 신호 먼저 출력 후 카메라 Stop으로 변경 - 물류 정보 읽기 처리 후 1000ms Delay 삭제 - 얼라인 측정 시작(카메라 Live Start) 후 Delay 300ms -> 100ms(이미지 들어오는 시간 확보 필요) - ReadRawFile 처리 시작 전 500ms Delay 삭제 - Path Scheduling 완료 후 Review Ready 신호 출력 전 1000ms Delay 삭제 3. 버그 수정 - 이미지 저장 경로 생성 간 예외 처리 부분 버그 수정 4. 로그 시간 출력 불합리 개선 - 로그 시간이 파일 출력 시점으로 작성되어 로그 스래드 지연 시 시간이 맞지 않는 불합리 있음 - 로그 시간은 로그 발생 시점에 시간 저장, 해당 시간 이용하여 파일에 기록하도록 변경 --- ReviewHistory/include/akSTL/akRect.h | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/ReviewHistory/include/akSTL/akRect.h b/ReviewHistory/include/akSTL/akRect.h new file mode 100644 index 0000000..22a9119 --- /dev/null +++ b/ReviewHistory/include/akSTL/akRect.h @@ -0,0 +1,117 @@ +#pragma once + +#include "akSTLLinker.h" +#include "akRectT.h" +#include "akPoint.h" + +#define CakRectToCRect(akRect) CRect(akRect.left, akRect.top, akRect.right, akRect.bottom) +#define CRectToCakRect(rect) CakRect(rect.left, rect.top, rect.right, rect.bottom) +#define CakRectSet(rectDes, rectSrc) rectDes.SetRect(rectSrc.left, rectSrc.top, rectSrc.right, rectSrc.bottom) + +class AKSTL_DLLSPEC CakRect : public CakRectT<long> +{ +public: + + CakRect(){}; + CakRect(const long l, const long t, const long r, const long b){ + left=l,top=t,right=r,bottom=b; + }; + virtual ~CakRect(){}; + +public: + + // reference to the top-left point + CakPoint TopLeft() throw(); + // reference to the bottom-right point + CakPoint BottomRight() throw(); + // const reference to the top-left point + const CakPoint TopLeft() const throw(); + // const reference to the bottom-right point + const CakPoint BottomRight() const throw(); + // the geometric center point of the rectangle + CakPoint CenterPoint() const throw(); + + bool PtInRect(CakPoint point) const throw(); + +}; + +class AKSTL_DLLSPEC CakRectn : public CakRectT<int> +{ +public: + + CakRectn(){}; + CakRectn(int l, int t, int r, int b){ + left=l,top=t,right=r,bottom=b; + }; + virtual ~CakRectn(){}; + +public: + + // reference to the top-left point + CakPoint TopLeft() throw(); + // reference to the bottom-right point + CakPoint BottomRight() throw(); + // const reference to the top-left point + const CakPoint TopLeft() const throw(); + // const reference to the bottom-right point + const CakPoint BottomRight() const throw(); + // the geometric center point of the rectangle + CakPoint CenterPoint() const throw(); + + bool PtInRect(CakPoint point) const throw(); + +}; + +class AKSTL_DLLSPEC CakRectf : public CakRectT<float> +{ +public: + + CakRectf(){}; + CakRectf(float l, float t, float r, float b){ + left=l,top=t,right=r,bottom=b; + }; + virtual ~CakRectf(){}; + +public: + + // reference to the top-left point + CakPointf& TopLeft() throw(); + // reference to the bottom-right point + CakPointf& BottomRight() throw(); + // const reference to the top-left point + const CakPointf& TopLeft() const throw(); + // const reference to the bottom-right point + const CakPointf& BottomRight() const throw(); + // the geometric center point of the rectangle + CakPointf CenterPoint() const throw(); + + bool PtInRect(CakPointf point) const throw(); + +}; + +class AKSTL_DLLSPEC CakRectd : public CakRectT<double> +{ +public: + + CakRectd(){}; + CakRectd(double l, double t, double r, double b){ + left=l,top=t,right=r,bottom=b; + }; + virtual ~CakRectd(){}; + +public: + + // reference to the top-left point + CakPointd TopLeft() throw(); + // reference to the bottom-right point + CakPointd BottomRight() throw(); + // const reference to the top-left point + const CakPointd TopLeft() const throw(); + // const reference to the bottom-right point + const CakPointd BottomRight() const throw(); + // the geometric center point of the rectangle + CakPointd CenterPoint() const throw(); + + bool PtInRect(CakPointd point) const throw(); + +}; \ No newline at end of file -- Gitblit v1.9.3