From 7d40453bb5702b1898bc9fe57afbdb3f2e629918 Mon Sep 17 00:00:00 2001
From: C3032 <C3032@BC3032>
Date: 星期二, 06 一月 2026 15:09:01 +0800
Subject: [PATCH] Merge branch 'feature/Camera3D'
---
LB_SmartVision/VisionForm.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/LB_SmartVision/VisionForm.cs b/LB_SmartVision/VisionForm.cs
index 53a775f..544f872 100644
--- a/LB_SmartVision/VisionForm.cs
+++ b/LB_SmartVision/VisionForm.cs
@@ -3,6 +3,7 @@
using LB_SmartVision.Forms.Pages;
using LB_SmartVision.Forms.Pages.CameraPage;
using LB_SmartVision.Forms.Pages.CommunicatorPage;
+using LB_SmartVision.Forms.Pages.HistoricalData;
using LB_SmartVision.Forms.Pages.MESPage;
using LB_SmartVision.Forms.Pages.MotionControlPage;
using LB_SmartVision.Forms.Pages.ProcessPage;
@@ -42,6 +43,7 @@
{
AllProcessesPage AllProcessesPages = new AllProcessesPage();
CamerasEditPage CamerasEditPage = new CamerasEditPage();
+ HistoricalDataEditPage HistoricalDataEditPage = new HistoricalDataEditPage();
CommunicatorsEditPage CommunicatorsEditPage = new CommunicatorsEditPage();
SettingEditPage SettingEditPage = new SettingEditPage();
MESEditPage MESEditPage = new MESEditPage();
@@ -69,6 +71,8 @@
AllProcessesPages.controlsPanel.Dock = DockStyle.Fill;
materialTabControl.Controls.Add(AllProcessesPages);
+ HistoricalDataEditPage.LogInfo += LogInfo;
+ materialTabControl.Controls.Add(new MyPage(HistoricalDataEditPage));
CamerasEditPage.LogInfo += LogInfo;
materialTabControl.Controls.Add(new MyPage(CamerasEditPage));
@@ -358,7 +362,9 @@
}
catch { }
}
+
File.WriteAllText(GlobalVar.allLayoutPath, strJson, Encoding.UTF8);
+
return true;
}
catch { return false; }
@@ -1437,7 +1443,7 @@
catch { }
}
// 鐢熸垚鍥剧墖骞舵樉绀哄埌鎺т欢涓�
- HImage InputImage = null;
+ HObject InputImage = null;
HObject RecordImage = null;
foreach (var layout in GlobalVar.dicLayout.Values
--
Gitblit v1.9.3