Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r5d00e46dbca617ca3c297bff76dc7cc63211b9de -r1670a1ee74bd23ba9315ed1a49c0662dae4f072f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5d00e46dbca617ca3c297bff76dc7cc63211b9de)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1670a1ee74bd23ba9315ed1a49c0662dae4f072f)
@@ -987,6 +987,24 @@
}
///
+ /// Looks up a localized string similar to De naam van de grondlaag..
+ ///
+ public static string SoilLayer_Name_Description {
+ get {
+ return ResourceManager.GetString("SoilLayer_Name_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Naam.
+ ///
+ public static string SoilLayer_Name_DisplayName {
+ get {
+ return ResourceManager.GetString("SoilLayer_Name_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to De geometrie van de buitenring van deze grondlaag..
///
public static string SoilLayer_OuterRing_Description {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r5d00e46dbca617ca3c297bff76dc7cc63211b9de -r1670a1ee74bd23ba9315ed1a49c0662dae4f072f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5d00e46dbca617ca3c297bff76dc7cc63211b9de)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 1670a1ee74bd23ba9315ed1a49c0662dae4f072f)
@@ -571,4 +571,10 @@
Buitenring
+
+ De naam van de grondlaag.
+
+
+ Naam
+
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer1DProperties.cs
===================================================================
diff -u -r3000a7c59771885595ddc279f80680d941195cfd -r1670a1ee74bd23ba9315ed1a49c0662dae4f072f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer1DProperties.cs (.../MacroStabilityInwardsSoilLayer1DProperties.cs) (revision 3000a7c59771885595ddc279f80680d941195cfd)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer1DProperties.cs (.../MacroStabilityInwardsSoilLayer1DProperties.cs) (revision 1670a1ee74bd23ba9315ed1a49c0662dae4f072f)
@@ -40,8 +40,8 @@
{
[PropertyOrder(1)]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilProfile_Name_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.StochasticSoilProfile_Name_Description))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.SoilLayer_Name_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.SoilLayer_Name_Description))]
public string Name
{
get
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DProperties.cs
===================================================================
diff -u -r5d00e46dbca617ca3c297bff76dc7cc63211b9de -r1670a1ee74bd23ba9315ed1a49c0662dae4f072f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DProperties.cs (.../MacroStabilityInwardsSoilLayer2DProperties.cs) (revision 5d00e46dbca617ca3c297bff76dc7cc63211b9de)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DProperties.cs (.../MacroStabilityInwardsSoilLayer2DProperties.cs) (revision 1670a1ee74bd23ba9315ed1a49c0662dae4f072f)
@@ -41,8 +41,8 @@
{
[PropertyOrder(1)]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.StochasticSoilProfile_Name_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.StochasticSoilProfile_Name_Description))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.SoilLayer_Name_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.SoilLayer_Name_Description))]
public string Name
{
get
@@ -76,10 +76,9 @@
get
{
return data.Holes.Select(ring => new RingProperties
- {
- Data = ring
- })
- .ToArray();
+ {
+ Data = ring
+ }).ToArray();
}
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilProfileProperties.cs
===================================================================
diff -u -r5d00e46dbca617ca3c297bff76dc7cc63211b9de -r1670a1ee74bd23ba9315ed1a49c0662dae4f072f
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilProfileProperties.cs (.../StochasticSoilProfileProperties.cs) (revision 5d00e46dbca617ca3c297bff76dc7cc63211b9de)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilProfileProperties.cs (.../StochasticSoilProfileProperties.cs) (revision 1670a1ee74bd23ba9315ed1a49c0662dae4f072f)
@@ -118,7 +118,7 @@
{
get
{
- return new RoundedDouble(2, ((MacroStabilityInwardsSoilProfile1D) data.SoilProfile)?.Bottom ?? double.NaN).Value.ToString(CultureInfo.CurrentCulture);
+ return new RoundedDouble(2, (data.SoilProfile as MacroStabilityInwardsSoilProfile1D)?.Bottom ?? double.NaN).Value.ToString(CultureInfo.CurrentCulture);
}
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer1DPropertiesTest.cs
===================================================================
diff -u -r5d00e46dbca617ca3c297bff76dc7cc63211b9de -r1670a1ee74bd23ba9315ed1a49c0662dae4f072f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer1DPropertiesTest.cs (.../MacroStabilityInwardsSoilLayer1DPropertiesTest.cs) (revision 5d00e46dbca617ca3c297bff76dc7cc63211b9de)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer1DPropertiesTest.cs (.../MacroStabilityInwardsSoilLayer1DPropertiesTest.cs) (revision 1670a1ee74bd23ba9315ed1a49c0662dae4f072f)
@@ -120,7 +120,7 @@
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
generalCategoryName,
"Naam",
- "De naam van de ondergrondschematisatie.",
+ "De naam van de grondlaag.",
true);
PropertyDescriptor topLevelProperty = dynamicProperties[1];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(topLevelProperty,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DPropertiesTest.cs
===================================================================
diff -u -r5d00e46dbca617ca3c297bff76dc7cc63211b9de -r1670a1ee74bd23ba9315ed1a49c0662dae4f072f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DPropertiesTest.cs (.../MacroStabilityInwardsSoilLayer2DPropertiesTest.cs) (revision 5d00e46dbca617ca3c297bff76dc7cc63211b9de)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DPropertiesTest.cs (.../MacroStabilityInwardsSoilLayer2DPropertiesTest.cs) (revision 1670a1ee74bd23ba9315ed1a49c0662dae4f072f)
@@ -148,7 +148,7 @@
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
generalCategoryName,
"Naam",
- "De naam van de ondergrondschematisatie.",
+ "De naam van de grondlaag.",
true);
PropertyDescriptor outerRingProperty = dynamicProperties[1];
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilProfilePropertiesTest.cs
===================================================================
diff -u -r5d00e46dbca617ca3c297bff76dc7cc63211b9de -r1670a1ee74bd23ba9315ed1a49c0662dae4f072f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilProfilePropertiesTest.cs (.../StochasticSoilProfilePropertiesTest.cs) (revision 5d00e46dbca617ca3c297bff76dc7cc63211b9de)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilProfilePropertiesTest.cs (.../StochasticSoilProfilePropertiesTest.cs) (revision 1670a1ee74bd23ba9315ed1a49c0662dae4f072f)
@@ -379,6 +379,8 @@
Assert.AreSame(layerTwo, properties.Layers2D[1].Data);
Assert.AreEqual(0, properties.Layers1D.Length);
+ Assert.AreEqual(double.NaN.ToString(CultureInfo.CurrentCulture), properties.Bottom);
+
Assert.AreEqual(expectedProbability, properties.Probability);
Assert.AreEqual("2D profiel", properties.Type);
}