Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -rb0b8ed98bdefa41a1c250ed464a3616fd23c2d65 -r9f0d7c757bb18ed98a0656b2a1913b7971480210 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision b0b8ed98bdefa41a1c250ed464a3616fd23c2d65) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 9f0d7c757bb18ed98a0656b2a1913b7971480210) @@ -83,6 +83,7 @@ using Riskeer.Integration.IO.Importers; using Riskeer.Integration.Plugin.FileImporters; using Riskeer.Integration.Plugin.Handlers; +using Riskeer.Integration.Plugin.Helpers; using Riskeer.Integration.Plugin.Merge; using Riskeer.Integration.Plugin.Properties; using Riskeer.Integration.Service; @@ -1732,11 +1733,16 @@ private ContextMenuStrip AssessmentSectionStateRootContextMenuStrip(AssessmentSectionStateRootContext nodeData, object parentData, TreeViewControl treeViewControl) { + AssessmentSection assessmentSection = nodeData.WrappedData; + var importItem = new StrictContextMenuItem( CoreGuiResources.Import, CoreGuiResources.Import_ToolTip, CoreGuiResources.ImportIcon, - (sender, args) => assessmentSectionMerger.StartMerge(nodeData.WrappedData)); + (sender, args) => assessmentSectionMerger.StartMerge( + assessmentSection, new HydraulicBoundaryDataUpdateHandler( + assessmentSection, new DuneLocationsUpdateHandler( + Gui.ViewCommands, assessmentSection.DuneErosion)))); return Gui.Get(nodeData, treeViewControl) .AddOpenItem() @@ -2599,9 +2605,7 @@ RiskeerCommonFormsResources.GenericInputOutputIcon, (sender, args) => { - HydraulicBoundaryLocationCalculationsForTargetProbability hydraulicBoundaryLocationCalculationsForTargetProbability = CreateHydraulicBoundaryLocationCalculationsForTargetProbability(assessmentSection); - - nodeData.WrappedData.Add(hydraulicBoundaryLocationCalculationsForTargetProbability); + nodeData.WrappedData.Add(HydraulicBoundaryLocationCalculationsForTargetProbabilityHelper.Create(assessmentSection)); nodeData.WrappedData.NotifyObservers(); }); @@ -2724,9 +2728,7 @@ RiskeerCommonFormsResources.GenericInputOutputIcon, (sender, args) => { - HydraulicBoundaryLocationCalculationsForTargetProbability hydraulicBoundaryLocationCalculationsForTargetProbability = CreateHydraulicBoundaryLocationCalculationsForTargetProbability(assessmentSection); - - nodeData.WrappedData.Add(hydraulicBoundaryLocationCalculationsForTargetProbability); + nodeData.WrappedData.Add(HydraulicBoundaryLocationCalculationsForTargetProbabilityHelper.Create(assessmentSection)); nodeData.WrappedData.NotifyObservers(); }); @@ -2802,16 +2804,6 @@ .Any(whc => IllustrationPointsHelper.HasIllustrationPoints(whc.HydraulicBoundaryLocationCalculations)); } - private static HydraulicBoundaryLocationCalculationsForTargetProbability CreateHydraulicBoundaryLocationCalculationsForTargetProbability(IAssessmentSection assessmentSection) - { - var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01); - - calculationsForTargetProbability.HydraulicBoundaryLocationCalculations.AddRange( - assessmentSection.HydraulicBoundaryData.GetLocations().Select(hbl => new HydraulicBoundaryLocationCalculation(hbl))); - - return calculationsForTargetProbability; - } - #endregion #region AssemblyResults TreeNodeInfo