DAM / DamClients / DamUI / trunk

src

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 8
Last Commit: 17 Dec
Commits this week: 1
Total Lines of Code (LoC): 87,768
Net change in LoC this week: 78

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading

Subversion Details

1 property
  • svn:mergeinfo = /DamClients/DamUI/branches/DamUI 18.1/src:1460,1761,2115,2119 /DamClients/DamUI/branches/DamUI 19.1/src:2804-2805 /DamClients/DamUI/branches/DamUI 19.3/src:3703,3706-3707,3751,3753-3754,3766-3774 /DamClients/DamUI/branches/DamUI 23.1/src:3941 /DamClients/DamUI/branches/RefactoringClientLibrary/src:1501-1506,1509
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 16 Jul 2019
9:20 pm

Esther van Zantvoort

Refactored: use type double instead of double? for PlLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtRiver and PlLineOffsetBelowShoulderBaseInside in UI.

Related to Issue [MWDAM-1537]

Options
    • -4
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -38
    • +32
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
7:24 pm

Esther van Zantvoort

Set proper defaults for PlLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtRiver and PlLineOffsetBelowShoulderBaseInside in UI.

Related to Issue [MWDAM-1537]

Options
    • -4
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
    • -5
    • +6
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
7:10 pm

Esther van Zantvoort

Modified UI for: Made PlLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtRiver and PlLineOffsetBelowShoulderBaseInside required in xsd/DamLocation.xsd

Set default 0.0 when not specified in import (proper defaults in next commit)

Related to Issue [MWDAM-1537]

Options
    • -8
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -4
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
    • -26
    • +21
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
3:59 pm

Esther van Zantvoort

Removed PL1PlLineOffsetBelowDikeTopAtRiver, PL1PlLineOffsetBelowDikeTopAtPolder, PL1PlLineOffsetBelowShoulderBaseInside, PL1PlLineOffsetBelowDikeToeAtPolder from Translations.xml

Related to Issue [MWDAM-1537]

Options
    • -4
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
3:17 pm

John Bokma

Corrected setting DampingFactorPl3 and DampingFactorPl4.

Removed obsolete ModelParameters.

Related to Issue [MWDAM-1533]

Options
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
    • -2
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
    • -2
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -69
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/ModelParameters.cs
1:51 pm

Esther van Zantvoort

DegreeOfConsolidation default to null. Write DegreeOfConsolidationSpecified=false in xml to Engine when DegreeOfConsolidation is null.

Related to Issue [MWDAM-1539]

Options
    • -3
    • +6
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -1
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -2
    • +1
    ./Dam/Tests/LocationTest.cs
    • -2
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
Monday 15 Jul 2019
11:38 pm

Esther van Zantvoort

small refactoring in ImportDataForDikeRings

Related to Issue [MWDAM-1537]

Options
    • -4
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
5:35 pm

John Bokma

Oops, now with the correct seepage length (was not saved yet).

Related to Issue [MWDAM-1361]

Options
    • -1
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
5:32 pm

John Bokma

Corrected piping output for entry point and correct seepage length. Made DistanceToEntryPoint visible in the locations table.

Removed obsolete arePlLineCreationExpertKnowledgeParametersNeeded. Added test on RequiredSafetyFactorStabilityInnerSlope to prevent unwanted error.Removed obsolete RequiredSafetyPipingForAssessment.

Related to Issue [MWDAM-1361]

Options
    • -2
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -0
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamGlobalConstants.cs
3:52 pm

Esther van Zantvoort

refactored: Moved CreateLocationsFileWithObsoleteColumn upwards so that all CreateScenarios methods are together.

Related to Issue [MWDAM-1530]

Options
    • -16
    • +16
    ./Dam/Tests/CsvImporterTestsNew.cs
3:50 pm

Esther van Zantvoort

When expected head pl3 and pl4 headers are not found in the scenarios.csv, check if the old format headers are available.

Related to Issue [MWDAM-1530]

Options
    • -11
    • +74
    ./Dam/Tests/CsvImporterTestsNew.cs
    • -0
    • +18
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • -0
    • +10
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
3:17 pm

Esther van Zantvoort

Added comment at test that can fail on local computer after changing regional settings

Related to Issue [MWDAM-1537]

Options
    • -0
    • +1
    ./DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureTest.cs
1:50 pm

John Bokma

Adapted due to review comments.

Related to Issue [MWDAM-1527]

Options
    • -9
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -4
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs
    • -4
    • +4
    ./Dam/Tests/CsvImporterTestsNew.cs
    • -15
    • +15
    ./Dam/Tests/CsvImporterTest.cs
1:18 pm

Esther van Zantvoort

Removed DamCalculationBenchmarkTest.cs from Deltares.Dam.Tests.csproj, because it is also in Deltares.Dam.BenchmarkTests.csproj

Related to Issue [MWDAM-1519]

Options
    • -1
    • +0
    ./Dam/Tests/Deltares.Dam.Tests.csproj
10:26 am

Esther van Zantvoort

Removed parameters from Location that are in Scenario as well.

Related to Issue [MWDAM-1537]

Options
    • -24
    • +23
    ./Dam/Tests/IO/CombineImportedDataTest.cs
    • -4
    • +0
    ./Dam/Tests/CsvImporterTest.cs
    • -3
    • +10
    ./Dam/Tests/DataPluginImporterTests.cs
    • -138
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileImporterDotSpatial.cs
    • -8
    • +8
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
    • -70
    • +5
    ./Dam/Tests/LoadCompatiblityTest.cs
    • -250
    • +233
    ./Dam/Tests/Importers/LocationPropertyImporterTest.cs
    • -1
    • +0
    ./Dam/Tests/DataPluginImporterCsvTests.cs
    • -1
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationAttributeMapping.cs
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
    • -13
    • +13
    ./Dam/Tests/CsvImporterTestsNew.cs
    • -4
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -10
    • +10
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LineAttributeImporter.cs
    • too large
    ./Dam/Tests/TestData/DamLive/Grebbedijk/input.damx
    • -15
    • +16
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
  16. … 22 more files in changeset.
Saturday 13 Jul 2019
12:05 am

Esther van Zantvoort

Fixed IO tests, due to Removed ModelFactors.

Related to Issue [MWDAM-1519]

Options
    • -11
    • +0
    ./Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
12:02 am

Esther van Zantvoort

Removed ModelFactors from Location in xsd.

Related to Issue [MWDAM-1519]

Options
    • -16
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -12
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
Friday 12 Jul 2019
7:26 pm

Esther van Zantvoort

Fixed IO tests, due to Removed HeadPl3, HeadPl4, Pl1BelowCrestRiverside, Pl1BelowCrestPolderside, Pl1BelowShoulderCrestPolderside, Pl1BelowToeDikePolderside, Pl1BelowCrestMiddle, Pl1FactorBelowShoulderCrest from WaternetOptions.

Related to Issue [MWDAM-1519]

Options
    • -9
    • +0
    ./Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
6:59 pm

Esther van Zantvoort

Removed HeadPl3, HeadPl4, Pl1BelowCrestRiverside, Pl1BelowCrestPolderside, Pl1BelowShoulderCrestPolderside, Pl1BelowToeDikePolderside, Pl1BelowCrestMiddle, Pl1FactorBelowShoulderCrest from WaternetOptions.

Related to Issue [MWDAM-1519]

Options
    • -12
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -9
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
3:00 pm

Esther van Zantvoort

Fixed tests due to: Renamed WaterHeight back to RiverLevel, except in csv files.

Related to Issue [MWDAM-1521]

Options
    • -0
    • +1
    ./Dam/Tests/LoadCompatiblityTest.cs
8:50 am

tang_ds

Fixed failing tests:

- WaterHeight was renamed back to RiverLevel which caused the newly introduced visibility tests to fail.

Related to Issue [MWDAM-1518]

Options
    • -6
    • +6
    ./Dam/Tests/LocationTest.cs
Thursday 11 Jul 2019
6:44 pm

John Bokma

Removed obsolete parameters ProbabilisticType and SoilType.

Related to Issue [MWDAM-1527]

Options
    • -42
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs
    • -4
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs
    • -72
    • +30
    ./DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs
    • -25
    • +7
    ./DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs
    • -77
    • +16
    ./Dam/Tests/UISupport/ConfigurationManagerTest.cs
    • -32
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs
    • -2
    • +1
    ./Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
    • -2
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
    • -4
    • +0
    ./Dam/Tests/FailureMechanismTests.cs
    • -2
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -7
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs
    • -23
    • +0
    ./Dam/Tests/DamEngineIo/ConversionHelperTests.cs
    • -19
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs
    • -13
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
    • -7
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
6:35 pm

Esther van Zantvoort

Renamed WaterHeight back to RiverLevel, except in csv files.

Related to Issue [MWDAM-1521]

Options
    • -8
    • +8
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
    • -2
    • +1
    ./Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
    • -2
    • +2
    ./Dam/Tests/CsvImporterTest.cs
    • -10
    • +10
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
    • -11
    • +11
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • -2
    • +2
    ./Dam/Tests/IO/CombineImportedDataTest.cs
    • -2
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
    • -2
    • +2
    ./Dam/Tests/Sensors/SensorLocationTests.cs
    • -8
    • +8
    ./Dam/Tests/Importers/LocationPropertyImporterTest.cs
    • -35
    • +35
    ./Dam/Tests/DataPluginImporterTests.cs
    • -6
    • +6
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -3
    • +3
    ./DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs
    • -2
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
    • -2
    • +2
    ./Dam/Tests/LocationTest.cs
    • -12
    • +12
    ./Dam/Tests/CsvImporterTestsNew.cs
6:08 pm

John Bokma

Removed obsolete parameter IsUseOriginalCalculationOptions, cleaned up text references for previous obsolete parameters and removed obsolete Overtopping calculator.

Related to Issue [MWDAM-1527]

Options
    • -126
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/OvertoppingErosionCalculator.cs
    • -1
    • +0
    ./Dam/Tests/Deltares.Dam.Tests.csproj
    • -6
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs
    • -2
    • +1
    ./Dam/Forms/Properties/licenses.licx
    • -4
    • +0
    ./Dam/Tests/WaterBoardImporterTests.cs
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -95
    • +0
    ./Dam/Tests/OvertoppingErosionCalculatorTest.cs
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
5:55 pm

Esther van Zantvoort

Raise exception when river level is not defined in ValidateDamProjectData

Related to Issue [MWDAM-1521]

Options
    • -1
    • +21
    ./Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
    • -1
    • +12
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
5:44 pm

John Bokma

Removed obsolete parameters GrassQuality, Direction, LevelReductionInside, LevelReductionOutside, LayerHeightDeviation, LayerHeightDistribution and IsUseOriginalPLLineAssignments.

Related to Issue [MWDAM-1527]

Options
    • -691
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DesignPointCalculation.cs
    • -69
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
    • -8
    • +0
    ./Dam/Tests/IO/CombineImportedDataTest.cs
    • -3
    • +0
    ./Dam/Tests/WaterBoardImporterTests.cs
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
    • -57
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
    • -6
    • +0
    ./Dam/Tests/TestHelper/ProjectLoader.cs
    • -1
    • +0
    ./Dam/Tests/Deltares.Dam.Tests.csproj
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -59
    • +15
    ./Dam/Forms/DamProjectCalculationSpecificationPropertyControl.Designer.cs
    • -7
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -51
    • +0
    ./Dam/Tests/Importers/LocationPropertyImporterTest.cs
    • -11
    • +0
    ./Dam/Tests/LoadCompatiblityTest.cs
    • -35
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
    • -7
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/ModelParameters.cs
  16. … 12 more files in changeset.
4:41 pm

Esther van Zantvoort

Added comments at tests

Related to Issue [MWDAM-1516]

Options
    • -0
    • +20
    ./Dam/Tests/DataPluginImporterTests.cs
3:09 pm

tang_ds

Restored removed controls as these should still be visible when the project is not in design mode.

Merged revision(s) 2445 from DamClients/DamUI/trunk:

Removed obsolete properties from the LocationPropertyControl:

- Removed HeadPL3 and HeadPL4 items

Related to Issue [MWDAM-1518]

Options
    • -0
    • +72
    ./Dam/Forms/LocationPropertyControl.Designer.cs
    • -0
    • +2
    ./Dam/Forms/LocationPropertyControl.cs
3:05 pm

tang_ds

Reordered properties that are related to the scenarios tab:

- Visibility should however be maintained when the program is not in DesignMode

-- Added tests to verify behaviour of the parameters that are also displayed in the scenariostab

-- Optimized the switch-case logic by using fall-through

Related to Issue [MWDAM-1518]

Options
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -0
    • +106
    ./Dam/Tests/LocationTest.cs
1:04 pm

tang_ds

Restored removed properties as the context should determine the visibility and not the object itself

---

Merged revision(s) 2447 from DamClients/DamUI/trunk:

Removed obsolete properties from the Location:

- Removed the UpliftCriteria for Piping and Stability as these are already presented by the scenario

Related to Issue [MWDAM-1518]

Options
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs