From 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 十月 2024 11:18:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs |   76 +++++++++++++++++++++++++++++++++++--
 1 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs b/WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs
index f7636fa..18ceaf4 100644
--- a/WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs
+++ b/WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs
@@ -1,4 +1,5 @@
 锘縰sing DevExpress.Utils;
+using DevExpress.Utils.Svg;
 using HStation.WinFrmUI.Core.Lib;
 
 namespace HStation.WinFrmUI
@@ -8,6 +9,8 @@
     /// </summary>
     public class ImageLib
     {
+        #region 16
+
         public static ImageCollection Lib
         {
             get
@@ -18,7 +21,10 @@
                     _lib.ImageSize = new Size(16, 16);
                     _lib.Images.Add(Resource1.Group, "Group");
                     _lib.Images.Add(Resource1.Series, "Series");
-                    _lib.Images.Add(Resource1.Question, "Question"); 
+                    _lib.Images.Add(Resource1.Question, "Question");
+                    _lib.Images.Add(Resource1.Type, "Type");
+                    _lib.Images.Add(Resource1.ListView, "ListView");
+                    _lib.Images.Add(Resource1.Notlmported, "NotImported");
                 }
                 return _lib;
             }
@@ -28,20 +34,35 @@
 
         public static int Group
         {
-            get => GetImageIndex("Group");
+            get => GetImage16Index("Group");
         }
 
         public static int Series
         {
-            get => GetImageIndex("Series");
+            get => GetImage16Index("Series");
+        }
+
+        public static int Type
+        {
+            get => GetImage16Index("Type");
+        }
+
+        public static int Listview
+        {
+            get => GetImage16Index("Listview");
         }
 
         public static int Question
         {
-            get => GetImageIndex("Question");
+            get => GetImage16Index("Question");
         }
 
-        private static int GetImageIndex(string imgName)
+        public static int NotImported
+        {
+            get => GetImage16Index("NotImported");
+        }
+
+        private static int GetImage16Index(string imgName)
         {
             var img = Lib.Images[imgName];
             if (img == null)
@@ -49,5 +70,50 @@
 
             return _lib.Images.IndexOf(img);
         }
+
+        #endregion 16
+
+        #region Svg
+
+        public static SvgImageCollection LibSvg
+        {
+            get
+            {
+                if (_lib_svg == null)
+                {
+                    _lib_svg = new SvgImageCollection();
+                    _lib_svg.ImageSize = new Size(254, 254);
+                    _lib_svg.Add("Project", Resource1.Project);
+                    _lib_svg.Add("PumpMain", Resource1.PumpMain);
+                    _lib_svg.Add("Valve", Resource1.Valve);
+                    _lib_svg.Add("CoolingTower", Resource1.CoolingTower);
+                }
+                return _lib_svg;
+            }
+        }
+
+        private static SvgImageCollection _lib_svg;
+
+        public static SvgImage Project
+        {
+            get => LibSvg[0];
+        }
+
+        public static SvgImage PumpMain
+        {
+            get => LibSvg[1];
+        }
+
+        public static SvgImage Valve
+        {
+            get => LibSvg[2];
+        }
+
+        public static SvgImage CoolingTower
+        {
+            get => LibSvg[3];
+        }
+
+        #endregion Svg
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3