HStation/XHS.V1.0.git

			@@ -11,7 +11,7 @@
			this.pumpPerformInfoCtrl1.SetDesignPointEvent += (q, h) =>
			{
			_design_pt = new Yw.Geometry.Point2d(q, h);
			this.xtrPerform2dChart1.CalcDesignPointByQ(q, h);
			this.xtrPerform2dChart1.SetEquipPt(_design_pt);
			};
			this.xtrPerform2dChart1.OnCalcQueryPoint += (gropu_pt) =>
			{
			@@ -179,7 +179,7 @@
			//Excel 导入
			private void barBtnImportByExcel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			var dlg = new Yw.WinFrmUI.Phart.ImportPumpPerform2dByExcelDlg();
			var dlg = new Yw.WinFrmUI.Phart.PumpImportByExcelDlg();
			dlg.ReloadDataEvent += async (other_name, qh, qe, qp) =>
			{
			var bol = await Import(other_name, qh, qe, qp);
			@@ -203,7 +203,7 @@
			//单点导入
			private void barBtnImportByOnePoint_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			var dlg = new Yw.WinFrmUI.Phart.ImportPumpPerform2dByOnePointDlg();
			var dlg = new Yw.WinFrmUI.Phart.PumpImportByOnePointDlg();
			if (_pump_main != null)
			{
			dlg.Set(_pump_main.RatedFlow, _pump_main.RatedHead, _pump_main.RatedSpeed, _pump_main.RatedEfficiency);
			@@ -317,7 +317,7 @@
			qp = new Yw.Pump.CurveQP(Yw.Pump.eFeatType.Cubic, points_qp);
			}

			var dlg = new Yw.WinFrmUI.Phart.PumpPerform2dEditDlg();
			var dlg = new Yw.WinFrmUI.Phart.PumpEditChartDlg();
			dlg.SetBindingData(qh, qe, qp);
			dlg.ReloadDataEvent += async (new_qh, new_qe, new_qp) =>
			{
			@@ -412,32 +412,64 @@
			return;
			}

			var vm = new Yw.WinFrmUI.Phart.PumpVariableSpeedViewModel();
			//var vm = new Yw.WinFrmUI.Phart.PumpVariableSpeedViewModel();
			//vm.Id = _xhs_phart_diagram_ex_std_dto.ID.ToString();
			//vm.Name = $"{_pump_main.RatedSpeed}";
			//vm.RatedSpeed = _pump_main.RatedSpeed;
			//vm.CurrentSpeed = _pump_main.RatedSpeed;
			//vm.CurrentHz = 50;
			//vm.Qh = tuple.Item1;
			//vm.Qe = tuple.Item2;
			//vm.Qp = tuple.Item3;


			//var dlg = new PumpVariableSpeedChartDlg();
			//dlg.SetBindingData(vm, null);
			//dlg.ShowDialog();


			//var vm = new Yw.WinFrmUI.Phart.PumpWorkViewModel();
			//vm.Id = _xhs_phart_diagram_ex_std_dto.ID.ToString();
			//vm.Name = $"{_pump_main.RatedSpeed}";
			//vm.RatedSpeed = _pump_main.RatedSpeed;
			//vm.CurrentSpeed = _pump_main.RatedSpeed/2;
			//vm.CurrentHz = 50/2;
			//vm.Qh = tuple.Item1;
			//vm.Qe = tuple.Item2;
			//vm.Qp = tuple.Item3;
			//vm.WorkPoint = new Yw.Geometry.Point2d(15,16);

			//var vm1 = new Yw.WinFrmUI.Phart.PumpWorkViewModel();
			//vm1.Id = _xhs_phart_diagram_ex_std_dto.ID.ToString()+"1";
			//vm1.Name = $"{_pump_main.RatedSpeed}";
			//vm1.RatedSpeed = _pump_main.RatedSpeed;
			//vm1.CurrentSpeed = _pump_main.RatedSpeed / 1.6;
			//vm1.CurrentHz = 50 /1.6;
			//vm1.Qh = tuple.Item1;
			//vm1.Qe = tuple.Item2;
			//vm1.Qp = tuple.Item3;
			//vm1.WorkPoint = new Yw.Geometry.Point2d(12, 19);

			//var dlg = new PumpWorkComparisonChartDlg();
			//dlg.SetBindingData(new List<Yw.WinFrmUI.Phart.PumpWorkViewModel>() { vm,vm1});
			//dlg.ShowDialog();



			var vm = new Yw.WinFrmUI.Phart.PumpWorkViewModel();
			vm.Id = _xhs_phart_diagram_ex_std_dto.ID.ToString();
			vm.Name = $"{_pump_main.RatedSpeed}";
			//vm.IsBp = pump_mian.;
			vm.RatedSpeed = _pump_main.RatedSpeed;
			vm.CurrentSpeed = _pump_main.RatedSpeed;
			vm.CurrentHz = 50;
			vm.CurrentSpeed = _pump_main.RatedSpeed / 2;
			vm.CurrentHz = 50 / 2;
			vm.Qh = tuple.Item1;
			vm.Qe = tuple.Item2;
			vm.Qp = tuple.Item3;
			vm.RunStatus = true;
			vm.WorkPoint = new Yw.Geometry.Point2d(15, 16);

			double temp_head = 0;
			if (vm.Name == "CR32-4-2")
			{
			temp_head = 36;
			}
			else if (vm.Name == "CR20-10")
			{
			temp_head = 69;
			}
			else if (vm.Name == "CR10-14")
			{
			temp_head = 79;
			}
			var dlg = new PumpVariableSpeedChartDlg();
			dlg.SetBindingData(vm, null, temp_head);
			var dlg = new PumpWorkChartDlg();
			dlg.SetBindingData(vm);
			dlg.ShowDialog();
			}