Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs
===================================================================
diff -u -r6c7fbd4def41c722f172d3e11329a9635d2f7ba1 -rc219dfb51c1a7bcc8f85538175ca8a90dc7da788
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs (.../GrassCoverErosionInwardsInput.cs) (revision 6c7fbd4def41c722f172d3e11329a9635d2f7ba1)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs (.../GrassCoverErosionInwardsInput.cs) (revision c219dfb51c1a7bcc8f85538175ca8a90dc7da788)
@@ -169,6 +169,21 @@
public OvertoppingRateCalculationType OvertoppingRateCalculationType { get; set; }
///
+ /// Gets or sets if the illustration points should be calculated for Dike Height.
+ ///
+ public bool ShouldDikeHeightIllustrationPointsBeCalculated { get; set; }
+
+ ///
+ /// Gets or sets if the illustration points should be calculated for Critical Flow Rate.
+ ///
+ public bool ShouldCriticalFlowRateIllustrationPointsBeCalculated { get; set; }
+
+ ///
+ /// Gets or sets if the illustration points should be calculated for Overtopping Output.
+ ///
+ public bool ShouldOvertoppingOutputIllustrationPointsBeCalculated { get; set; }
+
+ ///
/// Gets the value true if the parameters of the instance of
/// that are derived from
/// match the properties of
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rb2841ec8a6fc64308b1ede3988aeddc479a749a0 -rc219dfb51c1a7bcc8f85538175ca8a90dc7da788
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b2841ec8a6fc64308b1ede3988aeddc479a749a0)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c219dfb51c1a7bcc8f85538175ca8a90dc7da788)
@@ -82,6 +82,15 @@
}
///
+ /// Looks up a localized string similar to Overslagdebiet.
+ ///
+ public static string Categories_CriticalFlowRate {
+ get {
+ return ResourceManager.GetString("Categories_CriticalFlowRate", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Toetseisen.
///
public static string Categories_CriticalValues {
@@ -91,6 +100,24 @@
}
///
+ /// Looks up a localized string similar to HBN.
+ ///
+ public static string Categories_DikeHeight {
+ get {
+ return ResourceManager.GetString("Categories_DikeHeight", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Sterkte berekening.
+ ///
+ public static string Categories_OvertoppingOutput {
+ get {
+ return ResourceManager.GetString("Categories_OvertoppingOutput", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Kritiek overslagdebiet per strekkende meter..
///
public static string CriticalFlowRate_Description {
@@ -442,6 +469,42 @@
}
///
+ /// Looks up a localized string similar to Illustratiepunten inlezen.
+ ///
+ public static string ShouldCriticalFlowRateIllustrationPointsBeCalculated_DisplayName {
+ get {
+ return ResourceManager.GetString("ShouldCriticalFlowRateIllustrationPointsBeCalculated_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Illustratiepunten inlezen.
+ ///
+ public static string ShouldDikeHeightIllustrationPointsBeCalculated_DisplayName {
+ get {
+ return ResourceManager.GetString("ShouldDikeHeightIllustrationPointsBeCalculated_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Neem de informatie over de illustratiepunten op in het berekeningsresultaat..
+ ///
+ public static string ShouldIllustrationPointsBeCalculated_Description {
+ get {
+ return ResourceManager.GetString("ShouldIllustrationPointsBeCalculated_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Illustratiepunten inlezen.
+ ///
+ public static string ShouldOvertoppingOutputIllustrationPointsBeCalculated_DisplayName {
+ get {
+ return ResourceManager.GetString("ShouldOvertoppingOutputIllustrationPointsBeCalculated_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to De coördinaten van de locatie van de dijk in het Rijksdriehoeksstelsel..
///
public static string WorldReferencePoint_DikeProfile_Description {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -rb2841ec8a6fc64308b1ede3988aeddc479a749a0 -rc219dfb51c1a7bcc8f85538175ca8a90dc7da788
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision b2841ec8a6fc64308b1ede3988aeddc479a749a0)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision c219dfb51c1a7bcc8f85538175ca8a90dc7da788)
@@ -240,4 +240,25 @@
De locatie van het bestand waaruit de dijkprofielen zijn geïmporteerd.
+
+ Overslagdebiet
+
+
+ HBN
+
+
+ Sterkte berekening
+
+
+ Neem de informatie over de illustratiepunten op in het berekeningsresultaat.
+
+
+ Illustratiepunten inlezen
+
+
+ Illustratiepunten inlezen
+
+
+ Illustratiepunten inlezen
+
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs
===================================================================
diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -rc219dfb51c1a7bcc8f85538175ca8a90dc7da788
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision aeb6e1a439617630e7613b9ed5af152c345fa2c6)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision c219dfb51c1a7bcc8f85538175ca8a90dc7da788)
@@ -206,7 +206,7 @@
}
[PropertyOrder(calculateDikeHeightPropertyIndex)]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))]
+ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_DikeHeight))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.DikeHeightCalculationType_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.DikeHeightCalculationType_Description))]
[TypeConverter(typeof(EnumTypeConverter))]
@@ -223,7 +223,7 @@
}
[PropertyOrder(calculateOvertoppingRatePropertyIndex)]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))]
+ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_CriticalFlowRate))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.OvertoppingRateCalculationType_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.OvertoppingRateCalculationType_Description))]
[TypeConverter(typeof(EnumTypeConverter))]
@@ -275,6 +275,54 @@
}
}
+ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_DikeHeight))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.ShouldDikeHeightIllustrationPointsBeCalculated_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.ShouldIllustrationPointsBeCalculated_Description))]
+ public bool ShouldDikeHeightIllustrationPointsBeCalculated
+ {
+ get
+ {
+ return data.WrappedData.ShouldDikeHeightIllustrationPointsBeCalculated;
+ }
+ set
+ {
+ data.WrappedData.ShouldDikeHeightIllustrationPointsBeCalculated = value;
+ data.WrappedData.NotifyObservers();
+ }
+ }
+
+ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_CriticalFlowRate))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.ShouldCriticalFlowRateIllustrationPointsBeCalculated_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.ShouldIllustrationPointsBeCalculated_Description))]
+ public bool ShouldCriticalFlowRateIllustrationPointsBeCalculated
+ {
+ get
+ {
+ return data.WrappedData.ShouldCriticalFlowRateIllustrationPointsBeCalculated;
+ }
+ set
+ {
+ data.WrappedData.ShouldCriticalFlowRateIllustrationPointsBeCalculated = value;
+ data.WrappedData.NotifyObservers();
+ }
+ }
+
+ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_OvertoppingOutput))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.ShouldOvertoppingOutputIllustrationPointsBeCalculated_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.ShouldIllustrationPointsBeCalculated_Description))]
+ public bool ShouldOvertoppingOutputIllustrationPointsBeCalculated
+ {
+ get
+ {
+ return data.WrappedData.ShouldOvertoppingOutputIllustrationPointsBeCalculated;
+ }
+ set
+ {
+ data.WrappedData.ShouldOvertoppingOutputIllustrationPointsBeCalculated = value;
+ data.WrappedData.NotifyObservers();
+ }
+ }
+
[DynamicReadOnlyValidationMethod]
public bool DynamicReadOnlyValidationMethod(string propertyName)
{
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -rc219dfb51c1a7bcc8f85538175ca8a90dc7da788
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision aeb6e1a439617630e7613b9ed5af152c345fa2c6)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision c219dfb51c1a7bcc8f85538175ca8a90dc7da788)
@@ -171,6 +171,10 @@
TestHelper.AssertTypeConverter(
nameof(GrassCoverErosionInwardsInputContextProperties.OvertoppingRateCalculationType));
Assert.IsNull(properties.WorldReferencePoint);
+ Assert.IsFalse(properties.ShouldCriticalFlowRateIllustrationPointsBeCalculated);
+ Assert.IsFalse(properties.ShouldDikeHeightIllustrationPointsBeCalculated);
+ Assert.IsFalse(properties.ShouldOvertoppingOutputIllustrationPointsBeCalculated);
+
mockRepository.VerifyAll();
}
@@ -209,6 +213,9 @@
Assert.AreEqual(input.DikeHeightCalculationType, properties.DikeHeightCalculationType);
Assert.AreEqual(input.OvertoppingRateCalculationType, properties.OvertoppingRateCalculationType);
Assert.AreEqual(new Point2D(12, 57), properties.WorldReferencePoint);
+ Assert.IsFalse(properties.ShouldCriticalFlowRateIllustrationPointsBeCalculated);
+ Assert.IsFalse(properties.ShouldDikeHeightIllustrationPointsBeCalculated);
+ Assert.IsFalse(properties.ShouldOvertoppingOutputIllustrationPointsBeCalculated);
mockRepository.VerifyAll();
}
@@ -600,7 +607,7 @@
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
- Assert.AreEqual(11, dynamicProperties.Count);
+ Assert.AreEqual(14, dynamicProperties.Count);
PropertyDescriptor dikeProfileProperty = dynamicProperties[dikeProfilePropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(dikeProfileProperty,
@@ -668,12 +675,12 @@
"De locatie met hydraulische randvoorwaarden.");
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(dynamicProperties[calculateDikeHeightPropertyIndex],
- "Schematisatie",
+ "HBN",
"HBN berekenen",
"Geeft aan of ook het Hydraulisch Belasting Niveau (HBN) moet worden berekend.");
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(dynamicProperties[calculateOvertoppingRatePropertyIndex],
- "Schematisatie",
+ "Overslagdebiet",
"Overslagdebiet berekenen",
"Geeft aan of ook het overslagdebiet moet worden berekend.");