Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs =================================================================== diff -u -r645 -r650 --- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 645) +++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlOutput.cs (.../FillDamUiFromXmlOutput.cs) (revision 650) @@ -24,6 +24,7 @@ using Deltares.Geometry; using Deltares.Geotechnics.GeotechnicalGeometry; using Deltares.Geotechnics.SurfaceLines; +using Deltares.Standard.EventPublisher; using SurfaceLine = Deltares.DamEngine.Io.XmlOutput.SurfaceLine; namespace Deltares.Dam.Data.DamEngineIo @@ -45,7 +46,11 @@ if (output != null && output.Results != null && output.Results.CalculationResults != null && output.Results.CalculationResults.DesignResults != null) { - CreateDesignResultsOutput(output, damProjectData); + DataEventPublisher.InvokeWithoutPublishingEvents(() => + { + CreateDesignResultsOutput(output, damProjectData); + } + ); } return damProjectData; } @@ -76,7 +81,12 @@ { CreateDesignResultsPipingOutput(designResult, desResult); } - //NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations/designResult.NwoResults.NumberOfIterations dus vullen daar waar beschikbaar CreateDesignResultsStbilityOutput/CreateDesignResultsNwoOutput + if (designResult.StabilityDesignResults != null) + { + desResult.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations; //Vullen daar waar beschikbaar CreateDesignResultsStbilityOutput + } + desResult.Scenario.CalculationResult = desResult.CalculationResult; + desResult.Scenario.CalculationResults.Add(desResult); damProjectData.DesignCalculations.Add(desResult); } }