Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u -reb939377a103ae461c4f101318408e4b3abb4989 -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision eb939377a103ae461c4f101318408e4b3abb4989) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -103,20 +103,6 @@ CreateInstance = context => new ClosingStructuresFailureMechanismView(context.WrappedData, context.Parent) }; - yield return new ViewInfo< - ProbabilityFailureMechanismSectionResultContext, - IObservableEnumerable, - ClosingStructuresFailureMechanismResultView> - { - GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - CloseForData = CloseFailureMechanismResultViewForData, - GetViewData = context => context.WrappedData, - CreateInstance = context => new ClosingStructuresFailureMechanismResultView( - context.WrappedData, - (ClosingStructuresFailureMechanism) context.FailureMechanism, context.AssessmentSection) - }; - yield return new ViewInfo { GetViewData = context => context.WrappedData, @@ -156,15 +142,6 @@ CalculationContextOnNodeRemoved, CalculationType.Probabilistic); - yield return new TreeNodeInfo> - { - Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - yield return new TreeNodeInfo { Text = context => RiskeerCommonFormsResources.StructuresCollection_DisplayName, @@ -290,27 +267,6 @@ : ReferenceEquals(view.FailureMechanism, failureMechanism); } - private static bool CloseFailureMechanismResultViewForData(ClosingStructuresFailureMechanismResultView view, object o) - { - var assessmentSection = o as IAssessmentSection; - var failureMechanism = o as ClosingStructuresFailureMechanism; - var failureMechanismContext = o as IFailureMechanismContext; - if (assessmentSection != null) - { - return assessmentSection - .GetFailureMechanisms() - .OfType() - .Any(fm => ReferenceEquals(view.FailureMechanism.SectionResults, fm.SectionResults)); - } - - if (failureMechanismContext != null) - { - failureMechanism = failureMechanismContext.WrappedData; - } - - return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults); - } - private static bool CloseScenariosViewForData(ClosingStructuresScenariosView view, object removedData) { var failureMechanism = removedData as ClosingStructuresFailureMechanism; @@ -391,9 +347,7 @@ { return new object[] { - new ClosingStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection), - new ProbabilityFailureMechanismSectionResultContext( - failureMechanism.SectionResults, failureMechanism, assessmentSection) + new ClosingStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection) }; } Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/FailureMechanismSectionResultContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/ProbabilityFailureMechanismSectionResultContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -1479,15 +1479,6 @@ } /// - /// Looks up a localized string similar to Resultaat. - /// - public static string FailureMechanism_AssessmentResult_DisplayName { - get { - return ResourceManager.GetString("FailureMechanism_AssessmentResult_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Het label van het toetsspoor.. /// public static string FailureMechanism_Code_Description { @@ -2077,16 +2068,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap FailureMechanismSectionResultIcon { - get { - object obj = ResourceManager.GetObject("FailureMechanismSectionResultIcon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Vakindeling waarmee de waterkering voor dit toetsspoor is geschematiseerd ten behoeve van de beoordeling.. /// public static string FailureMechanismSections_Description { Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r6a1093e75bdf23c60232116445c086ebb5319558 -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6a1093e75bdf23c60232116445c086ebb5319558) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -281,9 +281,6 @@ ..\Resources\chart-pie-separate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\document-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - De bijdragen van de maatgevende scenario's voor dit vak moeten opgeteld gelijk zijn aan 100%. @@ -470,9 +467,6 @@ Lengte-effect parameters - - Resultaat - Het label van het toetsspoor. Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs =================================================================== diff -u -rdaf5615ac270016b38f532446b315f5e618f9728 -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision daf5615ac270016b38f532446b315f5e618f9728) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -89,15 +89,6 @@ FailureMechanismEnabledContextMenuStrip, FailureMechanismDisabledContextMenuStrip); - yield return new TreeNodeInfo> - { - Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - yield return new TreeNodeInfo { Text = context => RiskeerCommonDataResources.HydraulicBoundaryConditions_DisplayName, Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -reb939377a103ae461c4f101318408e4b3abb4989 -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision eb939377a103ae461c4f101318408e4b3abb4989) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -196,21 +196,6 @@ Image = RiskeerCommonFormsResources.ScenariosIcon }; - yield return new ViewInfo< - ProbabilityFailureMechanismSectionResultContext, - IObservableEnumerable, - GrassCoverErosionInwardsFailureMechanismResultView> - { - GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - CloseForData = CloseFailureMechanismResultViewForData, - GetViewData = context => context.WrappedData, - CreateInstance = context => new GrassCoverErosionInwardsFailureMechanismResultView( - context.WrappedData, - (GrassCoverErosionInwardsFailureMechanism) context.FailureMechanism, - context.AssessmentSection) - }; - yield return new ViewInfo { Image = RiskeerCommonFormsResources.GenericInputOutputIcon, @@ -309,15 +294,6 @@ .Build() }; - yield return new TreeNodeInfo> - { - Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - yield return new TreeNodeInfo { Text = inputContext => RiskeerCommonFormsResources.Calculation_Input, @@ -416,27 +392,6 @@ return failureMechanism != null && ReferenceEquals(view.Data, failureMechanism.CalculationsGroup); } - private static bool CloseFailureMechanismResultViewForData(GrassCoverErosionInwardsFailureMechanismResultView view, object o) - { - var assessmentSection = o as IAssessmentSection; - var failureMechanism = o as GrassCoverErosionInwardsFailureMechanism; - var failureMechanismContext = o as IFailureMechanismContext; - if (assessmentSection != null) - { - return assessmentSection - .GetFailureMechanisms() - .OfType() - .Any(fm => ReferenceEquals(view.FailureMechanism.SectionResults, fm.SectionResults)); - } - - if (failureMechanismContext != null) - { - failureMechanism = failureMechanismContext.WrappedData; - } - - return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults); - } - private static bool CloseInputViewForData(GrassCoverErosionInwardsInputView view, object o) { if (o is GrassCoverErosionInwardsCalculationScenarioContext calculationContext) @@ -536,9 +491,7 @@ { return new object[] { - new GrassCoverErosionInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection), - new ProbabilityFailureMechanismSectionResultContext( - failureMechanism.SectionResults, failureMechanism, assessmentSection) + new GrassCoverErosionInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection) }; } Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r43fcdd248030392952b12352ebed96ae2999ce40 -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 43fcdd248030392952b12352ebed96ae2999ce40) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -228,15 +228,6 @@ WaveConditionsCalculationContextOnNodeRemoved, CalculationType.Hydraulic); - yield return new TreeNodeInfo> - { - Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - yield return new TreeNodeInfo { Text = context => RiskeerCommonDataResources.HydraulicBoundaryConditions_DisplayName, Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -rb35dbee0a240a26d4a54451b0e2d1464ae3164e4 -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision b35dbee0a240a26d4a54451b0e2d1464ae3164e4) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -168,21 +168,6 @@ CreateInstance = context => new HeightStructuresFailureMechanismView(context.WrappedData, context.Parent) }; - yield return new ViewInfo< - ProbabilityFailureMechanismSectionResultContext, - IObservableEnumerable, - HeightStructuresFailureMechanismResultView> - { - GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - CloseForData = CloseFailureMechanismResultViewForData, - GetViewData = context => context.WrappedData, - CreateInstance = context => new HeightStructuresFailureMechanismResultView( - context.WrappedData, - (HeightStructuresFailureMechanism) context.FailureMechanism, - context.AssessmentSection) - }; - yield return new ViewInfo { CreateInstance = context => new HeightStructuresCalculationsView(context.WrappedData, context.FailureMechanism, context.AssessmentSection), @@ -249,15 +234,6 @@ .AddPropertiesItem() .Build() }; - - yield return new TreeNodeInfo> - { - Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; } #region ViewInfos @@ -272,27 +248,6 @@ : ReferenceEquals(view.FailureMechanism, failureMechanism); } - private static bool CloseFailureMechanismResultViewForData(HeightStructuresFailureMechanismResultView view, object o) - { - var assessmentSection = o as IAssessmentSection; - var failureMechanism = o as HeightStructuresFailureMechanism; - var failureMechanismContext = o as IFailureMechanismContext; - if (assessmentSection != null) - { - return assessmentSection - .GetFailureMechanisms() - .OfType() - .Any(fm => ReferenceEquals(view.FailureMechanism.SectionResults, fm.SectionResults)); - } - - if (failureMechanismContext != null) - { - failureMechanism = failureMechanismContext.WrappedData; - } - - return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults); - } - private static bool CloseCalculationsViewForData(HeightStructuresCalculationsView view, object o) { var failureMechanism = o as HeightStructuresFailureMechanism; @@ -326,8 +281,7 @@ return new object[] { new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetInputs(wrappedData, assessmentSection), TreeFolderCategory.Input), - new HeightStructuresCalculationGroupContext(wrappedData.CalculationsGroup, null, wrappedData, assessmentSection), - new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Outputs_DisplayName, GetOutputs(wrappedData, assessmentSection), TreeFolderCategory.Output) + new HeightStructuresCalculationGroupContext(wrappedData.CalculationsGroup, null, wrappedData, assessmentSection) }; } @@ -342,15 +296,6 @@ }; } - private static IEnumerable GetOutputs(HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) - { - return new object[] - { - new ProbabilityFailureMechanismSectionResultContext( - failureMechanism.SectionResults, failureMechanism, assessmentSection) - }; - } - private static object[] FailureMechanismDisabledChildNodeObjects(HeightStructuresFailureMechanismContext context) { return new object[] Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -reb939377a103ae461c4f101318408e4b3abb4989 -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision eb939377a103ae461c4f101318408e4b3abb4989) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -24,7 +24,6 @@ using System.Linq; using System.Windows.Forms; using Components.Persistence.Stability; -using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Controls.TreeView; using Core.Common.Gui.ContextMenu; @@ -245,20 +244,6 @@ CreateInstance = context => new MacroStabilityInwardsFailureMechanismView(context.WrappedData, context.Parent) }; - yield return new ViewInfo< - ProbabilityFailureMechanismSectionResultContext, - IObservableEnumerable, - MacroStabilityInwardsFailureMechanismResultView> - { - GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - CloseForData = CloseFailureMechanismResultViewForData, - GetViewData = context => context.WrappedData, - CreateInstance = context => new MacroStabilityInwardsFailureMechanismResultView( - context.WrappedData, - (MacroStabilityInwardsFailureMechanism) context.FailureMechanism, context.AssessmentSection) - }; - yield return new ViewInfo { GetViewData = context => context.WrappedData, @@ -331,15 +316,6 @@ CalculationGroupContextContextMenuStrip, CalculationGroupContextOnNodeRemoved); - yield return new TreeNodeInfo> - { - Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - yield return new TreeNodeInfo { Text = context => RiskeerCommonFormsResources.Calculation_Input, @@ -452,27 +428,6 @@ : ReferenceEquals(view.FailureMechanism, failureMechanism); } - private static bool CloseFailureMechanismResultViewForData(MacroStabilityInwardsFailureMechanismResultView view, object o) - { - var assessmentSection = o as IAssessmentSection; - var failureMechanism = o as MacroStabilityInwardsFailureMechanism; - var failureMechanismContext = o as IFailureMechanismContext; - if (assessmentSection != null) - { - return assessmentSection - .GetFailureMechanisms() - .OfType() - .Any(fm => ReferenceEquals(view.FailureMechanism.SectionResults, fm.SectionResults)); - } - - if (failureMechanismContext != null) - { - failureMechanism = failureMechanismContext.WrappedData; - } - - return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults); - } - private static bool CloseCalculationsViewForData(MacroStabilityInwardsCalculationsView view, object o) { var assessmentSection = o as IAssessmentSection; @@ -627,8 +582,7 @@ { return new object[] { - new MacroStabilityInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection), - new ProbabilityFailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism, assessmentSection) + new MacroStabilityInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection) }; } Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -reb939377a103ae461c4f101318408e4b3abb4989 -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision eb939377a103ae461c4f101318408e4b3abb4989) +++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -248,21 +248,6 @@ CreateInstance = context => new PipingFailureMechanismView(context.WrappedData, context.Parent) }; - yield return new ViewInfo< - ProbabilityFailureMechanismSectionResultContext, - IObservableEnumerable, - PipingFailureMechanismResultView> - { - GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - CloseForData = CloseFailureMechanismResultViewForData, - GetViewData = context => context.WrappedData, - CreateInstance = context => new PipingFailureMechanismResultView( - context.WrappedData, - (PipingFailureMechanism) context.FailureMechanism, - context.AssessmentSection) - }; - yield return new ViewInfo { GetViewData = context => context.WrappedData, @@ -392,15 +377,6 @@ CalculationGroupContextContextMenuStrip, CalculationGroupContextOnNodeRemoved); - yield return new TreeNodeInfo> - { - Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - yield return new TreeNodeInfo { Text = pipingInputContext => RiskeerCommonFormsResources.Calculation_Input, @@ -612,27 +588,6 @@ : ReferenceEquals(view.FailureMechanism, pipingFailureMechanism); } - private static bool CloseFailureMechanismResultViewForData(PipingFailureMechanismResultView view, object o) - { - var assessmentSection = o as IAssessmentSection; - var failureMechanism = o as PipingFailureMechanism; - var failureMechanismContext = o as IFailureMechanismContext; - if (assessmentSection != null) - { - return assessmentSection - .GetFailureMechanisms() - .OfType() - .Any(fm => ReferenceEquals(view.FailureMechanism.SectionResults, fm.SectionResults)); - } - - if (failureMechanismContext != null) - { - failureMechanism = failureMechanismContext.WrappedData; - } - - return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults); - } - private static bool ClosePipingCalculationsViewForData(PipingCalculationsView view, object o) { var assessmentSection = o as IAssessmentSection; @@ -819,8 +774,7 @@ { return new object[] { - new PipingScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection), - new ProbabilityFailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism, assessmentSection) + new PipingScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection) }; } Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 440b34184d063f6b2d41f8c448bf80163b8b64e6 refers to a dead (removed) revision in file `Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -reb939377a103ae461c4f101318408e4b3abb4989 -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision eb939377a103ae461c4f101318408e4b3abb4989) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -101,20 +101,6 @@ CreateInstance = context => new StabilityPointStructuresFailureMechanismView(context.WrappedData, context.Parent) }; - yield return new ViewInfo< - ProbabilityFailureMechanismSectionResultContext, - IObservableEnumerable, - StabilityPointStructuresFailureMechanismResultView> - { - GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - CloseForData = CloseFailureMechanismResultViewForData, - GetViewData = context => context.WrappedData, - CreateInstance = context => new StabilityPointStructuresFailureMechanismResultView( - context.WrappedData, - (StabilityPointStructuresFailureMechanism) context.FailureMechanism, context.AssessmentSection) - }; - yield return new ViewInfo { GetViewData = context => context.WrappedData, @@ -143,15 +129,6 @@ FailureMechanismEnabledContextMenuStrip, FailureMechanismDisabledContextMenuStrip); - yield return new TreeNodeInfo> - { - Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - yield return new TreeNodeInfo { Text = context => RiskeerCommonFormsResources.StructuresCollection_DisplayName, @@ -288,27 +265,6 @@ : ReferenceEquals(view.FailureMechanism, failureMechanism); } - private static bool CloseFailureMechanismResultViewForData(StabilityPointStructuresFailureMechanismResultView view, object viewData) - { - var assessmentSection = viewData as IAssessmentSection; - var failureMechanism = viewData as StabilityPointStructuresFailureMechanism; - var failureMechanismContext = viewData as IFailureMechanismContext; - if (assessmentSection != null) - { - return assessmentSection - .GetFailureMechanisms() - .OfType() - .Any(fm => ReferenceEquals(view.FailureMechanism.SectionResults, fm.SectionResults)); - } - - if (failureMechanismContext != null) - { - failureMechanism = failureMechanismContext.WrappedData; - } - - return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults); - } - private static bool CloseScenariosViewForData(StabilityPointStructuresScenariosView view, object removedData) { var failureMechanism = removedData as StabilityPointStructuresFailureMechanism; @@ -398,9 +354,7 @@ { return new object[] { - new StabilityPointStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection), - new ProbabilityFailureMechanismSectionResultContext( - failureMechanism.SectionResults, failureMechanism, assessmentSection) + new StabilityPointStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism, assessmentSection) }; } Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r34989078bce443e1ed36624207427c604ca3b4ea -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 34989078bce443e1ed36624207427c604ca3b4ea) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -149,15 +149,6 @@ .Build() }; - yield return new TreeNodeInfo> - { - Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - yield return new TreeNodeInfo { Text = context => RiskeerCommonFormsResources.Calculation_Input, Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r572020ec2d5d38ca8f988634c1df5b153994d65c -r440b34184d063f6b2d41f8c448bf80163b8b64e6 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 572020ec2d5d38ca8f988634c1df5b153994d65c) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 440b34184d063f6b2d41f8c448bf80163b8b64e6) @@ -128,15 +128,6 @@ FailureMechanismEnabledContextMenuStrip, FailureMechanismDisabledContextMenuStrip); - yield return new TreeNodeInfo> - { - Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - yield return RiskeerTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo( WaveConditionsCalculationGroupContextChildNodeObjects, WaveConditionsCalculationGroupContextContextMenuStrip,