Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs
===================================================================
diff -u -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 -re71edd5419b172c4f428cf6b71fe8f7fc78f507f
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision e71edd5419b172c4f428cf6b71fe8f7fc78f507f)
@@ -35,8 +35,6 @@
public class MacroStabilityInwardsFailureMechanism : FailureMechanismBase,
ICalculatableFailureMechanism
{
- private FailureMechanismSectionCollection sectionCollection;
-
///
/// Initializes a new instance of the class.
///
@@ -51,7 +49,6 @@
{
Name = RiskeerCommonDataResources.FailureMechanism_Calculations_DisplayName
};
- sectionCollection = new FailureMechanismSectionCollection();
}
///
@@ -84,36 +81,5 @@
return CalculationsGroup.GetCalculations();
}
}
-
- public IEnumerable Sections
- {
- get
- {
- return sectionCollection;
- }
- }
-
- public string FailureMechanismSectionSourcePath
- {
- get
- {
- return sectionCollection.SourcePath;
- }
- }
-
- public void SetSections(IEnumerable sections, string sourcePath)
- {
- if (sections == null)
- {
- throw new ArgumentNullException(nameof(sections));
- }
-
- if (sourcePath == null)
- {
- throw new ArgumentNullException(nameof(sourcePath));
- }
-
- sectionCollection.SetSections(sections, sourcePath);
- }
}
}
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.cs
===================================================================
diff -u -rb7563beb9774f2f1f733dd041941efe962080911 -re71edd5419b172c4f428cf6b71fe8f7fc78f507f
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.cs (.../MacroStabilityInwardsFailureMechanismView.cs) (revision b7563beb9774f2f1f733dd041941efe962080911)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.cs (.../MacroStabilityInwardsFailureMechanismView.cs) (revision e71edd5419b172c4f428cf6b71fe8f7fc78f507f)
@@ -28,7 +28,6 @@
using Core.Components.Gis.Forms;
using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.Calculation;
-using Riskeer.Common.Data.FailureMechanism;
using Riskeer.Common.Data.Hydraulics;
using Riskeer.Common.Forms.Factories;
using Riskeer.Common.Forms.Helpers;
@@ -52,11 +51,6 @@
private MapPointData hydraulicBoundaryLocationsMapData;
private MapLineData calculationsMapData;
- private MapLineData sectionsMapData;
- private MapPointData sectionsStartPointMapData;
- private MapPointData sectionsEndPointMapData;
-
- private Observer failureMechanismObserver;
private Observer hydraulicBoundaryLocationsObserver;
private Observer assessmentSectionObserver;
private Observer referenceLineObserver;
@@ -128,7 +122,6 @@
protected override void Dispose(bool disposing)
{
- failureMechanismObserver.Dispose();
assessmentSectionObserver.Dispose();
referenceLineObserver.Dispose();
waterLevelCalculationsForFactorizedSignalingNormObserver.Dispose();
@@ -164,30 +157,16 @@
surfaceLinesMapData = RiskeerMapDataFactory.CreateSurfaceLinesMapData();
calculationsMapData = RiskeerMapDataFactory.CreateCalculationsMapData();
- MapDataCollection sectionsMapDataCollection = RiskeerMapDataFactory.CreateSectionsMapDataCollection();
- sectionsMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsMapData();
- sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData();
- sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
-
mapDataCollection.Add(referenceLineMapData);
mapDataCollection.Add(stochasticSoilModelsMapData);
mapDataCollection.Add(surfaceLinesMapData);
- sectionsMapDataCollection.Add(sectionsMapData);
- sectionsMapDataCollection.Add(sectionsStartPointMapData);
- sectionsMapDataCollection.Add(sectionsEndPointMapData);
- mapDataCollection.Add(sectionsMapDataCollection);
-
mapDataCollection.Add(hydraulicBoundaryLocationsMapData);
mapDataCollection.Add(calculationsMapData);
}
private void CreateObservers()
{
- failureMechanismObserver = new Observer(UpdateFailureMechanismMapData)
- {
- Observable = FailureMechanism
- };
assessmentSectionObserver = new Observer(UpdateReferenceLineMapData)
{
Observable = AssessmentSection
@@ -252,7 +231,6 @@
SetHydraulicBoundaryLocationsMapData();
SetReferenceLineMapData();
- SetSectionsMapData();
SetSurfaceLinesMapData();
SetStochasticSoilModelsMapData();
}
@@ -305,27 +283,6 @@
#endregion
- #region FailureMechanism MapData
-
- private void UpdateFailureMechanismMapData()
- {
- SetSectionsMapData();
- sectionsMapData.NotifyObservers();
- sectionsStartPointMapData.NotifyObservers();
- sectionsEndPointMapData.NotifyObservers();
- }
-
- private void SetSectionsMapData()
- {
- IEnumerable failureMechanismSections = FailureMechanism.Sections;
-
- sectionsMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections);
- sectionsStartPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections);
- sectionsEndPointMapData.Features = RiskeerMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections);
- }
-
- #endregion
-
#region SurfaceLines MapData
private void UpdateSurfaceLinesMapData()
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs
===================================================================
diff -u -r3817cebd14b218c9a81fa83bbc55872c4a7dccb0 -re71edd5419b172c4f428cf6b71fe8f7fc78f507f
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs (.../MacroStabilityInwardsDataSynchronizationService.cs) (revision 3817cebd14b218c9a81fa83bbc55872c4a7dccb0)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs (.../MacroStabilityInwardsDataSynchronizationService.cs) (revision e71edd5419b172c4f428cf6b71fe8f7fc78f507f)
@@ -120,8 +120,7 @@
}
var changedObjects = new Collection();
- object[] removedObjects = failureMechanism.Sections.OfType