From e71088d7566e16f92ecd9a7f3c8703976debffb4 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 17 三月 2025 13:33:06 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/IBox.WinFrmUI/IBoxForm.cs | 89 +++++---------------------------------------
1 files changed, 11 insertions(+), 78 deletions(-)
diff --git a/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs b/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs
index a1607fa..5d61f82 100644
--- a/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs
+++ b/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs
@@ -8,12 +8,13 @@
using System.Text;
using Yw;
using Yw.WinFrmUI;
+using PBS.Vmo;
namespace IBox.WinFrmUI
{
public partial class IBoxForm : DocumentPage
{
- private Facility _facilities;
+ private IBoxControllViewModel _ibox;
private BluetoothRadio radio = null;//钃濈墮閫傞厤鍣�
private string sendFileName = null;//鍙戦�佹枃浠跺悕
private BluetoothAddress sendAddress = null;//鍙戦�佺洰鐨勫湴鍧�
@@ -124,6 +125,7 @@
private void InitControl()
{
+ var _facilities = _ibox.facilities;
IBoxFormOverview = new IBoxFormOverview();
IBoxFormOverview.Dock = DockStyle.Fill;
IBoxFormOverview.SendData += SendText;
@@ -134,7 +136,7 @@
IBoxFormMonitor.SendData += SendText;
xtraTabPage1.Controls.Add(IBoxFormMonitor);
- //IBoxFormControll = new IBoxFormControll(_facilities);
+ //IBoxFormControll = new IBoxFormControll(_ibox);
//IBoxFormControll.Dock = DockStyle.Fill;
//IBoxFormControll.SendData += SendText;
//xtraTabPage7.Controls.Add(IBoxFormControll);
@@ -216,11 +218,6 @@
private void barButtonItem2_ItemClick(object sender, ItemClickEventArgs e)
{
- //IBoxFormOverview = null;
- //IBoxFormMonitor = new IBoxFormMonitor();
- //IBoxFormMonitor.Dock = DockStyle.Fill;
- //IBoxFormMonitor.SendData += SendText;
- //AddControl(IBoxFormMonitor);
HideAll();
IBoxFormMonitor = new IBoxFormMonitor();
IBoxFormMonitor.Dock = DockStyle.Fill;
@@ -233,12 +230,8 @@
private void barButtonItem5_ItemClick(object sender, ItemClickEventArgs e)
{
- //IBoxFormControll = new IBoxFormControll(_facilities);
- //IBoxFormControll.Dock = DockStyle.Fill;
- //IBoxFormControll.SendData += SendText;
- //AddControl(IBoxFormControll);
HideAll();
- //IBoxFormControll = new IBoxFormControll(_facilities);
+ //IBoxFormControll = new IBoxFormControll(_ibox);
//IBoxFormControll.Dock = DockStyle.Fill;
//IBoxFormControll.SendData += SendText;
//xtraTabPage7.Controls.Add(IBoxFormControll);
@@ -249,11 +242,6 @@
private void barButtonItem3_ItemClick_1(object sender, ItemClickEventArgs e)
{
- //IBoxFormParams = new IBoxFormParams();
- //IBoxFormParams.Dock = DockStyle.Fill;
- //IBoxFormParams.SendData += SendText;
- //AddControl(IBoxFormParams);
-
HideAll();
IBoxFormParams = new IBoxFormParams();
IBoxFormParams.Dock = DockStyle.Fill;
@@ -265,11 +253,6 @@
private void barButtonItem4_ItemClick(object sender, ItemClickEventArgs e)
{
- //IBoxFormLog = new IBoxFormLog();
- //IBoxFormLog.Dock = DockStyle.Fill;
- //IBoxFormLog.SendData += SendText;
- //AddControl(IBoxFormLog);
-
HideAll();
IBoxFormLog = new IBoxFormLog();
IBoxFormLog.Dock = DockStyle.Fill;
@@ -281,11 +264,6 @@
private void barButtonItem7_ItemClick(object sender, ItemClickEventArgs e)
{
- //IBoxFormProtocol = new IBoxFormProtocol();
- //IBoxFormProtocol.Dock = DockStyle.Fill;
- //IBoxFormProtocol.SendData += SendText;
- //AddControl(IBoxFormProtocol);
-
HideAll();
IBoxFormProtocol = new IBoxFormProtocol();
IBoxFormProtocol.Dock = DockStyle.Fill;
@@ -297,13 +275,8 @@
private void barButtonItem8_ItemClick(object sender, ItemClickEventArgs e)
{
- //IBoxFormRule = new IBoxFormRule();
- //IBoxFormRule.Dock = DockStyle.Fill;
- //IBoxFormRule.SendData += SendText;
- //AddControl(IBoxFormRule);
-
HideAll();
- IBoxFormRule = new IBoxFormRule(_facilities);
+ IBoxFormRule = new IBoxFormRule(_ibox?.facilities);
IBoxFormRule.Dock = DockStyle.Fill;
IBoxFormRule.SendData += SendText;
xtraTabPage4.Controls.Add(IBoxFormRule);
@@ -369,7 +342,6 @@
if (IBoxFormOverview != null)
{
IBoxFormOverview.BindGrid(getbaselist, ConnectType == 1 ? true : false);
- IBoxFormOverview.TestData(ConnectType == 1 ? true : false);
}
stationMonitors = getbaselist;
//else
@@ -465,52 +437,13 @@
}
}
public Build _SelectedBuild;
- //private List<CalcResultViewModel> _res;
private string filePath = "Data\\AnalyData_{0}.json";
- //private void ShowChart()
- //{
- // var file = string.Format(filePath, _facilities.ID.ToString());
- // var path = Path.Combine(Directory.GetCurrentDirectory(), file);
- // if (!File.Exists(path))
- // {
- // MessageBoxHelper.ShowInfo("璇峰厛杩涜绯荤粺鏇茬嚎鎿嶄綔!");
- // return;
- // }
- // else
- // {
- // SetResult(path);
- // }
- //}
- //private void SetResult(string path)
- //{
- // var content = new Eventech.Common.FileHelper().ReadFile(path);
- // var result = JsonHelper.Json2Object<List<CalcResultViewModel>>(content);
- // AddPoints(result);
- //}
- //public void AddPoints(List<CalcResultViewModel> res)
- //{
- // _res = res;
- // List<PointF> nums = res.Select(o => new PointF((float)o.Demand, (float)o.ObjFunctionValue)).ToList();
- // var chartDatas = nums.Select(p => new PointF(p.X, p.Y + _SelectedBuild.鐢ㄦ埛鍘嬪姏闇�姹�)).ToList();
- // if (chartDatas == null || chartDatas.Count == 0) return;
-
- // // 璁＄畻澶氶」寮忓湪鐐� x 澶勭殑鍙栧��
- // // 璁＄畻鎷熷悎鏇茬嚎涓婄殑鐐�
- // var curve = new CurveFitHelper(chartDatas, 2);
- // //List<PointF> fitPoints = curve.GetFitCurve(100);
- // List<List<PointF>> confidencePoints = curve.GetConfidenceCurve(100);
-
- // //_SelectedPump.娴侀噺鍘嬮檷骞冲潎.Data = fitPoints;
- // //_SelectedBuild.娴侀噺鍘嬮檷鏇茬嚎.Data = chartDatas;
- // _SelectedBuild.Datasets.Clear();
- // _SelectedBuild.娴侀噺鍘嬮檷鏇茬嚎.Data = chartDatas;
- // _SelectedBuild.娴侀噺鍘嬮檷涓嬮檺.Data = confidencePoints[0];
- // _SelectedBuild.娴侀噺鍘嬮檷涓婇檺.Data = confidencePoints[1];
- //}
+
private void barButtonItem9_ItemClick(object sender, ItemClickEventArgs e)
{
HideAll();
+ var _facilities = _ibox.facilities;
_SelectedBuild = new Build()
{
factoryName = _facilities.Name,
@@ -690,13 +623,13 @@
xtraTabControl1.SelectedTabPage = xtraTabPage11;
}
- public IBoxForm(Facility facilities = null)
+ public IBoxForm(IBoxControllViewModel ibox = null)
{
InitializeComponent();
this.PageTitle.Caption = "鏅鸿兘鐩掑瓙";
- if (facilities != null)
+ if (ibox != null)
{
- _facilities = facilities;
+ ibox = ibox;
}
else
{
--
Gitblit v1.9.3