Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r3b1b80d82960d3bfa4906e06e37e73e4729eb3ad -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3b1b80d82960d3bfa4906e06e37e73e4729eb3ad) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -118,60 +118,6 @@ } /// - /// Looks up a localized string similar to Instroommodel van het kunstwerk.. - /// - public static string ClosingStructureInflowModelType_Description { - get { - return ResourceManager.GetString("ClosingStructureInflowModelType_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Instroommodel. - /// - public static string ClosingStructureInflowModelType_DisplayName { - get { - return ResourceManager.GetString("ClosingStructureInflowModelType_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Afvoercoëfficient.. - /// - public static string DrainCoefficient_Description { - get { - return ResourceManager.GetString("DrainCoefficient_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Afvoercoëfficient [-]. - /// - public static string DrainCoefficient_DisplayName { - get { - return ResourceManager.GetString("DrainCoefficient_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Factor voor stormduur hoogwater gegeven geopend kunstwerk.. - /// - public static string FactorStormDurationOpenStructure_Description { - get { - return ResourceManager.GetString("FactorStormDurationOpenStructure_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Factor voor stormduur hoogwater [-]. - /// - public static string FactorStormDurationOpenStructure_DisplayName { - get { - return ResourceManager.GetString("FactorStormDurationOpenStructure_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Kans op mislukken sluiting van geopend kunstwerk.. /// public static string FailureProbabilityOpenStructure_Description { Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx =================================================================== diff -u -r3b1b80d82960d3bfa4906e06e37e73e4729eb3ad -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3b1b80d82960d3bfa4906e06e37e73e4729eb3ad) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -117,12 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Instroommodel van het kunstwerk. - - - Instroommodel - Aantal identieke doorstroomopeningen. @@ -165,16 +159,4 @@ 2NA [-] - - Afvoercoëfficient. - - - Afvoercoëfficient [-] - - - Factor voor stormduur hoogwater gegeven geopend kunstwerk. - - - Factor voor stormduur hoogwater [-] - \ No newline at end of file Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs =================================================================== diff -u -r7d6e4c28a40fb056c182d0691dda2b2e88aeebfd -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision 7d6e4c28a40fb056c182d0691dda2b2e88aeebfd) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -97,8 +97,8 @@ [PropertyOrder(inflowModelTypePropertyIndex)] [TypeConverter(typeof(EnumTypeConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "ClosingStructureInflowModelType_DisplayName")] - [ResourcesDescription(typeof(Resources), "ClosingStructureInflowModelType_Description")] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_InflowModelType_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_InflowModelType_Description")] public ClosingStructureInflowModelType InflowModelType { get Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs =================================================================== diff -u -re4e785f127ce9a2d0d1734c1b51e02d910a31bbe -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision e4e785f127ce9a2d0d1734c1b51e02d910a31bbe) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -150,8 +150,8 @@ [PropertyOrder(drainCoefficientPropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] - [ResourcesDisplayName(typeof(Resources), "DrainCoefficient_DisplayName")] - [ResourcesDescription(typeof(Resources), "DrainCoefficient_Description")] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_DrainCoefficient_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_DrainCoefficient_Description")] public NormalDistributionProperties DrainCoefficient { get @@ -165,8 +165,8 @@ [PropertyOrder(factorStormDurationOpenStructurePropertyIndex)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] - [ResourcesDisplayName(typeof(Resources), "FactorStormDurationOpenStructure_DisplayName")] - [ResourcesDescription(typeof(Resources), "FactorStormDurationOpenStructure_Description")] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_FactorStormDurationOpenStructure_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_FactorStormDurationOpenStructure_Description")] public RoundedDouble FactorStormDurationOpenStructure { get @@ -187,8 +187,8 @@ [PropertyOrder(inflowModelTypePropertyIndex)] [TypeConverter(typeof(EnumTypeConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "ClosingStructureInflowModelType_DisplayName")] - [ResourcesDescription(typeof(Resources), "ClosingStructureInflowModelType_Description")] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_InflowModelType_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_InflowModelType_Description")] public ClosingStructureInflowModelType InflowModelType { get Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs =================================================================== diff -u -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -304,7 +304,7 @@ if (IsInvalidNumber(input.FactorStormDurationOpenStructure)) { validationResults.Add(string.Format(RingtoetsCommonServiceResources.Validation_ValidateInput_No_value_entered_for_ParameterName_0_, - ParameterNameExtractor.GetFromDisplayName(ClosingStructuresFormsResources.FactorStormDurationOpenStructure_DisplayName))); + ParameterNameExtractor.GetFromDisplayName(RingtoetsCommonFormsResources.Structure_FactorStormDurationOpenStructure_DisplayName))); } validationResults.AddRange(DistributionValidation.ValidateDistribution(input.WidthFlowApertures, Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r86984ca293c30b4f9b47da7825cbae1404fffe08 -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 86984ca293c30b4f9b47da7825cbae1404fffe08) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -1775,6 +1775,42 @@ } /// + /// Looks up a localized string similar to Afvoercoëfficient.. + /// + public static string Structure_DrainCoefficient_Description { + get { + return ResourceManager.GetString("Structure_DrainCoefficient_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Afvoercoëfficient [-]. + /// + public static string Structure_DrainCoefficient_DisplayName { + get { + return ResourceManager.GetString("Structure_DrainCoefficient_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Factor voor stormduur hoogwater gegeven geopend kunstwerk.. + /// + public static string Structure_FactorStormDurationOpenStructure_Description { + get { + return ResourceManager.GetString("Structure_FactorStormDurationOpenStructure_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Factor voor stormduur hoogwater [-]. + /// + public static string Structure_FactorStormDurationOpenStructure_DisplayName { + get { + return ResourceManager.GetString("Structure_FactorStormDurationOpenStructure_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Faalkans kunstwerk gegeven erosie bodem.. /// public static string Structure_FailureProbabilityStructureWithErosion_Description { @@ -1829,6 +1865,24 @@ } /// + /// Looks up a localized string similar to Instroommodel van het kunstwerk.. + /// + public static string Structure_InflowModelType_Description { + get { + return ResourceManager.GetString("Structure_InflowModelType_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Instroommodel. + /// + public static string Structure_InflowModelType_DisplayName { + get { + return ResourceManager.GetString("Structure_InflowModelType_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Binnenwaterstand.. /// public static string Structure_InsideWaterLevel_Description { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r86984ca293c30b4f9b47da7825cbae1404fffe08 -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 86984ca293c30b4f9b47da7825cbae1404fffe08) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -820,4 +820,22 @@ Er zijn geen kunstwerken beschikbaar om berekeningen voor te genereren. + + Afvoercoëfficient. + + + Afvoercoëfficient [-] + + + Factor voor stormduur hoogwater gegeven geopend kunstwerk. + + + Factor voor stormduur hoogwater [-] + + + Instroommodel van het kunstwerk. + + + Instroommodel + \ No newline at end of file Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r5cebd1bde0e31fe6099039a89333ce5c21245e50 -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5cebd1bde0e31fe6099039a89333ce5c21245e50) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -82,24 +82,6 @@ } /// - /// Looks up a localized string similar to Instroommodel van het kunstwerk.. - /// - internal static string StabilityPointStructureInflowModelType_Description { - get { - return ResourceManager.GetString("StabilityPointStructureInflowModelType_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Instroommodel [-]. - /// - internal static string StabilityPointStructureInflowModelType_DisplayName { - get { - return ResourceManager.GetString("StabilityPointStructureInflowModelType_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Modelfactor voor aanvaarbelasting.. /// internal static string StabilityPointStructuresInputFailureMechanismContext_ModelFactorCollisionLoad_Description { Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.resx =================================================================== diff -u -r5cebd1bde0e31fe6099039a89333ce5c21245e50 -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5cebd1bde0e31fe6099039a89333ce5c21245e50) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -117,12 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Instroommodel van het kunstwerk. - - - Instroommodel [-] - Modelfactor voor aanvaarbelasting. Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs =================================================================== diff -u -r7d6e4c28a40fb056c182d0691dda2b2e88aeebfd -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs (.../StabilityPointStructureProperties.cs) (revision 7d6e4c28a40fb056c182d0691dda2b2e88aeebfd) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs (.../StabilityPointStructureProperties.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -173,8 +173,8 @@ [PropertyOrder(stabilityPointStructureInflowModelTypePropertyIndex)] [TypeConverter(typeof(EnumTypeConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "StabilityPointStructureInflowModelType_DisplayName")] - [ResourcesDescription(typeof(Resources), "StabilityPointStructureInflowModelType_Description")] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_InflowModelType_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_InflowModelType_Description")] public StabilityPointStructureInflowModelType InflowModelType { get Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilitypointStructuresInputContextProperties.cs =================================================================== diff -u -rbf7824face851bd1ca833bd4337c9f80efedac00 -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilitypointStructuresInputContextProperties.cs (.../StabilitypointStructuresInputContextProperties.cs) (revision bf7824face851bd1ca833bd4337c9f80efedac00) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilitypointStructuresInputContextProperties.cs (.../StabilitypointStructuresInputContextProperties.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -27,7 +27,6 @@ using Core.Common.Utils.Attributes; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityPointStructures.Forms.PresentationObjects; -using Ringtoets.StabilityPointStructures.Forms.Properties; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.PropertyClasses; @@ -126,8 +125,8 @@ [PropertyOrder(drainCoefficientPropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] - [ResourcesDisplayName(typeof(Resources), "DrainCoefficient_DisplayName")] - [ResourcesDescription(typeof(Resources), "DrainCoefficient_Description")] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_DrainCoefficient_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_DrainCoefficient_Description")] public NormalDistributionProperties DrainCoefficient { get @@ -141,8 +140,8 @@ [PropertyOrder(factorStormDurationOpenStructurePropertyIndex)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] - [ResourcesDisplayName(typeof(Resources), "FactorStormDurationOpenStructure_DisplayName")] - [ResourcesDescription(typeof(Resources), "FactorStormDurationOpenStructure_Description")] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_FactorStormDurationOpenStructure_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_FactorStormDurationOpenStructure_Description")] public RoundedDouble FactorStormDurationOpenStructure { get @@ -163,8 +162,8 @@ [PropertyOrder(inflowModelTypePropertyIndex)] [TypeConverter(typeof(EnumTypeConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "StabilityPointStructureInflowModelType_DisplayName")] - [ResourcesDescription(typeof(Resources), "StabilityPointStructureInflowModelType_Description")] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_InflowModelType_DisplayName")] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_InflowModelType_Description")] public StabilityPointStructureInflowModelType InflowModelType { get Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs =================================================================== diff -u -re7423204b7d614fbd894dbadfa4d4c7a7e894e94 -ra16989b635b3770eb1bbf10c47e41eef796ce2fa --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision e7423204b7d614fbd894dbadfa4d4c7a7e894e94) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) @@ -266,7 +266,7 @@ PropertyDescriptor stabilityPointStructureTypeProperty = dynamicProperties[stabilityPointStructureInflowModelTypePropertyIndex]; Assert.IsInstanceOf(stabilityPointStructureTypeProperty.Converter); Assert.AreEqual(schematizationCategory, stabilityPointStructureTypeProperty.Category); - Assert.AreEqual("Instroommodel [-]", stabilityPointStructureTypeProperty.DisplayName); + Assert.AreEqual("Instroommodel", stabilityPointStructureTypeProperty.DisplayName); Assert.AreEqual("Instroommodel van het kunstwerk.", stabilityPointStructureTypeProperty.Description); PropertyDescriptor widthFlowAperturesProperty = dynamicProperties[widthFlowAperturesPropertyIndex];