Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r11da71c456a4db44c05b16aa17cdacfc26639af4 -rdb399c3f94284852ca23773a931a43338f281e90
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 11da71c456a4db44c05b16aa17cdacfc26639af4)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision db399c3f94284852ca23773a931a43338f281e90)
@@ -2911,6 +2911,15 @@
}
///
+ /// Looks up a localized string similar to De afstand tussen het eindpunt van het vak en het begin van het traject, gemeten langs het traject in meters (afgerond)..
+ ///
+ public static string SectionEnd_Description {
+ get {
+ return ResourceManager.GetString("SectionEnd_Description", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Metrering* tot [m].
///
public static string SectionEnd_DisplayName {
@@ -2930,6 +2939,15 @@
}
///
+ /// Looks up a localized string similar to De afstand tussen het beginpunt van het vak en het begin van het traject, gemeten langs het traject in meters (afgerond)..
+ ///
+ public static string SectionStart_Description {
+ get {
+ return ResourceManager.GetString("SectionStart_Description", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Metrering* van [m].
///
public static string SectionStart_DisplayName {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r11da71c456a4db44c05b16aa17cdacfc26639af4 -rdb399c3f94284852ca23773a931a43338f281e90
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 11da71c456a4db44c05b16aa17cdacfc26639af4)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision db399c3f94284852ca23773a931a43338f281e90)
@@ -1476,4 +1476,10 @@
Metrering* van [m]
+
+ De afstand tussen het eindpunt van het vak en het begin van het traject, gemeten langs het traject in meters (afgerond).
+
+
+ De afstand tussen het beginpunt van het vak en het begin van het traject, gemeten langs het traject in meters (afgerond).
+
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProbabilityAssessmentProperties.cs
===================================================================
diff -u -r07fad131acfb09fc9736d890ab76f0e2e542c84e -rdb399c3f94284852ca23773a931a43338f281e90
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProbabilityAssessmentProperties.cs (.../FailureMechanismSectionProbabilityAssessmentProperties.cs) (revision 07fad131acfb09fc9736d890ab76f0e2e542c84e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProbabilityAssessmentProperties.cs (.../FailureMechanismSectionProbabilityAssessmentProperties.cs) (revision db399c3f94284852ca23773a931a43338f281e90)
@@ -56,7 +56,7 @@
this.probabilityAssessmentInput = probabilityAssessmentInput;
}
- [PropertyOrder(5)]
+ [PropertyOrder(7)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionProbabilityAssessment_N_Rounded_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.FailureMechanismSectionProbabilityAssessment_N_Rounded_Description))]
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProperties.cs
===================================================================
diff -u -rba2c38d1315dda29a2bd0005138530b2aeb10f1f -rdb399c3f94284852ca23773a931a43338f281e90
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProperties.cs (.../FailureMechanismSectionProperties.cs) (revision ba2c38d1315dda29a2bd0005138530b2aeb10f1f)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProperties.cs (.../FailureMechanismSectionProperties.cs) (revision db399c3f94284852ca23773a931a43338f281e90)
@@ -67,6 +67,30 @@
[PropertyOrder(2)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.SectionStart_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.SectionStart_Description))]
+ public RoundedDouble SectionStart
+ {
+ get
+ {
+ return new RoundedDouble(2);
+ }
+ }
+
+ [PropertyOrder(3)]
+ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.SectionEnd_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.SectionEnd_Description))]
+ public RoundedDouble SectionEnd
+ {
+ get
+ {
+ return new RoundedDouble(2);
+ }
+ }
+
+ [PropertyOrder(4)]
+ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSection_Length_Rounded_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.FailureMechanismSection_Length_Rounded_Description))]
public RoundedDouble Length
@@ -77,7 +101,7 @@
}
}
- [PropertyOrder(3)]
+ [PropertyOrder(5)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSection_StartPoint_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.FailureMechanismSection_StartPoint_Description))]
@@ -89,7 +113,7 @@
}
}
- [PropertyOrder(4)]
+ [PropertyOrder(6)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSection_EndPoint_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.FailureMechanismSection_EndPoint_Description))]
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs
===================================================================
diff -u -r58553ea29ddb98c5be3b8ae3417e38135e3ed81c -rdb399c3f94284852ca23773a931a43338f281e90
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs (.../FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs) (revision 58553ea29ddb98c5be3b8ae3417e38135e3ed81c)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs (.../FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs) (revision db399c3f94284852ca23773a931a43338f281e90)
@@ -78,34 +78,46 @@
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
- Assert.AreEqual(5, dynamicProperties.Count);
+ Assert.AreEqual(7, dynamicProperties.Count);
PropertyDescriptor nameProperty = dynamicProperties[0];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
"Algemeen",
"Vaknaam",
"De naam van het vak.",
true);
- PropertyDescriptor lengthProperty = dynamicProperties[1];
+ PropertyDescriptor sectionStartDistanceProperty = dynamicProperties[1];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(sectionStartDistanceProperty,
+ "Algemeen",
+ "Metrering* van [m]",
+ "De afstand tussen het beginpunt van het vak en het begin van het traject, gemeten langs het traject in meters (afgerond).",
+ true);
+ PropertyDescriptor sectionEndDistanceProperty = dynamicProperties[2];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(sectionEndDistanceProperty,
+ "Algemeen",
+ "Metrering* tot [m]",
+ "De afstand tussen het eindpunt van het vak en het begin van het traject, gemeten langs het traject in meters (afgerond).",
+ true);
+ PropertyDescriptor lengthProperty = dynamicProperties[3];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(lengthProperty,
"Algemeen",
"Lengte* [m]",
"De totale lengte van het vak in meters (afgerond).",
true);
- PropertyDescriptor startPointProperty = dynamicProperties[2];
+ PropertyDescriptor startPointProperty = dynamicProperties[4];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(startPointProperty,
"Algemeen",
"Beginpunt",
"Beginpunt van het vak (X-coördinaat, Y-coördinaat).",
true);
- PropertyDescriptor endPointProperty = dynamicProperties[3];
+ PropertyDescriptor endPointProperty = dynamicProperties[5];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(endPointProperty,
"Algemeen",
"Eindpunt",
"Eindpunt van het vak (X-coördinaat, Y-coördinaat).",
true);
- PropertyDescriptor nProperty = dynamicProperties[4];
+ PropertyDescriptor nProperty = dynamicProperties[6];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nProperty,
"Algemeen",
"Nvak* [-]",
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionPropertiesTest.cs
===================================================================
diff -u -ra1d6bc6106fb1bad8fc3bc80097ad628622b30de -rdb399c3f94284852ca23773a931a43338f281e90
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionPropertiesTest.cs (.../FailureMechanismSectionPropertiesTest.cs) (revision a1d6bc6106fb1bad8fc3bc80097ad628622b30de)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionPropertiesTest.cs (.../FailureMechanismSectionPropertiesTest.cs) (revision db399c3f94284852ca23773a931a43338f281e90)
@@ -63,6 +63,11 @@
Assert.AreEqual(section.Length, properties.Length, properties.Length.GetAccuracy());
Assert.AreEqual(section.StartPoint, properties.StartPoint);
Assert.AreEqual(section.EndPoint, properties.EndPoint);
+
+ Assert.AreEqual(2, properties.SectionStart.NumberOfDecimalPlaces);
+ Assert.AreEqual(0.0, properties.SectionStart);
+ Assert.AreEqual(2, properties.SectionEnd.NumberOfDecimalPlaces);
+ Assert.AreEqual(0.0, properties.SectionEnd);
}
[Test]
@@ -76,27 +81,39 @@
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
- Assert.AreEqual(4, dynamicProperties.Count);
+ Assert.AreEqual(6, dynamicProperties.Count);
PropertyDescriptor nameProperty = dynamicProperties[0];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
"Algemeen",
"Vaknaam",
"De naam van het vak.",
true);
- PropertyDescriptor lengthProperty = dynamicProperties[1];
+ PropertyDescriptor sectionStartDistanceProperty = dynamicProperties[1];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(sectionStartDistanceProperty,
+ "Algemeen",
+ "Metrering* van [m]",
+ "De afstand tussen het beginpunt van het vak en het begin van het traject, gemeten langs het traject in meters (afgerond).",
+ true);
+ PropertyDescriptor sectionEndDistanceProperty = dynamicProperties[2];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(sectionEndDistanceProperty,
+ "Algemeen",
+ "Metrering* tot [m]",
+ "De afstand tussen het eindpunt van het vak en het begin van het traject, gemeten langs het traject in meters (afgerond).",
+ true);
+ PropertyDescriptor lengthProperty = dynamicProperties[3];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(lengthProperty,
"Algemeen",
"Lengte* [m]",
"De totale lengte van het vak in meters (afgerond).",
true);
- PropertyDescriptor startPointProperty = dynamicProperties[2];
+ PropertyDescriptor startPointProperty = dynamicProperties[4];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(startPointProperty,
"Algemeen",
"Beginpunt",
"Beginpunt van het vak (X-coördinaat, Y-coördinaat).",
true);
- PropertyDescriptor endPointProperty = dynamicProperties[3];
+ PropertyDescriptor endPointProperty = dynamicProperties[5];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(endPointProperty,
"Algemeen",
"Eindpunt",