From bb006801e4d7fc281e8c1b43ab4b7b83da044ab6 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 26 三月 2024 13:59:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/shys/ChEqCalc.V1.3
---
WinFrmUI/IStation.WinFrmUI.CalcErQu/RangeCtrl/TimeBlockRangePanel.cs | 115 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 63 insertions(+), 52 deletions(-)
diff --git a/WinFrmUI/IStation.WinFrmUI.CalcErQu/RangeCtrl/TimeBlockRangePanel.cs b/WinFrmUI/IStation.WinFrmUI.CalcErQu/RangeCtrl/TimeBlockRangePanel.cs
index 8090465..1b66fa8 100644
--- a/WinFrmUI/IStation.WinFrmUI.CalcErQu/RangeCtrl/TimeBlockRangePanel.cs
+++ b/WinFrmUI/IStation.WinFrmUI.CalcErQu/RangeCtrl/TimeBlockRangePanel.cs
@@ -1,4 +1,5 @@
锘縰sing IStation.CalcModel;
+using IStation.Model;
using System;
using System.Collections.Generic;
using System.Drawing;
@@ -29,8 +30,10 @@
{
return null;
}
-
- var startHour = Settings.AnaSetting.StartHourPerDay;
+ var anaSetting = IStation.AnaGlobalParas.Setting;
+ if (anaSetting == null)
+ return null;
+ var startHour = anaSetting.StartHourPerDay;
var statTime = anaDay.AddHours(startHour);
List<CalcModel.PumpRunRange> listRange = new List<CalcModel.PumpRunRange>();
@@ -157,9 +160,13 @@
/// </summary>
public void InitialTimeBlock(int CalcSpaceMinute)
{
+ var anaSetting = IStation.AnaGlobalParas.Setting;
+ if (anaSetting == null)
+ return;
+
_block_item_list = new List<TimeSmallBlock>();
- var startHour = Settings.AnaSetting.StartHourPerDay;
+ var startHour = anaSetting.StartHourPerDay;
this._calcSpaceMinute = CalcSpaceMinute;
var statTime = DateTime.Today.AddDays(startHour);
@@ -177,65 +184,66 @@
return;
#region
- if (!string.IsNullOrEmpty(Settings.AnaSetting.SwitchPumpIgnoreTimes))
- {
- var ttt = Settings.AnaSetting.SwitchPumpIgnoreTimes.Split(
- new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
- foreach (var t in ttt)
- {
- var ddd = t.Split(new char[] { '-' }, StringSplitOptions.RemoveEmptyEntries);
- var st = ddd[1].Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
- var ed = ddd[2].Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
- int ed_h = Convert.ToInt32(ed[0]);
+ //if (!string.IsNullOrEmpty(anaSetting.SwitchPumpIgnoreTimes))
+ //{
+ // var ttt = anaSetting.SwitchPumpIgnoreTimes.Split(
+ // new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+ // foreach (var t in ttt)
+ // {
+ // var ddd = t.Split(new char[] { '-' }, StringSplitOptions.RemoveEmptyEntries);
+ // var st = ddd[1].Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
+ // var ed = ddd[2].Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
+
+ // int ed_h = Convert.ToInt32(ed[0]);
- if (Convert.ToBoolean(ddd[0]))
- {
- var IsNexDay = ed_h > 23 ? true : false;
+ // if (Convert.ToBoolean(ddd[0]))
+ // {
+ // var IsNexDay = ed_h > 23 ? true : false;
- var StartH = Convert.ToInt32(st[0]);
- var StartM = Convert.ToInt32(st[1]);
- var EndH = ed_h > 23 ? ed_h - 24 : ed_h;
- var EndM = Convert.ToInt32(ed[1]);
+ // var StartH = Convert.ToInt32(st[0]);
+ // var StartM = Convert.ToInt32(st[1]);
+ // var EndH = ed_h > 23 ? ed_h - 24 : ed_h;
+ // var EndM = Convert.ToInt32(ed[1]);
- //foreach(var b in drawBlocks)
- //{
- // if(b.Time.Hour >= StartH && b.Time.Minute)
- //}
- }
+ // //foreach(var b in drawBlocks)
+ // //{
+ // // if(b.Time.Hour >= StartH && b.Time.Minute)
+ // //}
+ // }
- }
- }
+ // }
+ //}
- if (!string.IsNullOrEmpty(Settings.AnaSetting.OpenPumpIgnoreTimes))
- {
- var ttt = Settings.AnaSetting.OpenPumpIgnoreTimes.Split(
- new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
- foreach (var t in ttt)
- {
- var ddd = t.Split(new char[] { '-' }, StringSplitOptions.RemoveEmptyEntries);
- var st = ddd[1].Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
- var ed = ddd[2].Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
+ //if (!string.IsNullOrEmpty(anaSetting.OpenPumpIgnoreTimes))
+ //{
+ // var ttt = anaSetting.OpenPumpIgnoreTimes.Split(
+ // new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+ // foreach (var t in ttt)
+ // {
+ // var ddd = t.Split(new char[] { '-' }, StringSplitOptions.RemoveEmptyEntries);
+ // var st = ddd[1].Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
+ // var ed = ddd[2].Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
- int ed_h = Convert.ToInt32(ed[0]);
+ // int ed_h = Convert.ToInt32(ed[0]);
- //CurrentViewModel v = new CurrentViewModel();
- //v.IsUse = Convert.ToBoolean(ddd[0]);
- //v.IsNexDay = ed_h > 23 ? true : false;
+ // //CurrentViewModel v = new CurrentViewModel();
+ // //v.IsUse = Convert.ToBoolean(ddd[0]);
+ // //v.IsNexDay = ed_h > 23 ? true : false;
- //v.StartH = Convert.ToInt32(st[0]);
- //v.StartM = Convert.ToInt32(st[1]);
- //v.EndH = ed_h > 23 ? ed_h - 24 : ed_h;
- //v.StartM = Convert.ToInt32(ed[1]);
+ // //v.StartH = Convert.ToInt32(st[0]);
+ // //v.StartM = Convert.ToInt32(st[1]);
+ // //v.EndH = ed_h > 23 ? ed_h - 24 : ed_h;
+ // //v.StartM = Convert.ToInt32(ed[1]);
- //list涓嶈寮�娉垫椂闂�.Add(v);
- }
- }
+ // //list涓嶈寮�娉垫椂闂�.Add(v);
+ // }
+ //}
#endregion
@@ -255,8 +263,8 @@
{
return;
}
-
- var startHour = Settings.AnaSetting.StartHourPerDay;
+ var anaSetting = IStation.AnaGlobalParas.Setting;
+ var startHour = anaSetting.StartHourPerDay;
//var space鍒嗘瀽姝ラ暱 = .Default.CalcSpaceMinute;
var statTime = anaDay.AddDays(startHour);
@@ -282,13 +290,15 @@
///
/// </summary>
/// <param name="templates"></param>
- internal void SetRangePumpCount(DateTime anaDay, List<PumpRunRange> templates)
+ internal void SetRangePumpCount(DateTime anaDay, List<CalcModel.PumpRunRange> templates)
{
+ var anaSetting = IStation.AnaGlobalParas.Setting;
+
if (_block_item_list == null)
{
InitialTimeBlock(this._calcSpaceMinute);
}
- var startHour = Settings.AnaSetting.StartHourPerDay;
+ var startHour = anaSetting.StartHourPerDay;
//var space鍒嗘瀽姝ラ暱 = .Default.CalcSpaceMinute;
var statTime = anaDay.AddDays(startHour);
@@ -332,7 +342,8 @@
{
InitialTimeBlock(this._calcSpaceMinute);
}
- var startHour = Settings.AnaSetting.StartHourPerDay;
+ var anaSetting = IStation.AnaGlobalParas.Setting;
+ var startHour = anaSetting.StartHourPerDay;
var anaDay = anaPrj.StartTime.Date;
var statTime = anaPrj.StartTime;
var endTime = anaPrj.EndTime;
--
Gitblit v1.9.3