Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresCalculationsProperties.cs
===================================================================
diff -u -r9b96fbd9683bc9fe1f4b96f149e090972bfa578c -r76bdb353d191ba24960e3836dcdb2fd1e9f4d8e3
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresCalculationsProperties.cs (.../StabilityPointStructuresCalculationsProperties.cs) (revision 9b96fbd9683bc9fe1f4b96f149e090972bfa578c)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresCalculationsProperties.cs (.../StabilityPointStructuresCalculationsProperties.cs) (revision 76bdb353d191ba24960e3836dcdb2fd1e9f4d8e3)
@@ -38,12 +38,11 @@
{
private const int namePropertyIndex = 1;
private const int codePropertyIndex = 2;
- private const int groupPropertyIndex = 3;
- private const int gravitationalAccelerationPropertyIndex = 4;
- private const int modelFactorStorageVolumePropertyIndex = 5;
- private const int modelFactorCollisionLoadPropertyIndex = 6;
- private const int modelFactorLoadEffectPropertyIndex = 7;
- private const int modelFactorLongThresholdPropertyIndex = 8;
+ private const int gravitationalAccelerationPropertyIndex = 3;
+ private const int modelFactorStorageVolumePropertyIndex = 4;
+ private const int modelFactorCollisionLoadPropertyIndex = 5;
+ private const int modelFactorLoadEffectPropertyIndex = 6;
+ private const int modelFactorLongThresholdPropertyIndex = 7;
///
/// Creates a new instance of .
@@ -53,8 +52,7 @@
public StabilityPointStructuresCalculationsProperties(StabilityPointStructuresFailureMechanism data) : base(data, new ConstructionProperties
{
NamePropertyIndex = namePropertyIndex,
- CodePropertyIndex = codePropertyIndex,
- GroupPropertyIndex = groupPropertyIndex
+ CodePropertyIndex = codePropertyIndex
}) {}
#region General
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs
===================================================================
diff -u -r9b96fbd9683bc9fe1f4b96f149e090972bfa578c -r76bdb353d191ba24960e3836dcdb2fd1e9f4d8e3
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision 9b96fbd9683bc9fe1f4b96f149e090972bfa578c)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision 76bdb353d191ba24960e3836dcdb2fd1e9f4d8e3)
@@ -64,9 +64,6 @@
},
{
nameof(Code), constructionProperties.CodePropertyIndex
- },
- {
- nameof(Group), constructionProperties.GroupPropertyIndex
}
};
}
@@ -96,11 +93,6 @@
///
public int CodePropertyIndex { get; set; }
- ///
- /// Gets or sets the property index for .
- ///
- public int GroupPropertyIndex { get; set; }
-
#endregion
}
@@ -130,18 +122,6 @@
}
}
- [DynamicPropertyOrder]
- [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Group_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Group_Description))]
- public int Group
- {
- get
- {
- return data.Group;
- }
- }
-
#endregion
}
}
\ No newline at end of file
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailurePathProperties.cs
===================================================================
diff -u -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 -r76bdb353d191ba24960e3836dcdb2fd1e9f4d8e3
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailurePathProperties.cs (.../StabilityPointStructuresFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailurePathProperties.cs (.../StabilityPointStructuresFailurePathProperties.cs) (revision 76bdb353d191ba24960e3836dcdb2fd1e9f4d8e3)
@@ -48,10 +48,31 @@
public StabilityPointStructuresFailurePathProperties(StabilityPointStructuresFailureMechanism data) : base(data, new ConstructionProperties
{
NamePropertyIndex = namePropertyIndex,
- CodePropertyIndex = codePropertyIndex,
- GroupPropertyIndex = groupPropertyIndex
+ CodePropertyIndex = codePropertyIndex
}) {}
+ #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();
+ }
+ }
+
+ #endregion
+
[DynamicVisibleValidationMethod]
public bool DynamicVisibleValidationMethod(string propertyName)
{
@@ -66,6 +87,18 @@
#region General
+ [PropertyOrder(groupPropertyIndex)]
+ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Group_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Group_Description))]
+ public int Group
+ {
+ get
+ {
+ return data.Group;
+ }
+ }
+
[PropertyOrder(inAssemblyPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
[ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailurePath_InAssembly_DisplayName))]
@@ -92,27 +125,5 @@
}
#endregion
-
- #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();
- }
- }
-
- #endregion
}
}
\ No newline at end of file
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresCalculationsPropertiesTest.cs
===================================================================
diff -u -r9b96fbd9683bc9fe1f4b96f149e090972bfa578c -r76bdb353d191ba24960e3836dcdb2fd1e9f4d8e3
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresCalculationsPropertiesTest.cs (.../StabilityPointStructuresCalculationsPropertiesTest.cs) (revision 9b96fbd9683bc9fe1f4b96f149e090972bfa578c)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresCalculationsPropertiesTest.cs (.../StabilityPointStructuresCalculationsPropertiesTest.cs) (revision 76bdb353d191ba24960e3836dcdb2fd1e9f4d8e3)
@@ -34,12 +34,11 @@
{
private const int namePropertyIndex = 0;
private const int codePropertyIndex = 1;
- private const int groupPropertyIndex = 2;
- private const int gravitationalAccelerationPropertyIndex = 3;
- private const int modelFactorStorageVolumePropertyIndex = 4;
- private const int modelFactorCollisionLoadPropertyIndex = 5;
- private const int modelFactorLoadEffectPropertyIndex = 6;
- private const int modelFactorLongThresholdPropertyIndex = 7;
+ private const int gravitationalAccelerationPropertyIndex = 2;
+ private const int modelFactorStorageVolumePropertyIndex = 3;
+ private const int modelFactorCollisionLoadPropertyIndex = 4;
+ private const int modelFactorLoadEffectPropertyIndex = 5;
+ private const int modelFactorLongThresholdPropertyIndex = 6;
[Test]
public void Constructor_DataIsNull_ThrowArgumentNullException()
@@ -66,7 +65,6 @@
Assert.AreSame(failureMechanism, properties.Data);
Assert.AreEqual(failureMechanism.Name, properties.Name);
Assert.AreEqual(failureMechanism.Code, properties.Code);
- Assert.AreEqual(failureMechanism.Group, properties.Group);
GeneralStabilityPointStructuresInput generalInput = failureMechanism.GeneralInput;
Assert.AreEqual(generalInput.GravitationalAcceleration, properties.GravitationalAcceleration);
@@ -94,7 +92,7 @@
const string modelSettingsCategory = "Modelinstellingen";
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
- Assert.AreEqual(8, dynamicProperties.Count);
+ Assert.AreEqual(7, dynamicProperties.Count);
PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
@@ -110,13 +108,6 @@
"Het label van het toetsspoor.",
true);
- PropertyDescriptor groupProperty = dynamicProperties[groupPropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(groupProperty,
- generalCategory,
- "Groep",
- "De groep waar het toetsspoor toe behoort.",
- true);
-
PropertyDescriptor gravitationalAccelerationProperty = dynamicProperties[gravitationalAccelerationPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(gravitationalAccelerationProperty,
generalCategory,
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r9b96fbd9683bc9fe1f4b96f149e090972bfa578c -r76bdb353d191ba24960e3836dcdb2fd1e9f4d8e3
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision 9b96fbd9683bc9fe1f4b96f149e090972bfa578c)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision 76bdb353d191ba24960e3836dcdb2fd1e9f4d8e3)
@@ -31,9 +31,8 @@
{
public class StabilityPointStructuresFailureMechanismPropertiesTest
{
- private const int namePropertyIndex = 2;
- private const int codePropertyIndex = 1;
- private const int groupPropertyIndex = 0;
+ private const int namePropertyIndex = 1;
+ private const int codePropertyIndex = 0;
[Test]
public void Constructor_DataNull_ThrowArgumentNullException()
@@ -70,7 +69,6 @@
Assert.IsInstanceOf>(properties);
Assert.AreEqual(failureMechanism.Name, properties.Name);
Assert.AreEqual(failureMechanism.Code, properties.Code);
- Assert.AreEqual(failureMechanism.Group, properties.Group);
}
[Test]
@@ -83,13 +81,12 @@
var properties = new StabilityPointStructuresFailureMechanismProperties(failureMechanism, new StabilityPointStructuresFailureMechanismProperties.ConstructionProperties
{
NamePropertyIndex = namePropertyIndex,
- CodePropertyIndex = codePropertyIndex,
- GroupPropertyIndex = groupPropertyIndex
+ CodePropertyIndex = codePropertyIndex
});
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
- Assert.AreEqual(3, dynamicProperties.Count);
+ Assert.AreEqual(2, dynamicProperties.Count);
const string generalCategory = "Algemeen";
@@ -106,13 +103,6 @@
"Label",
"Het label van het toetsspoor.",
true);
-
- PropertyDescriptor groupProperty = dynamicProperties[groupPropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(groupProperty,
- generalCategory,
- "Groep",
- "De groep waar het toetsspoor toe behoort.",
- true);
}
}
}
\ No newline at end of file