Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailurePathProperties.cs
===================================================================
diff -u -r05fdac93d85697887cf68b13696ca6a339de78bd -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailurePathProperties.cs (.../ClosingStructuresFailurePathProperties.cs) (revision 05fdac93d85697887cf68b13696ca6a339de78bd)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailurePathProperties.cs (.../ClosingStructuresFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -161,8 +161,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r378f723f6144609e39bdf9bda161981e74cbba23 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 378f723f6144609e39bdf9bda161981e74cbba23)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -2135,18 +2135,18 @@
///
/// Looks up a localized string similar to Geeft aan of het lengte-effect binnen een vak toegepast wordt..
///
- public static string FailurePath_Apply_LengthEffect_In_Section_Description {
+ public static string FailurePath_ApplyLengthEffectInSection_Description {
get {
- return ResourceManager.GetString("FailurePath_Apply_LengthEffect_In_Section_Description", resourceCulture);
+ return ResourceManager.GetString("FailurePath_ApplyLengthEffectInSection_Description", resourceCulture);
}
}
///
/// Looks up a localized string similar to Toepassen lengte-effect binnen vak.
///
- public static string FailurePath_Apply_LengthEffect_In_Section_DisplayName {
+ public static string FailurePath_ApplyLengthEffectInSection_DisplayName {
get {
- return ResourceManager.GetString("FailurePath_Apply_LengthEffect_In_Section_DisplayName", resourceCulture);
+ return ResourceManager.GetString("FailurePath_ApplyLengthEffectInSection_DisplayName", resourceCulture);
}
}
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r378f723f6144609e39bdf9bda161981e74cbba23 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 378f723f6144609e39bdf9bda161981e74cbba23)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -1733,10 +1733,10 @@
Duidingsklasse
-
+
Toepassen lengte-effect binnen vak
-
+
Geeft aan of het lengte-effect binnen een vak toegepast wordt.
\ No newline at end of file
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs
===================================================================
diff -u -r7aff1faba7849422aa685d5b8343139b14d25a16 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs (.../DuneErosionFailurePathProperties.cs) (revision 7aff1faba7849422aa685d5b8343139b14d25a16)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs (.../DuneErosionFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -89,8 +89,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs
===================================================================
diff -u -r170077f9e19596ca9e435c0f56cde4997b9154e4 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs (.../GrassCoverErosionInwardsFailurePathProperties.cs) (revision 170077f9e19596ca9e435c0f56cde4997b9154e4)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs (.../GrassCoverErosionInwardsFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -116,8 +116,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailurePathProperties.cs
===================================================================
diff -u -rc32114e2ca7e943d46c4db7053f737a91d1beb4d -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailurePathProperties.cs (.../GrassCoverErosionOutwardsFailurePathProperties.cs) (revision c32114e2ca7e943d46c4db7053f737a91d1beb4d)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailurePathProperties.cs (.../GrassCoverErosionOutwardsFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -94,8 +94,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresFailurePathProperties.cs
===================================================================
diff -u -red81b2c9fe714201309ffa8746a766c3b09c55b0 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresFailurePathProperties.cs (.../HeightStructuresFailurePathProperties.cs) (revision ed81b2c9fe714201309ffa8746a766c3b09c55b0)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresFailurePathProperties.cs (.../HeightStructuresFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -88,8 +88,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/SpecificFailurePathProperties.cs
===================================================================
diff -u -r53db672ea7f64a027340bc5170cfdf7b837acb48 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/SpecificFailurePathProperties.cs (.../SpecificFailurePathProperties.cs) (revision 53db672ea7f64a027340bc5170cfdf7b837acb48)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/SpecificFailurePathProperties.cs (.../SpecificFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -123,8 +123,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/MacroStabilityOutwardsFailurePathProperties.cs
===================================================================
diff -u -r009907dda8668691732dc46c044efe1dac40e9fd -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/MacroStabilityOutwardsFailurePathProperties.cs (.../MacroStabilityOutwardsFailurePathProperties.cs) (revision 009907dda8668691732dc46c044efe1dac40e9fd)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/MacroStabilityOutwardsFailurePathProperties.cs (.../MacroStabilityOutwardsFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -215,8 +215,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/PipingStructureFailurePathProperties.cs
===================================================================
diff -u -r75229fe1249a839986bf80c01755f18657135b71 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/PipingStructureFailurePathProperties.cs (.../PipingStructureFailurePathProperties.cs) (revision 75229fe1249a839986bf80c01755f18657135b71)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/PipingStructureFailurePathProperties.cs (.../PipingStructureFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -93,8 +93,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StandAloneFailurePathProperties.cs
===================================================================
diff -u -rcb83886c96a9d1f96347521f3d0746877b9c15a6 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StandAloneFailurePathProperties.cs (.../StandAloneFailurePathProperties.cs) (revision cb83886c96a9d1f96347521f3d0746877b9c15a6)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StandAloneFailurePathProperties.cs (.../StandAloneFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -107,8 +107,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StrengthStabilityLengthwiseConstructionFailurePathProperties.cs
===================================================================
diff -u -r02fa09b26415f7b50bafd3c991f49ffaf369e20a -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StrengthStabilityLengthwiseConstructionFailurePathProperties.cs (.../StrengthStabilityLengthwiseConstructionFailurePathProperties.cs) (revision 02fa09b26415f7b50bafd3c991f49ffaf369e20a)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StrengthStabilityLengthwiseConstructionFailurePathProperties.cs (.../StrengthStabilityLengthwiseConstructionFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -20,39 +20,97 @@
// All rights reserved.
using System;
+using System.Linq;
+using Core.Common.Base.Data;
using Core.Common.Util.Attributes;
using Core.Gui.Attributes;
+using Core.Gui.PropertyBag;
using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.Contribution;
using Riskeer.Common.Data.FailureMechanism;
using Riskeer.Integration.Data.StandAlone;
+using Riskeer.Integration.Forms.Properties;
using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
namespace Riskeer.Integration.Forms.PropertyClasses.StandAlone
{
///
/// Failure path related ViewModel of for properties panel.
///
- public class StrengthStabilityLengthwiseConstructionFailurePathProperties : StandAloneFailurePathProperties
+ public class StrengthStabilityLengthwiseConstructionFailurePathProperties : ObjectProperties
{
+ private const int namePropertyIndex = 1;
+ private const int codePropertyIndex = 2;
+ private const int groupPropertyIndex = 3;
+ private const int contributionPropertyIndex = 4;
+ private const int inAssemblyPropertyIndex = 5;
+ private const int nPropertyIndex = 6;
private const int applyLengthEffectInSectionPropertyIndex = 7;
+ private readonly IAssessmentSection assessmentSection;
+
///
/// Creates a new instance of .
///
/// The failure mechanism to show the properties for.
/// The assessment section the failure mechanism belongs to.
/// Thrown when any parameter is null.
public StrengthStabilityLengthwiseConstructionFailurePathProperties(IHasGeneralInput failureMechanism, IAssessmentSection assessmentSection)
- : base(failureMechanism, assessmentSection) {}
+ {
+ if (failureMechanism == null)
+ {
+ throw new ArgumentNullException(nameof(failureMechanism));
+ }
+ if (assessmentSection == null)
+ {
+ throw new ArgumentNullException(nameof(assessmentSection));
+ }
+
+ this.assessmentSection = assessmentSection;
+
+ Data = failureMechanism;
+ }
+
+ [DynamicVisibleValidationMethod]
+ public bool DynamicVisibleValidationMethod(string propertyName)
+ {
+ return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName);
+ }
+
+ private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName)
+ {
+ return nameof(Contribution).Equals(propertyName)
+ || nameof(N).Equals(propertyName)
+ || nameof(ApplyLengthEffectInSection).Equals(propertyName);
+ }
+
#region Length effect parameters
[DynamicVisible]
+ [PropertyOrder(nPropertyIndex)]
+ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Description))]
+ public RoundedDouble N
+ {
+ get
+ {
+ return data.GeneralInput.N;
+ }
+ set
+ {
+ data.GeneralInput.N = value;
+ data.NotifyObservers();
+ }
+ }
+
+ [DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
- public new bool ApplyLengthEffectInSection
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
+ public bool ApplyLengthEffectInSection
{
get
{
@@ -61,5 +119,71 @@
}
#endregion
+
+ #region General
+
+ [PropertyOrder(namePropertyIndex)]
+ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Name_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Name_Description))]
+ public string Name
+ {
+ get
+ {
+ return data.Name;
+ }
+ }
+
+ [PropertyOrder(codePropertyIndex)]
+ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Code_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Code_Description))]
+ public string Code
+ {
+ get
+ {
+ return data.Code;
+ }
+ }
+
+ [PropertyOrder(groupPropertyIndex)]
+ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Group_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Group_Description))]
+ public int Group
+ {
+ get
+ {
+ return data.Group;
+ }
+ }
+
+ [DynamicVisible]
+ [PropertyOrder(contributionPropertyIndex)]
+ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Contribution_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Contribution_Description))]
+ public string Contribution
+ {
+ get
+ {
+ return string.Format(Resources.FailureMechanismProperties_Contribution_Other_Percentage_0,
+ assessmentSection.GetContributingFailureMechanisms().Single(fm => fm is OtherFailureMechanism).Contribution);
+ }
+ }
+
+ [PropertyOrder(inAssemblyPropertyIndex)]
+ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_InAssembly_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_InAssembly_Description))]
+ public bool InAssembly
+ {
+ get
+ {
+ return data.InAssembly;
+ }
+ }
+
+ #endregion
}
}
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/StandAlone/StrengthStabilityLengthwiseConstructionFailurePathPropertiesTest.cs
===================================================================
diff -u -r02fa09b26415f7b50bafd3c991f49ffaf369e20a -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/StandAlone/StrengthStabilityLengthwiseConstructionFailurePathPropertiesTest.cs (.../StrengthStabilityLengthwiseConstructionFailurePathPropertiesTest.cs) (revision 02fa09b26415f7b50bafd3c991f49ffaf369e20a)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/StandAlone/StrengthStabilityLengthwiseConstructionFailurePathPropertiesTest.cs (.../StrengthStabilityLengthwiseConstructionFailurePathPropertiesTest.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -24,6 +24,7 @@
using Core.Common.Base;
using Core.Common.Base.Data;
using Core.Common.TestUtil;
+using Core.Gui.PropertyBag;
using Core.Gui.TestUtil;
using NUnit.Framework;
using Rhino.Mocks;
@@ -101,7 +102,7 @@
var properties = new StrengthStabilityLengthwiseConstructionFailurePathProperties(failureMechanism, assessmentSection);
// Assert
- Assert.IsInstanceOf(properties);
+ Assert.IsInstanceOf>(properties);
Assert.AreEqual(failureMechanism.Name, properties.Name);
Assert.AreEqual(failureMechanism.Code, properties.Code);
Assert.AreEqual(failureMechanism.Group, properties.Group);
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailurePathProperties.cs
===================================================================
diff -u -r8ad64b1a03aa287717312208b0feddd63d55e402 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailurePathProperties.cs (.../MacroStabilityInwardsFailurePathProperties.cs) (revision 8ad64b1a03aa287717312208b0feddd63d55e402)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailurePathProperties.cs (.../MacroStabilityInwardsFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -190,8 +190,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs
===================================================================
diff -u -r378f723f6144609e39bdf9bda161981e74cbba23 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs (.../PipingFailurePathProperties.cs) (revision 378f723f6144609e39bdf9bda161981e74cbba23)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs (.../PipingFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -190,8 +190,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailurePathProperties.cs
===================================================================
diff -u -ra22d807fb63e9d3f0f9d6af213793a80c6cc32a1 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailurePathProperties.cs (.../StabilityPointStructuresFailurePathProperties.cs) (revision a22d807fb63e9d3f0f9d6af213793a80c6cc32a1)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailurePathProperties.cs (.../StabilityPointStructuresFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -88,8 +88,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverFailurePathProperties.cs
===================================================================
diff -u -r631b6c404d5ad7dcca09ee6516425f7648d9c4b6 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverFailurePathProperties.cs (.../StabilityStoneCoverFailurePathProperties.cs) (revision 631b6c404d5ad7dcca09ee6516425f7648d9c4b6)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverFailurePathProperties.cs (.../StabilityStoneCoverFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -88,8 +88,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailurePathProperties.cs
===================================================================
diff -u -r80a9bf12d4c27c4d686f68722f53197339c44787 -r26f427a7724ebe6e50c0d83fd87156df30f17e9c
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailurePathProperties.cs (.../WaveImpactAsphaltCoverFailurePathProperties.cs) (revision 80a9bf12d4c27c4d686f68722f53197339c44787)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailurePathProperties.cs (.../WaveImpactAsphaltCoverFailurePathProperties.cs) (revision 26f427a7724ebe6e50c0d83fd87156df30f17e9c)
@@ -173,8 +173,8 @@
[DynamicVisible]
[PropertyOrder(applyLengthEffectInSectionPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_Apply_LengthEffect_In_Section_Description))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_ApplyLengthEffectInSection_Description))]
public bool ApplyLengthEffectInSection
{
get