DAM

DamClients

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 14
Total Committers: 13
Last Commit: 16 Apr
Commits this week: 14
Total Lines of Code (LoC): 159,819
Net change in LoC this week: -3,606

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
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 11 Apr 2019
2:55 pm

John Bokma

Added the required wix package.

Related to Issue [MWDAM-1417]

Options
    • -0
    • +116
    ./DamUI/trunk/packages/WiX.3.11.0/tools/sdk/inc/balutil.h
    • binary
    ./DamUI/trunk/packages/WiX.3.11.0/tools/difxapp_x64.wixlib
    • -0
    • +97
    ./DamUI/trunk/packages/WiX.3.11.0/tools/sdk/inc/conutil.h
    • -0
    • +695
    ./DamUI/trunk/packages/WiX.3.11.0/tools/sdk/inc/BalBaseBootstrapperApplication.h
    • binary
    ./DamUI/trunk/packages/WiX.3.11.0/tools/WixPSExtension.dll
    • -0
    • +39
    ./DamUI/trunk/packages/WiX.3.11.0/tools/sdk/inc/polcutil.h
    • binary
    ./DamUI/trunk/packages/WiX.3.11.0/WiX.3.11.0.nupkg
    • -0
    • +46
    ./DamUI/trunk/packages/WiX.3.11.0/tools/sdk/inc/rmutil.h
    • -0
    • +54
    ./DamUI/trunk/packages/WiX.3.11.0/tools/sdk/inc/rexutil.h
  10. ./DamUI/trunk/packages/WiX.3.11.0/tools/sdk/x86
    • -0
    • +211
    ./DamUI/trunk/packages/WiX.3.11.0/tools/doc/firewall.xsd
    • -0
    • +136
    ./DamUI/trunk/packages/WiX.3.11.0/tools/sdk/inc/sqlutil.h
    • binary
    ./DamUI/trunk/packages/WiX.3.11.0/tools/heat.exe
    • binary
    ./DamUI/trunk/packages/WiX.3.11.0/tools/sdk/BootstrapperCore.dll
    • binary
    ./DamUI/trunk/packages/WiX.3.11.0/tools/WixVSExtension.MSBuild12.dll
  16. … 237 more files in changeset.
2:29 pm

John Bokma

Added the tests for valid coinciding traffic load.

Related to Issue [MWDAM-300]

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

John Bokma

Added the requested tests.

Related to Issue [MWDAM-300]

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

John Bokma

Removed generated files.

Related to Issue [MWDAM-1417]

Options
    • too large
    ./DamUI/trunk/setup/DamSetupProject/Harvest/DamFiles.wxs
    • too large
    ./DamUI/trunk/setup/DamSetupProject/Harvest/DamTestScriptsFiles.wxs
11:50 am

John Bokma

Update latest version before delete.

Related to Issue [MWDAM-1417]

Options
    • too large
    ./DamUI/trunk/setup/DamSetupProject/Harvest/DamFiles.wxs
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
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -1
    • +5
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
Wednesday 10 Apr 2019
4:57 pm

John Bokma

Updated with the RELEASE version(s) instead of the debug ones.

Related to Issue [MWDAM-1417]

Options
    • binary
    ./DamUI/trunk/release/Install_Version/NetTopologySuite.IO.PostGis.dll
    • binary
    ./DamUI/trunk/release/Install_Version/Deltares.Maps.dll
    • binary
    ./DamUI/trunk/release/Install_Version/Deltares.Dam.IntegrationTests.dll
    • binary
    ./DamUI/trunk/release/Install_Version/Deltares.Maps.pdb
    • binary
    ./DamUI/trunk/release/Install_Version/Deltares.Dam.TestHelper.pdb
    • binary
    ./DamUI/trunk/release/Install_Version/DevExpress.XtraGauges.v12.2.Win.dll
    • binary
    ./DamUI/trunk/release/Install_Version/Deltares.DamClientsLibrary.Version.pdb
    • binary
    ./DamUI/trunk/release/Install_Version/Deltares.DamClientsLibrary.Version.dll
    • binary
    ./DamUI/trunk/release/Install_Version/Deltares.Dam.Forms.pdb
    • binary
    ./DamUI/trunk/release/Install_Version/Deltares.Dam.DamWti.Tests.pdb
    • binary
    ./DamUI/trunk/release/Install_Version/DevExpress.PivotGrid.v12.2.Core.dll
    • binary
    ./DamUI/trunk/release/Install_Version/Deltares.Dam.Tests.dll
    • binary
    ./DamUI/trunk/release/Install_Version/Deltares.Dam.Data.pdb
    • binary
    ./DamUI/trunk/release/Install_Version/LumenWorks.Framework.IO.pdb
    • binary
    ./DamUI/trunk/release/Install_Version/Deltares.Dam.Data.dll
  16. … 22 more files in changeset.
4:22 pm

John Bokma

Added the new installer.

Related to Issue [MWDAM-1417]

Options
    • too large
    ./DamUI/trunk/setup/DamSetupProject/Harvest/DamTestScriptsFiles.wxs
    • binary
    ./DamUI/trunk/setup/DamSetupProject/Resources/splash_screen.jpg
    • -0
    • +4
    ./DamUI/trunk/setup/DamSetupProject/Manuals/Manuals.wxi
    • -0
    • +5
    ./DamUI/trunk/setup/DamSetupProject/packages.config
    • -0
    • +103
    ./DamUI/trunk/setup/DamSetupProject/DamSetupProject.wixproj
  6. ./DamUI/trunk/setup/DamSetupProject/Manuals
    • -0
    • +67
    ./DamUI/trunk/setup/DamSetupProject/WixUI/WixUIVariables.wxl
    • -0
    • +10
    ./DamUI/trunk/setup/DamSetupProject/Features.wxi
    • -0
    • +29
    ./DamUI/trunk/setup/DamSetupProject/Harvest/DamTransform.xsl
    • -0
    • +3
    ./DamUI/trunk/setup/DamSetupProject/Localization/Localization.wxl
  11. ./DamUI/trunk/setup/DamSetupProject/Localization
    • -0
    • +63
    ./DamUI/trunk/setup/DamSetupProject/Harvest/Harvest.targets
    • -7
    • +14
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Segment.cs
    • -0
    • +6
    ./DamUI/trunk/setup/DamSetupProject/Harvest/DamDefines.wxi
    • -0
    • +5
    ./DamUI/trunk/setup/DamSetupProject/Manuals/ManualShortcuts.wxi
  16. … 18 more files in changeset.
4:17 pm

John Bokma

Added files to be used in new installer.

Related to Issue [MWDAM-1417]

Options
    • binary
    ./DamUI/trunk/release/Install_Version/ogr_csharp.dll
    • binary
    ./DamUI/trunk/release/Install_Version/System.Data.SQLite.dll
  3. ./DamUI/trunk/release/Install_Version/cs
    • -0
    • +3
    ./DamUI/trunk/release/Install_Version/TmpImportFiles/scenarios.csv
    • binary
    ./DamUI/trunk/release/Install_Version/DevExpress.XtraCharts.v12.2.dll
    • -0
    • +1899
    ./DamUI/trunk/release/Install_Version/KellermanSoftware.Compare-NET-Objects.xml
  7. ./DamUI/trunk/release/Install_Version/pt-BR
    • -0
    • +125
    ./DamUI/trunk/release/Install_Version/Deltares.Dam.Data.dll.config
    • -0
    • +1538
    ./DamUI/trunk/release/Install_Version/LumenWorks.Framework.IO.XML
    • too large
    ./DamUI/trunk/release/Install_Version/nunit.framework.xml
    • binary
    ./DamUI/trunk/release/Install_Version/de-DE/DotSpatial.Projections.Forms.resources.dll
    • binary
    ./DamUI/trunk/release/Install_Version/DevExpress.XtraCharts.v12.2.UI.dll
    • binary
    ./DamUI/trunk/release/Install_Version/pt-BR/DotSpatial.Projections.Forms.resources.dll
    • binary
    ./DamUI/trunk/release/Install_Version/de-DE/DotSpatial.Symbology.Forms.resources.dll
    • binary
    ./DamUI/trunk/release/Install_Version/nl/DotSpatial.Projections.Forms.resources.dll
  16. … 196 more files in changeset.
Monday 08 Apr 2019
11:58 am

John Bokma

Start of Wix installer for Dam.

Related to Issue [MWDAM-1417]

Options
  1. ./DamUI/trunk/setup
9:23 am

Tom The

Replaced with DataFormat.tex (capital F)

Related to Issue [MWDAM-1323]

Options
    • -19
    • +0
    ./DamUI/trunk/doc/DAM UI - Functional Design/Dataformat.tex
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
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Validator.cs
    • -1
    • +66
    ./DamUI/trunk/src/Dam/Forms/DamContext.cs
    • -1
    • +1
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Group.cs
    • -0
    • +1
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Extensions/SpecificationExtensions.cs
    • -2
    • +6
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValidationResult.cs
10:44 am

zwan_ie

added validation about characteristic points sets

Related to Issue [MWDAM-1323]

Options
    • -14
    • +13
    ./DamUI/trunk/doc/DAM UI - Functional Design/DataFormat.tex
    • binary
    ./DamUI/trunk/doc/DAM UI - Functional Design/DAM UI - Functional Design.pdf
Thursday 04 Apr 2019
5:53 pm

Esther van Zantvoort

Created CanRetrieveDegreeOfConsolidationFromDataShapeFileInCombinationWithCrossSectionShapeFile

Related to Issue [MWDAM-1415]

Options
    • -2
    • +79
    ./DamUI/trunk/src/Dam/Tests/DataPluginImporterDataShapeFilesTests.cs
2:41 pm

Esther van Zantvoort

Replaced test data HHNK_WILMEBREEK in DamEngineTestProjects with data from DamIssueRelatedData\MWDAM-1415\NewTestDataShape\HHNK_WILMEBREEK so it can be used in integration test

Related to Issue [MWDAM-1415]

Options
    • -0
    • +3
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/Shapes/DampingFactorPL3.shp.xml
    • binary
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/Shapes/DampingFactorPL3.shp
    • binary
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/Shapes/DampingFactorPL3.shx
    • binary
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/Shapes/PLLevels.dbf
    • -0
    • +26
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/shapefiletrace.log
    • binary
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/Shapes/DampingFactorPL3.dbf
    • too large
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/DAM_WILMKEBREEK.damx
    • -0
    • +1
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/Shapes/DampingFactorPL3.prj
    • binary
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/Shapes/DampingFactorPL3.sbn
    • binary
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/Shapes/TrafficLoad.dbf
    • binary
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/Shapes/DampingFactorPL3.sbx
    • -0
    • +0
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/Shapes/DampingFactorPL3.shp.L50023.14588.6644.sr.lock
    • -0
    • +53
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/DAM_WILMKEBREEK_VB.defx
    • -0
    • +1
    ./DamUI/trunk/data/DamEngineTestProjects/HHNK_WILMEBREEK/Shapes/DampingFactorPL3.cpg
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
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • too large
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
12:38 pm

zwan_ie

Processed review comment

Related to Issue [mwdam-1323]

Options
    • binary
    ./DamUI/trunk/doc/DAM UI - Functional Design/DAM UI - Functional Design.pdf
    • -0
    • +0
    ./DamUI/trunk/doc/DAM UI - Functional Design/DataFormat.tex
12:34 pm

Esther van Zantvoort

Added TL_DegreeOfConsolidation to Translations.xml

Related to Issue [MWDAM-1415]

Options
    • -0
    • +2
    ./DamUI/trunk/src/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
    ./DamUI/trunk/src/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
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -1
    • +7
    ./DamUI/trunk/src/Dam/Forms/DamContext.cs
    • -0
    • +1
    ./DamUI/trunk/src/Dam/Forms/DamPlugin.cs
    • -1
    • +1
    ./DamUI/trunk/src/Dam/Forms/DamSurfaceLineControl.cs
1:53 pm

zwan_ie

Itemized 7.4

Related to Issue [MWDAM-1323]

Options
    • -7
    • +12
    ./DamUI/trunk/doc/DAM UI - Functional Design/DataEdit.tex
    • binary
    ./DamUI/trunk/doc/DAM UI - Functional Design/DAM UI - Functional Design.pdf
1:42 pm

zwan_ie

new text

Related to Issue [MWDAM-1323]

Options
    • binary
    ./DamUI/trunk/doc/DAM UI - Functional Design/DAM UI - Functional Design.pdf
    • -1
    • +1
    ./DamUI/trunk/doc/DAM UI - Functional Design/DSoilmodel.tex
    • -1
    • +6
    ./DamUI/trunk/doc/DAM UI - Functional Design/DataEdit.tex
9:07 am

zwan_ie

consistent name LOCATIONID

Related to Issue [MWDAM-1419]

Options
    • -24
    • +25
    ./DamUI/trunk/data/DamEngineTestProjects/Basissom/DAM invoerfiles/scenarios.csv
9:03 am

zwan_ie

extra scenarios for screendump properties-scenarios

Related to Issue [MWDAM-1419]

Options
    • -1
    • +25
    ./DamUI/trunk/data/DamEngineTestProjects/Basissom/DAM invoerfiles/scenarios.csv
Tuesday 02 Apr 2019
5:38 pm

John Bokma

Fixed the failing test.

Related to Issue [MWDAM-300]

Options
    • -1
    • +1
    ./DamUI/trunk/src/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
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSurfaceLine.cs
    • -69
    • +64
    ./DamUI/trunk/src/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
    ./DamUI/trunk/src/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
    ./DamUI/trunk/src/Dam/Tests/WaterBoardImporterTests.cs
    • -4
    • +3
    ./DamUI/trunk/src/Dam/Tests/DataPluginImporterCsvTests.cs
    • -1
    • +2
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -2
    • +61
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -0
    • +4
    ./DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
    • -2
    • +2
    ./DamUI/trunk/src/Dam/Tests/CsvImporterTestsNew.cs
2:59 pm

Tom The

Fix file headers

Related to Issue [MWDAM-1407]

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

John Bokma

Adapted ProjectLoader for now static method.

Related to Issue [MWDAM-1458]

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