Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r2b9f000bc1f88cdaf1c348b049d6e9a3a47d48f9 -r4098e7338585cd9047636c465ffcb213c12bf987
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision 2b9f000bc1f88cdaf1c348b049d6e9a3a47d48f9)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision 4098e7338585cd9047636c465ffcb213c12bf987)
@@ -81,7 +81,7 @@
protected override void PerformCalculation()
{
- calculationService.OnProgress = UpdateProgressText;
+ calculationService.OnProgressChanged += UpdateProgressText;
GrassCoverErosionOutwardsDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation);
calculationService.Calculate(
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs
===================================================================
diff -u -r9e877195a92839a9f121a3b4cac77712b63b589b -r4098e7338585cd9047636c465ffcb213c12bf987
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 9e877195a92839a9f121a3b4cac77712b63b589b)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 4098e7338585cd9047636c465ffcb213c12bf987)
@@ -48,13 +48,16 @@
public abstract class WaveConditionsCalculationServiceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(WaveConditionsCalculationServiceBase));
-
- public OnProgressChanged OnProgress;
protected int TotalWaterLevelCalculations;
private int currentStep = 1;
private IWaveConditionsCosineCalculator calculator;
///
+ /// Fired when the calculation progress changed.
+ ///
+ public event OnProgressChanged OnProgressChanged;
+
+ ///
/// Cancels any currently running wave conditions calculation.
///
public void Cancel()
@@ -239,7 +242,7 @@
private void NotifyProgress(RoundedDouble waterLevel, int currentStepNumber, int totalStepsNumber)
{
string message = string.Format(Resources.WaveConditionsCalculationService_OnRun_Calculate_for_waterlevel_0_, waterLevel);
- OnProgress?.Invoke(message, currentStepNumber, totalStepsNumber);
+ OnProgressChanged?.Invoke(message, currentStepNumber, totalStepsNumber);
}
///
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r2b9f000bc1f88cdaf1c348b049d6e9a3a47d48f9 -r4098e7338585cd9047636c465ffcb213c12bf987
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs (.../StabilityStoneCoverWaveConditionsCalculationActivity.cs) (revision 2b9f000bc1f88cdaf1c348b049d6e9a3a47d48f9)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs (.../StabilityStoneCoverWaveConditionsCalculationActivity.cs) (revision 4098e7338585cd9047636c465ffcb213c12bf987)
@@ -80,7 +80,7 @@
protected override void PerformCalculation()
{
- calculationService.OnProgress = UpdateProgressText;
+ calculationService.OnProgressChanged += UpdateProgressText;
StabilityStoneCoverDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation);
calculationService.Calculate(
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r9e877195a92839a9f121a3b4cac77712b63b589b -r4098e7338585cd9047636c465ffcb213c12bf987
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 9e877195a92839a9f121a3b4cac77712b63b589b)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 4098e7338585cd9047636c465ffcb213c12bf987)
@@ -290,7 +290,7 @@
{
var currentStep = 1;
var stabilityStoneCoverWaveConditionsCalculationService = new StabilityStoneCoverWaveConditionsCalculationService();
- stabilityStoneCoverWaveConditionsCalculationService.OnProgress += (description, step, steps) =>
+ stabilityStoneCoverWaveConditionsCalculationService.OnProgressChanged += (description, step, steps) =>
{
// Assert
string text = $"Berekenen voor een waterstand van '{waterLevels[(step - 1) % waterLevels.Length]}' [m+NAP].";
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r2b9f000bc1f88cdaf1c348b049d6e9a3a47d48f9 -r4098e7338585cd9047636c465ffcb213c12bf987
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs) (revision 2b9f000bc1f88cdaf1c348b049d6e9a3a47d48f9)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs) (revision 4098e7338585cd9047636c465ffcb213c12bf987)
@@ -80,7 +80,7 @@
protected override void PerformCalculation()
{
- calculationService.OnProgress = UpdateProgressText;
+ calculationService.OnProgressChanged += UpdateProgressText;
WaveImpactAsphaltCoverDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation);
calculationService.Calculate(