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
Thursday 11 Jul 2019
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
12:37 pm

Esther van Zantvoort

Updated comments about required properties in scenarios.csv

Related to Issue [MWDAM-1531]

Options
    • -15
    • +15
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • -3
    • +5
    ./Dam/Tests/DataPluginImporterTests.cs
11:48 am

John Bokma

Adapted test values to the removal of code deleting locations. Due to this, more locations and less errors are to be expected.

Related to Issue [MWDAM-1524]

Options
    • -2
    • +2
    ./Dam/Tests/IO/CombineImportedDataTest.cs
Tuesday 09 Jul 2019
6:16 pm

John Bokma

Corrected test by setting the illegal value to a field that is read instead of now skipped.

Related to Issue [MWDAM-1527]

Options
    • -1
    • +1
    ./Dam/Tests/CsvImporterTestsNew.cs
6:08 pm

John Bokma

Removed all probabilistic parameters except for type. Also removed obsolete SchematizationFactorData and control.

Related to Issue [MWDAM-1527]

Options
    • -214
    • +0
    ./Dam/Forms/SchematizationFactorPropertyControl.Designer.cs
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -21
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
    • -21
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • -30
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
    • -16
    • +14
    ./DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs
    • -3
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/ModelParameters.cs
    • -2
    • +0
    ./Dam/Forms/DamPlugin.cs
    • -15
    • +0
    ./Dam/Tests/CsvImporterTestsNew.cs
    • -70
    • +0
    ./Dam/Forms/SchematizationFactorPropertyControl.cs
    • -120
    • +0
    ./Dam/Forms/SchematizationFactorPropertyControl.resx
    • -84
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs
    • -199
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
    • -53
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
    • -2
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd
  16. … 15 more files in changeset.
6:00 pm

Esther van Zantvoort

DikeTableHeight is no longer required in scenarios.csv

Related to Issue [MWDAM-1531]

Options
    • -1
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
    • -7
    • +7
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • -15
    • +15
    ./Dam/Tests/DataPluginImporterTests.cs
5:42 pm

Esther van Zantvoort

Removed deleting locations when WaterHeight is not specified in import.

Related to Issue [MWDAM-1524]

Options
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -112
    • +11
    ./Dam/Tests/DataPluginImporterTests.cs
    • -1
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
    • -24
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
4:49 pm

John Bokma

Removed the water_height_decimeringshoogte and max_water_height options.

Related to Issue [MWDAM-1527]

Options
    • -15
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • -1
    • +1
    ./Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
    • -8
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -16
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
    • -21
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
    • -2
    • +0
    ./Dam/Tests/IO/CombineImportedDataTest.cs
    • -111
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
    • -11
    • +3
    ./Dam/Tests/Importers/LocationPropertyImporterTest.cs
    • -11
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
    • -3
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
    • -3
    • +1
    ./Dam/Tests/CsvImporterTest.cs
    • -13
    • +1
    ./Dam/Tests/CsvImporterTestsNew.cs
4:11 pm

Esther van Zantvoort

Fixed another test for changed csv column names.

Related to Issue [MWDAM-1530]

Options
    • -1
    • +1
    ./Dam/Tests/TestData/CSVData/Full1DProject/csvfiles/locations.csv
4:06 pm

John Bokma

Removed the Dupuit options and related test data.

Related to Issue [MWDAM-1527]

Options
    • -43
    • +0
    ./Dam/Tests/TestData/FrieslandIJsselmeer/CalculationParametersDupuitDynamic.xml
    • -37
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DupuitPLLines.cs
    • -43
    • +0
    ./Dam/Tests/TestData/FrieslandIJsselmeer/CalculationParametersDupuitStatic.xml
    • -2
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -46
    • +0
    ./Dam/Tests/TestData/GrebbeDijk/CalculationParameters.xml
  7. ./Dam/Tests/TestData/Dupuit
    • -48
    • +0
    ./Dam/Tests/TestData/SampleCalculationParameters.xml
  9. ./Dam/Tests/TestData/SallandStabDupuit
    • -2
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd
  11. ./Dam/Tests/TestData/SallandProbabilistic
    • -9
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs
    • -21
    • +0
    ./Dam/Tests/Deltares.Dam.IntegrationTests.csproj
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs
    • -2
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
  16. … 16 more files in changeset.
2:49 pm

Esther van Zantvoort

Fixed tests for changed csv column names.

Related to Issue [MWDAM-1530]

Options
    • -2
    • +2
    ./Dam/Tests/CsvImporterTestsNew.cs
2:40 pm

Esther van Zantvoort

Moved field names for import of scenarios.csv to CsvColumnNames.

Related to Issue [MWDAM-1530]

Options
    • -33
    • +17
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • -5
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
    • -5
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
    • -12
    • +17
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
2:02 pm

John Bokma

Removed Category "Calculation" as this prevents running the tests even on Full Test. Added Category slow for all tests where this was missing to prevent those test from always being run.

Related to Issue [MWDAM-1460]

Options
    • -1
    • +3
    ./Dam/Tests/DamCalculationBenchmarkTest.cs
1:14 pm

tang_ds

Fixed failing unit tests:

- Added logic to always have the data source folder set of where to retrieve the geometries from. The data source can come from the DamDataSource of the current object or from the passed argument

Related to Issue [MWDAM-1242]

Options
    • -2
    • +14
    ./DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
12:47 pm

Esther van Zantvoort

Renamed LocationCsvColumnNames to CsvColumnNames

Related to Issue [MWDAM-1530]

Options
    • -0
    • +435
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
    • -76
    • +76
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
    • -1
    • +1
    ./Dam/Forms/DamNewProjectDialog.cs
    • -1
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
    • -435
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs
    • -80
    • +80
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
11:24 am

Aron Noordam

Deleted DamIntegrationTestHelper.cs

Related to Issue [MWDAM-1460]

Options
    • -107
    • +0
    ./Dam/Tests/DamIntegrationTestHelper.cs
11:24 am

Aron Noordam

reverted DamProject.cs

Deleted DamIntegrationTestHelper.cs

Related to Issue [MWDAM-1460]

Options
    • -1
    • +0
    ./Dam/Tests/Deltares.Dam.Tests.csproj
    • -1
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
    • -1
    • +0
    ./Dam/Tests/Deltares.Dam.IntegrationTests.csproj
Monday 08 Jul 2019
11:56 pm

Esther van Zantvoort

Fixed test, due to Remove locations when no WaterHeight was specified in any of the import files. Add message for each location that was removed.

Related to Issue [MWDAM-1524]

Options
    • -2
    • +2
    ./Dam/Tests/IO/CombineImportedDataTest.cs
11:52 pm

Esther van Zantvoort

Remove locations when no WaterHeight was specified in any of the import files. Add message for each location that was removed.

Related to Issue [MWDAM-1524]

Options
    • -0
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -0
    • +24
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -2
    • +325
    ./Dam/Tests/DataPluginImporterTests.cs
    • -3
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • -1
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
4:35 pm

tang_ds

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
3:55 pm

tang_ds

Removed obsolete properties from the LocationPropertyControl:

- Removed HeadPL3 and HeadPL4 items

Related to Issue [MWDAM-1518]

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

tang_ds

Removed obsolete property required probability of failure piping:

- Updated numbering of remaining property order attributes

Related to Issue [MWDAM-1517]

Options
    • -9
    • +9
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
3:09 pm

tang_ds

Removed obsolete property required probability of failure piping

Related to Issue [MWDAM-1517]

Options
    • -22
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
    • -4
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs
    • -2
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -29
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
10:47 am

tang_ds

Fixed directory generation by adding a routine to determine the geometry source path. The fix is to determine the source directory based on:

- The defx source definition for the geometry

- The directory where the defx file resides

- The directory of the damx project file.

Paths in the defx can be specified as relative or direct paths. The former definition causes the described bug, as the project directory where the .damx file resides + the relative path of the geometries does not exist at the time of project creation. --> hence the directory cannot be created.

Related to Issue [MWDAM-1242]

Options
    • -11
    • +35
    ./DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
Friday 05 Jul 2019
10:25 pm

Esther van Zantvoort

Added DikeTableHeight, WaterHeight, WaterHeightLow, WaterHeightDecimeringsHoogte, MaxWaterHeight to Location. Implemented import from locations.csv and shapefile. Removed RiverLevel and RiverLevelLow from Location.

Related to Issue [MWDAM-1521]

Options
    • -2
    • +2
    ./Dam/Tests/Sensors/SensorLocationTests.cs
    • -2
    • +52
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
    • -1
    • +36
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
    • -3
    • +3
    ./Dam/Tests/TestData/CSVData/Full1DProject/csvfiles/locations.csv
    • -0
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
    • -0
    • +5
    ./Dam/Tests/CsvImporterTest.cs
    • -7
    • +7
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
    • -1
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -2
    • +2
    ./Dam/Tests/LocationTest.cs
    • -1
    • +2
    ./Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
    • -14
    • +11
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -3
    • +3
    ./DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs
    • -5
    • +17
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -0
    • +25
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs
  16. … 4 more files in changeset.
3:17 pm

Esther van Zantvoort

Moved TransferScenarios after reading all datasources, including shapefiles.

Added test ValuesFromShapeFileAreCopiedToScenarioIfNotDefinedInScenariosCsv

Related to Issue [MWDAM-1515]

Options
    • -16
    • +16
    ./Dam/Tests/DataPluginImporterTests.cs
    • -4
    • +8
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -6
    • +27
    ./DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
2:36 pm

Esther van Zantvoort

transfer headpl3 and headpl4 from locations to scenario

Added test ValuesFromLocationsCsvAreCopiedToScenarioIfNotDefinedInScenariosCsvOrShapeFile

Related to Issue [MWDAM-1516]

Options
    • -5
    • +35
    ./Dam/Tests/DataPluginImporterTests.cs
    • -8
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs