Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
| | |
| | | var dlg = new SimulationPumpSingleMatchingDlg(); |
| | | dlg.ReloadDataEvent += (output) => |
| | | { |
| | | HydroMatchingHelper.Apply(pumpViewModel, output); |
| | | HydroMatchingHelper.Apply(pumpViewModel, output, _changeHelper, _propStatusHelper); |
| | | this.hydroVisualPropertyCtrl1.UpdateRows(); |
| | | this.PropertyValueChangedEvent?.Invoke(vm.Vmo); |
| | | this.MarkPropertyValueChangedEvent?.Invoke(vm.Vmo); |
| | |
| | | link.EndCode = tempCode; |
| | | link.UpdateVmoProperty(); |
| | | |
| | | _propStatusHelper?.UpdatePropStatus(link.Code, nameof(link.Vmo.StartCode), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}调整上下游"); |
| | | _propStatusHelper?.UpdatePropStatus(link.Code, nameof(link.Vmo.EndCode), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}调整上下游"); |
| | | |
| | | var translation = this.SelectedObject as HydroTranslationViewModel; |
| | | if (translation != null) |
| | | { |
| | |
| | | translation.StartDiameter = translation.EndDiameter; |
| | | translation.EndDiameter = tempDiameter; |
| | | translation.UpdateVmoProperty(); |
| | | _propStatusHelper?.UpdatePropStatus(translation.Code, nameof(translation.Vmo.StartDiameter), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}调整上下游"); |
| | | _propStatusHelper?.UpdatePropStatus(translation.Code, nameof(translation.Vmo.EndDiameter), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}调整上下游"); |
| | | } |
| | | |
| | | var pump = this.SelectedObject as HydroPumpViewModel; |
| | |
| | | pump.InletDiameter = pump.OutletDiameter; |
| | | pump.OutletDiameter = tempDiameter; |
| | | pump.UpdateVmoProperty(); |
| | | _propStatusHelper?.UpdatePropStatus(pump.Code, nameof(pump.Vmo.InletDiameter), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}调整上下游"); |
| | | _propStatusHelper?.UpdatePropStatus(pump.Code, nameof(pump.Vmo.OutletDiameter), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}调整上下游"); |
| | | } |
| | | |
| | | _changeHelper?.Append(link.Vmo, eChangeType.Update); |
| | | |
| | | this.propertyGridControl1.UpdateRows(); |
| | | } |
| | | } |
| | |
| | | /// <summary> |
| | | /// 应用 |
| | | /// </summary> |
| | | public static bool Apply(HydroPumpViewModel visualViewModel, HydroPumpMatchingViewModel matching) |
| | | public static bool Apply |
| | | ( |
| | | HydroPumpViewModel visualViewModel, |
| | | HydroPumpMatchingViewModel matching, |
| | | HydroChangeHelper changeHelper = null, |
| | | HydroPropStatusHelper propStatusHelper = null |
| | | ) |
| | | { |
| | | var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching); |
| | | var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper); |
| | | visualViewModel.UpdateProperty(); |
| | | return bol; |
| | | } |