Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs =================================================================== diff -u -r4070 -r4239 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 4239) @@ -25,6 +25,7 @@ using Deltares.Standard; using Deltares.Standard.Attributes; using Deltares.Standard.EventPublisher; +using Deltares.Standard.Units; using Deltares.Standard.Validation; namespace Deltares.Dam.Data; @@ -108,6 +109,7 @@ private double bishopGridVerticalPointDistance; [Format("F2")] + [Unit(UnitType.Length)] public double XCoordinateLastUpliftPoint { get @@ -125,6 +127,7 @@ public TangentLinesDefinition UpliftVanTangentLinesDefinition { get; set; } [Format("F2")] + [Unit(UnitType.Length)] [Minimum(0.01)] [Maximum(1000.0)] public double UpliftVanTangentLinesDistance @@ -144,6 +147,7 @@ public TangentLinesDefinition BishopTangentLinesDefinition { get; set; } [Format("F2")] + [Unit(UnitType.Length)] [Minimum(0.01)] [Maximum(1000.0)] public double BishopTangentLinesDistance @@ -162,6 +166,7 @@ public GridSizeDetermination GridSizeDetermination { get; set; } + [Unit(UnitType.None)] [Minimum(1)] [Maximum(100)] public int UpliftVanLeftGridVerticalPointCount @@ -179,6 +184,7 @@ } [Format("F2")] + [Unit(UnitType.Length)] [Minimum(0.01)] [Maximum(1000.0)] public double UpliftVanLeftGridVerticalPointDistance @@ -195,6 +201,7 @@ } } + [Unit(UnitType.None)] [Minimum(1)] [Maximum(100)] public int UpliftVanLeftGridHorizontalPointCount @@ -212,6 +219,7 @@ } [Format("F2")] + [Unit(UnitType.Length)] [Minimum(0.01)] [Maximum(1000.0)] public double UpliftVanLeftGridHorizontalPointDistance @@ -228,6 +236,7 @@ } } + [Unit(UnitType.None)] [Minimum(1)] [Maximum(100)] public int UpliftVanRightGridVerticalPointCount @@ -245,6 +254,7 @@ } [Format("F2")] + [Unit(UnitType.Length)] [Minimum(0.01)] [Maximum(1000.0)] public double UpliftVanRightGridVerticalPointDistance @@ -261,6 +271,7 @@ } } + [Unit(UnitType.None)] [Minimum(1)] [Maximum(100)] public int UpliftVanRightGridHorizontalPointCount @@ -278,6 +289,7 @@ } [Format("F2")] + [Unit(UnitType.Length)] [Minimum(0.01)] [Maximum(1000.0)] public double UpliftVanRightGridHorizontalPointDistance @@ -295,6 +307,7 @@ } [Minimum(1)] + [Unit(UnitType.None)] [Maximum(100)] public int BishopGridVerticalPointCount { @@ -311,6 +324,7 @@ } [Format("F2")] + [Unit(UnitType.Length)] [Minimum(0.01)] [Maximum(1000.0)] public double BishopGridVerticalPointDistance @@ -327,6 +341,7 @@ } } + [Unit(UnitType.None)] [Minimum(1)] [Maximum(100)] public int BishopGridHorizontalPointCount @@ -344,6 +359,7 @@ } [Format("F2")] + [Unit(UnitType.Length)] [Minimum(0.01)] [Maximum(1000.0)] public double BishopGridHorizontalPointDistance Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs =================================================================== diff -u -r4070 -r4239 --- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs (.../DamProjectCalculationOptionsPropertyControl.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs (.../DamProjectCalculationOptionsPropertyControl.cs) (revision 4239) @@ -40,24 +40,24 @@ BindSupport.BindTextAndValue(CircleDefinitionPanelControl, GridCreationLabel, GridCreationComboBox, p => p.GridSizeDetermination); BindSupport.BindTextAndValue(CircleDefinitionPanelControl, TangentLineBishopLabel, TangentLineBishopComboBox, p => p.BishopTangentLinesDefinition); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, DistanceTangentLinesBishopLabel, DistanceTangentLinesBishopEdit, p => p.BishopTangentLinesDistance); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, DistanceTangentLinesBishopLabel, DistanceTangentLinesBishopEdit, p => p.BishopTangentLinesDistance); BindSupport.BindTextAndValue(CircleDefinitionPanelControl, TangentLineUpliftVanLabel, TangentLineUpliftVanComboBox, p => p.UpliftVanTangentLinesDefinition); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, DistanceTangentLinesUVLabel, DistanceTangentLinesUVEdit, p => p.UpliftVanTangentLinesDistance); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, DistanceTangentLinesUVLabel, DistanceTangentLinesUVEdit, p => p.UpliftVanTangentLinesDistance); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, LeftGridVerticalPointCountUVLabel, LeftGridVerticalPointCountUVEdit, p => p.UpliftVanLeftGridVerticalPointCount); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, LeftGridVerticalPointDistanceUVLabel, LeftGridVerticalPointDistanceUVEdit, p => p.UpliftVanLeftGridVerticalPointDistance); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, LeftGridHorizontalPointCountUVLabel, LeftGridHorizontalPointCountUVEdit, p => p.UpliftVanLeftGridHorizontalPointCount); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, LeftGridHorizontalPointDistanceUVLabel, LeftGridHorizontalPointDistanceUVEdit, p => p.UpliftVanLeftGridHorizontalPointDistance); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, LeftGridVerticalPointCountUVLabel, LeftGridVerticalPointCountUVEdit, p => p.UpliftVanLeftGridVerticalPointCount); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, LeftGridVerticalPointDistanceUVLabel, LeftGridVerticalPointDistanceUVEdit, p => p.UpliftVanLeftGridVerticalPointDistance); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, LeftGridHorizontalPointCountUVLabel, LeftGridHorizontalPointCountUVEdit, p => p.UpliftVanLeftGridHorizontalPointCount); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, LeftGridHorizontalPointDistanceUVLabel, LeftGridHorizontalPointDistanceUVEdit, p => p.UpliftVanLeftGridHorizontalPointDistance); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, RightGridVerticalPointCountUVLabel, RightGridVerticalPointCountUVEdit, p => p.UpliftVanRightGridVerticalPointCount); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, RightGridVerticalPointDistanceUVLabel, RightGridVerticalPointDistanceUVEdit, p => p.UpliftVanRightGridVerticalPointDistance); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, RightGridHorizontalPointCountUVLabel, RightGridHorizontalPointCountUVEdit, p => p.UpliftVanRightGridHorizontalPointCount); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, RightGridHorizontalPointDistanceUVLabel, RightGridHorizontalPointDistanceUVEdit, p => p.UpliftVanRightGridHorizontalPointDistance); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, RightGridVerticalPointCountUVLabel, RightGridVerticalPointCountUVEdit, p => p.UpliftVanRightGridVerticalPointCount); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, RightGridVerticalPointDistanceUVLabel, RightGridVerticalPointDistanceUVEdit, p => p.UpliftVanRightGridVerticalPointDistance); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, RightGridHorizontalPointCountUVLabel, RightGridHorizontalPointCountUVEdit, p => p.UpliftVanRightGridHorizontalPointCount); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, RightGridHorizontalPointDistanceUVLabel, RightGridHorizontalPointDistanceUVEdit, p => p.UpliftVanRightGridHorizontalPointDistance); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, GridVerticalPointCountBishopLabel, GridVerticalPointCountBishopEdit, p => p.BishopGridVerticalPointCount); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, GridVerticalPointDistanceBishopLabel, GridVerticalPointDistanceBishopEdit, p => p.BishopGridVerticalPointDistance); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, GridHorizontalPointCountBishopLabel, GridHorizontalPointCountBishopEdit, p => p.BishopGridHorizontalPointCount); - BindSupport.BindTextAndValue(CircleDefinitionPanelControl, GridHorizontalPointDistanceBishopLabel, GridHorizontalPointDistanceBishopEdit, p => p.BishopGridHorizontalPointDistance); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, GridVerticalPointCountBishopLabel, GridVerticalPointCountBishopEdit, p => p.BishopGridVerticalPointCount); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, GridVerticalPointDistanceBishopLabel, GridVerticalPointDistanceBishopEdit, p => p.BishopGridVerticalPointDistance); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, GridHorizontalPointCountBishopLabel, GridHorizontalPointCountBishopEdit, p => p.BishopGridHorizontalPointCount); + BindSupport.BindTextValueAndUnit(CircleDefinitionPanelControl, GridHorizontalPointDistanceBishopLabel, GridHorizontalPointDistanceBishopEdit, p => p.BishopGridHorizontalPointDistance); StabilityGroupControl.Text = "StabilityOptionsGroupControl"; LocalizationSupport.RegisterAndTranslate(typeof(DamProjectCalculationOptionsPropertyControl), StabilityGroupControl);