From dedcf4174c8540ee3a912daad2ff13e014e495b1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 28 三月 2025 16:28:30 +0800
Subject: [PATCH] 优化UI组件；
---
WPFProject/UI/WorkControl.xaml.cs | 104 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 65 insertions(+), 39 deletions(-)
diff --git a/WPFProject/UI/WorkControl.xaml.cs b/WPFProject/UI/WorkControl.xaml.cs
index 755b5d2..725407c 100644
--- a/WPFProject/UI/WorkControl.xaml.cs
+++ b/WPFProject/UI/WorkControl.xaml.cs
@@ -2,10 +2,10 @@
using System.Collections.Generic;
using System.Windows;
using System.Windows.Controls;
-using System.Windows.Media;
+using HMI.Base;
+using log4net;
using WPFProject.Controls;
using WPFProject.Models;
-using WPFProject.UI.Test;
using WPFProject.Utils;
namespace WPFProject.UI
@@ -13,8 +13,9 @@
/// <summary>
/// WorkControl.xaml 鐨勪氦浜掗�昏緫
/// </summary>
- public partial class WorkControl : UserControl, IPlugin
+ public partial class WorkControl : PluginControl
{
+ private ILog log;
public WorkControl()
{
InitializeComponent();
@@ -68,49 +69,49 @@
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
- List<CanvasPosition> pos = InitGridSize();
- ProgramList programList = new ProgramList();
- InnerWindow p = new InnerWindow(pos[0])
- {
- Title = "绋嬪簭鍒楄〃",
- Content = programList
- };
- HandleInnerWindow(p);
+ //List<CanvasPosition> pos = InitGridSize();
+ //ProgramList programList = new ProgramList();
+ //InnerWindow p = new InnerWindow(pos[0])
+ //{
+ // Title = "绋嬪簭鍒楄〃",
+ // Content = programList
+ //};
+ //HandleInnerWindow(p);
- InnerWindow p1 = new InnerWindow(pos[1])
- {
- Title = "鍥剧墖",
- };
- HandleInnerWindow(p1);
+ //InnerWindow p1 = new InnerWindow(pos[1])
+ //{
+ // Title = "鍥剧墖",
+ //};
+ //HandleInnerWindow(p1);
- SequnceList sequnceList = new SequnceList();
- programList.ProgramChanged += sequnceList.Selected_Program_Changed;
+ //SequnceList sequnceList = new SequnceList();
+ //programList.ProgramChanged += sequnceList.Selected_Program_Changed;
- InnerWindow p2 = new InnerWindow(pos[2])
- {
- Title = "搴忓垪",
- Content = sequnceList
- };
- HandleInnerWindow(p2);
+ //InnerWindow p2 = new InnerWindow(pos[2])
+ //{
+ // Title = "搴忓垪",
+ // Content = sequnceList
+ //};
+ //HandleInnerWindow(p2);
- FunctionSetting functionSetting = new FunctionSetting();
- InnerWindow p3 = new InnerWindow(pos[3])
- {
- Title = "鍑芥暟",
- Content = functionSetting
- };
- HandleInnerWindow(p3);
+ //FunctionSetting functionSetting = new FunctionSetting();
+ //InnerWindow p3 = new InnerWindow(pos[3])
+ //{
+ // Title = "鍑芥暟",
+ // Content = functionSetting
+ //};
+ //HandleInnerWindow(p3);
- StepSetting stepSetting = new StepSetting();
- InnerWindow p4 = new InnerWindow(pos[4])
- {
- Title = "鍗曟璁剧疆",
- Content = stepSetting
- };
- HandleInnerWindow(p4);
+ //StepSetting stepSetting = new StepSetting();
+ //InnerWindow p4 = new InnerWindow(pos[4])
+ //{
+ // Title = "鍗曟璁剧疆",
+ // Content = stepSetting
+ //};
+ //HandleInnerWindow(p4);
- SizeChanged += WorkControl_SizeChanged;
+ //SizeChanged += WorkControl_SizeChanged;
Loaded -= UserControl_Loaded;
}
@@ -283,5 +284,30 @@
}
}
}
+
+ public object Active()
+ {
+ return null;
+ }
+
+ public object DeActive()
+ {
+ return null;
+ }
+
+ public void OnTabChange(object sender, object args)
+ {
+
+ }
+
+ public object Init()
+ {
+ return null;
+ }
+
+ public void SetLogger(ILog logger)
+ {
+ log = logger;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1