Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs =================================================================== diff -u -r2529 -r2571 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 2529) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 2571) @@ -103,10 +103,10 @@ private double? riverLevel; private double? riverLevelLow; private double? dikeTableHeight; - private double? plLineOffsetBelowDikeTopAtRiver; - private double? plLineOffsetBelowDikeTopAtPolder; - private double? plLineOffsetBelowShoulderBaseInside; - private double? plLineOffsetBelowDikeToeAtPolder; + private double? plLineOffsetBelowDikeTopAtRiver = 0.5; + private double? plLineOffsetBelowDikeTopAtPolder = 1.5; + private double? plLineOffsetBelowShoulderBaseInside = 0.1; + private double? plLineOffsetBelowDikeToeAtPolder = 0.1; private bool? usePlLineOffsetBelowDikeCrestMiddle; private double? plLineOffsetBelowDikeCrestMiddle; private bool? usePlLineOffsetFactorBelowShoulderCrest; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r2570 -r2571 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2570) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 2571) @@ -662,15 +662,16 @@ }, }; var locationRecord = LocationRecords.FirstOrDefault(l => l.LocationId == scenarioRecord.LocationId); - //hier de nieuwe waarden vastzetten (1 uit scenariorecord, 2 uit location halen etc.) + // set values in scenario (1 from scenariorecord, 2 from locationrecord, 3 default) scenario.PlLineOffsetBelowDikeToeAtPolder = scenarioRecord.PlLineOffsetBelowDikeToeAtPolder ?? - (locationRecord.PlLineOffsetBelowDikeToeAtPolder ?? 0.0); + (locationRecord.PlLineOffsetBelowDikeToeAtPolder ?? scenario.PlLineOffsetBelowDikeToeAtPolder); scenario.PlLineOffsetBelowDikeTopAtPolder = scenarioRecord.PlLineOffsetBelowDikeTopAtPolder ?? - (locationRecord.PlLineOffsetBelowDikeTopAtPolder ?? 0.0); + (locationRecord.PlLineOffsetBelowDikeTopAtPolder ?? scenario.PlLineOffsetBelowDikeTopAtPolder); scenario.PlLineOffsetBelowDikeTopAtRiver = scenarioRecord.PlLineOffsetBelowDikeTopAtRiver ?? - (locationRecord.PlLineOffsetBelowDikeTopAtRiver ?? 0.0); + (locationRecord.PlLineOffsetBelowDikeTopAtRiver ?? scenario.PlLineOffsetBelowDikeTopAtRiver); scenario.PlLineOffsetBelowShoulderBaseInside = scenarioRecord.PlLineOffsetBelowShoulderBaseInside ?? - (locationRecord.PlLineOffsetBelowShoulderBaseInside ?? 0.0); + (locationRecord.PlLineOffsetBelowShoulderBaseInside ?? scenario.PlLineOffsetBelowShoulderBaseInside); + // set values in scenario (1 from scenariorecord, 2 from locationrecord) scenario.PlLineOffsetBelowDikeCrestMiddle = scenarioRecord.PlLineOffsetBelowDikeCrestMiddle ?? locationRecord.PlLineOffsetBelowDikeCrestMiddle; scenario.PlLineOffsetFactorBelowShoulderCrest = scenarioRecord.PlLineOffsetFactorBelowShoulderCrest ??