Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r039794fd06a72ae34d24f8f1f6d0bf9f7ee99147 -r62c0c80758d506b417ba3340e80b918419a6aa4d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 039794fd06a72ae34d24f8f1f6d0bf9f7ee99147)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 62c0c80758d506b417ba3340e80b918419a6aa4d)
@@ -1490,7 +1490,7 @@
}
///
- /// Looks up a localized string similar to De totale lengte van het vak in meters..
+ /// Looks up a localized string similar to De totale lengte van het vak in meters (afgerond)..
///
public static string FailureMechanismSection_Length_Description {
get {
@@ -1499,7 +1499,7 @@
}
///
- /// Looks up a localized string similar to Lengte [m].
+ /// Looks up a localized string similar to Lengte* [m].
///
public static string FailureMechanismSection_Length_DisplayName {
get {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r039794fd06a72ae34d24f8f1f6d0bf9f7ee99147 -r62c0c80758d506b417ba3340e80b918419a6aa4d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 039794fd06a72ae34d24f8f1f6d0bf9f7ee99147)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 62c0c80758d506b417ba3340e80b918419a6aa4d)
@@ -1257,10 +1257,10 @@
Eindpunt
- De totale lengte van het vak in meters.
+ De totale lengte van het vak in meters (afgerond).
- Lengte [m]
+ Lengte* [m]
De naam van het vak.
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProperties.cs
===================================================================
diff -u -r4e9d3556e3cee0365fc0f26d0bad19b50594e12d -r62c0c80758d506b417ba3340e80b918419a6aa4d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProperties.cs (.../FailureMechanismSectionProperties.cs) (revision 4e9d3556e3cee0365fc0f26d0bad19b50594e12d)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProperties.cs (.../FailureMechanismSectionProperties.cs) (revision 62c0c80758d506b417ba3340e80b918419a6aa4d)
@@ -21,6 +21,7 @@
using System;
using System.ComponentModel;
+using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
using Core.Common.Gui.Attributes;
using Core.Common.Gui.PropertyBag;
@@ -68,11 +69,11 @@
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSection_Length_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.FailureMechanismSection_Length_Description))]
- public double Length
+ public RoundedDouble Length
{
get
{
- return data.Length;
+ return new RoundedDouble(2, data.Length);
}
}
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs
===================================================================
diff -u -r4e9d3556e3cee0365fc0f26d0bad19b50594e12d -r62c0c80758d506b417ba3340e80b918419a6aa4d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs (.../FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs) (revision 4e9d3556e3cee0365fc0f26d0bad19b50594e12d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs (.../FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs) (revision 62c0c80758d506b417ba3340e80b918419a6aa4d)
@@ -89,8 +89,8 @@
PropertyDescriptor lengthProperty = dynamicProperties[1];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(lengthProperty,
"Algemeen",
- "Lengte [m]",
- "De totale lengte van het vak in meters.",
+ "Lengte* [m]",
+ "De totale lengte van het vak in meters (afgerond).",
true);
PropertyDescriptor startPointProperty = dynamicProperties[2];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(startPointProperty,
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionPropertiesTest.cs
===================================================================
diff -u -r09a2360e1ee2624ea986c6338ef1c3ca65e8c215 -r62c0c80758d506b417ba3340e80b918419a6aa4d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionPropertiesTest.cs (.../FailureMechanismSectionPropertiesTest.cs) (revision 09a2360e1ee2624ea986c6338ef1c3ca65e8c215)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismSectionPropertiesTest.cs (.../FailureMechanismSectionPropertiesTest.cs) (revision 62c0c80758d506b417ba3340e80b918419a6aa4d)
@@ -21,6 +21,7 @@
using System;
using System.ComponentModel;
+using Core.Common.Base.Data;
using Core.Common.Gui.PropertyBag;
using Core.Common.TestUtil;
using NUnit.Framework;
@@ -59,7 +60,8 @@
TestHelper.AssertTypeConverter();
Assert.AreEqual(section.Name, properties.Name);
- Assert.AreEqual(section.Length, properties.Length);
+ Assert.AreEqual(2, properties.Length.NumberOfDecimalPlaces);
+ Assert.AreEqual(section.Length, properties.Length, properties.Length.GetAccuracy());
Assert.AreEqual(section.StartPoint, properties.StartPoint);
Assert.AreEqual(section.EndPoint, properties.EndPoint);
}
@@ -86,8 +88,8 @@
PropertyDescriptor lengthProperty = dynamicProperties[1];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(lengthProperty,
"Algemeen",
- "Lengte [m]",
- "De totale lengte van het vak in meters.",
+ "Lengte* [m]",
+ "De totale lengte van het vak in meters (afgerond).",
true);
PropertyDescriptor startPointProperty = dynamicProperties[2];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(startPointProperty,
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsTableTest.cs
===================================================================
diff -u -rcada16310abbc84232fb2131ca6639abbccece13 -r62c0c80758d506b417ba3340e80b918419a6aa4d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsTableTest.cs (.../FailureMechanismSectionsTableTest.cs) (revision cada16310abbc84232fb2131ca6639abbccece13)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsTableTest.cs (.../FailureMechanismSectionsTableTest.cs) (revision 62c0c80758d506b417ba3340e80b918419a6aa4d)
@@ -44,7 +44,7 @@
DataGridViewColumn nameColumn = table.GetColumnFromIndex(nameColumnIndex);
Assert.AreEqual("Vaknaam", nameColumn.HeaderText);
DataGridViewColumn lengthColumn = table.GetColumnFromIndex(lengthColumnIndex);
- Assert.AreEqual("Lengte [m]", lengthColumn.HeaderText);
+ Assert.AreEqual("Lengte* [m]", lengthColumn.HeaderText);
Assert.Throws(() => table.GetColumnFromIndex(lengthColumnIndex + 1));
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rcd5e764c0cceea5f2133a0e86d7698511ca1ba4a -r62c0c80758d506b417ba3340e80b918419a6aa4d
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision cd5e764c0cceea5f2133a0e86d7698511ca1ba4a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 62c0c80758d506b417ba3340e80b918419a6aa4d)
@@ -1109,6 +1109,8 @@
.AddOpenItem()
.AddSeparator()
.AddImportItem()
+ .AddSeparator()
+ .AddPropertiesItem()
.Build();
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs
===================================================================
diff -u -ra39fb3074f6c4cfa06efce5663d8ee428587dddb -r62c0c80758d506b417ba3340e80b918419a6aa4d
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs (.../FailureMechanismSectionsContextTreeNodeInfoTest.cs) (revision a39fb3074f6c4cfa06efce5663d8ee428587dddb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs (.../FailureMechanismSectionsContextTreeNodeInfoTest.cs) (revision 62c0c80758d506b417ba3340e80b918419a6aa4d)
@@ -130,6 +130,8 @@
menuBuilder.Expect(mb => mb.AddOpenItem()).Return(menuBuilder);
menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
menuBuilder.Expect(mb => mb.AddImportItem()).Return(menuBuilder);
+ menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
+ menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder);
menuBuilder.Expect(mb => mb.Build()).Return(null);
}