From 4fb0f6c9b7b0fdfc6cc52c9bf1153d87f92651ca Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 14 八月 2025 11:52:50 +0800
Subject: [PATCH] 1. 修复RIP新增配方闪退的问题 2. 完善RIP结果绘画在视图窗口
---
EdgeInspector_App/Recipe/HardwareSettings.h | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/EdgeInspector_App/Recipe/HardwareSettings.h b/EdgeInspector_App/Recipe/HardwareSettings.h
index afb57c3..114a279 100644
--- a/EdgeInspector_App/Recipe/HardwareSettings.h
+++ b/EdgeInspector_App/Recipe/HardwareSettings.h
@@ -3,8 +3,8 @@
#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 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
@@ -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
--
Gitblit v1.9.3