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
Monday 22 Jul 2019
10:46 am

Esther van Zantvoort

Added tests for import of parameters that can be imported from scenarios.csv but also from locations.csv and shapefiles.

Related to Issue [MWDAM-1541]

Options
    • -0
    • +3
    ./Dam/Tests/TestData/HempolderImport/csvfiles/scenarios.csv
    • -0
    • +30
    ./Dam/Tests/TestData/HempolderImport/Lijnscenarios.defx
    • -0
    • +1
    ./Dam/Tests/TestData/HempolderImport/shapefiles/Locations.qpj
    • -0
    • +7
    ./Dam/Tests/TestData/HempolderImport/csvfiles/soilprofiles.csv
    • binary
    ./Dam/Tests/TestData/HempolderImport/shapefiles/Segments.shp
    • binary
    ./Dam/Tests/TestData/HempolderImport/shapefiles/Crosssection.sbn
    • -0
    • +1
    ./Dam/Tests/TestData/HempolderImport/shapefiles/Segments.qpj
    • -0
    • +1
    ./Dam/Tests/TestData/HempolderImport/shapefiles/LijnScenario.prj
    • -26
    • +564
    ./Dam/Tests/DataPluginImporterTests.cs
  10. ./Dam/Tests/TestData/HempolderImport/csvfiles
    • -0
    • +3
    ./Dam/Tests/TestData/HempolderImport/csvfiles/locations_complete.csv
    • -0
    • +30
    ./Dam/Tests/TestData/HempolderImport/Vlakscenario.defx
    • binary
    ./Dam/Tests/TestData/HempolderImport/shapefiles/VlakScenario.shx
    • binary
    ./Dam/Tests/TestData/HempolderImport/shapefiles/Locations.shx
    • -0
    • +1
    ./Dam/Tests/TestData/HempolderImport/shapefiles/VlakScenario.prj
  16. … 30 more files in changeset.
Friday 19 Jul 2019
2:37 pm

Esther van Zantvoort

Add import of uplift criteria and safety factors from locations.csv of shapefile to scenario.

Related to Issue [MWDAM-1521]

Options
    • -6
    • +6
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • -12
    • +12
    ./Dam/Tests/CsvImporterTestsNew.cs
    • -28
    • +13
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -7
    • +7
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
9:35 am

Tom The

Enable and improve License tests

Related to Issue [MWDAM-890]

Options
    • -4
    • +8
    ./Dam/Tests/License/LicenseTest.cs
Thursday 18 Jul 2019
6:03 pm

Tom The

Prepare to implement DamLicense object for DamLive

Related to Issue [MWDAM-890]

Options
    • -3
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/License/DamLicense.cs
    • -1
    • +2
    ./Dam/Application/Program.cs
    • -1
    • +1
    ./Dam/Tests/License/LicenseTest.cs
5:33 pm

Esther van Zantvoort

Modified test for HeadPl2

Related to Issue [MWDAM-1537]

Options
    • -6
    • +7
    ./Dam/Tests/DataPluginImporterTests.cs
9:51 am

tang_ds

Added menu item to redirect to a webpage when the user selects the Help -> Manual menu item

Related to Issue [MWDAM-1550]

Options
    • -1
    • +35
    ./Dam/Forms/DamPlugin.cs
    • -0
    • +1
    ./Dam/Forms/Translations.xml
Wednesday 17 Jul 2019
1:32 am

Esther van Zantvoort

2nd part of commit (oops not saved)

Modified UI for: Made RequiredSafetyFactorStabilityInnerSlope, RequiredSafetyFactorStabilityOuterSlope, RequiredSafetyFactorPiping, UpliftCriterionStability and UpliftCriterionPiping required in xsd/DamLocation.xsd

Set defaults when not specified in import.

Related to Issue [MWDAM-1537]

Options
    • -34
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • -8
    • +27
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
1:30 am

Esther van Zantvoort

Modified UI for: Made RequiredSafetyFactorStabilityInnerSlope, RequiredSafetyFactorStabilityOuterSlope, RequiredSafetyFactorPiping, UpliftCriterionStability and UpliftCriterionPiping required in xsd/DamLocation.xsd

Set defaults when not specified in import.

Related to Issue [MWDAM-1537]

Options
    • -5
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
    • -10
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -33
    • +15
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
    • -18
    • +21
    ./DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs
12:47 am

Esther van Zantvoort

Reverted revision(s) 2573 from DamClients/DamUI/trunk/src that caused a stack overflow:

Refactored: removed ModelFactors as class.

Related to Issue [MWDAM-1537]

Options
    • -0
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
    • -0
    • +50
    ./DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs
    • -5
    • +8
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -37
    • +377
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
Tuesday 16 Jul 2019
9:50 pm

Esther van Zantvoort

Refactored: removed ModelFactors as class.

Related to Issue [MWDAM-1537]

Options
    • -50
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs
    • -8
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
    • -377
    • +37
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
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