Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -r567534be8c92740e5e2bd0782b80ef1910c9679e -ra0a4e8059c0e23db4eb3525d01a264fcf38c5ddd --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 567534be8c92740e5e2bd0782b80ef1910c9679e) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision a0a4e8059c0e23db4eb3525d01a264fcf38c5ddd) @@ -80,9 +80,9 @@ { CreateInstance = context => new MacroStabilityInwardsFailureMechanismContextProperties(context, new FailureMechanismPropertyChangeHandler()) }; - yield return new PropertyInfo + yield return new PropertyInfo { - CreateInstance = context => new PipingInputContextProperties(context, new ObservablePropertyChangeHandler(context.PipingCalculation, context.WrappedData)) + CreateInstance = context => new MacroStabilityInwardsInputContextProperties(context, new ObservablePropertyChangeHandler(context.MacroStabilityInwardsCalculation, context.WrappedData)) }; yield return new PropertyInfo(); yield return new PropertyInfo @@ -137,7 +137,7 @@ (context, filePath) => new PipingCalculationConfigurationExporter(context.WrappedData.Children, filePath), context => context.WrappedData.Children.Any()); - yield return RingtoetsExportInfoFactory.CreateCalculationConfigurationExportInfo( + yield return RingtoetsExportInfoFactory.CreateCalculationConfigurationExportInfo( (context, filePath) => new PipingCalculationConfigurationExporter(new[] { context.WrappedData @@ -207,9 +207,9 @@ } }; - yield return new ViewInfo + yield return new ViewInfo { - GetViewData = context => context.PipingCalculation, + GetViewData = context => context.MacroStabilityInwardsCalculation, GetViewName = (view, input) => RingtoetsCommonFormsResources.Calculation_Input, Image = MacroStabilityInwardsFormsResources.PipingInputIcon, CloseForData = ClosePipingInputViewForData @@ -234,7 +234,7 @@ FailureMechanismEnabledContextMenuStrip, FailureMechanismDisabledContextMenuStrip); - yield return RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo( + yield return RingtoetsTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo( PipingCalculationContextChildNodeObjects, PipingCalculationContextContextMenuStrip, PipingCalculationContextOnNodeRemoved); @@ -461,19 +461,19 @@ private static bool ClosePipingInputViewForData(PipingInputView view, object o) { - var pipingCalculationScenarioContext = o as PipingCalculationScenarioContext; + var pipingCalculationScenarioContext = o as MacroStabilityInwardsCalculationScenarioContext; if (pipingCalculationScenarioContext != null) { return ReferenceEquals(view.Data, pipingCalculationScenarioContext.WrappedData); } - IEnumerable calculations = null; + IEnumerable calculations = null; var pipingCalculationGroupContext = o as PipingCalculationGroupContext; if (pipingCalculationGroupContext != null) { calculations = pipingCalculationGroupContext.WrappedData.GetCalculations() - .OfType(); + .OfType(); } var failureMechanism = o as MacroStabilityInwardsFailureMechanism; @@ -495,7 +495,7 @@ if (failureMechanism != null) { calculations = failureMechanism.CalculationsGroup.GetCalculations() - .OfType(); + .OfType(); } return calculations != null && calculations.Any(ci => ReferenceEquals(view.Data, ci)); @@ -505,7 +505,7 @@ private void CalculateAll(MacroStabilityInwardsFailureMechanismContext failureMechanismContext) { - IEnumerable calculations = GetAllPipingCalculations(failureMechanismContext.WrappedData); + IEnumerable calculations = GetAllPipingCalculations(failureMechanismContext.WrappedData); MacroStabilityInwardsProbabilityAssessmentInput assessmentInput = failureMechanismContext.WrappedData.MacroStabilityInwardsProbabilityAssessmentInput; double norm = failureMechanismContext.Parent.FailureMechanismContribution.Norm; double contribution = failureMechanismContext.WrappedData.Contribution; @@ -515,23 +515,23 @@ private void CalculateAll(CalculationGroup group, PipingCalculationGroupContext context) { - PipingCalculation[] calculations = group.GetCalculations().OfType().ToArray(); + MacroStabilityInwardsCalculation[] calculations = group.GetCalculations().OfType().ToArray(); MacroStabilityInwardsProbabilityAssessmentInput assessmentInput = context.FailureMechanism.MacroStabilityInwardsProbabilityAssessmentInput; double norm = context.AssessmentSection.FailureMechanismContribution.Norm; double contribution = context.FailureMechanism.Contribution; CalculateAll(calculations, assessmentInput, norm, contribution); } - private static void ValidateAll(IEnumerable pipingCalculations) + private static void ValidateAll(IEnumerable pipingCalculations) { - foreach (PipingCalculation calculation in pipingCalculations) + foreach (MacroStabilityInwardsCalculation calculation in pipingCalculations) { PipingCalculationService.Validate(calculation); } } - private void CalculateAll(IEnumerable calculations, MacroStabilityInwardsProbabilityAssessmentInput assessmentInput, + private void CalculateAll(IEnumerable calculations, MacroStabilityInwardsProbabilityAssessmentInput assessmentInput, double norm, double contribution) { ActivityProgressDialogRunner.Run( @@ -625,7 +625,7 @@ private static void ValidateAll(MacroStabilityInwardsFailureMechanismContext context) { - ValidateAll(context.WrappedData.Calculations.OfType()); + ValidateAll(context.WrappedData.Calculations.OfType()); } private ContextMenuStrip FailureMechanismDisabledContextMenuStrip(MacroStabilityInwardsFailureMechanismContext macroStabilityInwardsFailureMechanismContext, @@ -646,9 +646,9 @@ return ValidateAllDataAvailableAndGetErrorMessage(context.WrappedData); } - private static IEnumerable GetAllPipingCalculations(MacroStabilityInwardsFailureMechanism failureMechanism) + private static IEnumerable GetAllPipingCalculations(MacroStabilityInwardsFailureMechanism failureMechanism) { - return failureMechanism.Calculations.OfType(); + return failureMechanism.Calculations.OfType(); } private static object[] FailureMechanismEnabledChildNodeObjects(MacroStabilityInwardsFailureMechanismContext macroStabilityInwardsFailureMechanismContext) @@ -694,13 +694,13 @@ #endregion - #region PipingCalculationScenarioContext TreeNodeInfo + #region MacroStabilityInwardsCalculationScenarioContext TreeNodeInfo - private ContextMenuStrip PipingCalculationContextContextMenuStrip(PipingCalculationScenarioContext nodeData, object parentData, TreeViewControl treeViewControl) + private ContextMenuStrip PipingCalculationContextContextMenuStrip(MacroStabilityInwardsCalculationScenarioContext nodeData, object parentData, TreeViewControl treeViewControl) { var builder = new RingtoetsContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); - PipingCalculation calculation = nodeData.WrappedData; + MacroStabilityInwardsCalculation calculation = nodeData.WrappedData; StrictContextMenuItem updateEntryAndExitPoint = CreateUpdateEntryAndExitPointItem(nodeData); @@ -729,26 +729,26 @@ .Build(); } - private static object[] PipingCalculationContextChildNodeObjects(PipingCalculationScenarioContext pipingCalculationScenarioContext) + private static object[] PipingCalculationContextChildNodeObjects(MacroStabilityInwardsCalculationScenarioContext macroStabilityInwardsCalculationScenarioContext) { - PipingCalculationScenario pipingCalculationScenario = pipingCalculationScenarioContext.WrappedData; + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = macroStabilityInwardsCalculationScenarioContext.WrappedData; var childNodes = new List { - pipingCalculationScenario.Comments, - new MacroStabilityInwardsInputContext(pipingCalculationScenario.InputParameters, - pipingCalculationScenario, - pipingCalculationScenarioContext.AvailablePipingSurfaceLines, - pipingCalculationScenarioContext.AvailableStochasticSoilModels, - pipingCalculationScenarioContext.FailureMechanism, - pipingCalculationScenarioContext.AssessmentSection) + macroStabilityInwardsCalculationScenario.Comments, + new MacroStabilityInwardsInputContext(macroStabilityInwardsCalculationScenario.InputParameters, + macroStabilityInwardsCalculationScenario, + macroStabilityInwardsCalculationScenarioContext.AvailablePipingSurfaceLines, + macroStabilityInwardsCalculationScenarioContext.AvailableStochasticSoilModels, + macroStabilityInwardsCalculationScenarioContext.FailureMechanism, + macroStabilityInwardsCalculationScenarioContext.AssessmentSection) }; - if (pipingCalculationScenario.HasOutput) + if (macroStabilityInwardsCalculationScenario.HasOutput) { childNodes.Add(new PipingOutputContext( - pipingCalculationScenario.Output, - pipingCalculationScenario.SemiProbabilisticOutput)); + macroStabilityInwardsCalculationScenario.Output, + macroStabilityInwardsCalculationScenario.SemiProbabilisticOutput)); } else { @@ -758,30 +758,30 @@ return childNodes.ToArray(); } - private static void PipingCalculationContextOnNodeRemoved(PipingCalculationScenarioContext pipingCalculationScenarioContext, object parentNodeData) + private static void PipingCalculationContextOnNodeRemoved(MacroStabilityInwardsCalculationScenarioContext macroStabilityInwardsCalculationScenarioContext, object parentNodeData) { var calculationGroupContext = parentNodeData as PipingCalculationGroupContext; if (calculationGroupContext != null) { - bool successfullyRemovedData = calculationGroupContext.WrappedData.Children.Remove(pipingCalculationScenarioContext.WrappedData); + bool successfullyRemovedData = calculationGroupContext.WrappedData.Children.Remove(macroStabilityInwardsCalculationScenarioContext.WrappedData); if (successfullyRemovedData) { calculationGroupContext.NotifyObservers(); } } } - private static void Validate(PipingCalculationScenarioContext context) + private static void Validate(MacroStabilityInwardsCalculationScenarioContext context) { PipingCalculationService.Validate(context.WrappedData); } - private static string ValidateAllDataAvailableAndGetErrorMessage(PipingCalculationScenarioContext context) + private static string ValidateAllDataAvailableAndGetErrorMessage(MacroStabilityInwardsCalculationScenarioContext context) { return ValidateAllDataAvailableAndGetErrorMessage(context.FailureMechanism); } - private void PerformCalculation(PipingCalculation calculation, PipingCalculationScenarioContext context) + private void PerformCalculation(MacroStabilityInwardsCalculation calculation, MacroStabilityInwardsCalculationScenarioContext context) { ActivityProgressDialogRunner.Run(Gui.MainWindow, new PipingCalculationActivity(calculation, @@ -790,7 +790,7 @@ context.FailureMechanism.Contribution)); } - private StrictContextMenuItem CreateUpdateEntryAndExitPointItem(PipingCalculationScenarioContext context) + private StrictContextMenuItem CreateUpdateEntryAndExitPointItem(MacroStabilityInwardsCalculationScenarioContext context) { var contextMenuEnabled = true; string toolTipMessage = Resources.PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_calculation_with_characteristic_points_ToolTip; @@ -815,7 +815,7 @@ }; } - private void UpdatedSurfaceLineDependentDataOfCalculation(PipingCalculation scenario) + private void UpdatedSurfaceLineDependentDataOfCalculation(MacroStabilityInwardsCalculation scenario) { string message = RingtoetsCommonFormsResources.VerifyUpdate_Confirm_calculation_output_cleared; if (VerifyEntryAndExitPointUpdates(new[] @@ -827,7 +827,7 @@ } } - private static void UpdateSurfaceLineDependentData(PipingCalculation scenario) + private static void UpdateSurfaceLineDependentData(MacroStabilityInwardsCalculation scenario) { scenario.InputParameters.SynchronizeEntryAndExitPointInput(); @@ -854,12 +854,12 @@ foreach (ICalculationBase item in nodeData.WrappedData.Children) { - var calculation = item as PipingCalculationScenario; + var calculation = item as MacroStabilityInwardsCalculationScenario; var group = item as CalculationGroup; if (calculation != null) { - childNodeObjects.Add(new PipingCalculationScenarioContext(calculation, + childNodeObjects.Add(new MacroStabilityInwardsCalculationScenarioContext(calculation, nodeData.AvailablePipingSurfaceLines, nodeData.AvailableStochasticSoilModels, nodeData.FailureMechanism, @@ -951,12 +951,12 @@ private static void ValidateAll(PipingCalculationGroupContext context) { - ValidateAll(context.WrappedData.GetCalculations().OfType()); + ValidateAll(context.WrappedData.GetCalculations().OfType()); } private static void AddCalculationScenario(PipingCalculationGroupContext nodeData) { - var calculation = new PipingCalculationScenario(nodeData.FailureMechanism.GeneralInput) + var calculation = new MacroStabilityInwardsCalculationScenario(nodeData.FailureMechanism.GeneralInput) { Name = NamingHelper.GetUniqueName(nodeData.WrappedData.Children, RingtoetsCommonDataResources.Calculation_DefaultName, c => c.Name) }; @@ -1018,8 +1018,8 @@ { var contextMenuEnabled = true; string toolTipMessage = Resources.PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_all_calculations_with_surface_line_ToolTip; - IList calculationsToUpdate = nodeData.WrappedData.GetCalculations() - .OfType() + IList calculationsToUpdate = nodeData.WrappedData.GetCalculations() + .OfType() .Where(c => c.InputParameters.SurfaceLine != null && !c.InputParameters.IsEntryAndExitPointInputSynchronized) .ToList(); @@ -1039,19 +1039,19 @@ }; } - private void UpdateEntryAndExitPointsOfAllCalculations(IList calculations) + private void UpdateEntryAndExitPointsOfAllCalculations(IList calculations) { string message = RingtoetsCommonFormsResources.VerifyUpdate_Confirm_calculation_outputs_cleared; if (VerifyEntryAndExitPointUpdates(calculations, message)) { - foreach (PipingCalculationScenario calculation in calculations) + foreach (MacroStabilityInwardsCalculationScenario calculation in calculations) { UpdateSurfaceLineDependentData(calculation); } } } - private bool VerifyEntryAndExitPointUpdates(IEnumerable calculations, string query) + private bool VerifyEntryAndExitPointUpdates(IEnumerable calculations, string query) { var changeHandler = new CalculationChangeHandler(calculations, query, new DialogBasedInquiryHelper(Gui.MainWindow));