From c66bf7bf2122bfab4de3f1073b33959468250e7b Mon Sep 17 00:00:00 2001
From: C3031 <shitiangui@lanpucloud.cn>
Date: 星期一, 05 一月 2026 12:38:21 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/~zhengyabo/LB_TyreAppearanceInspectionSoftware
---
LB_SmartVision/VisionForm.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/LB_SmartVision/VisionForm.cs b/LB_SmartVision/VisionForm.cs
index 53a775f..974f174 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));
@@ -1437,7 +1441,7 @@
catch { }
}
// 鐢熸垚鍥剧墖骞舵樉绀哄埌鎺т欢涓�
- HImage InputImage = null;
+ HObject InputImage = null;
HObject RecordImage = null;
foreach (var layout in GlobalVar.dicLayout.Values
--
Gitblit v1.9.3