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 08 Jul 2019
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
Thursday 04 Jul 2019
5:54 pm

Esther van Zantvoort

Added test ValuesFromShapeFileOverwriteValuesFromLocationsCsv

Related to Issue [MWDAM-1515]

Options
    • -0
    • +87
    ./Dam/Tests/DataPluginImporterTests.cs
5:53 pm

Esther van Zantvoort

small refactoring CombineImport tests

Related to Issue [MWDAM-1515]

Options
    • -4
    • +4
    ./Dam/Tests/IO/CombineImportedDataTest.cs
2:16 pm

Esther van Zantvoort

Moved CombineImport tests to its own class

Related to Issue [MWDAM-1515]

Options
    • -291
    • +0
    ./Dam/Tests/CsvImporterTestsNew.cs
    • -0
    • +322
    ./Dam/Tests/IO/CombineImportedDataTest.cs
    • -0
    • +1
    ./Dam/Tests/Deltares.Dam.Tests.csproj
1:16 pm

Aron Noordam

removed unnecessary files for the tests as stated in the issue. Also removed test BM04Opdrijven04SituatieMetEenSchuineSlootbodemEnOpdrijvenOp1Locatie1D_Using_WTIStabilityKernel, as the wbi kernel is not yet implemented

Related to Issue [MWDAM-1460]

Options
    • -20
    • +1
    ./Dam/Tests/DamCalculationBenchmarkTest.cs
  2. … 111 more files in changeset.
9:56 am

Aron Noordam

readded test and got the test working for uplift design

Related to Issue [MWDAM-1460]

Options
    • -0
    • +233
    ./Dam/Tests/DamCalculationBenchmarkTest.cs
    • -1
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
    • -0
    • +2
    ./Dam/Tests/Deltares.Dam.Tests.csproj
    • -0
    • +1
    ./Dam/Tests/Deltares.Dam.BenchmarkTests.csproj
    • -1
    • +0
    ./Dam/Tests/DamIntegrationTestHelper.cs
  6. … 122 more files in changeset.
Wednesday 03 Jul 2019
4:46 pm

tang_ds

Removed export functionality of calculation images

Related to Issue [MWDAM-1259]

Options
    • -1
    • +0
    ./Dam/Forms/Translations.xml
    • -30
    • +0
    ./Dam/Forms/DamPlugin.cs
4:41 pm

tang_ds

Removed export functionality of Calculations (sti files)

Related to Issue [MWDAM-1258]

Options
    • -11
    • +0
    ./Dam/Forms/DamPlugin.cs
    • -1
    • +0
    ./Dam/Forms/Translations.xml
4:14 pm

tang_ds

Disabled the the export of surfacelines when there's no calculation result available.

Related to Issue [MWDAM-1469]

Options
    • -1
    • +1
    ./Dam/Forms/DamPlugin.cs
3:16 pm

John Bokma

Implemented DistanceToEntryPoint in communication with Engine. Added tests to see if it works.

Removed obsolete packages.config from Deltares.Maps.

Related to Issue [MWDAM-1361]

Options
    • -0
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
    • -1
    • +8
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
    • -16
    • +49
    ./Dam/Tests/DamPipingBenchmarkTest.cs
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj
    • -0
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
  6. … 1 more file in changeset.
Monday 01 Jul 2019
4:08 pm

John Bokma

Solved the issue by:

- deleting obsolete kernel types

- adapting the translations for the remaining types

- setting the proper enabled status for the selected kernel type

- making sure the right aligned combo box is shown properly.

Related to Issue [MWDAM-1483]

Options
    • -2
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -0
    • +8
    ./Dam/Forms/DamContext.cs
    • -1
    • +2
    ./Dam/Forms/DamPlugin.cs
    • -11
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs
    • -3
    • +3
    ./Dam/Forms/StabilityKernelTypeSpecificationsControl.Designer.cs
    • -3
    • +4
    ./Dam/Forms/StabilityKernelTypeSpecificationsControl.cs
Thursday 11 Apr 2019
2:29 pm

John Bokma

Added the tests for valid coinciding traffic load.

Related to Issue [MWDAM-300]

Options
    • -0
    • +18
    ./Dam/Tests/CsvImporterTestsNew.cs
2:07 pm

John Bokma

Added the requested tests.

Related to Issue [MWDAM-300]

Options
    • -11
    • +20
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -0
    • +68
    ./Dam/Tests/CsvImporterTestsNew.cs
11:43 am

John Bokma

For some reason !? a test which should have failed always only now decided to actually fail. So I fixed this here.

Related to Issue [MWDAM-1417]

Options
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -1
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
Wednesday 10 Apr 2019
4:22 pm

John Bokma

Added the new installer.

Related to Issue [MWDAM-1417]

Options
    • -7
    • +14
    ./DamClientsLibrary/Deltares.Dam.Data/Segment.cs
  2. … 32 more files in changeset.
Friday 05 Apr 2019
1:29 pm

John Bokma

Also Issue [MWDAM-1407]: removed repairers from dam, added extra validation for surfacelines, implemented the new required domain for surface lines.

Related to Issue [MWDAM-1466]

Options
    • -0
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Specifications/Validator.cs
    • -1
    • +66
    ./Dam/Forms/DamContext.cs
    • -1
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Sensors/Group.cs
    • -0
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Specifications/Extensions/SpecificationExtensions.cs
    • -2
    • +6
    ./DamClientsLibrary/Deltares.Dam.Data/Specifications/ValidationResult.cs
Thursday 04 Apr 2019
5:53 pm

Esther van Zantvoort

Created CanRetrieveDegreeOfConsolidationFromDataShapeFileInCombinationWithCrossSectionShapeFile

Related to Issue [MWDAM-1415]

Options
    • -2
    • +79
    ./Dam/Tests/DataPluginImporterDataShapeFilesTests.cs
2:30 pm

Esther van Zantvoort

Modified label and description for TL_DegreeOfConsolidation in Translations.xml according to OverviewDataUIAndEngine.xlsx revision 2284.

Removed label and description for TL_DegreeOfConsolidation in Location.cs because otherwise the English text from Translations.xml will not be used.

Related to Issue [MWDAM-1415]

Options
    • -2
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
12:34 pm

Esther van Zantvoort

Added TL_DegreeOfConsolidation to Translations.xml

Related to Issue [MWDAM-1415]

Options
    • -0
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
Wednesday 03 Apr 2019
4:09 pm

John Bokma

Removed all [Label] attributes on the properties to have a single source for the translations (the xml-files). This solved the problem as mentioned by Irene as the Labels override the use of the translation xml.

Related to Issue [MWDAM-1432]

Options
    • -95
    • +3
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
2:54 pm

John Bokma

Made the CharacteristicPointype editable in the table. Added the mechanisms to Mechanism support in order to get the proper items in the drop down list. Corrected the property editor to use the local line instead of the global line.

Related to Issue [MWDAM-1466]

Options
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -1
    • +7
    ./Dam/Forms/DamContext.cs
    • -0
    • +1
    ./Dam/Forms/DamPlugin.cs
    • -1
    • +1
    ./Dam/Forms/DamSurfaceLineControl.cs
Tuesday 02 Apr 2019
5:38 pm

John Bokma

Fixed the failing test.

Related to Issue [MWDAM-300]

Options
    • -1
    • +1
    ./Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs
5:28 pm

Esther van Zantvoort

Export coordinates of characteristic points and surface lines with 3 decimals

Related to Issue [MWDAM-1456]

Options
    • -3
    • +3
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportSurfaceLine.cs
    • -69
    • +64
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs
4:53 pm

John Bokma

Added comments as requested by reviewer.

Related to Issue [MWDAM-1407]

Options
    • -0
    • +20
    ./Dam/Forms/DamSurfaceLineControl.cs
3:54 pm

John Bokma

Added the requested check with log messages for errors found. Adapted test values as some of the test data used in these existing tests proved to contain coinciding characteristic points which is now no longer accepted.

Related to Issue [MWDAM-300]

Options
    • -7
    • +7
    ./Dam/Tests/WaterBoardImporterTests.cs
    • -4
    • +3
    ./Dam/Tests/DataPluginImporterCsvTests.cs
    • -1
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -2
    • +61
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -0
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
    • -2
    • +2
    ./Dam/Tests/CsvImporterTestsNew.cs
2:59 pm

Tom The

Fix file headers

Related to Issue [MWDAM-1407]

Options
    • -1
    • +22
    ./Dam/Forms/DamSurfaceLineControl.Designer.cs
    • -3
    • +3
    ./Dam/Forms/DamSurfaceLineControl.cs
12:36 pm

John Bokma

Adapted ProjectLoader for now static method.

Related to Issue [MWDAM-1458]

Options
    • -1
    • +1
    ./Dam/Tests/TestHelper/ProjectLoader.cs