From e0b138b3e057de6f57021e6c8963868f5c5acc5a Mon Sep 17 00:00:00 2001
From: tx <123456>
Date: 星期二, 22 四月 2025 11:07:06 +0800
Subject: [PATCH] 大改
---
TProduct.WinFrmUI/TProduct.WinFrmUI.DataBase/设置/SetSoftSettingDlg.cs | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git "a/TProduct.WinFrmUI/TProduct.WinFrmUI.DataBase/\350\256\276\347\275\256/SetSoftSettingDlg.cs" "b/TProduct.WinFrmUI/TProduct.WinFrmUI.DataBase/\350\256\276\347\275\256/SetSoftSettingDlg.cs"
index 597288e..ee2e293 100644
--- "a/TProduct.WinFrmUI/TProduct.WinFrmUI.DataBase/\350\256\276\347\275\256/SetSoftSettingDlg.cs"
+++ "b/TProduct.WinFrmUI/TProduct.WinFrmUI.DataBase/\350\256\276\347\275\256/SetSoftSettingDlg.cs"
@@ -1,6 +1,7 @@
锘縰sing DevExpress.XtraEditors;
using System;
using System.Collections.Generic;
+using System.Linq;
using System.Windows.Forms;
using TProduct.UserSetting;
@@ -98,9 +99,10 @@
imageComboUnitPressPump.EditValue = (int)pump_test.UnitPress;
imageComboUnitFlowPump.EditValue = (int)pump_test.UnitFlow;
- if (pump_test.PipeIndex != null && pump_test.PipeIndex.Count > 0)
+ var all_piles = TProduct.Common.PipelineHelper.GetAll();
+ if (all_piles != null && all_piles.Count > 0)
{
- textEditPipeIndexPump.Text = string.Join(",", pump_test.PipeIndex);
+ textEditPipeIndexPump.Text = string.Join(",", (from x in all_piles select x.Name));
}
checkEditIsDispCurveQE.Checked = pump_test.IsDispCurveQE;
@@ -275,16 +277,16 @@
checkEditIsDispCurveQP.Checked;
TProduct.UserSetting.Setting.PumpTest.IsDispCmdExtendZeroH =
check鏄剧ず寤堕暱鍒伴浂鎵▼.Checked;
- TProduct.UserSetting.Setting.PumpTest.PipeIndex = null;
- if (!string.IsNullOrEmpty(textEditPipeIndexPump.Text))
- {
- var ssss = textEditPipeIndexPump.Text.Split(',');
- TProduct.UserSetting.Setting.PumpTest.PipeIndex = new List<string>();
- foreach(var s in ssss)
- {
- TProduct.UserSetting.Setting.PumpTest.PipeIndex.Add(s);
- }
- }
+ //TProduct.UserSetting.Setting.PumpTest.PipeIndex = null;
+ //if (!string.IsNullOrEmpty(textEditPipeIndexPump.Text))
+ //{
+ // var ssss = textEditPipeIndexPump.Text.Split(',');
+ // TProduct.UserSetting.Setting.PumpTest.PipeIndex = new List<string>();
+ // foreach(var s in ssss)
+ // {
+ // TProduct.UserSetting.Setting.PumpTest.PipeIndex.Add(s);
+ // }
+ //}
TProduct.UserSetting.Setting.PumpTest.IsCheckErrorEta100 =
checkEdit鏄惁妫�鏌ユ晥鐜囪秴杩�100鐨勯棶棰�.Checked;
TProduct.UserSetting.Setting.PumpTest.IsDispCorrectPtGrid =
--
Gitblit v1.9.3