Fisheye: Tag 862ee4a6ae0e249344f2a98fe640788312980b88 refers to a dead (removed) revision in file `Riskeer/HeightStructures/src/Riskeer.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 862ee4a6ae0e249344f2a98fe640788312980b88 refers to a dead (removed) revision in file `Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Factories/HeightStructuresAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs =================================================================== diff -u -r35349144a21f4e3627505605840f286b21b2d004 -r862ee4a6ae0e249344f2a98fe640788312980b88 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision 35349144a21f4e3627505605840f286b21b2d004) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision 862ee4a6ae0e249344f2a98fe640788312980b88) @@ -36,7 +36,6 @@ using Riskeer.Common.Forms.Factories; using Riskeer.Common.Forms.Helpers; using Riskeer.HeightStructures.Data; -using Riskeer.HeightStructures.Forms.Factories; using HeightStructuresDataResources = Riskeer.HeightStructures.Data.Properties.Resources; namespace Riskeer.HeightStructures.Forms.Views @@ -57,11 +56,6 @@ private MapPointData sectionsStartPointMapData; private MapPointData sectionsEndPointMapData; - private MapLineData simpleAssemblyMapData; - private MapLineData detailedAssemblyMapData; - private MapLineData tailorMadeAssemblyMapData; - private MapLineData combinedAssemblyMapData; - private Observer failureMechanismObserver; private Observer assessmentSectionObserver; private Observer referenceLineObserver; @@ -82,7 +76,6 @@ private RecursiveObserver> calculationObserver; private RecursiveObserver foreshoreProfileObserver; private RecursiveObserver, HeightStructure> structureObserver; - private RecursiveObserver, HeightStructuresFailureMechanismSectionResult> sectionResultObserver; /// /// Creates a new instance of . @@ -156,7 +149,6 @@ calculationObserver.Dispose(); structuresObserver.Dispose(); structureObserver.Dispose(); - sectionResultObserver.Dispose(); if (disposing) { @@ -180,25 +172,13 @@ sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData(); sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData(); - MapDataCollection assemblyMapDataCollection = AssemblyMapDataFactory.CreateAssemblyMapDataCollection(); - tailorMadeAssemblyMapData = AssemblyMapDataFactory.CreateTailorMadeAssemblyMapData(); - detailedAssemblyMapData = AssemblyMapDataFactory.CreateDetailedAssemblyMapData(); - simpleAssemblyMapData = AssemblyMapDataFactory.CreateSimpleAssemblyMapData(); - combinedAssemblyMapData = AssemblyMapDataFactory.CreateCombinedAssemblyMapData(); - mapDataCollection.Add(referenceLineMapData); sectionsMapDataCollection.Add(sectionsMapData); sectionsMapDataCollection.Add(sectionsStartPointMapData); sectionsMapDataCollection.Add(sectionsEndPointMapData); mapDataCollection.Add(sectionsMapDataCollection); - assemblyMapDataCollection.Add(tailorMadeAssemblyMapData); - assemblyMapDataCollection.Add(detailedAssemblyMapData); - assemblyMapDataCollection.Add(simpleAssemblyMapData); - assemblyMapDataCollection.Add(combinedAssemblyMapData); - mapDataCollection.Add(assemblyMapDataCollection); - mapDataCollection.Add(hydraulicBoundaryLocationsMapData); mapDataCollection.Add(foreshoreProfilesMapData); mapDataCollection.Add(structuresMapData); @@ -271,12 +251,6 @@ { Observable = FailureMechanism.HeightStructures }; - - sectionResultObserver = new RecursiveObserver, - HeightStructuresFailureMechanismSectionResult>(UpdateAssemblyMapData, sr => sr) - { - Observable = FailureMechanism.SectionResults - }; } private void SetAllMapDataFeatures() @@ -287,38 +261,14 @@ SetForeshoreProfilesMapData(); SetStructuresMapData(); SetCalculationsMapData(); - SetAssemblyMapData(); } - #region Assembly MapData - - private void UpdateAssemblyMapData() - { - SetAssemblyMapData(); - simpleAssemblyMapData.NotifyObservers(); - detailedAssemblyMapData.NotifyObservers(); - tailorMadeAssemblyMapData.NotifyObservers(); - combinedAssemblyMapData.NotifyObservers(); - } - - private void SetAssemblyMapData() - { - simpleAssemblyMapData.Features = HeightStructuresAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(FailureMechanism); - detailedAssemblyMapData.Features = HeightStructuresAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(FailureMechanism, AssessmentSection); - tailorMadeAssemblyMapData.Features = HeightStructuresAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(FailureMechanism, AssessmentSection); - combinedAssemblyMapData.Features = HeightStructuresAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(FailureMechanism, AssessmentSection); - } - - #endregion - #region Calculations MapData private void UpdateCalculationsMapData() { SetCalculationsMapData(); calculationsMapData.NotifyObservers(); - - UpdateAssemblyMapData(); } private void SetCalculationsMapData() @@ -369,8 +319,6 @@ sectionsMapData.NotifyObservers(); sectionsStartPointMapData.NotifyObservers(); sectionsEndPointMapData.NotifyObservers(); - - UpdateAssemblyMapData(); } private void SetSectionsMapData() Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/Riskeer.StabilityPointStructures.Data.csproj =================================================================== diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r862ee4a6ae0e249344f2a98fe640788312980b88 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/Riskeer.StabilityPointStructures.Data.csproj (.../Riskeer.StabilityPointStructures.Data.csproj) (revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/Riskeer.StabilityPointStructures.Data.csproj (.../Riskeer.StabilityPointStructures.Data.csproj) (revision 862ee4a6ae0e249344f2a98fe640788312980b88) @@ -10,12 +10,12 @@ - - - - - - + + + + + + Fisheye: Tag 862ee4a6ae0e249344f2a98fe640788312980b88 refers to a dead (removed) revision in file `Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 862ee4a6ae0e249344f2a98fe640788312980b88 refers to a dead (removed) revision in file `Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Factories/StabilityPointStructuresAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs =================================================================== diff -u -r68ec97043e735b40f5f6fa555ad53ef7cc43527d -r862ee4a6ae0e249344f2a98fe640788312980b88 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.cs) (revision 68ec97043e735b40f5f6fa555ad53ef7cc43527d) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.cs) (revision 862ee4a6ae0e249344f2a98fe640788312980b88) @@ -36,7 +36,6 @@ using Riskeer.Common.Forms.Factories; using Riskeer.Common.Forms.Helpers; using Riskeer.StabilityPointStructures.Data; -using Riskeer.StabilityPointStructures.Forms.Factories; using StabilityPointStructuresDataResources = Riskeer.StabilityPointStructures.Data.Properties.Resources; namespace Riskeer.StabilityPointStructures.Forms.Views @@ -57,11 +56,6 @@ private MapPointData sectionsStartPointMapData; private MapPointData sectionsEndPointMapData; - private MapLineData simpleAssemblyMapData; - private MapLineData detailedAssemblyMapData; - private MapLineData tailorMadeAssemblyMapData; - private MapLineData combinedAssemblyMapData; - private Observer failureMechanismObserver; private Observer assessmentSectionObserver; private Observer referenceLineObserver; @@ -82,7 +76,6 @@ private RecursiveObserver> calculationObserver; private RecursiveObserver foreshoreProfileObserver; private RecursiveObserver, StabilityPointStructure> structureObserver; - private RecursiveObserver, StabilityPointStructuresFailureMechanismSectionResult> sectionResultObserver; /// /// Creates a new instance of . @@ -156,7 +149,6 @@ calculationObserver.Dispose(); structuresObserver.Dispose(); structureObserver.Dispose(); - sectionResultObserver.Dispose(); if (disposing) { @@ -180,25 +172,13 @@ sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData(); sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData(); - MapDataCollection assemblyMapDataCollection = AssemblyMapDataFactory.CreateAssemblyMapDataCollection(); - tailorMadeAssemblyMapData = AssemblyMapDataFactory.CreateTailorMadeAssemblyMapData(); - detailedAssemblyMapData = AssemblyMapDataFactory.CreateDetailedAssemblyMapData(); - simpleAssemblyMapData = AssemblyMapDataFactory.CreateSimpleAssemblyMapData(); - combinedAssemblyMapData = AssemblyMapDataFactory.CreateCombinedAssemblyMapData(); - mapDataCollection.Add(referenceLineMapData); sectionsMapDataCollection.Add(sectionsMapData); sectionsMapDataCollection.Add(sectionsStartPointMapData); sectionsMapDataCollection.Add(sectionsEndPointMapData); mapDataCollection.Add(sectionsMapDataCollection); - assemblyMapDataCollection.Add(tailorMadeAssemblyMapData); - assemblyMapDataCollection.Add(detailedAssemblyMapData); - assemblyMapDataCollection.Add(simpleAssemblyMapData); - assemblyMapDataCollection.Add(combinedAssemblyMapData); - mapDataCollection.Add(assemblyMapDataCollection); - mapDataCollection.Add(hydraulicBoundaryLocationsMapData); mapDataCollection.Add(foreshoreProfilesMapData); mapDataCollection.Add(structuresMapData); @@ -271,12 +251,6 @@ { Observable = FailureMechanism.StabilityPointStructures }; - - sectionResultObserver = new RecursiveObserver, - StabilityPointStructuresFailureMechanismSectionResult>(UpdateAssemblyMapData, sr => sr) - { - Observable = FailureMechanism.SectionResults - }; } private void SetAllMapDataFeatures() @@ -287,38 +261,14 @@ SetForeshoreProfilesMapData(); SetStructuresMapData(); SetCalculationsMapData(); - SetAssemblyMapData(); } - #region Assembly MapData - - private void UpdateAssemblyMapData() - { - SetAssemblyMapData(); - simpleAssemblyMapData.NotifyObservers(); - detailedAssemblyMapData.NotifyObservers(); - tailorMadeAssemblyMapData.NotifyObservers(); - combinedAssemblyMapData.NotifyObservers(); - } - - private void SetAssemblyMapData() - { - simpleAssemblyMapData.Features = StabilityPointStructuresAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(FailureMechanism); - detailedAssemblyMapData.Features = StabilityPointStructuresAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(FailureMechanism, AssessmentSection); - tailorMadeAssemblyMapData.Features = StabilityPointStructuresAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(FailureMechanism, AssessmentSection); - combinedAssemblyMapData.Features = StabilityPointStructuresAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(FailureMechanism, AssessmentSection); - } - - #endregion - #region Calculations MapData private void UpdateCalculationsMapData() { SetCalculationsMapData(); calculationsMapData.NotifyObservers(); - - UpdateAssemblyMapData(); } private void SetCalculationsMapData() @@ -369,8 +319,6 @@ sectionsMapData.NotifyObservers(); sectionsStartPointMapData.NotifyObservers(); sectionsEndPointMapData.NotifyObservers(); - - UpdateAssemblyMapData(); } private void SetSectionsMapData()