Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r4216 -r4238
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 4216)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 4238)
@@ -1614,7 +1614,7 @@
}
}
- [Label("Forbidden Zone Factor")]
+ [Label("Forbidden zone factor")]
[Description("Factor of zone to be used in stability calculations")]
[Format("F2")]
[Unit(UnitType.None)]
@@ -1965,7 +1965,6 @@
///
/// The pl line creation method.
///
- [Unit(UnitType.None)]
[Label("PL-Line creation")]
[Description("PL-Line creation method")]
[Format("F3")]
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.Designer.cs
===================================================================
diff -u -r3526 -r4238
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.Designer.cs (.../DamProjectCalculationSpecificationPropertyControl.Designer.cs) (revision 3526)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.Designer.cs (.../DamProjectCalculationSpecificationPropertyControl.Designer.cs) (revision 4238)
@@ -19,7 +19,8 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using Deltares.Standard;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Forms.DExpress;
namespace Deltares.Dam.Forms
{
@@ -67,10 +68,12 @@
this.CalculationSpecificationsGroupControl.Dock = System.Windows.Forms.DockStyle.Top;
this.CalculationSpecificationsGroupControl.Location = new System.Drawing.Point(0, 0);
this.CalculationSpecificationsGroupControl.Margin = new System.Windows.Forms.Padding(4);
- this.CalculationSpecificationsGroupControl.Name = "CalculationSpecificationsGroupControl";
this.CalculationSpecificationsGroupControl.Size = new System.Drawing.Size(328, 909);
this.CalculationSpecificationsGroupControl.TabIndex = 4;
- this.CalculationSpecificationsGroupControl.Text = "Calculation specifications";
+ this.CalculationSpecificationsGroupControl.Text = "CalculationSpecificationsGroupControl";
+ LocalizationSupport.RegisterAndTranslate(typeof(DamProjectCalculationSpecificationPropertyControl), CalculationSpecificationsGroupControl);
+ DataEventPublisher.OnAfterChange += DataEventPublisher_OnAfterChange;
+
//
// damProjectCalculationOptionsPropertyControl1
//
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r4237 -r4238
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 4237)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 4238)
@@ -42,10 +42,10 @@
-
-
+
-
+
@@ -84,37 +84,37 @@
-
+
-
-
-
-
-
+
+
+
+
+
+ nl-NL="PL1-binnenteen (droog) offset"/>
-
+ en-US="PL1 offset below toe of dike (polderside) in dry situation"
+ nl-NL="Ligging freatisch vlak (buitenwaterstand minus deze waarde) onder de binnenteen van de dijk aan de polderzijde onder droge condities"/>
+
-
-
+
+
@@ -124,8 +124,8 @@
-
-
+
-
@@ -222,24 +221,24 @@
-
+
+ nl-NL="Aantal verticale punten grid links (UV)"/>
+ nl-NL="Afstand verticale punten grid links (UV)"/>
+ nl-NL="Aantal horizontale punten grid links (UV)"/>
+ nl-NL="Afstand horizontale punten grid links (UV)"/>
+ nl-NL="Aantal verticale punten grid rechts (UV)"/>
-
+ nl-NL="Afstand verticale punten grid rechts (UV)"/>
+
+ nl-NL="Afstand horizontale punten grid rechts (UV)"/>
+
-
@@ -409,17 +408,15 @@
-
-
-
-
+
-
+
+
@@ -450,33 +447,33 @@
nl-NL="Kans van voorkomen ondergrond (Stabiliteit)"/>
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -539,47 +536,45 @@
nl-NL="Voor faalmechanisme buitenwaartse stabiliteit is ontwerp met aanpassing geometrie niet toegestaan"/>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -676,6 +671,7 @@
+
-
+
-
-
-
-
-
-
+
-
+
-
-
+
-
-
-
+
-
+
-
-
-
-
-
+
-
+
-
-
-
-
Index: DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml
===================================================================
diff -u -r4070 -r4238
--- DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml (.../Translations.xml) (revision 4070)
+++ DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml (.../Translations.xml) (revision 4238)
@@ -114,9 +114,10 @@
nl-NL="Rekenen kan alleen met een geldige DAM licentie"/>
-
-
-
+
+
+
+
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
===================================================================
diff -u -r4070 -r4238
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 4070)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 4238)
@@ -230,6 +230,7 @@
/// The uplift criterion piping.
///
[PropertyOrder(1, 5)]
+ [Unit(UnitType.None)]
[Format("F2")]
[Label("Uplift criterion piping")]
[Description("Uplift criterion piping")]
@@ -254,6 +255,7 @@
/// The uplift criterion stability.
///
[PropertyOrder(1, 6)]
+ [Unit(UnitType.None)]
[Format("F2")]
[Label("Uplift criterion stability")]
[Description("Uplift criterion stability")]
@@ -271,6 +273,12 @@
}
}
+ ///
+ /// Gets or sets the pl line offset below dike top at river side.
+ ///
+ ///
+ /// The pl line offset below dike top at river side.
+ ///
[PropertyOrder(1, 7)]
[Unit(UnitType.Length)]
[Format("F2")]
@@ -364,7 +372,6 @@
/// The use pl line offset below dike crest middle.
///
[PropertyOrder(1, 11)]
- [Unit(UnitType.None)]
[Clearable]
public bool? UsePlLineOffsetBelowDikeCrestMiddle
{
@@ -410,7 +417,6 @@
/// The use pl line offset factor below shoulder crest.
///
[PropertyOrder(1, 13)]
- [Unit(UnitType.None)]
[Clearable]
public bool? UsePlLineOffsetFactorBelowShoulderCrest
{
@@ -525,9 +531,8 @@
/// The required safety factor stability inner slope.
///
[PropertyOrder(1, 18)]
+ [Unit(UnitType.None)]
[Format("F2")]
- [Label("Required safety factor stability inner slope")]
- [Description("Required safety factor stability inner slope")]
public double RequiredSafetyFactorStabilityInnerSlope
{
get
@@ -549,9 +554,8 @@
/// The required safety factor stability outer slope.
///
[PropertyOrder(1, 19)]
- [Format("F2")]
- [Label("Required safety factor stability outer slope")]
- [Description("Required safety factor stability outer slope")]
+ [Unit(UnitType.None)]
+ [Format("F2")]
public double RequiredSafetyFactorStabilityOuterSlope
{
get
@@ -573,9 +577,8 @@
/// The required safety factor piping.
///
[PropertyOrder(1, 20)]
- [Format("F2")]
- [Label("Required safety factor piping")]
- [Description("Required safety factor piping")]
+ [Unit(UnitType.None)]
+ [Format("F2")]
public double RequiredSafetyFactorPiping
{
get