Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -118,7 +118,7 @@ } /// - /// Looks up a localized string similar to De hoogte van de dam [m+NAP].. + /// Looks up a localized string similar to De hoogte van de dam.. /// public static string BreakWaterHeight_Description { get { @@ -317,7 +317,7 @@ } /// - /// Looks up a localized string similar to De hoogte van de dijk [m+NAP].. + /// Looks up a localized string similar to De hoogte van de dijk.. /// public static string DikeHeight_Description { get { Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx =================================================================== diff -u -rdc138b91865e2d63b0a92e81888473c9a8f63260 -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision dc138b91865e2d63b0a92e81888473c9a8f63260) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -155,7 +155,7 @@ Schematisatie - De hoogte van de dam [m+NAP]. + De hoogte van de dam. Hoogte [m+NAP] @@ -203,7 +203,7 @@ Ruwheden [-] - De hoogte van de dijk [m+NAP]. + De hoogte van de dijk. Dijkhoogte [m+NAP] Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileBreakWaterPropertiesTest.cs =================================================================== diff -u -r53aef346fd0ee3cc79d1f5df9171c476453f2935 -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileBreakWaterPropertiesTest.cs (.../DikeProfileBreakWaterPropertiesTest.cs) (revision 53aef346fd0ee3cc79d1f5df9171c476453f2935) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileBreakWaterPropertiesTest.cs (.../DikeProfileBreakWaterPropertiesTest.cs) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -115,7 +115,7 @@ Assert.IsTrue(breakWaterHeightProperty.IsBrowsable); Assert.IsTrue(breakWaterHeightProperty.IsReadOnly); Assert.AreEqual("Hoogte [m+NAP]", breakWaterHeightProperty.DisplayName); - Assert.AreEqual("De hoogte van de dam [m+NAP].", breakWaterHeightProperty.Description); + Assert.AreEqual("De hoogte van de dam.", breakWaterHeightProperty.Description); } [Test] Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfilePropertiesTest.cs =================================================================== diff -u -rdc138b91865e2d63b0a92e81888473c9a8f63260 -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfilePropertiesTest.cs (.../DikeProfilePropertiesTest.cs) (revision dc138b91865e2d63b0a92e81888473c9a8f63260) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfilePropertiesTest.cs (.../DikeProfilePropertiesTest.cs) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -139,7 +139,7 @@ Assert.IsTrue(dikeHeightProperty.IsReadOnly); Assert.AreEqual("Schematisatie", dikeHeightProperty.Category); Assert.AreEqual("Dijkhoogte [m+NAP]", dikeHeightProperty.DisplayName); - Assert.AreEqual("De hoogte van de dijk [m+NAP].", dikeHeightProperty.Description); + Assert.AreEqual("De hoogte van de dijk.", dikeHeightProperty.Description); } private const int namePropertyIndex = 0; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs =================================================================== diff -u -r53aef346fd0ee3cc79d1f5df9171c476453f2935 -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs) (revision 53aef346fd0ee3cc79d1f5df9171c476453f2935) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -158,7 +158,7 @@ Assert.IsNotNull(breakWaterHeightProperty); Assert.AreEqual(!withDikeProfile, breakWaterHeightProperty.IsReadOnly); Assert.AreEqual("Hoogte [m+NAP]", breakWaterHeightProperty.DisplayName); - Assert.AreEqual("De hoogte van de dam [m+NAP].", breakWaterHeightProperty.Description); + Assert.AreEqual("De hoogte van de dam.", breakWaterHeightProperty.Description); mockRepository.VerifyAll(); } @@ -214,7 +214,7 @@ Assert.IsNotNull(breakWaterHeightProperty); Assert.AreEqual(!useBreakWaterState, breakWaterHeightProperty.IsReadOnly); Assert.AreEqual("Hoogte [m+NAP]", breakWaterHeightProperty.DisplayName); - Assert.AreEqual("De hoogte van de dam [m+NAP].", breakWaterHeightProperty.Description); + Assert.AreEqual("De hoogte van de dam.", breakWaterHeightProperty.Description); mockRepository.VerifyAll(); } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs =================================================================== diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 7f759fbabca9c41e75d229269f1b21581b373b5f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -254,7 +254,7 @@ Assert.AreEqual(!withDikeProfile, dikeHeightProperty.IsReadOnly); Assert.AreEqual("Schematisatie", dikeHeightProperty.Category); Assert.AreEqual("Dijkhoogte [m+NAP]", dikeHeightProperty.DisplayName); - Assert.AreEqual("De hoogte van de dijk [m+NAP].", dikeHeightProperty.Description); + Assert.AreEqual("De hoogte van de dijk.", dikeHeightProperty.Description); PropertyDescriptor criticalFlowRateProperty = dynamicProperties[criticalFlowRatePropertyIndex]; Assert.IsNotNull(criticalFlowRateProperty); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -ra099492313e1f81f882fe3142f4996a0c27e04ee -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a099492313e1f81f882fe3142f4996a0c27e04ee) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -1,7 +1,28 @@ -//------------------------------------------------------------------------------ +// 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. + +//------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -89,7 +110,7 @@ } /// - /// Looks up a localized string similar to Id van het traject.. + /// Looks up a localized string similar to ID van het traject.. /// public static string AssessmentSection_Id_Description { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -ra099492313e1f81f882fe3142f4996a0c27e04ee -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision a099492313e1f81f882fe3142f4996a0c27e04ee) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -232,7 +232,7 @@ Dijk / Duin - Id van het traject. + ID van het traject. ID Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rb88a94ef727139fee2d0fcb7df05494aad8301d6 -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b88a94ef727139fee2d0fcb7df05494aad8301d6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -1476,7 +1476,7 @@ } /// - /// Looks up a localized string similar to Id van het stochastische ondergrondmodel in de database.. + /// Looks up a localized string similar to ID van het stochastische ondergrondmodel in de database.. /// public static string StochasticSoilModel_Id_Description { get { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -rb88a94ef727139fee2d0fcb7df05494aad8301d6 -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision b88a94ef727139fee2d0fcb7df05494aad8301d6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -563,7 +563,7 @@ Geometrie - Id van het stochastische ondergrondmodel in de database. + ID van het stochastische ondergrondmodel in de database. ID Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilModelProperties.cs =================================================================== diff -u -r050043cae5f4544e895e577a8a0f42c0271b80b0 -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilModelProperties.cs (.../StochasticSoilModelProperties.cs) (revision 050043cae5f4544e895e577a8a0f42c0271b80b0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/StochasticSoilModelProperties.cs (.../StochasticSoilModelProperties.cs) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -26,8 +26,8 @@ using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; -using Ringtoets.Common.Forms.Properties; using Ringtoets.Piping.Data; +using Ringtoets.Piping.Forms.Properties; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.Piping.Forms.PropertyClasses Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs =================================================================== diff -u -rbf334f50530164badedba45a78f3aab857ae1bf6 -r672ae203d551fb1e86b1cc9d4a0599a211560804 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision bf334f50530164badedba45a78f3aab857ae1bf6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 672ae203d551fb1e86b1cc9d4a0599a211560804) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using System.ComponentModel; using Core.Common.Base.Geometry; using Core.Common.Gui.PropertyBag; using NUnit.Framework; @@ -74,5 +75,74 @@ Assert.IsInstanceOf(properties.StochasticSoilProfiles); Assert.AreEqual(1, properties.StochasticSoilProfiles.Length); } + + [Test] + public void PropertyAttributes_ReturnExpectedValues() + { + // Setup + StochasticSoilModel stochasticSoilModel = new StochasticSoilModel(1324, "Name", "SegmentName"); + stochasticSoilModel.Geometry.Add(new Point2D(1.0, 2.0)); + var pipingSoilProfile = new PipingSoilProfile("PipingSoilProfile", 0, new List + { + new PipingSoilLayer(10) + }, SoilProfileType.SoilProfile1D, 0); + var stochasticSoilProfile = new StochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) + { + SoilProfile = pipingSoilProfile + }; + stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); + + // Call + var properties = new StochasticSoilModelProperties + { + Data = stochasticSoilModel + }; + + // Assert + var dynamicPropertyBag = new DynamicPropertyBag(properties); + PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(); + Assert.AreEqual(6, dynamicProperties.Count); + + PropertyDescriptor stochasticSoilModelIdProperty = dynamicProperties[stochasticSoilModelIdPropertyIndex]; + Assert.IsNotNull(stochasticSoilModelIdProperty); + Assert.IsTrue(stochasticSoilModelIdProperty.IsReadOnly); + Assert.AreEqual("Algemeen", stochasticSoilModelIdProperty.Category); + Assert.AreEqual("ID", stochasticSoilModelIdProperty.DisplayName); + Assert.AreEqual("ID van het stochastische ondergrondmodel in de database.", stochasticSoilModelIdProperty.Description); + + PropertyDescriptor stochasticSoilModelNameProperty = dynamicProperties[stochasticSoilModelNamePropertyIndex]; + Assert.IsNotNull(stochasticSoilModelNameProperty); + Assert.IsTrue(stochasticSoilModelNameProperty.IsReadOnly); + Assert.AreEqual("Algemeen", stochasticSoilModelNameProperty.Category); + Assert.AreEqual("Naam", stochasticSoilModelNameProperty.DisplayName); + Assert.AreEqual("Naam van het stochastische ondergrondmodel.", stochasticSoilModelNameProperty.Description); + + PropertyDescriptor stochasticSoilModelSegmentNameProperty = dynamicProperties[stochasticSoilModelSegmentNamePropertyIndex]; + Assert.IsNotNull(stochasticSoilModelSegmentNameProperty); + Assert.IsTrue(stochasticSoilModelSegmentNameProperty.IsReadOnly); + Assert.AreEqual("Algemeen", stochasticSoilModelSegmentNameProperty.Category); + Assert.AreEqual("Segment naam", stochasticSoilModelSegmentNameProperty.DisplayName); + Assert.AreEqual("Naam van het stochastische ondergrondmodel segment.", stochasticSoilModelSegmentNameProperty.Description); + + PropertyDescriptor stochasticSoilModelGeometryProperty = dynamicProperties[stochasticSoilModelGeometryPropertyIndex]; + Assert.IsNotNull(stochasticSoilModelGeometryProperty); + Assert.IsTrue(stochasticSoilModelGeometryProperty.IsReadOnly); + Assert.AreEqual("Algemeen", stochasticSoilModelGeometryProperty.Category); + Assert.AreEqual("Geometrie", stochasticSoilModelGeometryProperty.DisplayName); + Assert.AreEqual("Geometrie uit de database.", stochasticSoilModelGeometryProperty.Description); + + PropertyDescriptor stochasticSoilModelStochasticSoilProfilesProperty = dynamicProperties[stochasticSoilModelStochasticSoilProfilesPropertyIndex]; + Assert.IsNotNull(stochasticSoilModelStochasticSoilProfilesProperty); + Assert.IsTrue(stochasticSoilModelStochasticSoilProfilesProperty.IsReadOnly); + Assert.AreEqual("Algemeen", stochasticSoilModelStochasticSoilProfilesProperty.Category); + Assert.AreEqual("Ondergrondschematisaties", stochasticSoilModelStochasticSoilProfilesProperty.DisplayName); + Assert.AreEqual("Ondergrondschematisaties uit de database.", stochasticSoilModelStochasticSoilProfilesProperty.Description); + } + + private const int stochasticSoilModelIdPropertyIndex = 0; + private const int stochasticSoilModelNamePropertyIndex = 1; + private const int stochasticSoilModelSegmentNamePropertyIndex = 2; + private const int stochasticSoilModelGeometryPropertyIndex = 3; + private const int stochasticSoilModelStochasticSoilProfilesPropertyIndex = 4; } } \ No newline at end of file