Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r12b6d33eb444e7772320fc6f747e1b9ccf101002 -r36089e883fc170498c85a840b883f786b96023d8 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 12b6d33eb444e7772320fc6f747e1b9ccf101002) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 36089e883fc170498c85a840b883f786b96023d8) @@ -599,6 +599,15 @@ } /// + /// Looks up a localized string similar to Karakteristieke punten. + /// + public static string Categories_Characteristic_points { + get { + return ResourceManager.GetString("Categories_Characteristic_points", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Algemeen. /// public static string Categories_General { @@ -671,6 +680,123 @@ } /// + /// Looks up a localized string similar to De locatie van het begin van de slootbodem wanneer deze van de kant van de dijk wordt benaderd.. + /// + public static string CharacteristicPoint_BottomDitchDikeSide_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_BottomDitchDikeSide_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De locatie van het begin van de slootbodem wanneer deze van binnen de polder wordt benaderd.. + /// + public static string CharacteristicPoint_BottomDitchPolderSide_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_BottomDitchPolderSide_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De locatie van de teen van de dijk wanneer de dijk van binnen de polder wordt benaderd.. + /// + public static string CharacteristicPoint_DikeToeAtPolder_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_DikeToeAtPolder_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De locatie van de teen van de dijk wanneer de dijk van buiten de polder wordt benaderd.. + /// + public static string CharacteristicPoint_DikeToeAtRiver_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_DikeToeAtRiver_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De kruin van het talud wanneer de dijk van binnen de polder wordt benaderd.. + /// + public static string CharacteristicPoint_DikeTopAtPolder_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_DikeTopAtPolder_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De locatie van het begin van de sloot wanneer deze van de kant van de dijk wordt benaderd.. + /// + public static string CharacteristicPoint_DitchDikeSide_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_DitchDikeSide_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De locatie van het begin van de sloot wanneer deze van binnen de polder wordt benaderd.. + /// + public static string CharacteristicPoint_DitchPolderSide_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_DitchPolderSide_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De locatie van de insteek van de binnenberm.. + /// + public static string CharacteristicPoint_ShoulderBaseInside_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_ShoulderBaseInside_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De locatie van de kruin van de binnenberm.. + /// + public static string CharacteristicPoint_ShoulderTopInside_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_ShoulderTopInside_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De locatie van het maaiveld binnen de polder.. + /// + public static string CharacteristicPoint_SurfaceLevelInside_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_SurfaceLevelInside_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De locatie van het maaiveld buiten de polder.. + /// + public static string CharacteristicPoint_SurfaceLevelOutside_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_SurfaceLevelOutside_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De locatie van de verkeersbelasting wanneer de dijk van binnen de polder wordt benaderd.. + /// + public static string CharacteristicPoint_TrafficLoadInside_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_TrafficLoadInside_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De locatie van de verkeersbelasting wanneer de dijk van buiten de polder wordt benaderd.. + /// + public static string CharacteristicPoint_TrafficLoadOutside_Description { + get { + return ResourceManager.GetString("CharacteristicPoint_TrafficLoadOutside_Description", resourceCulture); + } + } + + /// /// Looks up a localized string similar to {0} - {1}. /// public static string ChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_ { @@ -2739,6 +2865,42 @@ } /// + /// Looks up a localized string similar to Naam van de profielschematisatie.. + /// + public static string SurfaceLine_Name_Description { + get { + return ResourceManager.GetString("SurfaceLine_Name_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Naam. + /// + public static string SurfaceLine_Name_DisplayName { + get { + return ResourceManager.GetString("SurfaceLine_Name_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De punten die de geometrie van de profielschematisatie definiëren.. + /// + public static string SurfaceLine_Points_Description { + get { + return ResourceManager.GetString("SurfaceLine_Points_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Geometriepunten. + /// + public static string SurfaceLine_Points_DisplayName { + get { + return ResourceManager.GetString("SurfaceLine_Points_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to {0} ({1}). /// public static string TopLevelSubMechanismIllustrationPointProperties_ToString_WindDirectionName_0_ClosingSituation_1 { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r12b6d33eb444e7772320fc6f747e1b9ccf101002 -r36089e883fc170498c85a840b883f786b96023d8 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 12b6d33eb444e7772320fc6f747e1b9ccf101002) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 36089e883fc170498c85a840b883f786b96023d8) @@ -1065,4 +1065,58 @@ {0} ({1}) + + Naam van de profielschematisatie. + + + Naam + + + De punten die de geometrie van de profielschematisatie definiëren. + + + Geometriepunten + + + De locatie van het begin van de slootbodem wanneer deze van de kant van de dijk wordt benaderd. + + + De locatie van het begin van de slootbodem wanneer deze van binnen de polder wordt benaderd. + + + De locatie van het begin van de sloot wanneer deze van de kant van de dijk wordt benaderd. + + + De locatie van het begin van de sloot wanneer deze van binnen de polder wordt benaderd. + + + De locatie van de teen van de dijk wanneer de dijk van buiten de polder wordt benaderd. + + + De locatie van de teen van de dijk wanneer de dijk van binnen de polder wordt benaderd. + + + De kruin van het talud wanneer de dijk van binnen de polder wordt benaderd. + + + De locatie van de insteek van de binnenberm. + + + De locatie van de kruin van de binnenberm. + + + De locatie van het maaiveld binnen de polder. + + + De locatie van het maaiveld buiten de polder. + + + De locatie van de verkeersbelasting wanneer de dijk van binnen de polder wordt benaderd. + + + De locatie van de verkeersbelasting wanneer de dijk van buiten de polder wordt benaderd. + + + Karakteristieke punten + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/RingtoetsMacroStabilityInwardsSurfaceLineProperties.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r36089e883fc170498c85a840b883f786b96023d8 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/RingtoetsMacroStabilityInwardsSurfaceLineProperties.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineProperties.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/RingtoetsMacroStabilityInwardsSurfaceLineProperties.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineProperties.cs) (revision 36089e883fc170498c85a840b883f786b96023d8) @@ -27,6 +27,8 @@ using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; using TypeConverter = System.ComponentModel.TypeConverterAttribute; + +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses @@ -38,8 +40,8 @@ public class RingtoetsMacroStabilityInwardsSurfaceLineProperties : ObjectProperties { [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.RingtoetsMacroStabilityInwardsSurfaceLine_Name_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.RingtoetsMacroStabilityInwardsSurfaceLine_Name_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_Name_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_Name_Description))] public string Name { get @@ -50,14 +52,157 @@ [TypeConverter(typeof(ExpandableArrayConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.RingtoetsMacroStabilityInwardsSurfaceLine_Points_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.RingtoetsMacroStabilityInwardsSurfaceLine_Points_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_Points_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_Points_Description))] public Point3D[] Points { get { return data.Points.ToArray(); } } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_SurfaceLevelOutside))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_SurfaceLevelOutside_Description))] + public Point3D SurfaceLevelOutside + { + get + { + return data.SurfaceLevelOutside; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_DikeToeAtRiver))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_DikeToeAtRiver_Description))] + public Point3D DikeToeAtRiver + { + get + { + return data.DikeToeAtRiver; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_TrafficLoadOutside))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_TrafficLoadOutside_Description))] + public Point3D TrafficLoadOutside + { + get + { + return data.TrafficLoadOutside; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_TrafficLoadInside))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_TrafficLoadInside_Description))] + public Point3D TrafficLoadInside + { + get + { + return data.TrafficLoadInside; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_DikeTopAtPolder))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_DikeTopAtPolder_Description))] + public Point3D DikeTopAtPolder + { + get + { + return data.DikeTopAtPolder; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_ShoulderBaseInside))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_ShoulderBaseInside_Description))] + public Point3D ShoulderBaseInside + { + get + { + return data.ShoulderBaseInside; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_ShoulderTopInside))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_ShoulderTopInside_Description))] + public Point3D ShoulderTopInside + { + get + { + return data.ShoulderTopInside; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_DikeToeAtPolder))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_DikeToeAtPolder_Description))] + public Point3D DikeToeAtPolder + { + get + { + return data.DikeToeAtPolder; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_DitchDikeSide))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_DitchDikeSide_Description))] + public Point3D DitchDikeSide + { + get + { + return data.DitchDikeSide; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_BottomDitchDikeSide))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_BottomDitchDikeSide_Description))] + public Point3D BottomDitchDikeSide + { + get + { + return data.BottomDitchDikeSide; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_BottomDitchPolderSide))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_BottomDitchPolderSide_Description))] + public Point3D BottomDitchPolderSide + { + get + { + return data.BottomDitchPolderSide; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_DitchPolderSide))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_DitchPolderSide_Description))] + public Point3D DitchPolderSide + { + get + { + return data.DitchPolderSide; + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_SurfaceLevelInside))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_SurfaceLevelInside_Description))] + public Point3D SurfaceLevelInside + { + get + { + return data.SurfaceLevelInside; + } + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/RingtoetsMacroStabilityInwardsSurfaceLinePropertiesTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r36089e883fc170498c85a840b883f786b96023d8 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/RingtoetsMacroStabilityInwardsSurfaceLinePropertiesTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLinePropertiesTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/RingtoetsMacroStabilityInwardsSurfaceLinePropertiesTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLinePropertiesTest.cs) (revision 36089e883fc170498c85a840b883f786b96023d8) @@ -85,21 +85,115 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(2, dynamicProperties.Count); + Assert.AreEqual(15, dynamicProperties.Count); const string generalCategory = "Algemeen"; + const string charactersticPointsCategory = "Karakteristieke punten"; - PropertyDescriptor nameProperty = dynamicProperties[0]; - Assert.IsTrue(nameProperty.IsReadOnly); - Assert.AreEqual(generalCategory, nameProperty.Category); - Assert.AreEqual("Naam", nameProperty.DisplayName); - Assert.AreEqual("Naam van de profielschematisatie.", nameProperty.Description); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[0], + generalCategory, + "Naam", + "Naam van de profielschematisatie.", + true); - PropertyDescriptor pointsProperty = dynamicProperties[1]; - Assert.IsTrue(pointsProperty.IsReadOnly); - Assert.AreEqual(generalCategory, pointsProperty.Category); - Assert.AreEqual("Geometriepunten", pointsProperty.DisplayName); - Assert.AreEqual("De punten die de geometrie van de profielschematisatie definiëren.", pointsProperty.Description); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[1], + generalCategory, + "Geometriepunten", + "De punten die de geometrie van de profielschematisatie definiëren.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[2], + charactersticPointsCategory, + "Maaiveld buitenwaarts", + "De locatie van het maaiveld buiten de polder.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[3], + charactersticPointsCategory, + "Teen dijk buitenwaarts", + "De locatie van de teen van de dijk wanneer de dijk van buiten de polder wordt benaderd.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[4], + charactersticPointsCategory, + "Verkeersbelasting kant buitenwaarts", + "De locatie van de verkeersbelasting wanneer de dijk van buiten de polder wordt benaderd.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[5], + charactersticPointsCategory, + "Verkeersbelasting kant binnenwaarts", + "De locatie van de verkeersbelasting wanneer de dijk van binnen de polder wordt benaderd.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[6], + charactersticPointsCategory, + "Kruin binnentalud", + "De kruin van het talud wanneer de dijk van binnen de polder wordt benaderd.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[7], + charactersticPointsCategory, + "Insteek binnenberm", + "De locatie van de insteek van de binnenberm.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[8], + charactersticPointsCategory, + "Kruin binnenberm", + "De locatie van de kruin van de binnenberm.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[9], + charactersticPointsCategory, + "Teen dijk binnenwaarts", + "De locatie van de teen van de dijk wanneer de dijk van binnen de polder wordt benaderd.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[10], + charactersticPointsCategory, + "Insteek sloot dijkzijde", + "De locatie van het begin van de sloot wanneer deze van de kant van de dijk wordt benaderd.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[11], + charactersticPointsCategory, + "Slootbodem dijkzijde", + "De locatie van het begin van de slootbodem wanneer deze van de kant van de dijk wordt benaderd.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[12], + charactersticPointsCategory, + "Slootbodem polderzijde", + "De locatie van het begin van de slootbodem wanneer deze van binnen de polder wordt benaderd.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[13], + charactersticPointsCategory, + "Insteek sloot polderzijde", + "De locatie van het begin van de sloot wanneer deze van binnen de polder wordt benaderd.", + true); + + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[14], + charactersticPointsCategory, + "Maaiveld binnenwaarts", + "De locatie van het maaiveld binnen de polder.", + true); } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6a241363ac2d257e8012cb6336d66a8e9e350b8d -r36089e883fc170498c85a840b883f786b96023d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 36089e883fc170498c85a840b883f786b96023d8) @@ -82,15 +82,6 @@ } /// - /// Looks up a localized string similar to Karakteristieke punten. - /// - public static string Categories_Characteristic_points { - get { - return ResourceManager.GetString("Categories_Characteristic_points", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Heave. /// public static string Categories_Heave { @@ -1285,42 +1276,6 @@ } /// - /// Looks up a localized string similar to De locatie van het begin van de slootbodem wanneer deze van de kant van de dijk wordt benaderd.. - /// - public static string RingtoetsPipingSurfaceLine_BottomDitchDikeSide_Description { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_BottomDitchDikeSide_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to De locatie van het begin van de slootbodem wanneer deze van binnen de polder wordt benaderd.. - /// - public static string RingtoetsPipingSurfaceLine_BottomDitchPolderSide_Description { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_BottomDitchPolderSide_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to De locatie van de teen van de dijk wanneer de dijk van binnen de polder wordt benaderd.. - /// - public static string RingtoetsPipingSurfaceLine_DikeToeAtPolder_Description { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DikeToeAtPolder_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to De locatie van de teen van de dijk wanneer de dijk van buiten de polder wordt benaderd.. - /// - public static string RingtoetsPipingSurfaceLine_DikeToeAtRiver_Description { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DikeToeAtRiver_Description", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Profielschematisatie. /// public static string RingtoetsPipingSurfaceLine_DisplayName { @@ -1330,60 +1285,6 @@ } /// - /// Looks up a localized string similar to De locatie van het begin van de sloot wanneer deze van de kant van de dijk wordt benaderd.. - /// - public static string RingtoetsPipingSurfaceLine_DitchDikeSide_Description { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchDikeSide_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to De locatie van het begin van de sloot wanneer deze van binnen de polder wordt benaderd.. - /// - public static string RingtoetsPipingSurfaceLine_DitchPolderSide_Description { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_DitchPolderSide_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Naam van de profielschematisatie.. - /// - public static string RingtoetsPipingSurfaceLine_Name_Description { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_Name_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Naam. - /// - public static string RingtoetsPipingSurfaceLine_Name_DisplayName { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_Name_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to De punten die de geometrie van de profielschematisatie definiëren.. - /// - public static string RingtoetsPipingSurfaceLine_Points_Description { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_Points_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Geometriepunten. - /// - public static string RingtoetsPipingSurfaceLine_Points_DisplayName { - get { - return ResourceManager.GetString("RingtoetsPipingSurfaceLine_Points_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to De locatie van het bestand waaruit de profielschematisaties zijn geïmporteerd.. /// public static string RingtoetsPipingSurfaceLineCollection_SourcePath_Description { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r6a241363ac2d257e8012cb6336d66a8e9e350b8d -r36089e883fc170498c85a840b883f786b96023d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 36089e883fc170498c85a840b883f786b96023d8) @@ -250,18 +250,6 @@ ..\Resources\chart_curve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Naam van de profielschematisatie. - - - Naam - - - De punten die de geometrie van de profielschematisatie definiëren. - - - Geometriepunten - Profielschematisatie @@ -325,27 +313,6 @@ Rekenwaarde - - De locatie van het begin van de slootbodem wanneer deze van de kant van de dijk wordt benaderd. - - - De locatie van het begin van de slootbodem wanneer deze van binnen de polder wordt benaderd. - - - De locatie van het begin van de sloot wanneer deze van de kant van de dijk wordt benaderd. - - - De locatie van het begin van de sloot wanneer deze van binnen de polder wordt benaderd. - - - De locatie van de teen van de dijk wanneer de dijk van buiten de polder wordt benaderd. - - - De locatie van de teen van de dijk wanneer de dijk van binnen de polder wordt benaderd. - - - Karakteristieke punten - De positie in het dwarsprofiel van het intredepunt. Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r36089e883fc170498c85a840b883f786b96023d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs (.../RingtoetsPipingSurfaceLineProperties.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/RingtoetsPipingSurfaceLineProperties.cs (.../RingtoetsPipingSurfaceLineProperties.cs) (revision 36089e883fc170498c85a840b883f786b96023d8) @@ -27,7 +27,7 @@ using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Primitives; using TypeConverter = System.ComponentModel.TypeConverterAttribute; -using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Piping.Forms.PropertyClasses @@ -39,8 +39,8 @@ public class RingtoetsPipingSurfaceLineProperties : ObjectProperties { [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.RingtoetsPipingSurfaceLine_Name_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.RingtoetsPipingSurfaceLine_Name_Description))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_Name_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_Name_Description))] public string Name { get @@ -49,9 +49,21 @@ } } - [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Characteristic_points))] - [ResourcesDisplayName(typeof(PipingDataResources), nameof(PipingDataResources.CharacteristicPoint_DikeToeAtRiver))] - [ResourcesDescription(typeof(Resources), nameof(Resources.RingtoetsPipingSurfaceLine_DikeToeAtRiver_Description))] + [TypeConverter(typeof(ExpandableArrayConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_Points_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.SurfaceLine_Points_Description))] + public Point3D[] Points + { + get + { + return data.Points.ToArray(); + } + } + + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_DikeToeAtRiver))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_DikeToeAtRiver_Description))] public Point3D DikeToeAtRiver { get @@ -60,9 +72,9 @@ } } - [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Characteristic_points))] - [ResourcesDisplayName(typeof(PipingDataResources), nameof(PipingDataResources.CharacteristicPoint_DikeToeAtPolder))] - [ResourcesDescription(typeof(Resources), nameof(Resources.RingtoetsPipingSurfaceLine_DikeToeAtPolder_Description))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_DikeToeAtPolder))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_DikeToeAtPolder_Description))] public Point3D DikeToeAtPolder { get @@ -71,9 +83,9 @@ } } - [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Characteristic_points))] - [ResourcesDisplayName(typeof(PipingDataResources), nameof(PipingDataResources.CharacteristicPoint_DitchDikeSide))] - [ResourcesDescription(typeof(Resources), nameof(Resources.RingtoetsPipingSurfaceLine_DitchDikeSide_Description))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_DitchDikeSide))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_DitchDikeSide_Description))] public Point3D DitchDikeSide { get @@ -82,9 +94,9 @@ } } - [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Characteristic_points))] - [ResourcesDisplayName(typeof(PipingDataResources), nameof(PipingDataResources.CharacteristicPoint_BottomDitchDikeSide))] - [ResourcesDescription(typeof(Resources), nameof(Resources.RingtoetsPipingSurfaceLine_BottomDitchDikeSide_Description))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_BottomDitchDikeSide))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_BottomDitchDikeSide_Description))] public Point3D BottomDitchDikeSide { get @@ -93,9 +105,9 @@ } } - [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Characteristic_points))] - [ResourcesDisplayName(typeof(PipingDataResources), nameof(PipingDataResources.CharacteristicPoint_BottomDitchPolderSide))] - [ResourcesDescription(typeof(Resources), nameof(Resources.RingtoetsPipingSurfaceLine_BottomDitchPolderSide_Description))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_BottomDitchPolderSide))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_BottomDitchPolderSide_Description))] public Point3D BottomDitchPolderSide { get @@ -104,27 +116,15 @@ } } - [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Characteristic_points))] - [ResourcesDisplayName(typeof(PipingDataResources), nameof(PipingDataResources.CharacteristicPoint_DitchPolderSide))] - [ResourcesDescription(typeof(Resources), nameof(Resources.RingtoetsPipingSurfaceLine_DitchPolderSide_Description))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] + [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_DitchPolderSide))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_DitchPolderSide_Description))] public Point3D DitchPolderSide { get { return data.DitchPolderSide; } } - - [TypeConverter(typeof(ExpandableArrayConverter))] - [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.RingtoetsPipingSurfaceLine_Points_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.RingtoetsPipingSurfaceLine_Points_Description))] - public Point3D[] Points - { - get - { - return data.Points.ToArray(); - } - } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r36089e883fc170498c85a840b883f786b96023d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs (.../RingtoetsPipingSurfaceLinePropertiesTest.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/RingtoetsPipingSurfaceLinePropertiesTest.cs (.../RingtoetsPipingSurfaceLinePropertiesTest.cs) (revision 36089e883fc170498c85a840b883f786b96023d8) @@ -102,53 +102,61 @@ const string generalCategory = "Algemeen"; const string charactersticPointsCategory = "Karakteristieke punten"; - PropertyDescriptor nameProperty = dynamicProperties[0]; - Assert.IsTrue(nameProperty.IsReadOnly); - Assert.AreEqual(generalCategory, nameProperty.Category); - Assert.AreEqual("Naam", nameProperty.DisplayName); - Assert.AreEqual("Naam van de profielschematisatie.", nameProperty.Description); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[0], + generalCategory, + "Naam", + "Naam van de profielschematisatie.", + true); - PropertyDescriptor dikeToeAtRiverProperty = dynamicProperties[1]; - Assert.IsTrue(dikeToeAtRiverProperty.IsReadOnly); - Assert.AreEqual(charactersticPointsCategory, dikeToeAtRiverProperty.Category); - Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverProperty.DisplayName); - Assert.AreEqual("De locatie van de teen van de dijk wanneer de dijk van buiten de polder wordt benaderd.", dikeToeAtRiverProperty.Description); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[1], + generalCategory, + "Geometriepunten", + "De punten die de geometrie van de profielschematisatie definiëren.", + true); - PropertyDescriptor dikeToeAtPolderProperty = dynamicProperties[2]; - Assert.IsTrue(dikeToeAtPolderProperty.IsReadOnly); - Assert.AreEqual(charactersticPointsCategory, dikeToeAtPolderProperty.Category); - Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderProperty.DisplayName); - Assert.AreEqual("De locatie van de teen van de dijk wanneer de dijk van binnen de polder wordt benaderd.", dikeToeAtPolderProperty.Description); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[2], + charactersticPointsCategory, + "Teen dijk buitenwaarts", + "De locatie van de teen van de dijk wanneer de dijk van buiten de polder wordt benaderd.", + true); - PropertyDescriptor ditchDikeSideProperty = dynamicProperties[3]; - Assert.IsTrue(ditchDikeSideProperty.IsReadOnly); - Assert.AreEqual(charactersticPointsCategory, ditchDikeSideProperty.Category); - Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideProperty.DisplayName); - Assert.AreEqual("De locatie van het begin van de sloot wanneer deze van de kant van de dijk wordt benaderd.", ditchDikeSideProperty.Description); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[3], + charactersticPointsCategory, + "Teen dijk binnenwaarts", + "De locatie van de teen van de dijk wanneer de dijk van binnen de polder wordt benaderd.", + true); - PropertyDescriptor bottomDitchDikeSideProperty = dynamicProperties[4]; - Assert.IsTrue(bottomDitchDikeSideProperty.IsReadOnly); - Assert.AreEqual(charactersticPointsCategory, bottomDitchDikeSideProperty.Category); - Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideProperty.DisplayName); - Assert.AreEqual("De locatie van het begin van de slootbodem wanneer deze van de kant van de dijk wordt benaderd.", bottomDitchDikeSideProperty.Description); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[4], + charactersticPointsCategory, + "Insteek sloot dijkzijde", + "De locatie van het begin van de sloot wanneer deze van de kant van de dijk wordt benaderd.", + true); - PropertyDescriptor bottomDitchPolderSideProperty = dynamicProperties[5]; - Assert.IsTrue(bottomDitchPolderSideProperty.IsReadOnly); - Assert.AreEqual(charactersticPointsCategory, bottomDitchPolderSideProperty.Category); - Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideProperty.DisplayName); - Assert.AreEqual("De locatie van het begin van de slootbodem wanneer deze van binnen de polder wordt benaderd.", bottomDitchPolderSideProperty.Description); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[5], + charactersticPointsCategory, + "Slootbodem dijkzijde", + "De locatie van het begin van de slootbodem wanneer deze van de kant van de dijk wordt benaderd.", + true); - PropertyDescriptor ditchPolderSideProperty = dynamicProperties[6]; - Assert.IsTrue(ditchPolderSideProperty.IsReadOnly); - Assert.AreEqual(charactersticPointsCategory, ditchPolderSideProperty.Category); - Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideProperty.DisplayName); - Assert.AreEqual("De locatie van het begin van de sloot wanneer deze van binnen de polder wordt benaderd.", ditchPolderSideProperty.Description); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[6], + charactersticPointsCategory, + "Slootbodem polderzijde", + "De locatie van het begin van de slootbodem wanneer deze van binnen de polder wordt benaderd.", + true); - PropertyDescriptor pointsProperty = dynamicProperties[7]; - Assert.IsTrue(pointsProperty.IsReadOnly); - Assert.AreEqual(generalCategory, pointsProperty.Category); - Assert.AreEqual("Geometriepunten", pointsProperty.DisplayName); - Assert.AreEqual("De punten die de geometrie van de profielschematisatie definiëren.", pointsProperty.Description); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( + dynamicProperties[7], + charactersticPointsCategory, + "Insteek sloot polderzijde", + "De locatie van het begin van de sloot wanneer deze van binnen de polder wordt benaderd.", + true); } } } \ No newline at end of file