Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -ra0eac32f05f503713d027f116b0194040418ceb2 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a0eac32f05f503713d027f116b0194040418ceb2)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -92,6 +92,24 @@
}
///
+ /// Looks up a localized string similar to Waterstand met een overschrijdingsfrequentie gelijk aan de trajectnorm..
+ ///
+ public static string AssessmentLevel_Description {
+ get {
+ return ResourceManager.GetString("AssessmentLevel_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Toetspeil [m+NAP].
+ ///
+ public static string AssessmentLevel_DisplayName {
+ get {
+ return ResourceManager.GetString("AssessmentLevel_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Is er een dam aanwezig?.
///
public static string BreakWater_HasBreakWater_Description {
@@ -110,6 +128,24 @@
}
///
+ /// Looks up a localized string similar to Moet de dam worden gebruikt tijdens de berekening?.
+ ///
+ public static string BreakWater_UseBreakWater_Description {
+ get {
+ return ResourceManager.GetString("BreakWater_UseBreakWater_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Gebruik.
+ ///
+ public static string BreakWater_UseBreakWater_DisplayName {
+ get {
+ return ResourceManager.GetString("BreakWater_UseBreakWater_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to De hoogte van de dam..
///
public static string BreakWaterHeight_Description {
@@ -410,6 +446,15 @@
}
///
+ /// Looks up a localized string similar to Hydraulische gegevens.
+ ///
+ public static string Categories_HydraulicData {
+ get {
+ return ResourceManager.GetString("Categories_HydraulicData", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Lengte-effect parameters.
///
public static string Categories_LengthEffect {
@@ -430,9 +475,9 @@
///
/// Looks up a localized string similar to Schematisatie.
///
- public static string Categories_Schematisation {
+ public static string Categories_Schematization {
get {
- return ResourceManager.GetString("Categories_Schematisation", resourceCulture);
+ return ResourceManager.GetString("Categories_Schematization", resourceCulture);
}
}
@@ -854,6 +899,33 @@
}
///
+ /// Looks up a localized string similar to Voorlandprofiel.
+ ///
+ public static string Foreshore_DisplayName {
+ get {
+ return ResourceManager.GetString("Foreshore_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Moet het voorlandprofiel worden gebruikt tijdens de berekening?.
+ ///
+ public static string Foreshore_UseForeshore_Description {
+ get {
+ return ResourceManager.GetString("Foreshore_UseForeshore_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Gebruik.
+ ///
+ public static string Foreshore_UseForeshore_DisplayName {
+ get {
+ return ResourceManager.GetString("Foreshore_UseForeshore_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Naam van het voorland..
///
public static string ForeshoreProfile_Name_Description {
@@ -863,11 +935,11 @@
}
///
- /// Looks up a localized string similar to Voorlanden.
+ /// Looks up a localized string similar to Voorlandprofielen.
///
- public static string ForeshoreProfilesContext_DisplayName {
+ public static string ForeshoreProfiles_DisplayName {
get {
- return ResourceManager.GetString("ForeshoreProfilesContext_DisplayName", resourceCulture);
+ return ResourceManager.GetString("ForeshoreProfiles_DisplayName", resourceCulture);
}
}
@@ -890,15 +962,6 @@
}
///
- /// Looks up a localized string similar to Voorlanden.
- ///
- public static string Foreshores_DisplayName {
- get {
- return ResourceManager.GetString("Foreshores_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
public static System.Drawing.Bitmap GeneralFolderIcon {
@@ -1047,6 +1110,24 @@
}
///
+ /// Looks up a localized string similar to De locatie met hydraulische randvoorwaarden..
+ ///
+ public static string HydraulicBoundaryLocation_Description {
+ get {
+ return ResourceManager.GetString("HydraulicBoundaryLocation_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Locatie met hydraulische randvoorwaarden.
+ ///
+ public static string HydraulicBoundaryLocation_DisplayName {
+ get {
+ return ResourceManager.GetString("HydraulicBoundaryLocation_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
public static System.Drawing.Bitmap InputFolderIcon {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -ra0eac32f05f503713d027f116b0194040418ceb2 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision a0eac32f05f503713d027f116b0194040418ceb2)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -439,8 +439,8 @@
Genereer &berekeningen...
-
- Voorlanden
+
+ Voorlandprofielen
Algemeen
@@ -526,12 +526,9 @@
Aanwezig
-
+
Schematisatie
-
- Voorlanden
-
Naam van het voorland.
@@ -568,4 +565,34 @@
Invoer
+
+ Hydraulische gegevens
+
+
+ De locatie met hydraulische randvoorwaarden.
+
+
+ Locatie met hydraulische randvoorwaarden
+
+
+ Waterstand met een overschrijdingsfrequentie gelijk aan de trajectnorm.
+
+
+ Toetspeil [m+NAP]
+
+
+ Moet de dam worden gebruikt tijdens de berekening?
+
+
+ Gebruik
+
+
+ Voorlandprofiel
+
+
+ Moet het voorlandprofiel worden gebruikt tijdens de berekening?
+
+
+ Gebruik
+
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ForeshoreProfileProperties.cs
===================================================================
diff -u -r3e5a3e2990566fe86caaaa87136d0f57543a9666 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ForeshoreProfileProperties.cs (.../ForeshoreProfileProperties.cs) (revision 3e5a3e2990566fe86caaaa87136d0f57543a9666)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ForeshoreProfileProperties.cs (.../ForeshoreProfileProperties.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -54,7 +54,7 @@
}
[PropertyOrder(worldReferencePointPropertyIndex)]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "WorldReferencePoint_DisplayName")]
[ResourcesDescription(typeof(Resources), "WorldReferencePoint_ForeshoreProfile_Description")]
public Point2D WorldReferencePoint
@@ -68,7 +68,7 @@
}
[PropertyOrder(orientationPropertyIndex)]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "Orientation_DisplayName")]
[ResourcesDescription(typeof(Resources), "Orientation_ForeshoreProfile_Description")]
public RoundedDouble Orientation
@@ -81,7 +81,7 @@
[PropertyOrder(breakWaterPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "BreakWaterProperties_DisplayName")]
[ResourcesDescription(typeof(Resources), "BreakWaterProperties_Description")]
public BreakWaterProperties BreakWater
@@ -97,7 +97,7 @@
[PropertyOrder(foreshorePropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "ForeshoreProperties_DisplayName")]
[ResourcesDescription(typeof(Resources), "ForeshoreProperties_Description")]
public ForeshoreGeometryProperties Foreshore
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -22,7 +22,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -82,24 +82,6 @@
}
///
- /// Looks up a localized string similar to Moet de dam worden gebruikt tijdens de berekening?.
- ///
- public static string BreakWater_UseBreakWater_Description {
- get {
- return ResourceManager.GetString("BreakWater_UseBreakWater_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Gebruik.
- ///
- public static string BreakWater_UseBreakWater_DisplayName {
- get {
- return ResourceManager.GetString("BreakWater_UseBreakWater_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Geeft aan of ook het Hydraulisch Belasting Niveau (HBN) moet worden berekend..
///
public static string CalculateDikeHeight_Description {
@@ -137,15 +119,6 @@
}
///
- /// Looks up a localized string similar to Hydraulische gegevens.
- ///
- public static string Categories_HydraulicData {
- get {
- return ResourceManager.GetString("Categories_HydraulicData", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Indicatieve golfhoogte.
///
public static string Categories_Indicative_WaveHeight {
@@ -272,33 +245,6 @@
}
///
- /// Looks up a localized string similar to Voorland.
- ///
- public static string Foreshore_DisplayName {
- get {
- return ResourceManager.GetString("Foreshore_DisplayName", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Moet het voorland worden gebruikt tijdens de berekening?.
- ///
- public static string Foreshore_UseForeshore_Description {
- get {
- return ResourceManager.GetString("Foreshore_UseForeshore_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Gebruik.
- ///
- public static string Foreshore_UseForeshore_DisplayName {
- get {
- return ResourceManager.GetString("Foreshore_UseForeshore_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to {0} - {1}.
///
public static string GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_ {
@@ -501,24 +447,6 @@
}
///
- /// Looks up a localized string similar to De locatie met hydraulische randvoorwaarden..
- ///
- public static string HydraulicBoundaryLocation_Description {
- get {
- return ResourceManager.GetString("HydraulicBoundaryLocation_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Locatie met hydraulische randvoorwaarden.
- ///
- public static string HydraulicBoundaryLocation_DisplayName {
- get {
- return ResourceManager.GetString("HydraulicBoundaryLocation_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Oriëntatie van de dijk..
///
public static string Orientation_DikeProfile_Description {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -139,12 +139,6 @@
Modelfactoren
-
- Moet de dam worden gebruikt tijdens de berekening?
-
-
- Gebruik
-
Eigenschappen van de dijkgeometrie.
@@ -163,12 +157,6 @@
Dijkhoogte [m+NAP]
-
- Moet het voorland worden gebruikt tijdens de berekening?
-
-
- Gebruik
-
Naam van het dijkprofiel.
@@ -205,24 +193,12 @@
Kritisch overslagdebiet [m³/s/m]
-
- Hydraulische gegevens
-
-
- De locatie met hydraulische randvoorwaarden.
-
-
- Locatie met hydraulische randvoorwaarden
-
De schematisatie van het dijkprofiel.
Dijkprofiel
-
- Voorland
-
Dijkhoogte
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileProperties.cs
===================================================================
diff -u -r3e5a3e2990566fe86caaaa87136d0f57543a9666 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileProperties.cs (.../DikeProfileProperties.cs) (revision 3e5a3e2990566fe86caaaa87136d0f57543a9666)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileProperties.cs (.../DikeProfileProperties.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -59,7 +59,7 @@
}
[PropertyOrder(worldReferencePointPropertyIndex)]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "WorldReferencePoint_DisplayName")]
[ResourcesDescription(typeof(GrassCoverErosionInwardsFormsResources), "WorldReferencePoint_DikeProfile_Description")]
public Point2D WorldReferencePoint
@@ -73,7 +73,7 @@
}
[PropertyOrder(orientationPropertyIndex)]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Orientation_DisplayName")]
[ResourcesDescription(typeof(GrassCoverErosionInwardsFormsResources), "Orientation_DikeProfile_Description")]
public RoundedDouble Orientation
@@ -86,7 +86,7 @@
[PropertyOrder(breakWaterPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_DisplayName")]
[ResourcesDescription(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_Description")]
public BreakWaterProperties BreakWater
@@ -102,7 +102,7 @@
[PropertyOrder(foreshorePropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_DisplayName")]
[ResourcesDescription(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_Description")]
public ForeshoreGeometryProperties Foreshore
@@ -118,7 +118,7 @@
[PropertyOrder(dikeGeometryPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(GrassCoverErosionInwardsFormsResources), "DikeGeometryProperties_DisplayName")]
[ResourcesDescription(typeof(GrassCoverErosionInwardsFormsResources), "DikeGeometryProperties_Description")]
public DikeProfileDikeGeometryProperties DikeGeometry
@@ -133,7 +133,7 @@
}
[PropertyOrder(dikeHeightPropertyIndex)]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(GrassCoverErosionInwardsFormsResources), "DikeHeight_DisplayName")]
[ResourcesDescription(typeof(GrassCoverErosionInwardsFormsResources), "DikeHeight_Description")]
public RoundedDouble DikeHeight
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterProperties.cs
===================================================================
diff -u -r3e5a3e2990566fe86caaaa87136d0f57543a9666 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterProperties.cs (.../GrassCoverErosionInwardsInputContextBreakWaterProperties.cs) (revision 3e5a3e2990566fe86caaaa87136d0f57543a9666)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterProperties.cs (.../GrassCoverErosionInwardsInputContextBreakWaterProperties.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -29,7 +29,6 @@
using Ringtoets.Common.Data.DikeProfiles;
using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
-using Ringtoets.GrassCoverErosionInwards.Forms.Properties;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses
@@ -41,8 +40,8 @@
{
[DynamicReadOnly]
[PropertyOrder(1)]
- [ResourcesDisplayName(typeof(Resources), "BreakWater_UseBreakWater_DisplayName")]
- [ResourcesDescription(typeof(Resources), "BreakWater_UseBreakWater_Description")]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "BreakWater_UseBreakWater_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "BreakWater_UseBreakWater_Description")]
public bool UseBreakWater
{
get
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs
===================================================================
diff -u -r3e5a3e2990566fe86caaaa87136d0f57543a9666 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs (.../GrassCoverErosionInwardsInputContextForeshoreProperties.cs) (revision 3e5a3e2990566fe86caaaa87136d0f57543a9666)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs (.../GrassCoverErosionInwardsInputContextForeshoreProperties.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -28,7 +28,6 @@
using Core.Common.Utils.Attributes;
using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
-using Ringtoets.GrassCoverErosionInwards.Forms.Properties;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses
@@ -43,8 +42,8 @@
[DynamicReadOnly]
[PropertyOrder(useForeshorePropertyIndex)]
- [ResourcesDisplayName(typeof(Resources), "Foreshore_UseForeshore_DisplayName")]
- [ResourcesDescription(typeof(Resources), "Foreshore_UseForeshore_Description")]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Foreshore_UseForeshore_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Foreshore_UseForeshore_Description")]
public bool UseForeshore
{
get
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs
===================================================================
diff -u -r3e5a3e2990566fe86caaaa87136d0f57543a9666 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision 3e5a3e2990566fe86caaaa87136d0f57543a9666)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -56,7 +56,7 @@
[PropertyOrder(dikeProfilePropertyIndex)]
[Editor(typeof(GrassCoverErosionInwardsInputContextDikeProfileEditor), typeof(UITypeEditor))]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "DikeProfile_DisplayName")]
[ResourcesDescription(typeof(Resources), "DikeProfile_Description")]
public DikeProfile DikeProfile
@@ -74,7 +74,7 @@
}
[PropertyOrder(worldReferencePointPropertyIndex)]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "WorldReferencePoint_DisplayName")]
[ResourcesDescription(typeof(Resources), "WorldReferencePoint_DikeProfile_Description")]
public Point2D WorldReferencePoint
@@ -90,7 +90,7 @@
[DynamicReadOnly]
[PropertyOrder(orientationPropertyIndex)]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Orientation_DisplayName")]
[ResourcesDescription(typeof(Resources), "Orientation_DikeProfile_Description")]
public RoundedDouble Orientation
@@ -108,7 +108,7 @@
[PropertyOrder(breakWaterPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_DisplayName")]
[ResourcesDescription(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_Description")]
public GrassCoverErosionInwardsInputContextBreakWaterProperties BreakWater
@@ -124,7 +124,7 @@
[PropertyOrder(foreshorePropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_DisplayName")]
[ResourcesDescription(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_Description")]
public GrassCoverErosionInwardsInputContextForeshoreProperties Foreshore
@@ -140,7 +140,7 @@
[PropertyOrder(dikeGeometryPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "DikeGeometryProperties_DisplayName")]
[ResourcesDescription(typeof(Resources), "DikeGeometryProperties_Description")]
public GrassCoverErosionInwardsInputContextDikeGeometryProperties DikeGeometry
@@ -156,7 +156,7 @@
[DynamicReadOnly]
[PropertyOrder(dikeHeightPropertyIndex)]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "DikeHeight_DisplayName")]
[ResourcesDescription(typeof(Resources), "DikeHeight_Description")]
public RoundedDouble DikeHeight
@@ -173,7 +173,7 @@
}
[PropertyOrder(calculateDikeHeightPropertyIndex)]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "CalculateDikeHeight_DisplayName")]
[ResourcesDescription(typeof(Resources), "CalculateDikeHeight_Description")]
public bool CalculateDikeHeight
@@ -207,9 +207,9 @@
[PropertyOrder(hydraulicBoundaryLocationPropertyIndex)]
[Editor(typeof(GrassCoverErosionInwardsInputContextHydraulicBoundaryLocationEditor), typeof(UITypeEditor))]
- [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")]
- [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryLocation_DisplayName")]
- [ResourcesDescription(typeof(Resources), "HydraulicBoundaryLocation_Description")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_Description")]
public HydraulicBoundaryLocation HydraulicBoundaryLocation
{
get
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsChartDataFactory.cs
===================================================================
diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsChartDataFactory.cs (.../GrassCoverErosionInwardsChartDataFactory.cs) (revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsChartDataFactory.cs (.../GrassCoverErosionInwardsChartDataFactory.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -26,6 +26,7 @@
using Ringtoets.Common.Data.DikeProfiles;
using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.GrassCoverErosionInwards.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.GrassCoverErosionInwards.Forms.Views
{
@@ -53,7 +54,7 @@
/// The created .
public static ChartLineData CreateForeshoreGeometryChartData()
{
- return new ChartLineData(Resources.Foreshore_DisplayName)
+ return new ChartLineData(RingtoetsCommonFormsResources.Foreshore_DisplayName)
{
Style = new ChartLineStyle(Color.DarkOrange, 2, DashStyle.Solid)
};
@@ -103,8 +104,8 @@
chartData.Name = input != null && input.DikeProfile != null && input.UseForeshore
? string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_,
input.DikeProfile.Name,
- Resources.Foreshore_DisplayName)
- : Resources.Foreshore_DisplayName;
+ RingtoetsCommonFormsResources.Foreshore_DisplayName)
+ : RingtoetsCommonFormsResources.Foreshore_DisplayName;
}
}
}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs (.../GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs (.../GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -175,7 +175,7 @@
Assert.IsNotNull(useForeshoreProperty);
Assert.IsTrue(useForeshoreProperty.IsReadOnly);
Assert.AreEqual("Gebruik", useForeshoreProperty.DisplayName);
- Assert.AreEqual("Moet het voorland worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
+ Assert.AreEqual("Moet het voorlandprofiel worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex];
Assert.IsNotNull(coordinatesProperty);
@@ -219,7 +219,7 @@
Assert.IsNotNull(useForeshoreProperty);
Assert.IsTrue(useForeshoreProperty.IsReadOnly);
Assert.AreEqual("Gebruik", useForeshoreProperty.DisplayName);
- Assert.AreEqual("Moet het voorland worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
+ Assert.AreEqual("Moet het voorlandprofiel worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex];
Assert.IsNotNull(coordinatesProperty);
@@ -264,7 +264,7 @@
Assert.IsNotNull(useForeshoreProperty);
Assert.IsFalse(useForeshoreProperty.IsReadOnly);
Assert.AreEqual("Gebruik", useForeshoreProperty.DisplayName);
- Assert.AreEqual("Moet het voorland worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
+ Assert.AreEqual("Moet het voorlandprofiel worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex];
Assert.IsNotNull(coordinatesProperty);
@@ -312,7 +312,7 @@
Assert.IsNotNull(useForeshoreProperty);
Assert.AreEqual(!withDikeProfile, useForeshoreProperty.IsReadOnly);
Assert.AreEqual("Gebruik", useForeshoreProperty.DisplayName);
- Assert.AreEqual("Moet het voorland worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
+ Assert.AreEqual("Moet het voorlandprofiel worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex];
Assert.IsNotNull(coordinatesProperty);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsChartDataFactoryTest.cs
===================================================================
diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsChartDataFactoryTest.cs (.../GrassCoverErosionInwardsChartDataFactoryTest.cs) (revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsChartDataFactoryTest.cs (.../GrassCoverErosionInwardsChartDataFactoryTest.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -29,6 +29,7 @@
using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.GrassCoverErosionInwards.Forms.Properties;
using Ringtoets.GrassCoverErosionInwards.Forms.Views;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.Views
{
@@ -53,7 +54,7 @@
ChartLineData data = GrassCoverErosionInwardsChartDataFactory.CreateForeshoreGeometryChartData();
// Assert
- Assert.AreEqual(string.Format(Resources.Foreshore_DisplayName), data.Name);
+ Assert.AreEqual(string.Format(RingtoetsCommonFormsResources.Foreshore_DisplayName), data.Name);
AssertEqualStyle(data.Style, Color.DarkOrange, 2, DashStyle.Solid);
}
@@ -111,7 +112,7 @@
GrassCoverErosionInwardsChartDataFactory.UpdateForeshoreGeometryChartDataName(chartData, null);
// Assert
- Assert.AreEqual(Resources.Foreshore_DisplayName, chartData.Name);
+ Assert.AreEqual(RingtoetsCommonFormsResources.Foreshore_DisplayName, chartData.Name);
}
[Test]
@@ -128,7 +129,7 @@
GrassCoverErosionInwardsChartDataFactory.UpdateForeshoreGeometryChartDataName(chartData, input);
// Assert
- Assert.AreEqual(Resources.Foreshore_DisplayName, chartData.Name);
+ Assert.AreEqual(RingtoetsCommonFormsResources.Foreshore_DisplayName, chartData.Name);
}
[Test]
@@ -153,7 +154,7 @@
GrassCoverErosionInwardsChartDataFactory.UpdateForeshoreGeometryChartDataName(chartData, input);
// Assert
- Assert.AreEqual(Resources.Foreshore_DisplayName, chartData.Name);
+ Assert.AreEqual(RingtoetsCommonFormsResources.Foreshore_DisplayName, chartData.Name);
}
[Test]
@@ -180,7 +181,7 @@
// Assert
var expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_,
input.DikeProfile.Name,
- Resources.Foreshore_DisplayName);
+ RingtoetsCommonFormsResources.Foreshore_DisplayName);
Assert.AreEqual(expectedName, chartData.Name);
}
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs
===================================================================
diff -u -r275811c8e133cba03f636224f40a9536a733fb1f -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision 275811c8e133cba03f636224f40a9536a733fb1f)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -180,7 +180,7 @@
CollectionAssert.IsEmpty(foreshoreData.Points);
CollectionAssert.IsEmpty(dikeHeightData.Points);
Assert.AreEqual(Resources.DikeProfile_DisplayName, dikeGeometryData.Name);
- Assert.AreEqual(Resources.Foreshore_DisplayName, foreshoreData.Name);
+ Assert.AreEqual(RingtoetsCommonFormsResources.Foreshore_DisplayName, foreshoreData.Name);
Assert.AreEqual(Resources.DikeHeight_ChartName, dikeHeightData.Name);
}
}
@@ -216,7 +216,7 @@
var dikeHeightData = (ChartLineData) chartData.Collection.ElementAt(dikeHeightIndex);
CollectionAssert.IsEmpty(foreshoreData.Points);
- Assert.AreEqual(Resources.Foreshore_DisplayName, foreshoreData.Name);
+ Assert.AreEqual(RingtoetsCommonFormsResources.Foreshore_DisplayName, foreshoreData.Name);
AssertDikeProfileChartData(dikeProfile, dikeGeometryData);
AssertDikeHeightChartData(dikeProfile, dikeHeightData);
}
@@ -384,7 +384,7 @@
Assert.AreEqual(Resources.DikeProfile_DisplayName, dikeProfileChartData.Name);
var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(updatedForeshoreIndex);
- Assert.AreEqual(Resources.Foreshore_DisplayName, foreshoreChartData.Name);
+ Assert.AreEqual(RingtoetsCommonFormsResources.Foreshore_DisplayName, foreshoreChartData.Name);
var dikeHeightChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(updatedDikeHeightIndex);
Assert.AreEqual(Resources.DikeHeight_ChartName, dikeHeightChartData.Name);
@@ -404,7 +404,7 @@
var actualForeshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(updatedForeshoreIndex);
string expectedForeshoreName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_,
dikeProfile.Name,
- Resources.Foreshore_DisplayName);
+ RingtoetsCommonFormsResources.Foreshore_DisplayName);
Assert.AreEqual(expectedForeshoreName, actualForeshoreChartData.Name);
var actualDikeHeightChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(updatedDikeHeightIndex);
@@ -510,7 +510,7 @@
CollectionAssert.IsEmpty(dikeProfileData.Points);
CollectionAssert.IsEmpty(dikeHeightData.Points);
- Assert.AreEqual(Resources.Foreshore_DisplayName, foreshoreData.Name);
+ Assert.AreEqual(RingtoetsCommonFormsResources.Foreshore_DisplayName, foreshoreData.Name);
Assert.AreEqual(Resources.DikeProfile_DisplayName, dikeProfileData.Name);
Assert.AreEqual(Resources.DikeHeight_ChartName, dikeHeightData.Name);
}
@@ -541,7 +541,7 @@
string expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_,
dikeProfile.Name,
- Resources.Foreshore_DisplayName);
+ RingtoetsCommonFormsResources.Foreshore_DisplayName);
Assert.AreEqual(expectedName, chartData.Name);
}
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r15a5390b22bbd15e777f7df088c61e2b05803723 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 15a5390b22bbd15e777f7df088c61e2b05803723)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -110,15 +110,6 @@
}
///
- /// Looks up a localized string similar to Hydraulische gegevens.
- ///
- public static string Categories_HydraulicData {
- get {
- return ResourceManager.GetString("Categories_HydraulicData", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Modelfactoren.
///
public static string Categories_ModelSettings {
@@ -128,15 +119,6 @@
}
///
- /// Looks up a localized string similar to Schematisatie.
- ///
- public static string Categories_Schematisation {
- get {
- return ResourceManager.GetString("Categories_Schematisation", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Het kritieke overslagdebiet per strekkende meter..
///
public static string CriticalOvertoppingDischarge_Description {
@@ -324,24 +306,6 @@
}
///
- /// Looks up a localized string similar to De locatie met hydraulische randvoorwaarden..
- ///
- public static string HydraulicBoundaryLocation_Description {
- get {
- return ResourceManager.GetString("HydraulicBoundaryLocation_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Locatie met hydraulische randvoorwaarden.
- ///
- public static string HydraulicBoundaryLocation_DisplayName {
- get {
- return ResourceManager.GetString("HydraulicBoundaryLocation_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to De kerende hoogte van het kunstwerk..
///
public static string LevelOfCrestOfStructure_Description {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -r15a5390b22bbd15e777f7df088c61e2b05803723 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 15a5390b22bbd15e777f7df088c61e2b05803723)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -157,18 +157,12 @@
Modelfactor overslagdebiet [-]
-
- Schematisatie
-
De toegestane peilverhoging op het kombergend oppervlak.
Toegestane peilverhoging komberging [m]
-
- Hydraulische gegevens
-
Het kritieke overslagdebiet per strekkende meter.
@@ -187,12 +181,6 @@
Stroomvoerende breedte bij bodembescherming [m]
-
- De locatie met hydraulische randvoorwaarden.
-
-
- Locatie met hydraulische randvoorwaarden
-
De kerende hoogte van het kunstwerk.
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs
===================================================================
diff -u -r219bf641fa81657e9d154c9cb50245af9b2ebe27 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 219bf641fa81657e9d154c9cb50245af9b2ebe27)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -35,6 +35,7 @@
using Ringtoets.HeightStructures.Forms.UITypeEditors;
using Ringtoets.HydraRing.Data;
using CoreCommonBasePropertiesResources = Core.Common.Base.Properties.Resources;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.HeightStructures.Forms.PropertyClasses
{
@@ -87,7 +88,7 @@
#region Schematisation
[PropertyOrder(orientationOfTheNormalOfTheStructurePropertyIndex)]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "OrientationOfTheNormalOfTheStructure_DisplayName")]
[ResourcesDescription(typeof(Resources), "OrientationOfTheNormalOfTheStructure_Description")]
public RoundedDouble OrientationOfTheNormalOfTheStructure
@@ -105,7 +106,7 @@
[PropertyOrder(levelOfCrestOfStructurePropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "LevelOfCrestOfStructure_DisplayName")]
[ResourcesDescription(typeof(Resources), "LevelOfCrestOfStructure_Description")]
public NormalDistributionProperties LevelOfCrestOfStructure
@@ -121,7 +122,7 @@
[PropertyOrder(allowableIncreaseOfLevelForStoragePropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "AllowableIncreaseOfLevelForStorage_DisplayName")]
[ResourcesDescription(typeof(Resources), "AllowableIncreaseOfLevelForStorage_Description")]
public LogNormalDistributionProperties AllowableIncreaseOfLevelForStorage
@@ -137,7 +138,7 @@
[PropertyOrder(storageStructureAreaPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "StorageStructureArea_DisplayName")]
[ResourcesDescription(typeof(Resources), "StorageStructureArea_Description")]
public LogNormalDistributionVariationProperties StorageStructureArea
@@ -153,7 +154,7 @@
[PropertyOrder(flowWidthAtBottomProtectionPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "FlowWidthAtBottomProtection_DisplayName")]
[ResourcesDescription(typeof(Resources), "FlowWidthAtBottomProtection_Description")]
public LogNormalDistributionProperties FlowWidthAtBottomProtection
@@ -169,7 +170,7 @@
[PropertyOrder(widthOfFlowAperturesPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "WidthOfFlowApertures_DisplayName")]
[ResourcesDescription(typeof(Resources), "WidthOfFlowApertures_Description")]
public NormalDistributionProperties WidthOfFlowApertures
@@ -185,7 +186,7 @@
[PropertyOrder(criticalOvertoppingDischargePropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "CriticalOvertoppingDischarge_DisplayName")]
[ResourcesDescription(typeof(Resources), "CriticalOvertoppingDischarge_Description")]
public LogNormalDistributionVariationProperties CriticalOvertoppingDischarge
@@ -200,7 +201,7 @@
}
[PropertyOrder(failureProbabilityOfStructureGivenErosionPropertyIndex)]
- [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "FailureProbabilityOfStructureGivenErosion_DisplayName")]
[ResourcesDescription(typeof(Resources), "FailureProbabilityOfStructureGivenErosion_Description")]
public string FailureProbabilityOfStructureGivenErosion
@@ -237,9 +238,9 @@
[PropertyOrder(hydraulicBoundaryLocationPropertyIndex)]
[Editor(typeof(HeightStructuresInputContextHydraulicBoundaryLocationEditor), typeof(UITypeEditor))]
- [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")]
- [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryLocation_DisplayName")]
- [ResourcesDescription(typeof(Resources), "HydraulicBoundaryLocation_Description")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_Description")]
public HydraulicBoundaryLocation HydraulicBoundaryLocation
{
get
@@ -255,7 +256,7 @@
[PropertyOrder(stormDurationPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
[ResourcesDisplayName(typeof(Resources), "StormDuration_DisplayName")]
[ResourcesDescription(typeof(Resources), "StormDuration_Description")]
public LogNormalDistributionVariationProperties StormDuration
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rd2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision d2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -560,7 +560,7 @@
yield return new TreeNodeInfo
{
- Text = context => RingtoetsCommonFormsResources.Foreshores_DisplayName,
+ Text = context => RingtoetsCommonFormsResources.ForeshoreProfiles_DisplayName,
Image = context => RingtoetsCommonFormsResources.GeneralFolderIcon,
ForeColor = context => context.WrappedData.Any() ?
Color.FromKnownColor(KnownColor.ControlText) :
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileContextTreeNodeInfoTest.cs (.../ForeshoreProfileContextTreeNodeInfoTest.cs) (revision d2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ForeshoreProfileContextTreeNodeInfoTest.cs (.../ForeshoreProfileContextTreeNodeInfoTest.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -82,7 +82,7 @@
string text = info.Text(null);
// Assert
- Assert.AreEqual("Voorlanden", text);
+ Assert.AreEqual("Voorlandprofielen", text);
}
[Test]
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -22,7 +22,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -100,15 +100,6 @@
}
///
- /// Looks up a localized string similar to Hydraulische gegevens.
- ///
- public static string Categories_HydraulicData {
- get {
- return ResourceManager.GetString("Categories_HydraulicData", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Modelfactoren.
///
public static string Categories_ModelFactors {
@@ -127,15 +118,6 @@
}
///
- /// Looks up a localized string similar to Schematisatie.
- ///
- public static string Categories_Schematization {
- get {
- return ResourceManager.GetString("Categories_Schematization", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Terugschrijdende erosie (Sellmeijer).
///
public static string Categories_Sellmeijer {
@@ -627,24 +609,6 @@
}
///
- /// Looks up a localized string similar to Waterstand met een overschrijdingsfrequentie gelijk aan de trajectnorm..
- ///
- public static string PipingInput_AssessmentLevel_Description {
- get {
- return ResourceManager.GetString("PipingInput_AssessmentLevel_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Toetspeil [m+NAP].
- ///
- public static string PipingInput_AssessmentLevel_DisplayName {
- get {
- return ResourceManager.GetString("PipingInput_AssessmentLevel_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Dempingsfactor relateert respons van stijghoogte bij binnenteen aan buitenwaterstand..
///
public static string PipingInput_DampingFactorExit_Description {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -117,12 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Waterstand met een overschrijdingsfrequentie gelijk aan de trajectnorm.
-
-
- Toetspeil [m+NAP]
-
Hoek in het krachtenevenwicht die aangeeft hoeveel weerstand de korrels bieden tegen rollen; ook beddingshoek genoemd.
@@ -448,15 +442,9 @@
b [m]
-
- Hydraulische gegevens
-
Modelinstellingen
-
- Schematisatie
-
De veiligheidsfactor voor deze berekening.
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs
===================================================================
diff -u -r0cdb24eee9b746ab5d21381ca51c6836dd460292 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision 0cdb24eee9b746ab5d21381ca51c6836dd460292)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -34,6 +34,7 @@
using Ringtoets.Piping.Forms.UITypeEditors;
using Ringtoets.Piping.Primitives;
using Ringtoets.Piping.Service;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.Piping.Forms.PropertyClasses
{
@@ -77,7 +78,7 @@
#region Hydraulic data
[Editor(typeof(PipingInputContextHydraulicBoundaryLocationEditor), typeof(UITypeEditor))]
- [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_HydraulicBoundaryLocation_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_HydraulicBoundaryLocation_Description")]
public HydraulicBoundaryLocation HydraulicBoundaryLocation
@@ -93,9 +94,9 @@
}
}
- [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")]
- [ResourcesDisplayName(typeof(Resources), "PipingInput_AssessmentLevel_DisplayName")]
- [ResourcesDescription(typeof(Resources), "PipingInput_AssessmentLevel_Description")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "AssessmentLevel_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "AssessmentLevel_Description")]
public RoundedDouble AssessmentLevel
{
get
@@ -105,7 +106,7 @@
}
[TypeConverter(typeof(LogNormalDistributionDesignVariableTypeConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_DampingFactorExit_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_DampingFactorExit_Description")]
public DesignVariable DampingFactorExit
@@ -122,7 +123,7 @@
}
[TypeConverter(typeof(NormalDistributionDesignVariableTypeConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_PhreaticLevelExit_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_PhreaticLevelExit_Description")]
public DesignVariable PhreaticLevelExit
@@ -138,7 +139,7 @@
}
}
- [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_PiezometricHeadExit_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_PiezometricHeadExit_Description")]
public RoundedDouble PiezometricHeadExit
@@ -154,7 +155,7 @@
#region Schematization
[Editor(typeof(PipingInputContextSurfaceLineSelectionEditor), typeof(UITypeEditor))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_SurfaceLine_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_SurfaceLine_Description")]
public RingtoetsPipingSurfaceLine SurfaceLine
@@ -175,7 +176,7 @@
}
[Editor(typeof(PipingInputContextStochasticSoilModelSelectionEditor), typeof(UITypeEditor))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_StochasticSoilModel_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_StochasticSoilModel_Description")]
public StochasticSoilModel StochasticSoilModel
@@ -196,7 +197,7 @@
}
[Editor(typeof(PipingInputContextStochasticSoilProfileSelectionEditor), typeof(UITypeEditor))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_StochasticSoilProfile_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_StochasticSoilProfile_Description")]
public StochasticSoilProfile StochasticSoilProfile
@@ -215,7 +216,7 @@
}
}
- [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_EntryPointL_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_EntryPointL_Description")]
public RoundedDouble EntryPointL
@@ -231,7 +232,7 @@
}
}
- [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_ExitPointL_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_ExitPointL_Description")]
public RoundedDouble ExitPointL
@@ -248,7 +249,7 @@
}
[TypeConverter(typeof(LogNormalDistributionDesignVariableTypeConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_SeepageLength_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_SeepageLength_Description")]
public DesignVariable SeepageLength
@@ -260,7 +261,7 @@
}
[TypeConverter(typeof(LogNormalDistributionDesignVariableTypeConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_ThicknessCoverageLayer_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_ThicknessCoverageLayer_Description")]
public DesignVariable ThicknessCoverageLayer
@@ -272,7 +273,7 @@
}
[TypeConverter(typeof(LogNormalDistributionDesignVariableTypeConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_ThicknessAquiferLayer_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_ThicknessAquiferLayer_Description")]
public DesignVariable ThicknessAquiferLayer
@@ -284,7 +285,7 @@
}
[TypeConverter(typeof(LogNormalDistributionDesignVariableTypeConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_DarcyPermeability_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_DarcyPermeability_Description")]
public DesignVariable DarcyPermeability
@@ -296,7 +297,7 @@
}
[TypeConverter(typeof(LogNormalDistributionDesignVariableTypeConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_Diameter70_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_Diameter70_Description")]
public DesignVariable Diameter70
@@ -308,7 +309,7 @@
}
[TypeConverter(typeof(ShiftedLogNormalDistributionDesignVariableTypeConverter))]
- [ResourcesCategory(typeof(Resources), "Categories_Schematization")]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
[ResourcesDisplayName(typeof(Resources), "PipingInput_SaturatedVolumicWeightOfCoverageLayer_DisplayName")]
[ResourcesDescription(typeof(Resources), "PipingInput_SaturatedVolumicWeightOfCoverageLayer_Description")]
public DesignVariable SaturatedVolumicWeightOfCoverageLayer
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs
===================================================================
diff -u -rd2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision d2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -66,6 +66,18 @@
public HydraulicBoundaryLocation HydraulicBoundaryLocation { get; set; }
///
+ /// Gets the assessment level from the current hydraulic boundary location, or if there is no
+ /// location selected.
+ ///
+ public RoundedDouble AssessmentLevel
+ {
+ get
+ {
+ return HydraulicBoundaryLocation != null ? HydraulicBoundaryLocation.DesignWaterLevel : new RoundedDouble(2, double.NaN);
+ }
+ }
+
+ ///
/// Gets or sets the foreshore profile.
///
public ForeshoreProfile ForeshoreProfile
@@ -116,9 +128,7 @@
{
get
{
- return new RoundedDouble(2, HydraulicBoundaryLocation != null && !double.IsNaN(HydraulicBoundaryLocation.DesignWaterLevel)
- ? HydraulicBoundaryLocation.DesignWaterLevel - designWaterLevelSubstraction
- : double.NaN);
+ return new RoundedDouble(2, AssessmentLevel - designWaterLevelSubstraction);
}
}
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputBreakWaterProperties.cs
===================================================================
diff -u
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputBreakWaterProperties.cs (revision 0)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputBreakWaterProperties.cs (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -0,0 +1,113 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.ComponentModel;
+using Core.Common.Base.Data;
+using Core.Common.Gui.Attributes;
+using Core.Common.Gui.PropertyBag;
+using Core.Common.Utils;
+using Core.Common.Utils.Attributes;
+using Core.Common.Utils.Reflection;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Revetment.Data;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.Revetment.Forms.PropertyClasses
+{
+ ///
+ /// ViewModel of (i => i.UseBreakWater)))
+ {
+ return !UseBreakWater;
+ }
+
+ return false;
+ }
+
+ public override string ToString()
+ {
+ return string.Empty;
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputForeshoreProfileProperties.cs
===================================================================
diff -u
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputForeshoreProfileProperties.cs (revision 0)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputForeshoreProfileProperties.cs (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -0,0 +1,82 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.ComponentModel;
+using System.Linq;
+using Core.Common.Base.Geometry;
+using Core.Common.Gui.Attributes;
+using Core.Common.Gui.Converters;
+using Core.Common.Gui.PropertyBag;
+using Core.Common.Utils.Attributes;
+using Ringtoets.Revetment.Data;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.Revetment.Forms.PropertyClasses
+{
+ ///
+ /// ViewModel of for properties panel.
+ ///
+ public class WaveConditionsInputForeshoreProfileProperties : ObjectProperties
+ {
+ private const int useForeshorePropertyIndex = 1;
+ private const int coordinatesPropertyIndex = 2;
+
+ [DynamicReadOnly]
+ [PropertyOrder(useForeshorePropertyIndex)]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Foreshore_UseForeshore_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Foreshore_UseForeshore_Description")]
+ public bool UseForeshore
+ {
+ get
+ {
+ return data.UseForeshore;
+ }
+ set
+ {
+ data.UseForeshore = value;
+ data.NotifyObservers();
+ }
+ }
+
+ [PropertyOrder(coordinatesPropertyIndex)]
+ [TypeConverter(typeof(ExpandableReadOnlyArrayConverter))]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Geometry_Coordinates_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Geometry_Coordinates_Description")]
+ public Point2D[] Coordinates
+ {
+ get
+ {
+ return data.ForeshoreGeometry.ToArray();
+ }
+ }
+
+ [DynamicReadOnlyValidationMethod]
+ public bool DynamicReadOnlyValidationMethod(string propertyName)
+ {
+ return data.ForeshoreProfile == null || data.ForeshoreGeometry.Count() < 2;
+ }
+
+ public override string ToString()
+ {
+ return string.Empty;
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj
===================================================================
diff -u -r05f15dbef4e52da9f476beb11e4077df52a055d8 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj (.../Ringtoets.Revetment.Forms.csproj) (revision 05f15dbef4e52da9f476beb11e4077df52a055d8)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj (.../Ringtoets.Revetment.Forms.csproj) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -40,11 +40,13 @@
Properties\GlobalAssembly.cs
+
True
True
Resources.resx
+
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs
===================================================================
diff -u -rd2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision d2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -114,6 +114,7 @@
Assert.AreEqual(new RoundedDouble(2), input.BreakWater.Height);
Assert.IsFalse(input.UseForeshore);
CollectionAssert.IsEmpty(input.ForeshoreGeometry);
+ Assert.AreEqual(new RoundedDouble(2, double.NaN), input.AssessmentLevel);
Assert.AreEqual(new RoundedDouble(2, double.NaN), input.UpperBoundaryDesignWaterLevel);
Assert.AreEqual(new RoundedDouble(2, double.NaN), input.LowerBoundaryRevetment);
Assert.AreEqual(new RoundedDouble(2, double.NaN), input.UpperBoundaryRevetment);
@@ -124,6 +125,44 @@
}
[Test]
+ public void HydraulicBoundaryLocation_SetNewValue_AssessmentLevelAndUpperBoundaryDesignWaterLevelNaN()
+ {
+ // Setup
+ var input = new WaveConditionsInput();
+ var assessmentLevel = 3.2;
+
+ // Call
+ input.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "", 0, 0)
+ {
+ DesignWaterLevel = (RoundedDouble)assessmentLevel
+ };
+
+ // Assert
+ Assert.AreEqual(assessmentLevel, input.AssessmentLevel.Value, input.UpperBoundaryDesignWaterLevel.GetAccuracy());
+ Assert.AreEqual(assessmentLevel - 0.01, input.UpperBoundaryDesignWaterLevel.Value, input.UpperBoundaryDesignWaterLevel.GetAccuracy());
+ }
+
+ [Test]
+ public void HydraulicBoundaryLocation_SetNullValue_AssessmentLevelAndUpperBoundaryDesignWaterLevelNaN()
+ {
+ // Setup
+ var input = new WaveConditionsInput
+ {
+ HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "", 0, 0)
+ {
+ DesignWaterLevel = (RoundedDouble) 3.2
+ }
+ };
+
+ // Call
+ input.HydraulicBoundaryLocation = null;
+
+ // Assert
+ Assert.IsNaN(input.AssessmentLevel.Value);
+ Assert.IsNaN(input.UpperBoundaryDesignWaterLevel.Value);
+ }
+
+ [Test]
[Combinatorial]
public void ForeshoreProfile_SetNewValue_InputSyncedAccordingly(
[Values(true, false)] bool withBreakWater,
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputBreakWaterPropertiesTest.cs
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputBreakWaterPropertiesTest.cs (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputBreakWaterPropertiesTest.cs (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -0,0 +1,193 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.ComponentModel;
+using System.Linq;
+using Core.Common.Base;
+using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
+using Core.Common.Gui.PropertyBag;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.Forms.PropertyClasses;
+
+namespace Ringtoets.Revetment.Forms.Test.PropertyClasses
+{
+ [TestFixture]
+ public class WaveConditionsInputBreakWaterPropertiesTest
+ {
+ [Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Setup & Call
+ var properties = new WaveConditionsInputBreakWaterProperties();
+
+ // Assert
+ Assert.IsInstanceOf>(properties);
+ Assert.IsNull(properties.Data);
+ Assert.AreEqual(string.Empty, properties.ToString());
+ }
+
+ [Test]
+ public void Data_SetNewInputContextInstance_ReturnCorrectPropertyValues()
+ {
+ // Setup
+ var input = new WaveConditionsInput();
+ var properties = new WaveConditionsInputBreakWaterProperties();
+
+ // Call
+ properties.Data = input;
+
+ // Assert
+ Assert.IsFalse(properties.UseBreakWater);
+ Assert.AreEqual(BreakWaterType.Dam, properties.BreakWaterType);
+ Assert.AreEqual(0.0, properties.BreakWaterHeight.Value);
+ }
+
+ [Test]
+ public void SetProperties_IndividualProperties_UpdateDataAndNotifyObservers()
+ {
+ // Setup
+ var mockRepository = new MockRepository();
+ var observerMock = mockRepository.StrictMock();
+ const int numberProperties = 3;
+ observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties);
+ mockRepository.ReplayAll();
+
+ var input = new WaveConditionsInput();
+ var properties = new WaveConditionsInputBreakWaterProperties
+ {
+ Data = input
+ };
+
+ input.Attach(observerMock);
+
+ RoundedDouble newBreakWaterHeight = new RoundedDouble(2, 9);
+ const BreakWaterType newBreakWaterType = BreakWaterType.Wall;
+
+ // Call
+ properties.BreakWaterHeight = newBreakWaterHeight;
+ properties.BreakWaterType = newBreakWaterType;
+ properties.UseBreakWater = false;
+
+ // Assert
+ Assert.IsFalse(input.UseBreakWater);
+ Assert.AreEqual(newBreakWaterType, input.BreakWater.Type);
+ Assert.AreEqual(newBreakWaterHeight, input.BreakWater.Height);
+ mockRepository.VerifyAll();
+ }
+
+ [TestCase(true)]
+ [TestCase(false)]
+ public void PropertyAttributes_Always_ReturnExpectedValues(bool withDikeProfile)
+ {
+ // Setup
+ var input = new WaveConditionsInput();
+
+ if (withDikeProfile)
+ {
+ input.ForeshoreProfile = new ForeshoreProfile(new Point2D(0, 0), Enumerable.Empty(),
+ new BreakWater(BreakWaterType.Caisson, 1.1), new ForeshoreProfile.ConstructionProperties());
+ }
+
+ // Call
+ var properties = new WaveConditionsInputBreakWaterProperties
+ {
+ Data = input
+ };
+
+ // Assert
+ var dynamicPropertyBag = new DynamicPropertyBag(properties);
+ PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
+ Assert.AreEqual(4, dynamicProperties.Count);
+
+ PropertyDescriptor useBreakWaterProperty = dynamicProperties[0];
+ Assert.IsNotNull(useBreakWaterProperty);
+ Assert.AreEqual(!withDikeProfile, useBreakWaterProperty.IsReadOnly);
+ Assert.AreEqual("Gebruik", useBreakWaterProperty.DisplayName);
+ Assert.AreEqual("Moet de dam worden gebruikt tijdens de berekening?", useBreakWaterProperty.Description);
+
+ PropertyDescriptor breakWaterTypeProperty = dynamicProperties[1];
+ Assert.IsNotNull(breakWaterTypeProperty);
+ Assert.AreEqual(!withDikeProfile, breakWaterTypeProperty.IsReadOnly);
+ Assert.AreEqual("Type", breakWaterTypeProperty.DisplayName);
+ Assert.AreEqual("Het type van de dam.", breakWaterTypeProperty.Description);
+
+ PropertyDescriptor breakWaterHeightProperty = dynamicProperties[2];
+ Assert.IsNotNull(breakWaterHeightProperty);
+ Assert.AreEqual(!withDikeProfile, breakWaterHeightProperty.IsReadOnly);
+ Assert.AreEqual("Hoogte [m+NAP]", breakWaterHeightProperty.DisplayName);
+ Assert.AreEqual("De hoogte van de dam.", breakWaterHeightProperty.Description);
+ }
+
+ [TestCase(true, TestName = "PropertyAttributes_WithDikeProfileAndWaterState_ReturnValues(true)")]
+ [TestCase(false, TestName = "PropertyAttributes_WithDikeProfileAndWaterState_ReturnValues(false)")]
+ public void PropertyAttributes_WithDikeProfileAndSpecificUseBreakWaterState_ReturnExpectedValues(bool useBreakWaterState)
+ {
+ // Setup
+ var input = new WaveConditionsInput();
+
+ BreakWater breakWater = null;
+ if (useBreakWaterState)
+ {
+ breakWater = new BreakWater(BreakWaterType.Caisson, 1.1);
+ }
+ var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), Enumerable.Empty(),
+ breakWater, new ForeshoreProfile.ConstructionProperties());
+
+ input.ForeshoreProfile = foreshoreProfile;
+
+ // Precondition
+ Assert.AreEqual(useBreakWaterState, input.UseBreakWater);
+
+ // Call
+ var properties = new WaveConditionsInputBreakWaterProperties
+ {
+ Data = input
+ };
+
+ // Assert
+ var dynamicPropertyBag = new DynamicPropertyBag(properties);
+ PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
+ Assert.AreEqual(4, dynamicProperties.Count);
+
+ PropertyDescriptor useBreakWaterProperty = dynamicProperties[0];
+ Assert.IsNotNull(useBreakWaterProperty);
+ Assert.IsFalse(useBreakWaterProperty.IsReadOnly);
+ Assert.AreEqual("Gebruik", useBreakWaterProperty.DisplayName);
+ Assert.AreEqual("Moet de dam worden gebruikt tijdens de berekening?", useBreakWaterProperty.Description);
+
+ PropertyDescriptor breakWaterTypeProperty = dynamicProperties[1];
+ Assert.IsNotNull(breakWaterTypeProperty);
+ Assert.AreEqual(!useBreakWaterState, breakWaterTypeProperty.IsReadOnly);
+ Assert.AreEqual("Type", breakWaterTypeProperty.DisplayName);
+ Assert.AreEqual("Het type van de dam.", breakWaterTypeProperty.Description);
+
+ PropertyDescriptor breakWaterHeightProperty = dynamicProperties[2];
+ Assert.IsNotNull(breakWaterHeightProperty);
+ Assert.AreEqual(!useBreakWaterState, breakWaterHeightProperty.IsReadOnly);
+ Assert.AreEqual("Hoogte [m+NAP]", breakWaterHeightProperty.DisplayName);
+ Assert.AreEqual("De hoogte van de dam.", breakWaterHeightProperty.Description);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs (revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -0,0 +1,273 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.ComponentModel;
+using Core.Common.Base;
+using Core.Common.Base.Geometry;
+using Core.Common.Gui.PropertyBag;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.Forms.PropertyClasses;
+
+namespace Ringtoets.Revetment.Forms.Test.PropertyClasses
+{
+ [TestFixture]
+ public class WaveConditionsInputForeshoreProfilePropertiesTest
+ {
+
+ private const int useForeshorePropertyIndex = 0;
+ private const int coordinatesPropertyIndex = 1;
+
+ [Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Setup & Call
+ var properties = new WaveConditionsInputForeshoreProfileProperties();
+
+ // Assert
+ Assert.IsInstanceOf>(properties);
+ Assert.IsNull(properties.Data);
+ Assert.AreEqual(string.Empty, properties.ToString());
+ }
+
+ [Test]
+ public void Data_SetNewInputContextInstance_ReturnCorrectPropertyValues()
+ {
+ // Setup
+ var input = new WaveConditionsInput();
+ var properties = new WaveConditionsInputForeshoreProfileProperties();
+
+ // Call
+ properties.Data = input;
+
+ // Assert
+ Assert.IsFalse(properties.UseForeshore);
+ CollectionAssert.IsEmpty(properties.Coordinates);
+ }
+
+ [Test]
+ public void Data_SetInputContextInstanceWithData_ReturnCorrectPropertyValues()
+ {
+ // Setup
+ var input = new WaveConditionsInput
+ {
+ ForeshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
+ new[]
+ {
+ new Point2D(1.1, 2.2),
+ new Point2D(3.3, 4.4)
+ }, null, new ForeshoreProfile.ConstructionProperties())
+ };
+ var properties = new WaveConditionsInputForeshoreProfileProperties();
+
+ // Call
+ properties.Data = input;
+
+ // Assert
+ var expectedCoordinates = new[]
+ {
+ new Point2D(1.1, 2.2),
+ new Point2D(3.3, 4.4)
+ };
+ Assert.IsTrue(properties.UseForeshore);
+ CollectionAssert.AreEqual(expectedCoordinates, properties.Coordinates);
+ }
+
+ [Test]
+ public void SetProperties_IndividualProperties_UpdateDataAndNotifyObservers()
+ {
+ // Setup
+ var mockRepository = new MockRepository();
+ var observerMock = mockRepository.StrictMock();
+ const int numberProperties = 1;
+ observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties);
+ mockRepository.ReplayAll();
+
+ var input = new WaveConditionsInput();
+ var properties = new WaveConditionsInputForeshoreProfileProperties
+ {
+ Data = input
+ };
+
+ input.Attach(observerMock);
+
+ // Call
+ properties.UseForeshore = false;
+
+ // Assert
+ Assert.IsFalse(input.UseForeshore);
+ mockRepository.VerifyAll();
+ }
+
+ [Test]
+ public void PropertyAttributes_WithDikeProfileAndWithEmptyForeland_ReturnExpectedValues()
+ {
+ // Setup
+ var input = new WaveConditionsInput
+ {
+ ForeshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0],
+ null, new ForeshoreProfile.ConstructionProperties())
+ };
+
+ // Call
+ var properties = new WaveConditionsInputForeshoreProfileProperties
+ {
+ Data = input
+ };
+
+ // Assert
+ var dynamicPropertyBag = new DynamicPropertyBag(properties);
+ PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
+ Assert.AreEqual(3, dynamicProperties.Count);
+
+ PropertyDescriptor useForeshoreProperty = dynamicProperties[useForeshorePropertyIndex];
+ Assert.IsNotNull(useForeshoreProperty);
+ Assert.IsTrue(useForeshoreProperty.IsReadOnly);
+ Assert.AreEqual("Gebruik", useForeshoreProperty.DisplayName);
+ Assert.AreEqual("Moet het voorlandprofiel worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
+
+ PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex];
+ Assert.IsNotNull(coordinatesProperty);
+ Assert.IsTrue(coordinatesProperty.IsReadOnly);
+ Assert.AreEqual("Coördinaten [m]", coordinatesProperty.DisplayName);
+ Assert.AreEqual("Lijst met punten in lokale coördinaten.", coordinatesProperty.Description);
+ }
+
+ [Test]
+ public void PropertyAttributes_WithDikeProfileAndWithOnePointForeland_ReturnExpectedValues()
+ {
+ // Setup
+ var input = new WaveConditionsInput
+ {
+ ForeshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
+ new[]
+ {
+ new Point2D(0, 0)
+ }, null, new ForeshoreProfile.ConstructionProperties())
+ };
+
+ // Call
+ var properties = new WaveConditionsInputForeshoreProfileProperties
+ {
+ Data = input
+ };
+
+ // Assert
+ var dynamicPropertyBag = new DynamicPropertyBag(properties);
+ PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
+ Assert.AreEqual(3, dynamicProperties.Count);
+
+ PropertyDescriptor useForeshoreProperty = dynamicProperties[useForeshorePropertyIndex];
+ Assert.IsNotNull(useForeshoreProperty);
+ Assert.IsTrue(useForeshoreProperty.IsReadOnly);
+ Assert.AreEqual("Gebruik", useForeshoreProperty.DisplayName);
+ Assert.AreEqual("Moet het voorlandprofiel worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
+
+ PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex];
+ Assert.IsNotNull(coordinatesProperty);
+ Assert.IsTrue(coordinatesProperty.IsReadOnly);
+ Assert.AreEqual("Coördinaten [m]", coordinatesProperty.DisplayName);
+ Assert.AreEqual("Lijst met punten in lokale coördinaten.", coordinatesProperty.Description);
+ }
+
+ [Test]
+ public void PropertyAttributes_WithDikeProfileAndWithTwoPointForeland_ReturnExpectedValues()
+ {
+ // Setup
+ var input = new WaveConditionsInput
+ {
+ ForeshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
+ new[]
+ {
+ new Point2D(0, 0),
+ new Point2D(1, 1)
+ }, null, new ForeshoreProfile.ConstructionProperties())
+ };
+
+ // Call
+ var properties = new WaveConditionsInputForeshoreProfileProperties
+ {
+ Data = input
+ };
+
+ // Assert
+ var dynamicPropertyBag = new DynamicPropertyBag(properties);
+ PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
+ Assert.AreEqual(3, dynamicProperties.Count);
+
+ PropertyDescriptor useForeshoreProperty = dynamicProperties[useForeshorePropertyIndex];
+ Assert.IsNotNull(useForeshoreProperty);
+ Assert.IsFalse(useForeshoreProperty.IsReadOnly);
+ Assert.AreEqual("Gebruik", useForeshoreProperty.DisplayName);
+ Assert.AreEqual("Moet het voorlandprofiel worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
+
+ PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex];
+ Assert.IsNotNull(coordinatesProperty);
+ Assert.IsTrue(coordinatesProperty.IsReadOnly);
+ Assert.AreEqual("Coördinaten [m]", coordinatesProperty.DisplayName);
+ Assert.AreEqual("Lijst met punten in lokale coördinaten.", coordinatesProperty.Description);
+ }
+
+ [TestCase(true)]
+ [TestCase(false)]
+ public void PropertyAttributes_WithOrWithoutDikeProfile_ReturnExpectedValues(bool withDikeProfile)
+ {
+ // Setup
+ var input = new WaveConditionsInput();
+
+ if (withDikeProfile)
+ {
+ input.ForeshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
+ new[]
+ {
+ new Point2D(0, 0),
+ new Point2D(1, 1)
+ }, null, new ForeshoreProfile.ConstructionProperties());
+ }
+
+ // Call
+ var properties = new WaveConditionsInputForeshoreProfileProperties
+ {
+ Data = input
+ };
+
+ // Assert
+ var dynamicPropertyBag = new DynamicPropertyBag(properties);
+ PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
+ Assert.AreEqual(3, dynamicProperties.Count);
+
+ PropertyDescriptor useForeshoreProperty = dynamicProperties[useForeshorePropertyIndex];
+ Assert.IsNotNull(useForeshoreProperty);
+ Assert.AreEqual(!withDikeProfile, useForeshoreProperty.IsReadOnly);
+ Assert.AreEqual("Gebruik", useForeshoreProperty.DisplayName);
+ Assert.AreEqual("Moet het voorlandprofiel worden gebruikt tijdens de berekening?", useForeshoreProperty.Description);
+
+ PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex];
+ Assert.IsNotNull(coordinatesProperty);
+ Assert.IsTrue(coordinatesProperty.IsReadOnly);
+ Assert.AreEqual("Coördinaten [m]", coordinatesProperty.DisplayName);
+ Assert.AreEqual("Lijst met punten in lokale coördinaten.", coordinatesProperty.Description);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj
===================================================================
diff -u -r05f15dbef4e52da9f476beb11e4077df52a055d8 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj (.../Ringtoets.Revetment.Forms.Test.csproj) (revision 05f15dbef4e52da9f476beb11e4077df52a055d8)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Ringtoets.Revetment.Forms.Test.csproj (.../Ringtoets.Revetment.Forms.Test.csproj) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -41,6 +41,10 @@
..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
True
+
+ ..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll
+ True
+
@@ -49,6 +53,8 @@
Properties\GlobalAssembly.cs
+
+
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/packages.config
===================================================================
diff -u -r05f15dbef4e52da9f476beb11e4077df52a055d8 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/packages.config (.../packages.config) (revision 05f15dbef4e52da9f476beb11e4077df52a055d8)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/packages.config (.../packages.config) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -23,4 +23,5 @@
-->
+
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r05f15dbef4e52da9f476beb11e4077df52a055d8 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 05f15dbef4e52da9f476beb11e4077df52a055d8)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -22,7 +22,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.34209
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -92,6 +92,187 @@
}
///
+ /// Looks up a localized string similar to De schematisatie van het voorlandprofiel..
+ ///
+ public static string ForeshoreProfile_Description {
+ get {
+ return ResourceManager.GetString("ForeshoreProfile_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Voorlandprofiel.
+ ///
+ public static string ForeshoreProfile_DisplayName {
+ get {
+ return ResourceManager.GetString("ForeshoreProfile_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Steen (blokken en zuilen).
+ ///
+ public static string StabilityStoneCover_StoneRevetment_DisplayName {
+ get {
+ return ResourceManager.GetString("StabilityStoneCover_StoneRevetment_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Ondergrens tot waaraan de bekleding loopt..
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryRevetment_Description {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryRevetment_Descript" +
+ "ion", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Ondergrens bekleding [m+NAP].
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryRevetment_DisplayName {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryRevetment_DisplayN" +
+ "ame", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Een aangepaste ondergrens voor de waterstanden..
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryWaterLevels_Description {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryWaterLevels_Descri" +
+ "ption", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Ondergrens waterstanden [m+NAP].
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryWaterLevels_DisplayName {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryWaterLevels_Displa" +
+ "yName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Het type van de bekleding waarvoor berekend wordt..
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_RevetmentType_Description {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_RevetmentType_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Type bekleding.
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_RevetmentType_DisplayName {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_RevetmentType_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to De stapgrootte waarop waterstanden worden bepaald..
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_StepSize_Description {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_StepSize_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Stapgrootte [m].
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_StepSize_DisplayName {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_StepSize_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Bovengrens bepaald aan de hand van de waarde van het toetspeil op de geselecteerde hydraulische locatie..
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryDesignWaterLevel_Description {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryDesignWaterLevel_D" +
+ "escription", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Bovengrens op basis van toetspeil [m+NAP].
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryDesignWaterLevel_DisplayName {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryDesignWaterLevel_D" +
+ "isplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Bovengrens tot waaraan de bekleding loopt..
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryRevetment_Description {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryRevetment_Descript" +
+ "ion", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Bovengrens bekleding [m+NAP].
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryRevetment_DisplayName {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryRevetment_DisplayN" +
+ "ame", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Een aangepaste bovengrens voor de waterstanden..
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryWaterLevels_Description {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryWaterLevels_Descri" +
+ "ption", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Bovengrens waterstanden [m+NAP].
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryWaterLevels_DisplayName {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryWaterLevels_Displa" +
+ "yName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to De waterstanden waarvoor gerekend moet worden. Deze zijn afgeleid van de opggegeven waterstanden..
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_WaterLevels_Description {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_WaterLevels_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Te berekenen waterstanden.
+ ///
+ public static string StabilityStoneCoverWaveConditionsCalculationInput_WaterLevels_DisplayName {
+ get {
+ return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculationInput_WaterLevels_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Blokken.
///
public static string WaveConditionsOutput_Blocks_DisplayName {
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.resx
===================================================================
diff -u -r05f15dbef4e52da9f476beb11e4077df52a055d8 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.resx (.../Resources.resx) (revision 05f15dbef4e52da9f476beb11e4077df52a055d8)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.resx (.../Resources.resx) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -121,6 +121,63 @@
..\Resources\control_equalizer_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ De schematisatie van het voorlandprofiel.
+
+
+ Voorlandprofiel
+
+
+ Ondergrens tot waaraan de bekleding loopt.
+
+
+ Ondergrens bekleding [m+NAP]
+
+
+ Een aangepaste ondergrens voor de waterstanden.
+
+
+ Ondergrens waterstanden [m+NAP]
+
+
+ Het type van de bekleding waarvoor berekend wordt.
+
+
+ Type bekleding
+
+
+ De stapgrootte waarop waterstanden worden bepaald.
+
+
+ Stapgrootte [m]
+
+
+ Bovengrens bepaald aan de hand van de waarde van het toetspeil op de geselecteerde hydraulische locatie.
+
+
+ Bovengrens op basis van toetspeil [m+NAP]
+
+
+ Bovengrens tot waaraan de bekleding loopt.
+
+
+ Bovengrens bekleding [m+NAP]
+
+
+ Een aangepaste bovengrens voor de waterstanden.
+
+
+ Bovengrens waterstanden [m+NAP]
+
+
+ De waterstanden waarvoor gerekend moet worden. Deze zijn afgeleid van de opggegeven waterstanden.
+
+
+ Te berekenen waterstanden
+
+
+ Steen (blokken en zuilen)
+
Blokken
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs
===================================================================
diff -u
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs (revision 0)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextProperties.cs (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -0,0 +1,323 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Linq;
+using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
+using Core.Common.Gui.Attributes;
+using Core.Common.Gui.Converters;
+using Core.Common.Gui.PropertyBag;
+using Core.Common.Utils.Attributes;
+using Core.Common.Utils.Reflection;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.Revetment.Forms.PropertyClasses;
+using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
+using Ringtoets.StabilityStoneCover.Forms.UITypeEditors;
+using Ringtoets.StabilityStoneCover.Forms.Properties;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.StabilityStoneCover.Forms.PropertyClasses
+{
+ public class StabilityStoneCoverWaveConditionsCalculationInputContextProperties : ObjectProperties
+ {
+ private const int hydraulicBoundaryLocationPropertyIndex = 0;
+ private const int assessmentLevelPropertyIndex = 1;
+ private const int upperBoundaryDesignWaterLevelPropertyIndex = 2;
+ private const int upperBoundaryRevetmentPropertyIndex = 3;
+ private const int lowerBoundaryRevetmentPropertyIndex = 4;
+ private const int upperBoundaryWaterLevelsPropertyIndex = 5;
+ private const int lowerBoundaryWaterLevelsPropertyIndex = 6;
+ private const int stepSizePropertyIndex = 7;
+ private const int waterLevelsPropertyIndex = 8;
+
+ private const int foreshoreProfilePropertyIndex = 9;
+ private const int worldReferencePointPropertyIndex = 10;
+ private const int orientationPropertyIndex = 11;
+ private const int breakWaterPropertyIndex = 12;
+ private const int foreshoreGeometryPropertyIndex = 13;
+ private const int revetmentTypePropertyIndex = 14;
+
+ [PropertyOrder(hydraulicBoundaryLocationPropertyIndex)]
+ [Editor(typeof(StabilityStoneCoverWaveConditionsCalculationInputContextHydraulicBoundaryLocationEditor), typeof(UITypeEditor))]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_Description")]
+ public HydraulicBoundaryLocation HydraulicBoundaryLocation
+ {
+ get
+ {
+ return data.WrappedData.HydraulicBoundaryLocation;
+ }
+ set
+ {
+ data.WrappedData.HydraulicBoundaryLocation = value;
+ data.WrappedData.NotifyObservers();
+ }
+ }
+
+ [PropertyOrder(assessmentLevelPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "AssessmentLevel_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "AssessmentLevel_Description")]
+ public RoundedDouble AssessmentLevel
+ {
+ get
+ {
+ return data.WrappedData.AssessmentLevel;
+ }
+ }
+
+ [PropertyOrder(upperBoundaryDesignWaterLevelPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryDesignWaterLevel_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryDesignWaterLevel_Description")]
+ public RoundedDouble UpperBoundaryDesignWaterLevel
+ {
+ get
+ {
+ return data.WrappedData.UpperBoundaryDesignWaterLevel;
+ }
+ }
+
+ [PropertyOrder(upperBoundaryRevetmentPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryRevetment_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryRevetment_Description")]
+ public RoundedDouble UpperBoundaryRevetment
+ {
+ get
+ {
+ return data.WrappedData.UpperBoundaryRevetment;
+ }
+ set
+ {
+ data.WrappedData.UpperBoundaryRevetment = value;
+ data.WrappedData.NotifyObservers();
+ }
+ }
+
+ [PropertyOrder(lowerBoundaryRevetmentPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryRevetment_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryRevetment_Description")]
+ public RoundedDouble LowerBoundaryRevetment
+ {
+ get
+ {
+ return data.WrappedData.LowerBoundaryRevetment;
+ }
+ set
+ {
+ data.WrappedData.LowerBoundaryRevetment = value;
+ data.WrappedData.NotifyObservers();
+ }
+ }
+
+ [PropertyOrder(upperBoundaryWaterLevelsPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryWaterLevels_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_UpperBoundaryWaterLevels_Description")]
+ public RoundedDouble UpperBoundaryWaterLevels
+ {
+ get
+ {
+ return data.WrappedData.UpperBoundaryWaterLevels;
+ }
+ set
+ {
+ data.WrappedData.UpperBoundaryWaterLevels = value;
+ data.WrappedData.NotifyObservers();
+ }
+ }
+
+ [PropertyOrder(lowerBoundaryWaterLevelsPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryWaterLevels_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_LowerBoundaryWaterLevels_Description")]
+ public RoundedDouble LowerBoundaryWaterLevels
+ {
+ get
+ {
+ return data.WrappedData.LowerBoundaryWaterLevels;
+ }
+ set
+ {
+ data.WrappedData.LowerBoundaryWaterLevels = value;
+ data.WrappedData.NotifyObservers();
+ }
+ }
+
+ [PropertyOrder(stepSizePropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_StepSize_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_StepSize_Description")]
+ public RoundedDouble StepSize
+ {
+ get
+ {
+ return data.WrappedData.StepSize;
+ }
+ set
+ {
+ data.WrappedData.StepSize = value;
+ data.WrappedData.NotifyObservers();
+ }
+ }
+
+ [PropertyOrder(waterLevelsPropertyIndex)]
+ [TypeConverter(typeof(ExpandableArrayConverter))]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
+ [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_WaterLevels_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_WaterLevels_Description")]
+ public RoundedDouble[] WaterLevels
+ {
+ get
+ {
+ return data.WrappedData.WaterLevels.ToArray();
+ }
+ }
+
+ [PropertyOrder(foreshoreProfilePropertyIndex)]
+ [Editor(typeof(StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditor), typeof(UITypeEditor))]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
+ [ResourcesDisplayName(typeof(Resources), "ForeshoreProfile_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "ForeshoreProfile_Description")]
+ public ForeshoreProfile ForeshoreProfile
+ {
+ get
+ {
+ return data.WrappedData.ForeshoreProfile;
+ }
+ set
+ {
+ data.WrappedData.ForeshoreProfile = value;
+ data.WrappedData.NotifyObservers();
+ }
+ }
+
+ [PropertyOrder(worldReferencePointPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "WorldReferencePoint_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "WorldReferencePoint_ForeshoreProfile_Description")]
+ public Point2D WorldReferencePoint
+ {
+ get
+ {
+ if (data.WrappedData.ForeshoreProfile != null && data.WrappedData.ForeshoreProfile.WorldReferencePoint != null)
+ {
+ return new Point2D(
+ new RoundedDouble(0, data.WrappedData.ForeshoreProfile.WorldReferencePoint.X),
+ new RoundedDouble(0, data.WrappedData.ForeshoreProfile.WorldReferencePoint.Y));
+ }
+ return null;
+ }
+ }
+
+ [PropertyOrder(orientationPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Orientation_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Orientation_ForeshoreProfile_Description")]
+ public RoundedDouble Orientation
+ {
+ get
+ {
+ if (data.WrappedData.ForeshoreProfile != null)
+ {
+ return data.WrappedData.ForeshoreProfile.Orientation;
+ }
+ return new RoundedDouble(2, double.NaN);
+ }
+ }
+
+ [DynamicReadOnly]
+ [PropertyOrder(breakWaterPropertyIndex)]
+ [TypeConverter(typeof(ExpandableObjectConverter))]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "BreakWaterProperties_Description")]
+ public WaveConditionsInputBreakWaterProperties BreakWater
+ {
+ get
+ {
+ return new WaveConditionsInputBreakWaterProperties
+ {
+ Data = data.WrappedData
+ };
+ }
+ }
+
+ [DynamicReadOnly]
+ [PropertyOrder(foreshoreGeometryPropertyIndex)]
+ [TypeConverter(typeof(ExpandableObjectConverter))]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
+ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_DisplayName")]
+ [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "ForeshoreProperties_Description")]
+ public WaveConditionsInputForeshoreProfileProperties ForeshoreGeometry
+ {
+ get
+ {
+ return new WaveConditionsInputForeshoreProfileProperties
+ {
+ Data = data.WrappedData
+ };
+ }
+ }
+
+ [PropertyOrder(revetmentTypePropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
+ [ResourcesDisplayName(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_RevetmentType_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "StabilityStoneCoverWaveConditionsCalculationInput_RevetmentType_Description")]
+ public string RevetmentType
+ {
+ get
+ {
+ return Resources.StabilityStoneCover_StoneRevetment_DisplayName;
+ }
+ }
+
+ public IEnumerable GetAvailableHydraulicBoundaryLocations()
+ {
+ return data.AvailableHydraulicBoundaryLocations;
+ }
+
+ public IEnumerable GetAvailableForeshoreProfiles()
+ {
+ return data.AvailableForeshoreProfiles;
+ }
+
+ [DynamicReadOnlyValidationMethod]
+ public bool DynamicReadOnlyValidationMethod(string propertyName)
+ {
+ if (data.WrappedData.ForeshoreProfile == null &&
+ propertyName.Equals(TypeUtils.GetMemberName(i => i.ForeshoreGeometry)))
+ {
+ return true;
+ }
+
+ return false;
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Ringtoets.StabilityStoneCover.Forms.csproj
===================================================================
diff -u -r05f15dbef4e52da9f476beb11e4077df52a055d8 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Ringtoets.StabilityStoneCover.Forms.csproj (.../Ringtoets.StabilityStoneCover.Forms.csproj) (revision 05f15dbef4e52da9f476beb11e4077df52a055d8)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Ringtoets.StabilityStoneCover.Forms.csproj (.../Ringtoets.StabilityStoneCover.Forms.csproj) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -53,7 +53,10 @@
True
Resources.resx
+
+
+
UserControl
@@ -96,6 +99,10 @@
Ringtoets.Common.Forms
False
+
+ {888D4097-8BC2-4703-9FB1-8744C94D525E}
+ Ringtoets.HydraRing.Calculation
+
{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}
Ringtoets.HydraRing.Data
@@ -121,6 +128,7 @@
PublicResXFileCodeGenerator
Resources.Designer.cs
+ Designer
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/UITypeEditors/StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditor.cs
===================================================================
diff -u
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/UITypeEditors/StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditor.cs (revision 0)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/UITypeEditors/StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditor.cs (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.ComponentModel;
+using Core.Common.Utils.Reflection;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Forms.UITypeEditors;
+using Ringtoets.StabilityStoneCover.Forms.PropertyClasses;
+
+namespace Ringtoets.StabilityStoneCover.Forms.UITypeEditors
+{
+ ///
+ /// This class defines a drop down list edit-control from which the user can select a
+ /// from a collection.
+ ///
+ public class StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditor :
+ SelectionEditor
+ {
+ ///
+ /// Creates a new instance of .
+ ///
+ public StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditor()
+ {
+ DisplayMember = TypeUtils.GetMemberName(dp => dp.Name);
+ }
+
+ protected override IEnumerable GetAvailableOptions(ITypeDescriptorContext context)
+ {
+ return GetPropertiesObject(context).GetAvailableForeshoreProfiles();
+ }
+
+ protected override ForeshoreProfile GetCurrentOption(ITypeDescriptorContext context)
+ {
+ return GetPropertiesObject(context).ForeshoreProfile;
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/UITypeEditors/StabilityStoneCoverWaveConditionsCalculationInputContextHydraulicBoundaryLocationEditor.cs
===================================================================
diff -u
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/UITypeEditors/StabilityStoneCoverWaveConditionsCalculationInputContextHydraulicBoundaryLocationEditor.cs (revision 0)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/UITypeEditors/StabilityStoneCoverWaveConditionsCalculationInputContextHydraulicBoundaryLocationEditor.cs (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.ComponentModel;
+using Core.Common.Utils.Reflection;
+using Ringtoets.Common.Forms.UITypeEditors;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.StabilityStoneCover.Forms.PropertyClasses;
+
+namespace Ringtoets.StabilityStoneCover.Forms.UITypeEditors
+{
+ ///
+ /// This class defines a drop down list edit-control from which the user can select a
+ /// from a collection.
+ ///
+ public class StabilityStoneCoverWaveConditionsCalculationInputContextHydraulicBoundaryLocationEditor :
+ SelectionEditor
+ {
+ ///
+ /// Creates a new instance of .
+ ///
+ public StabilityStoneCoverWaveConditionsCalculationInputContextHydraulicBoundaryLocationEditor()
+ {
+ DisplayMember = TypeUtils.GetMemberName(hbl => hbl.Name);
+ }
+
+ protected override IEnumerable GetAvailableOptions(ITypeDescriptorContext context)
+ {
+ return GetPropertiesObject(context).GetAvailableHydraulicBoundaryLocations();
+ }
+
+ protected override HydraulicBoundaryLocation GetCurrentOption(ITypeDescriptorContext context)
+ {
+ return GetPropertiesObject(context).HydraulicBoundaryLocation;
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r2336e45e063aee566b1fa028efed72d531cdf5ee -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 2336e45e063aee566b1fa028efed72d531cdf5ee)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -60,6 +60,7 @@
public override IEnumerable GetPropertyInfos()
{
yield return new PropertyInfo();
+ yield return new PropertyInfo();
}
public override IEnumerable GetViewInfos()
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextPropertiesTest.cs
===================================================================
diff -u
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextPropertiesTest.cs (revision 0)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsCalculationInputContextPropertiesTest.cs (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -0,0 +1,412 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.ComponentModel;
+using System.Linq;
+using Core.Common.Base;
+using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
+using Core.Common.Gui.Converters;
+using Core.Common.Gui.PropertyBag;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.Revetment.Data;
+using Ringtoets.StabilityStoneCover.Data;
+using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
+using Ringtoets.StabilityStoneCover.Forms.PropertyClasses;
+
+namespace Ringtoets.StabilityStoneCover.Forms.Test.PropertyClasses
+{
+ [TestFixture]
+ public class StabilityStoneCoverWaveConditionsCalculationInputContextPropertiesTest
+ {
+ private const int hydraulicBoundaryLocationPropertyIndex = 0;
+ private const int assessmentLevelPropertyIndex = 1;
+ private const int upperBoundaryDesignWaterLevelPropertyIndex = 2;
+ private const int upperBoundaryRevetmentPropertyIndex = 3;
+ private const int lowerBoundaryRevetmentPropertyIndex = 4;
+ private const int upperBoundaryWaterLevelsPropertyIndex = 5;
+ private const int lowerBoundaryWaterLevelsPropertyIndex = 6;
+ private const int stepSizePropertyIndex = 7;
+ private const int waterLevelsPropertyIndex = 8;
+
+ private const int foreshoreProfilePropertyIndex = 9;
+ private const int worldReferencePointPropertyIndex = 10;
+ private const int orientationPropertyIndex = 11;
+ private const int breakWaterPropertyIndex = 12;
+ private const int foreshoreGeometryPropertyIndex = 13;
+ private const int revetmentTypePropertyIndex = 14;
+
+ private MockRepository mockRepository;
+
+ [SetUp]
+ public void SetUp()
+ {
+ mockRepository = new MockRepository();
+ }
+
+ [Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Call
+ var properties = new StabilityStoneCoverWaveConditionsCalculationInputContextProperties();
+
+ // Assert
+ Assert.IsInstanceOf>(properties);
+ Assert.IsNull(properties.Data);
+ }
+
+ [Test]
+ public void Data_SetDefaultInputContextInstance_ReturnCorrectPropertyValues()
+ {
+ // Setup
+ var assessmentSectionMock = mockRepository.StrictMock();
+ mockRepository.ReplayAll();
+
+ var failureMechanism = new StabilityStoneCoverFailureMechanism();
+
+ var input = new WaveConditionsInput();
+ var inputContext = new StabilityStoneCoverWaveConditionsCalculationInputContext(input, failureMechanism, assessmentSectionMock);
+
+ // Call
+ var properties = new StabilityStoneCoverWaveConditionsCalculationInputContextProperties
+ {
+ Data = inputContext
+ };
+
+ // Assert
+ Assert.IsNaN(properties.AssessmentLevel.Value);
+ Assert.IsNaN(properties.UpperBoundaryDesignWaterLevel.Value);
+ Assert.AreEqual(2, properties.UpperBoundaryDesignWaterLevel.NumberOfDecimalPlaces);
+ Assert.IsNaN(properties.UpperBoundaryRevetment.Value);
+ Assert.AreEqual(2, properties.UpperBoundaryRevetment.NumberOfDecimalPlaces);
+ Assert.IsNaN(properties.LowerBoundaryRevetment.Value);
+ Assert.AreEqual(2, properties.LowerBoundaryRevetment.NumberOfDecimalPlaces);
+ Assert.IsNaN(properties.UpperBoundaryWaterLevels.Value);
+ Assert.AreEqual(2, properties.UpperBoundaryWaterLevels.NumberOfDecimalPlaces);
+ Assert.IsNaN(properties.LowerBoundaryWaterLevels.Value);
+ Assert.AreEqual(2, properties.LowerBoundaryWaterLevels.NumberOfDecimalPlaces);
+ Assert.AreEqual(1, properties.StepSize.NumberOfDecimalPlaces);
+ Assert.IsNaN(properties.StepSize.Value);
+ CollectionAssert.AreEqual(input.WaterLevels, properties.WaterLevels);
+
+ Assert.IsNull(properties.ForeshoreProfile);
+ Assert.IsNull(properties.WorldReferencePoint);
+ Assert.AreEqual(2, properties.Orientation.NumberOfDecimalPlaces);
+ Assert.IsNaN(properties.Orientation.Value);
+ Assert.AreSame(input, properties.BreakWater.Data);
+ Assert.AreSame(input, properties.ForeshoreGeometry.Data);
+ Assert.AreEqual("Steen (blokken en zuilen)", properties.RevetmentType);
+
+ mockRepository.VerifyAll();
+ }
+
+ [Test]
+ public void Data_SetNewInputContextInstanceWithDikeProfile_ReturnCorrectPropertyValues()
+ {
+ // Setup
+ var assessmentSectionMock = mockRepository.StrictMock();
+ mockRepository.ReplayAll();
+
+ var failureMechanism = new StabilityStoneCoverFailureMechanism();
+
+ var random = new Random(21);
+ var assessmentLevel = (RoundedDouble)random.NextDouble();
+ var lowerBoundaryRevetment = (RoundedDouble)random.NextDouble();
+ var lowerBoundaryWaterLevels = (RoundedDouble)random.NextDouble();
+ var upperBoundaryRevetment = lowerBoundaryRevetment + (RoundedDouble)random.NextDouble();
+ var upperBoundaryWaterLevels = lowerBoundaryWaterLevels + (RoundedDouble)random.NextDouble();
+ var stepSize = (RoundedDouble)0.5;
+
+ var worldX = (RoundedDouble) random.NextDouble();
+ var worldY = (RoundedDouble) random.NextDouble();
+ var damHeight = (RoundedDouble) random.NextDouble();
+ var foreshoreProfileOrientation = (RoundedDouble)random.NextDouble();
+
+ var foreshoreProfile = new ForeshoreProfile(
+ new Point2D(worldX, worldY),
+ Enumerable.Empty(),
+ new BreakWater(BreakWaterType.Dam, damHeight),
+ new ForeshoreProfile.ConstructionProperties
+ {
+ Name = "",
+ Orientation = foreshoreProfileOrientation,
+ X0 = -3
+ });
+ var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 0, 0)
+ {
+ DesignWaterLevel = assessmentLevel
+ };
+ var input = new WaveConditionsInput
+ {
+ ForeshoreProfile = foreshoreProfile,
+ HydraulicBoundaryLocation = hydraulicBoundaryLocation,
+ UpperBoundaryRevetment = upperBoundaryRevetment,
+ LowerBoundaryRevetment = lowerBoundaryRevetment,
+ UpperBoundaryWaterLevels = upperBoundaryWaterLevels,
+ LowerBoundaryWaterLevels = lowerBoundaryWaterLevels,
+ StepSize = stepSize
+ };
+ var inputContext = new StabilityStoneCoverWaveConditionsCalculationInputContext(input, failureMechanism, assessmentSectionMock);
+
+ // Call
+ var properties = new StabilityStoneCoverWaveConditionsCalculationInputContextProperties
+ {
+ Data = inputContext
+ };
+
+ // Assert
+ Assert.AreSame(hydraulicBoundaryLocation, properties.HydraulicBoundaryLocation);
+ Assert.AreEqual(assessmentLevel.Value, properties.AssessmentLevel.Value, properties.AssessmentLevel.GetAccuracy());
+ Assert.AreSame(foreshoreProfile, properties.ForeshoreProfile);
+ Assert.AreEqual(worldX, properties.WorldReferencePoint.X, 0.5);
+ Assert.AreEqual(worldY, properties.WorldReferencePoint.Y, 0.5);
+ Assert.AreEqual(2, properties.Orientation.NumberOfDecimalPlaces);
+ Assert.AreEqual(foreshoreProfileOrientation, properties.Orientation.Value, properties.Orientation.GetAccuracy());
+ Assert.AreEqual(BreakWaterType.Dam, properties.BreakWater.BreakWaterType);
+ Assert.AreEqual(damHeight, properties.BreakWater.BreakWaterHeight.Value, properties.BreakWater.BreakWaterHeight.GetAccuracy());
+ Assert.IsEmpty(properties.ForeshoreGeometry.Coordinates);
+ mockRepository.VerifyAll();
+ }
+
+ [Test]
+ public void SetProperties_IndividualProperties_UpdateDataAndNotifyObservers()
+ {
+ // Setup
+ var observerMock = mockRepository.StrictMock();
+ const int numberProperties = 7;
+ observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties);
+ var assessmentSectionMock = mockRepository.StrictMock();
+ mockRepository.ReplayAll();
+
+ var failureMechanism = new StabilityStoneCoverFailureMechanism();
+
+ var random = new Random(21);
+ var assessmentLevel = (RoundedDouble)random.NextDouble();
+ var newLowerBoundaryRevetment = (RoundedDouble)random.NextDouble();
+ var newLowerBoundaryWaterLevels = (RoundedDouble)random.NextDouble();
+ var newUpperBoundaryRevetment = newLowerBoundaryRevetment + (RoundedDouble)random.NextDouble();
+ var newUpperBoundaryWaterLevels = newLowerBoundaryWaterLevels + (RoundedDouble)random.NextDouble();
+ var newStepSize = (RoundedDouble)0.5;
+
+ var newHydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "name", 0.0, 1.1)
+ {
+ DesignWaterLevel = assessmentLevel
+ };
+
+ var input = new WaveConditionsInput();
+ input.Attach(observerMock);
+ var inputContext = new StabilityStoneCoverWaveConditionsCalculationInputContext(input, failureMechanism, assessmentSectionMock);
+
+ var newForeshoreProfile = new ForeshoreProfile(
+ new Point2D(
+ (RoundedDouble)random.NextDouble(),
+ (RoundedDouble)random.NextDouble()),
+ Enumerable.Empty(),
+ new BreakWater(BreakWaterType.Dam, (RoundedDouble)random.NextDouble()),
+ new ForeshoreProfile.ConstructionProperties());
+
+ var properties = new StabilityStoneCoverWaveConditionsCalculationInputContextProperties
+ {
+ Data = inputContext
+ };
+
+ // Call
+ properties.ForeshoreProfile = newForeshoreProfile;
+ properties.UpperBoundaryRevetment = newUpperBoundaryRevetment;
+ properties.LowerBoundaryRevetment = newLowerBoundaryRevetment;
+ properties.UpperBoundaryWaterLevels = newUpperBoundaryWaterLevels;
+ properties.LowerBoundaryWaterLevels = newLowerBoundaryWaterLevels;
+ properties.StepSize = newStepSize;
+ properties.HydraulicBoundaryLocation = newHydraulicBoundaryLocation;
+
+ // Assert
+ Assert.AreSame(input.HydraulicBoundaryLocation, properties.HydraulicBoundaryLocation);
+ Assert.AreEqual(input.HydraulicBoundaryLocation.DesignWaterLevel.Value, properties.AssessmentLevel.Value);
+ Assert.AreEqual(assessmentLevel - 0.01, properties.UpperBoundaryDesignWaterLevel.Value, properties.UpperBoundaryDesignWaterLevel.GetAccuracy());
+ Assert.AreEqual(2, properties.UpperBoundaryDesignWaterLevel.NumberOfDecimalPlaces);
+ Assert.AreEqual(newUpperBoundaryRevetment.Value, properties.UpperBoundaryRevetment.Value, properties.UpperBoundaryRevetment.GetAccuracy());
+ Assert.AreEqual(2, properties.UpperBoundaryRevetment.NumberOfDecimalPlaces);
+ Assert.AreEqual(newLowerBoundaryRevetment.Value, properties.LowerBoundaryRevetment.Value, properties.LowerBoundaryRevetment.GetAccuracy());
+ Assert.AreEqual(2, properties.LowerBoundaryRevetment.NumberOfDecimalPlaces);
+ Assert.AreEqual(newUpperBoundaryWaterLevels.Value, properties.UpperBoundaryWaterLevels.Value, properties.UpperBoundaryWaterLevels.GetAccuracy());
+ Assert.AreEqual(2, properties.UpperBoundaryWaterLevels.NumberOfDecimalPlaces);
+ Assert.AreEqual(newLowerBoundaryWaterLevels.Value, properties.LowerBoundaryWaterLevels.Value, properties.LowerBoundaryWaterLevels.GetAccuracy());
+ Assert.AreEqual(2, properties.LowerBoundaryWaterLevels.NumberOfDecimalPlaces);
+ Assert.AreEqual(1, properties.StepSize.NumberOfDecimalPlaces);
+ Assert.AreEqual(newStepSize.Value, properties.StepSize.Value);
+ mockRepository.VerifyAll();
+ }
+
+ [Test]
+ public void PropertyAttributes_ReturnExpectedValues(
+ [Values(true,false)] bool withForeshoreProfile)
+ {
+ // Setup
+ var assessmentSectionMock = mockRepository.StrictMock();
+ mockRepository.ReplayAll();
+
+ var failureMechanism = new StabilityStoneCoverFailureMechanism();
+ var input = new WaveConditionsInput();
+ if (withForeshoreProfile)
+ {
+ input.ForeshoreProfile = new ForeshoreProfile(
+ new Point2D(0,0),
+ Enumerable.Empty(),
+ null,
+ new ForeshoreProfile.ConstructionProperties());
+ }
+ var inputContext = new StabilityStoneCoverWaveConditionsCalculationInputContext(input, failureMechanism, assessmentSectionMock);
+
+ // Call
+ var properties = new StabilityStoneCoverWaveConditionsCalculationInputContextProperties
+ {
+ Data = inputContext
+ };
+
+ // Assert
+ var dynamicPropertyBag = new DynamicPropertyBag(properties);
+ PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[]
+ {
+ BrowsableAttribute.Yes
+ });
+ Assert.AreEqual(15, dynamicProperties.Count);
+
+ var hydraulicParametersCategory = "Hydraulische gegevens";
+ var schematizationCategory = "Schematisatie";
+
+ PropertyDescriptor hydraulicBoundaryLocationProperty = dynamicProperties[hydraulicBoundaryLocationPropertyIndex];
+ Assert.IsNotNull(hydraulicBoundaryLocationProperty);
+ Assert.IsFalse(hydraulicBoundaryLocationProperty.IsReadOnly);
+ Assert.AreEqual(hydraulicParametersCategory, hydraulicBoundaryLocationProperty.Category);
+ Assert.AreEqual("Locatie met hydraulische randvoorwaarden", hydraulicBoundaryLocationProperty.DisplayName);
+ Assert.AreEqual("De locatie met hydraulische randvoorwaarden.", hydraulicBoundaryLocationProperty.Description);
+
+ PropertyDescriptor assessmentLevelProperty = dynamicProperties[assessmentLevelPropertyIndex];
+ Assert.IsNotNull(assessmentLevelProperty);
+ Assert.IsTrue(assessmentLevelProperty.IsReadOnly);
+ Assert.AreEqual(hydraulicParametersCategory, assessmentLevelProperty.Category);
+ Assert.AreEqual("Toetspeil [m+NAP]", assessmentLevelProperty.DisplayName);
+ Assert.AreEqual("Waterstand met een overschrijdingsfrequentie gelijk aan de trajectnorm.", assessmentLevelProperty.Description);
+
+ PropertyDescriptor upperBoundaryDesignWaterLevelProperty = dynamicProperties[upperBoundaryDesignWaterLevelPropertyIndex];
+ Assert.IsNotNull(upperBoundaryDesignWaterLevelProperty);
+ Assert.IsTrue(upperBoundaryDesignWaterLevelProperty.IsReadOnly);
+ Assert.AreEqual(hydraulicParametersCategory, upperBoundaryDesignWaterLevelProperty.Category);
+ Assert.AreEqual("Bovengrens op basis van toetspeil [m+NAP]", upperBoundaryDesignWaterLevelProperty.DisplayName);
+ Assert.AreEqual("Bovengrens bepaald aan de hand van de waarde van het toetspeil op de geselecteerde hydraulische locatie.", upperBoundaryDesignWaterLevelProperty.Description);
+
+ PropertyDescriptor upperBoundaryRevetmentProperty = dynamicProperties[upperBoundaryRevetmentPropertyIndex];
+ Assert.IsNotNull(upperBoundaryRevetmentProperty);
+ Assert.IsTrue(upperBoundaryDesignWaterLevelProperty.IsReadOnly);
+ Assert.AreEqual(hydraulicParametersCategory, upperBoundaryRevetmentProperty.Category);
+ Assert.AreEqual("Bovengrens bekleding [m+NAP]", upperBoundaryRevetmentProperty.DisplayName);
+ Assert.AreEqual("Bovengrens tot waaraan de bekleding loopt.", upperBoundaryRevetmentProperty.Description);
+
+ PropertyDescriptor lowerBoundaryRevetmentProperty = dynamicProperties[lowerBoundaryRevetmentPropertyIndex];
+ Assert.IsNotNull(lowerBoundaryRevetmentProperty);
+ Assert.IsFalse(lowerBoundaryRevetmentProperty.IsReadOnly);
+ Assert.AreEqual(hydraulicParametersCategory, lowerBoundaryRevetmentProperty.Category);
+ Assert.AreEqual("Ondergrens bekleding [m+NAP]", lowerBoundaryRevetmentProperty.DisplayName);
+ Assert.AreEqual("Ondergrens tot waaraan de bekleding loopt.", lowerBoundaryRevetmentProperty.Description);
+
+ PropertyDescriptor upperBoundaryWaterLevelsProperty = dynamicProperties[upperBoundaryWaterLevelsPropertyIndex];
+ Assert.IsNotNull(upperBoundaryWaterLevelsProperty);
+ Assert.IsFalse(upperBoundaryWaterLevelsProperty.IsReadOnly);
+ Assert.AreEqual(hydraulicParametersCategory, upperBoundaryWaterLevelsProperty.Category);
+ Assert.AreEqual("Bovengrens waterstanden [m+NAP]", upperBoundaryWaterLevelsProperty.DisplayName);
+ Assert.AreEqual("Een aangepaste bovengrens voor de waterstanden.", upperBoundaryWaterLevelsProperty.Description);
+
+ PropertyDescriptor lowerBoundaryWaterLevelsProperty = dynamicProperties[lowerBoundaryWaterLevelsPropertyIndex];
+ Assert.IsNotNull(lowerBoundaryWaterLevelsProperty);
+ Assert.IsFalse(lowerBoundaryWaterLevelsProperty.IsReadOnly);
+ Assert.AreEqual(hydraulicParametersCategory, lowerBoundaryWaterLevelsProperty.Category);
+ Assert.AreEqual("Ondergrens waterstanden [m+NAP]", lowerBoundaryWaterLevelsProperty.DisplayName);
+ Assert.AreEqual("Een aangepaste ondergrens voor de waterstanden.", lowerBoundaryWaterLevelsProperty.Description);
+
+ PropertyDescriptor stepSizeProperty = dynamicProperties[stepSizePropertyIndex];
+ Assert.IsNotNull(stepSizeProperty);
+ Assert.IsFalse(stepSizeProperty.IsReadOnly);
+ Assert.AreEqual(hydraulicParametersCategory, stepSizeProperty.Category);
+ Assert.AreEqual("Stapgrootte [m]", stepSizeProperty.DisplayName);
+ Assert.AreEqual("De stapgrootte waarop waterstanden worden bepaald.", stepSizeProperty.Description);
+
+ PropertyDescriptor waterLevelsProperty = dynamicProperties[waterLevelsPropertyIndex];
+ Assert.IsNotNull(waterLevelsProperty);
+ Assert.IsInstanceOf(waterLevelsProperty.Converter);
+ Assert.IsTrue(waterLevelsProperty.IsReadOnly);
+ Assert.AreEqual(hydraulicParametersCategory, waterLevelsProperty.Category);
+ Assert.AreEqual("Te berekenen waterstanden", waterLevelsProperty.DisplayName);
+ Assert.AreEqual("De waterstanden waarvoor gerekend moet worden. Deze zijn afgeleid van de opggegeven waterstanden.", waterLevelsProperty.Description);
+
+ PropertyDescriptor foreshoreProfileProperty = dynamicProperties[foreshoreProfilePropertyIndex];
+ Assert.IsNotNull(foreshoreProfileProperty);
+ Assert.IsFalse(foreshoreProfileProperty.IsReadOnly);
+ Assert.AreEqual(schematizationCategory, foreshoreProfileProperty.Category);
+ Assert.AreEqual("Voorlandprofiel", foreshoreProfileProperty.DisplayName);
+ Assert.AreEqual("De schematisatie van het voorlandprofiel.", foreshoreProfileProperty.Description);
+
+ PropertyDescriptor worldReferencePointProperty = dynamicProperties[worldReferencePointPropertyIndex];
+ Assert.IsNotNull(worldReferencePointProperty);
+ Assert.IsTrue(worldReferencePointProperty.IsReadOnly);
+ Assert.AreEqual(schematizationCategory, worldReferencePointProperty.Category);
+ Assert.AreEqual("Locatie (RD) [m]", worldReferencePointProperty.DisplayName);
+ Assert.AreEqual("De coördinaten van de locatie van het voorland in het Rijksdriehoeksstelsel.", worldReferencePointProperty.Description);
+
+ PropertyDescriptor orientationProperty = dynamicProperties[orientationPropertyIndex];
+ Assert.IsNotNull(orientationProperty);
+ Assert.IsTrue(orientationProperty.IsReadOnly);
+ Assert.AreEqual(schematizationCategory, orientationProperty.Category);
+ Assert.AreEqual("Oriëntatie [°]", orientationProperty.DisplayName);
+ Assert.AreEqual("Oriëntatie van het voorland.", orientationProperty.Description);
+
+ PropertyDescriptor breakWaterProperty = dynamicProperties[breakWaterPropertyIndex];
+ Assert.IsNotNull(breakWaterProperty);
+ Assert.IsInstanceOf(breakWaterProperty.Converter);
+ Assert.IsFalse(breakWaterProperty.IsReadOnly);
+ Assert.AreEqual(schematizationCategory, breakWaterProperty.Category);
+ Assert.AreEqual("Dam", breakWaterProperty.DisplayName);
+ Assert.AreEqual("Eigenschappen van de dam.", breakWaterProperty.Description);
+
+ PropertyDescriptor foreshoreGeometryProperty = dynamicProperties[foreshoreGeometryPropertyIndex];
+ Assert.IsNotNull(foreshoreGeometryProperty);
+ Assert.IsInstanceOf(foreshoreGeometryProperty.Converter);
+ Assert.AreEqual(!withForeshoreProfile, foreshoreGeometryProperty.IsReadOnly);
+ Assert.AreEqual(schematizationCategory, foreshoreGeometryProperty.Category);
+ Assert.AreEqual("Voorlandgeometrie", foreshoreGeometryProperty.DisplayName);
+ Assert.AreEqual("Eigenschappen van de voorlandgeometrie.", foreshoreGeometryProperty.Description);
+
+ PropertyDescriptor revetmentTypeProperty = dynamicProperties[revetmentTypePropertyIndex];
+ Assert.IsNotNull(revetmentTypeProperty);
+ Assert.IsTrue(revetmentTypeProperty.IsReadOnly);
+ Assert.AreEqual(schematizationCategory, revetmentTypeProperty.Category);
+ Assert.AreEqual("Type bekleding", revetmentTypeProperty.DisplayName);
+ Assert.AreEqual("Het type van de bekleding waarvoor berekend wordt.", revetmentTypeProperty.Description);
+
+ mockRepository.VerifyAll();
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj
===================================================================
diff -u -r05f15dbef4e52da9f476beb11e4077df52a055d8 -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj (.../Ringtoets.StabilityStoneCover.Forms.Test.csproj) (revision 05f15dbef4e52da9f476beb11e4077df52a055d8)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj (.../Ringtoets.StabilityStoneCover.Forms.Test.csproj) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -76,6 +76,7 @@
+
@@ -84,6 +85,8 @@
+
+
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/UITypeEditors/StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditorTest.cs
===================================================================
diff -u
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/UITypeEditors/StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditorTest.cs (revision 0)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/UITypeEditors/StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditorTest.cs (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -0,0 +1,145 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.ComponentModel;
+using System.Windows.Forms.Design;
+using Core.Common.Base.Geometry;
+using Core.Common.Gui.PropertyBag;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Revetment.Data;
+using Ringtoets.StabilityStoneCover.Data;
+using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
+using Ringtoets.StabilityStoneCover.Forms.PropertyClasses;
+using Ringtoets.StabilityStoneCover.Forms.UITypeEditors;
+
+namespace Ringtoets.StabilityStoneCover.Forms.Test.UITypeEditors
+{
+ [TestFixture]
+ public class StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditorTest
+ {
+ private MockRepository mockRepository;
+
+ [SetUp]
+ public void SetUp()
+ {
+ mockRepository = new MockRepository();
+ }
+
+ [Test]
+ public void EditValue_NoCurrentItemInAvailableItems_ReturnsOriginalValue()
+ {
+ // Setup
+ var failureMechanism = new StabilityStoneCoverFailureMechanism
+ {
+ ForeshoreProfiles =
+ {
+ new ForeshoreProfile(new Point2D(0, 0), new Point2D[0],
+ null, new ForeshoreProfile.ConstructionProperties())
+ }
+ };
+ var grassCoverErosionInwardsInput = new WaveConditionsInput();
+
+ var assessmentSectionMock = mockRepository.StrictMock();
+ var inputContext = new StabilityStoneCoverWaveConditionsCalculationInputContext(grassCoverErosionInwardsInput,
+ failureMechanism,
+ assessmentSectionMock);
+
+ var properties = new StabilityStoneCoverWaveConditionsCalculationInputContextProperties
+ {
+ Data = inputContext
+ };
+ var editor = new StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditor();
+ var propertyBag = new DynamicPropertyBag(properties);
+
+ var serviceProviderMock = mockRepository.StrictMock();
+ var serviceMock = mockRepository.StrictMock();
+ var descriptorContextMock = mockRepository.StrictMock();
+ serviceProviderMock.Expect(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
+ serviceMock.Expect(s => s.DropDownControl(null)).IgnoreArguments();
+ descriptorContextMock.Expect(c => c.Instance).Return(propertyBag).Repeat.Twice();
+ mockRepository.ReplayAll();
+
+ var someValue = new object();
+
+ // Call
+ var result = editor.EditValue(descriptorContextMock, serviceProviderMock, someValue);
+
+ // Assert
+ Assert.AreSame(someValue, result);
+
+ mockRepository.VerifyAll();
+ }
+
+ [Test]
+ public void EditValue_WithCurrentItemInAvailableItems_ReturnsCurrentItem()
+ {
+ // Setup
+ var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0],
+ null, new ForeshoreProfile.ConstructionProperties());
+ var failureMechanism = new StabilityStoneCoverFailureMechanism
+ {
+ ForeshoreProfiles =
+ {
+ foreshoreProfile
+ }
+ };
+ var waveConditionsInput = new WaveConditionsInput
+ {
+ ForeshoreProfile = foreshoreProfile
+ };
+
+ var assessmentSectionMock = mockRepository.StrictMock();
+ var inputContext = new StabilityStoneCoverWaveConditionsCalculationInputContext(waveConditionsInput,
+ failureMechanism,
+ assessmentSectionMock);
+
+ var properties = new StabilityStoneCoverWaveConditionsCalculationInputContextProperties
+ {
+ Data = inputContext
+ };
+ var editor = new StabilityStoneCoverWaveConditionsCalculationInputContextForeshoreProfileEditor();
+ var propertyBag = new DynamicPropertyBag(properties);
+
+ var serviceProviderMock = mockRepository.StrictMock();
+ var serviceMock = mockRepository.StrictMock();
+ var descriptorContextMock = mockRepository.StrictMock();
+ serviceProviderMock.Expect(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
+ serviceMock.Expect(s => s.DropDownControl(null)).IgnoreArguments();
+ serviceMock.Expect(s => s.CloseDropDown()).IgnoreArguments();
+ descriptorContextMock.Expect(c => c.Instance).Return(propertyBag).Repeat.Twice();
+ mockRepository.ReplayAll();
+
+ var someValue = new object();
+
+ // Call
+ var result = editor.EditValue(descriptorContextMock, serviceProviderMock, someValue);
+
+ // Assert
+ Assert.AreSame(foreshoreProfile, result);
+
+ mockRepository.VerifyAll();
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/UITypeEditors/StabilityStoneCoverWaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs
===================================================================
diff -u
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/UITypeEditors/StabilityStoneCoverWaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs (revision 0)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/UITypeEditors/StabilityStoneCoverWaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -0,0 +1,147 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.ComponentModel;
+using System.Windows.Forms.Design;
+using Core.Common.Gui.PropertyBag;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.Revetment.Data;
+using Ringtoets.StabilityStoneCover.Data;
+using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
+using Ringtoets.StabilityStoneCover.Forms.PropertyClasses;
+using Ringtoets.StabilityStoneCover.Forms.UITypeEditors;
+
+namespace Ringtoets.StabilityStoneCover.Forms.Test.UITypeEditors
+{
+ [TestFixture]
+ public class StabilityStoneCoverWaveConditionsInputContextHydraulicBoundaryLocationEditorTest
+ {
+ private MockRepository mockRepository;
+
+ [SetUp]
+ public void SetUp()
+ {
+ mockRepository = new MockRepository();
+ }
+
+ [Test]
+ public void EditValue_NoCurrentItemInAvailableItems_ReturnsOriginalValue()
+ {
+ // Setup
+ var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+ hydraulicBoundaryDatabase.Locations.Add(new TestHydraulicBoundaryLocation());
+
+ var failureMechanism = new StabilityStoneCoverFailureMechanism();
+ var grassCoverErosionInwardsInput = new WaveConditionsInput();
+
+ var assessmentSectionMock = mockRepository.StrictMock();
+ assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase)
+ .Return(hydraulicBoundaryDatabase)
+ .Repeat.AtLeastOnce();
+ var inputContext = new StabilityStoneCoverWaveConditionsCalculationInputContext(grassCoverErosionInwardsInput,
+ failureMechanism,
+ assessmentSectionMock);
+
+ var properties = new StabilityStoneCoverWaveConditionsCalculationInputContextProperties
+ {
+ Data = inputContext
+ };
+ var editor = new StabilityStoneCoverWaveConditionsCalculationInputContextHydraulicBoundaryLocationEditor();
+ var propertyBag = new DynamicPropertyBag(properties);
+
+ var serviceProviderMock = mockRepository.StrictMock();
+ var serviceMock = mockRepository.StrictMock();
+ var descriptorContextMock = mockRepository.StrictMock();
+ serviceProviderMock.Expect(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
+ serviceMock.Expect(s => s.DropDownControl(null)).IgnoreArguments();
+ descriptorContextMock.Expect(c => c.Instance).Return(propertyBag).Repeat.Twice();
+ mockRepository.ReplayAll();
+
+ var someValue = new object();
+
+ // Call
+ var result = editor.EditValue(descriptorContextMock, serviceProviderMock, someValue);
+
+ // Assert
+ Assert.AreSame(someValue, result);
+
+ mockRepository.VerifyAll();
+ }
+
+ [Test]
+ public void EditValue_WithCurrentItemInAvailableItems_ReturnsCurrentItem()
+ {
+ // Setup
+ var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+ var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+ hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
+
+ var failureMechanism = new StabilityStoneCoverFailureMechanism();
+ var waveConditionsInput = new WaveConditionsInput
+ {
+ HydraulicBoundaryLocation = hydraulicBoundaryLocation
+ };
+
+ var assessmentSectionMock = mockRepository.StrictMock();
+ assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase)
+ .Return(hydraulicBoundaryDatabase)
+ .Repeat.AtLeastOnce();
+ var inputContext = new StabilityStoneCoverWaveConditionsCalculationInputContext(waveConditionsInput,
+ failureMechanism,
+ assessmentSectionMock);
+
+ var properties = new StabilityStoneCoverWaveConditionsCalculationInputContextProperties
+ {
+ Data = inputContext
+ };
+ var editor = new StabilityStoneCoverWaveConditionsCalculationInputContextHydraulicBoundaryLocationEditor();
+ var propertyBag = new DynamicPropertyBag(properties);
+
+ var serviceProviderMock = mockRepository.StrictMock();
+ var serviceMock = mockRepository.StrictMock();
+ var descriptorContextMock = mockRepository.StrictMock();
+ serviceProviderMock.Expect(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
+ serviceMock.Expect(s => s.DropDownControl(null)).IgnoreArguments();
+ serviceMock.Expect(s => s.CloseDropDown()).IgnoreArguments();
+ descriptorContextMock.Expect(c => c.Instance).Return(propertyBag).Repeat.Twice();
+ mockRepository.ReplayAll();
+
+ var someValue = new object();
+
+ // Call
+ var result = editor.EditValue(descriptorContextMock, serviceProviderMock, someValue);
+
+ // Assert
+ Assert.AreSame(hydraulicBoundaryLocation, result);
+
+ mockRepository.VerifyAll();
+ }
+
+ private class TestHydraulicBoundaryLocation : HydraulicBoundaryLocation
+ {
+ public TestHydraulicBoundaryLocation() : base(0, string.Empty, 0, 0) {}
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs
===================================================================
diff -u -r2336e45e063aee566b1fa028efed72d531cdf5ee -re4313e642aa3af2d1f1ced4c397c421579cfb36d
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision 2336e45e063aee566b1fa028efed72d531cdf5ee)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision e4313e642aa3af2d1f1ced4c397c421579cfb36d)
@@ -48,11 +48,14 @@
PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
// Assert
- Assert.AreEqual(1, propertyInfos.Length);
+ Assert.AreEqual(2, propertyInfos.Length);
PluginTestHelper.AssertPropertyInfoDefined<
StabilityStoneCoverFailureMechanismContext,
StabilityStoneCoverFailureMechanismContextProperties>(propertyInfos);
+ PluginTestHelper.AssertPropertyInfoDefined<
+ StabilityStoneCoverWaveConditionsCalculationInputContext,
+ StabilityStoneCoverWaveConditionsCalculationInputContextProperties>(propertyInfos);
}
}