From 2afe37c9578fa831f00c5ac4d4c1a3329d79e29d Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 20 三月 2025 10:08:57 +0800
Subject: [PATCH] --新增设施编辑连接地址及连接方式
---
WinFrmUI/PBS.WinFrmUI.Hydro/template/BuildModel.cs | 226 +------------------------------------------------------
1 files changed, 7 insertions(+), 219 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/template/BuildModel.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/template/BuildModel.cs
index d2e4ddf..17b7f12 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/template/BuildModel.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/template/BuildModel.cs
@@ -399,14 +399,10 @@
p.Datasets[pair.Key].range_Y = Range.Union(rangeDefault, pair.Value.range_Y);
}
p.CurveFit();
- return p;
- //factory.Pumps.Add(p);
- //_EditFlag = true;
- //DisplayFactoryListInTreeView(factoryList);
+ return p;
}
- [Browsable(false)]
- //[Editor(typeof(TemplatePropertyEditor), typeof(UITypeEditor))]
+ [Browsable(false)]
public string templateID
{
get
@@ -423,226 +419,18 @@
public Template template { get; private set; } = null;
-
- [Browsable(false)]
- public BuildDataset 娴侀噺鍘嬮檷鏇茬嚎
-
- {
- get
- {
- if (!Datasets.ContainsKey("娴侀噺鍘嬮檷鏇茬嚎")) Datasets.Add("娴侀噺鍘嬮檷鏇茬嚎", new BuildDataset("娴侀噺鍘嬮檷鏇茬嚎"));
- return Datasets["娴侀噺鍘嬮檷鏇茬嚎"];
- }
- }
-
- [Browsable(false)]
-
- public BuildDataset 娴侀噺鍘嬮檷骞冲潎
- {
- get
- {
- if (!Datasets.ContainsKey("娴侀噺鍘嬮檷骞冲潎")) Datasets.Add("娴侀噺鍘嬮檷骞冲潎", new BuildDataset("娴侀噺鍘嬮檷骞冲潎"));
- return Datasets["娴侀噺鍘嬮檷骞冲潎"];
- }
- }
- [Browsable(false)]
-
- public BuildDataset 娴侀噺鍘嬮檷涓婇檺
- {
- get
- {
- if (!Datasets.ContainsKey("娴侀噺鍘嬮檷涓婇檺")) Datasets.Add("娴侀噺鍘嬮檷涓婇檺", new BuildDataset("娴侀噺鍘嬮檷涓婇檺"));
- return Datasets["娴侀噺鍘嬮檷涓婇檺"];
- }
- }
- [Browsable(false)]
-
-
- public BuildDataset 娴侀噺鍘嬮檷涓嬮檺
- {
- get
- {
- if (!Datasets.ContainsKey("娴侀噺鍘嬮檷涓嬮檺")) Datasets.Add("娴侀噺鍘嬮檷涓嬮檺", new BuildDataset("娴侀噺鍘嬮檷涓嬮檺"));
- return Datasets["娴侀噺鍘嬮檷涓嬮檺"];
- }
- }
-
- [Browsable(false)]
- public BuildDataset 鐢ㄦ按瓒嬪娍鏇茬嚎
- {
- get
- {
- if (!Datasets.ContainsKey("鐢ㄦ按瓒嬪娍鏇茬嚎")) Datasets.Add("鐢ㄦ按瓒嬪娍鏇茬嚎", new BuildDataset("鐢ㄦ按瓒嬪娍鏇茬嚎"));
- return Datasets["鐢ㄦ按瓒嬪娍鏇茬嚎"];
- }
- }
-
- [Browsable(false)]
- public BuildDataset 鐢ㄦ按瓒嬪娍涓嬮檺
- {
- get
- {
- if (!Datasets.ContainsKey("鐢ㄦ按瓒嬪娍涓嬮檺")) Datasets.Add("鐢ㄦ按瓒嬪娍涓嬮檺", new BuildDataset("鐢ㄦ按瓒嬪娍涓嬮檺"));
- return Datasets["鐢ㄦ按瓒嬪娍涓嬮檺"];
- }
- }
-
- [Browsable(false)]
- public BuildDataset 鐢ㄦ按瓒嬪娍涓婇檺
- {
- get
- {
- if (!Datasets.ContainsKey("鐢ㄦ按瓒嬪娍涓婇檺")) Datasets.Add("鐢ㄦ按瓒嬪娍涓婇檺", new BuildDataset("鐢ㄦ按瓒嬪娍涓婇檺"));
- return Datasets["鐢ㄦ按瓒嬪娍涓婇檺"];
- }
- }
-
- public DataTable UDList { get; set; }
-
- public List<string> UDNames { get; set; }
-
- public List<double> UDPatterns { get; set; }
+
public void CurveFit(bool is鎷熷悎 = true)
{
foreach (var data in Datasets)
- {
- //data.Value.Data.Sort((a, b) => a.X > b.X ? 1 : (a.X == b.X ? 0 : -1));
+ {
if (data.Value.HasData) data.Value.CurveFit();
}
-
-
- //string basetype = "娴侀噺鍘嬮檷鏇茬嚎";
-
- //string type = "";
-
- //if (Datasets[basetype].HasData)
- //{
- // var range = Datasets[basetype].range_X;
- // double step = range.Len / 20;
- // double i0 = 0;
- // List<PointF> list1 = new List<PointF>();
- // List<PointF> list2 = new List<PointF>();
- // List<PointF> list3 = new List<PointF>();
- // for (double i = range.Min; i < range.Max; i+=step)
- // {
- // var valueDatas = Datasets[basetype].Data.FindAll(m => i0 <= m.X && m.X < i).Select(m=>(double)m.Y). ToList();
- // if (valueDatas.Count < 3) continue;
- // Math_Expect math_Expect = new Math_Expect(valueDatas);
- // var y0= math_Expect.Average();
- // var x = (i0 + i) / 2;
- // var doubles = math_Expect.GetPercent(0.95);//math_Expect.GetExpect(0.05);
- // var y1 = doubles[0];
- // var y2 = doubles[1];
- // list1.Add(new PointF((float)x, (float)y0));
- // list2.Add(new PointF((float)x, (float)y1));
- // list3.Add(new PointF((float)x, (float)y2));
-
- // //Datasets[Global_model.list[1]].FittedCurve.Add(new PointF((float)x, (float)y1));
- // //Datasets[Global_model.list[2]].FittedCurve.Add(new PointF((float)x, (float)y2));
- // //Datasets[Global_model.list[0]].IsFitted = true;
- // //Datasets[Global_model.list[1]].IsFitted = true;
- // //Datasets[Global_model.list[2]].IsFitted = true;
-
-
- // //Datasets[Global_model.list[1]].IsFitted = true;
- // //Datasets[Global_model.list[2]].IsFitted = true;
- // i0 = i;
-
- // }
- // if (!is鎷熷悎)
- // {
-
- // 娴侀噺鍘嬮檷骞冲潎.FittedCurve = list1;
- // 娴侀噺鍘嬮檷骞冲潎.IsFitted = true;
-
-
- // Datasets[Global_model.list[1]].FittedCurve = list2;
- // Datasets[Global_model.list[1]].IsFitted = true;
-
-
- // Datasets[Global_model.list[2]].FittedCurve = list3;
- // Datasets[Global_model.list[2]].IsFitted = true;
- // }
- // else
- // {
- // var rangeX = Datasets[Global_model.list[0]].range_X;
- // 娴侀噺鍘嬮檷骞冲潎.Data = list1;
- // 娴侀噺鍘嬮檷骞冲潎.CurveFit(rangeX);
-
-
-
- // Datasets[Global_model.list[1]].Data = list2;
- // Datasets[Global_model.list[1]].CurveFit(rangeX);
-
-
- // Datasets[Global_model.list[2]].Data = list3;
- // Datasets[Global_model.list[2]].CurveFit(rangeX);
- // }
-
- //}
-
-
-
- //type = "娴侀噺鍘嬮檷涓嬮檺";
- //var type1 = "娴侀噺鍘嬮檷涓婇檺";
- //if (Datasets[type].IsFitted)
- //{
- // List<PointF> points = new List<PointF>();
- // List<PointF> points1 = new List<PointF>();
-
- // foreach (var yc in Datasets[basetype].Data)
- // {
- // float x= yc.X;
- // float y_鎵▼ = yc.Y;
- // float y_鏁堢巼= (float)Datasets[type].Evaluate(x);
- // points.Add(new PointF(x, y_鏁堢巼));
- // points1.Add(new PointF(x,x* y_鎵▼ / y_鏁堢巼 /3.6f ));
-
-
- // }
- // Datasets[type].Data = points;
- // Datasets[type1].Data = points1;
- // Datasets[type1].CurveFit();
- //}
-
- //type = "娴侀噺鍘嬮檷涓婇檺";
- //if (Datasets[type].IsFitted)
- //{
- // List<PointF> points = new List<PointF>();
- // foreach (var x in Datasets[basetype].Data.Select(p => p.X))
- // {
- // points.Add(new PointF(x, (float)Datasets[type].Evaluate(x)));
- // }
- // Datasets[type].Data = points;
-
- //}
- }
-
- public void ShowInGrid(DataGridView dataGridView)
- {
- //dataGridView.Rows.Clear();
- DataTable dt = new DataTable();
- dt.Columns.Add("娴侀噺");
- dt.Columns.Add("鍘嬮檷");
- dt.Columns.Add("涓婇檺");
- dt.Columns.Add("涓嬮檺");
-
- for (int i = 0; i < 娴侀噺鍘嬮檷鏇茬嚎.Data.Count; i++)
- {
- PointF p = 娴侀噺鍘嬮檷鏇茬嚎.Data[i];
- double y1 = 0, y2 = 0;
- //if (娴侀噺鍘嬮檷涓婇檺.IsFitted) y1 = 娴侀噺鍘嬮檷涓婇檺.Data[i].Y;
- //if (娴侀噺鍘嬮檷涓嬮檺.IsFitted) y2 = 娴侀噺鍘嬮檷涓嬮檺.Data[i].Y;
- dt.Rows.Add(Math.Round(p.X, 1), Math.Round(p.Y, 2), Math.Round(y1, 2), Math.Round(y2, 2));
- //dataGridView.Rows.Add(Math.Round(p.X,1), Math.Round(p.Y,2), Math.Round(y1,2), Math.Round(y2, 2));
- }
- dataGridView.DataSource = null;
- dataGridView.DataSource = dt;
- dataGridView.Refresh();
- }
-
+
+ }
+
}
public class Munity : Build
--
Gitblit v1.9.3