From 47873f48d17bb8f7602fda73d29b19adcf43fdd0 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 14 八月 2025 15:50:27 +0800
Subject: [PATCH] 1. 修复执行界面没有显示侧面检数据的问题
---
EdgeInspector_App/Recipe/HardwareSettings.h | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/EdgeInspector_App/Recipe/HardwareSettings.h b/EdgeInspector_App/Recipe/HardwareSettings.h
index 1343696..2fbaff6 100644
--- a/EdgeInspector_App/Recipe/HardwareSettings.h
+++ b/EdgeInspector_App/Recipe/HardwareSettings.h
@@ -1,11 +1,11 @@
-#pragma once
+锘�#pragma once
#include "Config.h"
#include "Global_Define.h"
-#define HARDWARE_SETTING_PATH _T("c:\\EdgeInspector_App\\Config\\HardwareSetting.cfg") // cfg 立辟 版肺汲沥
-#define HARDWARE_SETTING_BACKUP_DIR_PATH _T("c:\\EdgeInspector_App\\Config\\Backup")
-#define KEY_BASIC _T("Software\\EdgeInspector_App\\BASIC\\") // 饭瘤胶飘府 立辟 版肺汲沥
+#define HARDWARE_SETTING_PATH _T("C:\\EdgeInspector_App\\Config\\HardwareSetting.cfg") // cfg 绔嬭緹 鐗堣偤姹叉播
+#define HARDWARE_SETTING_BACKUP_DIR_PATH _T("C:\\EdgeInspector_App\\Config\\Backup")
+#define KEY_BASIC _T("Software\\EdgeInspector_App\\BASIC\\") // 楗槫鑳堕搴� 绔嬭緹 鐗堣偤姹叉播
#define MAX_CNC_COUNT 6
#define MAX_NCUT_STAGE_COUNT 12
#define MAX_CCUT_STAGE_COUNT 1
@@ -156,15 +156,15 @@
// Camera
public:
- int GetCameraCount(){return m_nCameraCount;}
- int GetScanCount(){return m_nScanCount;}
- BOOL SetCameraCount(int nCameraCount,int nScanCount);
- CCameraSettings *GetCameraSettings(){return m_pCameraSettings;}
- CCameraSettings *GetCameraSettings(int iCamera,int iScan);
- BOOL SetCameraSettings(CCameraSettings *pCamera);
+ int GetCameraCount() { return m_nCameraCount; }
+ int GetScanCount() { return m_nScanCount; }
+ BOOL SetCameraCount(int nCameraCount, int nScanCount);
+ CCameraSettings* GetCameraSettings() { return m_pCameraSettings; }
+ CCameraSettings* GetCameraSettings(int iCamera, int iScan);
+ BOOL SetCameraSettings(CCameraSettings* pCamera);
int GetScanToDimension(DimensionDir eDir);
- CAMERA_SCANDIR GetScanToScanDir(int iCam,int iScan);
+ CAMERA_SCANDIR GetScanToScanDir(int iCam, int iScan);
int GetCameraIndexToDimension(DimensionDir eDir);
// PLC
@@ -207,6 +207,9 @@
BOOL m_bSaveResultByHour;
public:
+ BOOL m_bUseRipInspection;
+
+public:
BOOL m_bEnableAutoCopy;
CString m_strCopyToolExePath;
CString m_strCopyToolConfigPath;
--
Gitblit v1.9.3