Activity DAM/DamClients/DamUI

- Made the PolderLevel property of the ScenarioRecord optional, as this can be defined in either the locations.csv or the scenarios.csv which makes the property optional.

- Added error message in case the PolderLevel was undefined in both files --> in this case the scenario is not imported and a log message is generated

Related to Issue [MWDAM-1584]

- -1
- +2
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
- History
- Source
- Diff
./trunk/src/.../Translations.xml
- -1
- +1
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
- History
- Source
- Diff
./trunk/src/.../CsvImporterScenarios.cs
- -44
- +70
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
- History
- Source
- Diff
./trunk/src/.../IO/CombineImportedData.cs

10:19 am

tang_ds

More
2824
changed 1 file
trunk

Incorporated comments review:

- Made file path variable when creating test files

- Fixed failing unit tests

Related to Issue [MWDAM-1584]

- -1
- +2
./trunk/src/Dam/Tests/CsvImporterTestsNew.cs
- History
- Source
- Diff
./trunk/src/.../Tests/CsvImporterTestsNew.cs

8:11 pm

tang_ds

More
2823
changed 1 file
trunk

Incorporated comments review:

- Made file path variable when creating test files

Related to Issue [MWDAM-1584]

- -203
- +185
./trunk/src/Dam/Tests/CsvImporterTestsNew.cs
- History
- Source
- Diff
./trunk/src/.../Tests/CsvImporterTestsNew.cs

4:17 pm

tang_ds

More
2821
changed 1 file
trunk

Incorporated comments review:

- Remove unused code

Related to Issue [MWDAM-1584]

- -11
- +0
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
- History
- Source
- Diff
./trunk/src/.../Deltares.Dam.Data/Location.cs

3:30 pm

Tom The

More
2820
changed 1 file
trunk

Outcomment debug code

Related to Issue [MWDAM-1617]

- -2
- +4
./trunk/src/Dam/Tests/FailureMechanismTests.cs
- History
- Source
- Diff
./trunk/src/.../Tests/FailureMechanismTests.cs

2:24 pm

Tom The

More
2818
changed 2 files
trunk

Fixed unit tests

Related to Issue [MWDAM-1617]

- -95
- +22
./trunk/src/Dam/Tests/FailureMechanismTests.cs
- History
- Source
- Diff
./trunk/src/.../Tests/FailureMechanismTests.cs
- too large
./trunk/data/DamEngineTestProjects/Actualisatie/Actualisatie.damx
- History
- Source
- Diff
./trunk/data/.../Actualisatie.damx

11:58 am

Tom The

More
2817
changed 1 file
trunk

Added check on scenarios

Related to Issue [MWDAM-1620]

- -3
- +52
./trunk/src/Dam/Tests/LoadCompatiblityTest.cs
- History
- Source
- Diff
./trunk/src/.../Tests/LoadCompatiblityTest.cs

9:34 am

tang_ds

More
2815
changed 1 file
trunk

Cleanup test:

- Replaced .Where().FirstOrDefault() statements with .FirstOrDefault(predicate) statements for readability and performance reasons

Related to Issue [MWDAM-1584]

- -7
- +7
./trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs
- History
- Source
- Diff
./trunk/src/.../DataPluginImporterCsvTests.cs

9:32 am

tang_ds

More
2814
changed 1 file
trunk

Fixed failing unit tests: fixed for the csv plugin importer as the PolderLevel property was moved from Location to Scenario

Related to Issue [MWDAM-1584]

- -8
- +6
./trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs
- History
- Source
- Diff
./trunk/src/.../DataPluginImporterCsvTests.cs

9:29 am

tang_ds

More
2813
changed 1 file
trunk

Fixed failing unit tests: fixed for the plugin importer as the HeadPl2 property was moved from Location to Scenario

Related to Issue [MWDAM-1584]

- -7
- +13
./trunk/src/Dam/Tests/DataPluginImporterTests.cs
- History
- Source
- Diff
./trunk/src/.../DataPluginImporterTests.cs

8:54 am

tang_ds

More
2812
changed 1 file
trunk

Fixed failing unit tests: fixed for the ScenarioTest as the PolderLevel became a NonNullable property.

Related to Issue [MWDAM-1584]

- -17
- +1
./trunk/src/Dam/Tests/ScenarioTest.cs
- History
- Source
- Diff
./trunk/src/Dam/Tests/ScenarioTest.cs

8:44 am

tang_ds

More
2811
changed 1 file
trunk

Reordered HeadPl2: column should appear before HeadPl3 and HeadPl4 respectively as a default configuration

Related to Issue [MWDAM-1584]

- -22
- +22
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
- History
- Source
- Diff
./trunk/src/.../Deltares.Dam.Data/Scenario.cs

5:24 pm

Tom The

More
2808
changed 1305 files
trunk

Add load compatibility test for 19.1.1

Merged revision(s) 2804-2805 from DamClients/DamUI/branches/DamUI 19.1:

Related to Issue [MWDAM-1620]

./trunk
- History
- Source
- Diff
./trunk
- -0
- +37
./trunk/src/Dam/Tests/LoadCompatiblityTest.cs
- History
- Source
- Diff
./trunk/src/.../Tests/LoadCompatiblityTest.cs
./trunk/data/Dam/Versions/V 19.1.1
- History
- Source
- Diff
./trunk/data/Dam/Versions/V 19.1.1
- -0
- +1685
./trunk/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(1)_Pro(Segment_235_1D5).sti
- History
- Source
- Diff
./trunk/.../Loc(TPL_Hempolder_0010)_Sce(1)_Pro(Segment_235_1D5).sti
- -0
- +185
./trunk/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(8)_Pro(Segment_235_1D11).sti.xml
- History
- Source
- Diff
./trunk/.../Loc(TPL_Hempolder_0010)_Sce(8)_Pro(Segment_235_1D11).sti.xml
- too large
./trunk/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design.geometries2D.0/26,2+75 Bishop a.sti
- History
- Source
- Diff
./trunk/data/.../26,2+75 Bishop a.sti
- too large
./trunk/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(1)_Pro(Segment_235_1D5).std
- History
- Source
- Diff
./trunk/.../Loc(TPL_Hempolder_0010)_Sce(1)_Pro(Segment_235_1D5).std
- binary
./trunk/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(2)_Pro(Segment_235_1D4).wmf
- History
- Source
- Diff
./trunk/.../Loc(TPL_Hempolder_0010)_Sce(2)_Pro(Segment_235_1D4).wmf
- -0
- +185
./trunk/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(4)_Pro(Segment_235_1D5).sti.xml
- History
- Source
- Diff
./trunk/.../Loc(TPL_Hempolder_0010)_Sce(4)_Pro(Segment_235_1D5).sti.xml
- -0
- +188
./trunk/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(1)_Pro(Segment_235_1D9).sti.xml
- History
- Source
- Diff
./trunk/.../Loc(TPL_Hempolder_0010)_Sce(1)_Pro(Segment_235_1D9).sti.xml
- -0
- +186
./trunk/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(2)_Pro(Segment_235_1D5).sti.xml
- History
- Source
- Diff
./trunk/.../Loc(TPL_Hempolder_0010)_Sce(2)_Pro(Segment_235_1D5).sti.xml
- binary
./trunk/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(6)_Pro(Segment_235_1D2).wmf
- History
- Source
- Diff
./trunk/.../Loc(TPL_Hempolder_0010)_Sce(6)_Pro(Segment_235_1D2).wmf
- too large
./trunk/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(1)_Pro(Segment_235_1D5).sto
- History
- Source
- Diff
./trunk/.../Loc(TPL_Hempolder_0010)_Sce(1)_Pro(Segment_235_1D5).sto
- binary
./trunk/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(8)_Pro(Segment_235_1D7).wmf
- History
- Source
- Diff
./trunk/.../Loc(TPL_Hempolder_0010)_Sce(8)_Pro(Segment_235_1D7).wmf
- too large
./trunk/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(9)_Pro(Segment_235_1D2).std
- History
- Source
- Diff
./trunk/.../Loc(TPL_Hempolder_0010)_Sce(9)_Pro(Segment_235_1D2).std
… 1290 more files in changeset.

4:21 pm

tang_ds

More
2807
changed 2 files
trunk

Removed PolderLevel from the Location.cs

Related to Issue [MWDAM-1584]

- -25
- +1
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
- History
- Source
- Diff
./trunk/src/.../Deltares.Dam.Data/Location.cs
- -1
- +0
./trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
- History
- Source
- Diff
./trunk/src/.../FillXmlInputFromDamUiTests.cs

4:19 pm

tang_ds

More
2806
changed 3 files
trunk

Removed HeadPL2 from the Location.cs

Related to Issue [MWDAM-1584]

- -1
- +0
./trunk/src/Dam/Tests/LoadCompatiblityTest.cs
- History
- Source
- Diff
./trunk/src/.../Tests/LoadCompatiblityTest.cs
- -1
- +2
./trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
- History
- Source
- Diff
./trunk/src/.../FillXmlInputFromDamUiTests.cs
- -27
- +0
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
- History
- Source
- Diff
./trunk/src/.../Deltares.Dam.Data/Location.cs

4:19 pm

Tom The

More
2805
changed 1 file
DamUI 19.1

Add load compatibility test for 19.1.1

(no test for regional projects, because it is deprecated)

Related to Issue [MWDAM-1620]

- -0
- +33
./branches/DamUI 19.1/src/Dam/Tests/LoadCompatiblityTest.cs
- History
- Source
- Diff
./branches/.../LoadCompatiblityTest.cs

4:14 pm

Tom The

More
2804
changed 1303 files
DamUI 19.1

Add load compatibility test for 19.1.1

Related to Issue [MWDAM-1620]

- -0
- +188
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(8)_Pro(Segment_235_1D10).sti.xml
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(8)_Pro(Segment_235_1D10).sti.xml
- too large
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(2)_Pro(Segment_235_1D3).std
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(2)_Pro(Segment_235_1D3).std
- -0
- +1685
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(9)_Pro(Segment_235_1D11).sti
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(9)_Pro(Segment_235_1D11).sti
- -0
- +3135
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design.geometries2D.0/DWP_23.sti
- History
- Source
./branches/DamUI 19.1/.../DWP_23.sti
- -0
- +2517
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design.geometries2D.0/36,9+26 bishop a.sti
- History
- Source
./branches/DamUI 19.1/.../36,9+26 bishop a.sti
- binary
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(6)_Pro(Segment_235_1D4).wmf
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(6)_Pro(Segment_235_1D4).wmf
- binary
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(7)_Pro(Segment_235_1D6).wmf
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(7)_Pro(Segment_235_1D6).wmf
- binary
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(7)_Pro(Segment_235_1D5).wmf
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(7)_Pro(Segment_235_1D5).wmf
- too large
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design.geometries2D.0/HHNK.damx
- History
- Source
./branches/DamUI 19.1/.../HHNK.damx
- binary
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(5)_Pro(Segment_235_1D2).jpg
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(5)_Pro(Segment_235_1D2).jpg
- binary
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(2)_Pro(Segment_235_1D6).jpg
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(2)_Pro(Segment_235_1D6).jpg
- too large
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(9)_Pro(Segment_235_1D9).std
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(9)_Pro(Segment_235_1D9).std
- -0
- +189
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(7)_Pro(Segment_235_1D4).sti.xml
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(7)_Pro(Segment_235_1D4).sti.xml
- -0
- +1834
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/TutorialDesign/DAM Tutorial Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(9)_Pro(Segment_235_1D1).sti
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(9)_Pro(Segment_235_1D1).sti
- binary
./branches/DamUI 19.1/data/Dam/Versions/V 19.1.1/HHNKRegionalDesign/HHNK HemPolder Regional Design - Calculated.Calc/Stability/Bishop/Loc(TPL_Hempolder_0010)_Sce(6)_Pro(Segment_235_1D1).jpg
- History
- Source
./branches/.../Loc(TPL_Hempolder_0010)_Sce(6)_Pro(Segment_235_1D1).jpg
… 1288 more files in changeset.

4:11 pm

tang_ds

More
2803
changed 6 files
trunk

Rewired the HeadPl2 and the PolderLevel properties of Scenario to the new XML entities:

- Changed nullable PolderLevel to a regular double as this is a mandatory required parameter (maintained consistency with the rest of the application)

Related to Issue [MWDAM-1584]

- -3
- +2
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
- History
- Source
- Diff
./trunk/src/.../FillDamUiFromXmlInput.cs
- -1
- +1
./trunk/src/Dam/Tests/IO/CombineImportedDataTest.cs
- History
- Source
- Diff
./trunk/src/.../IO/CombineImportedDataTest.cs
- -1
- +1
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
- History
- Source
- Diff
./trunk/src/.../IO/CombineImportedData.cs
- -8
- +5
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
- History
- Source
- Diff
./trunk/src/.../Deltares.Dam.Data/Scenario.cs
- -3
- +3
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
- History
- Source
- Diff
./trunk/src/.../FillXmlInputFromDamUi.cs
- -8
- +2
./trunk/src/Dam/Tests/ScenarioTest.cs
- History
- Source
- Diff
./trunk/src/Dam/Tests/ScenarioTest.cs

DamUI

Line History

Stats

Commits this week: 1

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

zwan_ie

zwan_ie

zwan_ie

zwan_ie

zwan_ie

zwan_ie

zwan_ie

zwan_ie

zwan_ie

zwan_ie

zwan_ie

zwan_ie

tang_ds

tang_ds

tang_ds

tang_ds

Tom The

Tom The

Tom The

tang_ds

tang_ds

tang_ds

tang_ds

tang_ds

Tom The

tang_ds

tang_ds

Tom The

Tom The

tang_ds