Activity DAM/DamClients/DamUI

Remove WIP-Status for DAM UI from successful tests, added includes for some missing DevExpress components, introduced local var locResults to solve timing problems introduced by new timer-based DevExpress components.

Related to Issue [MWDAM-2015]

- -0
- +33
./trunk/src/Dam/Application/Deltares.Dam.Application.csproj
- History
- Source
- Diff
./trunk/.../Deltares.Dam.Application.csproj
- -2
- +17
./trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs
- History
- Source
- Diff
./trunk/src/.../DamSpatialEditorDecorator.cs
- -5
- +4
./trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs
- History
- Source
- Diff
./trunk/src/.../LoadCompatiblityTest.cs

6:07 pm

Rob Brinkman

More
4527
changed 299 files
trunk

Upgraded to DevExpress 23.1

Related to Issue [MWDAM-2004]

- binary
./trunk/lib/DevExpress/DevExpress.Xpf.Grid.v12.2.Extensions.dll
- History
- Source
- Diff
./trunk/.../DevExpress.Xpf.Grid.v12.2.Extensions.dll
- binary
./trunk/lib/DevExpress/DevExpress.Web.v12.2.dll
- History
- Source
- Diff
./trunk/lib/.../DevExpress.Web.v12.2.dll
- binary
./trunk/lib/DevExpress/DevExpress.Xpo.v12.2.Extensions.Wcf.5.2.dll
- History
- Source
- Diff
./trunk/.../DevExpress.Xpo.v12.2.Extensions.Wcf.5.2.dll
- -28
- +0
./trunk/lib/DevExpress/DevExpress.XtraScheduler.v12.2.Reporting.Extensions.xml
- History
- Source
- Diff
./trunk/.../DevExpress.XtraScheduler.v12.2.Reporting.Extensions.xml
- binary
./trunk/lib/DevExpress/DevExpress.Web.ASPxPivotGrid.v12.2.dll
- History
- Source
- Diff
./trunk/.../DevExpress.Web.ASPxPivotGrid.v12.2.dll
- binary
./trunk/lib/DSL-FormsGeo/Deltares.Standard.Forms.dll
- History
- Source
- Diff
./trunk/lib/.../Deltares.Standard.Forms.dll
- binary
./trunk/lib/DevExpress/DevExpress.ExpressApp.ViewVariantsModule.v12.2.dll
- History
- Source
- Diff
./trunk/.../DevExpress.ExpressApp.ViewVariantsModule.v12.2.dll
- too large
./trunk/lib/DevExpress/DevExpress.Xpf.LayoutControl.v12.2.xml
- History
- Source
- Diff
./trunk/.../DevExpress.Xpf.LayoutControl.v12.2.xml
- too large
./trunk/lib/DevExpress/DevExpress.Xpf.Grid.v12.2.xml
- History
- Source
- Diff
./trunk/lib/.../DevExpress.Xpf.Grid.v12.2.xml
- binary
./trunk/lib/DevExpress/DevExpress.ExpressApp.Reports.v12.2.dll
- History
- Source
- Diff
./trunk/.../DevExpress.ExpressApp.Reports.v12.2.dll
- -1
- +1
./trunk/src/build/Test.targets
- History
- Source
- Diff
./trunk/src/build/Test.targets
- binary
./trunk/lib/DevExpress/DevExpress.Xpf.Themes.Office2007Blue.v12.2.dll
- History
- Source
- Diff
./trunk/.../DevExpress.Xpf.Themes.Office2007Blue.v12.2.dll
- too large
./trunk/lib/DevExpress/DevExpress.XtraCharts.v12.2.xml
- History
- Source
- Diff
./trunk/.../DevExpress.XtraCharts.v12.2.xml
- binary
./trunk/lib/DSL-FormsMap/Deltares.Standard.Maps.dll
- History
- Source
- Diff
./trunk/lib/.../Deltares.Standard.Maps.dll
- binary
./trunk/lib/DevExpress/DevExpress.Charts.v12.2.Core.dll
- History
- Source
- Diff
./trunk/.../DevExpress.Charts.v12.2.Core.dll
… 284 more files in changeset.

3:47 pm

John Bokma

More
4525
updated 1 file
trunk

Step 20: Updated the results of all piping tutorials based on v23.1 (Bligh, Sellmeijer Revised (WBI) as piping models.

Related to Issue [MWDAM-1624]

- binary
./trunk/data/Tutorials/DAMDesign/Piping/TutorialPipingResult.xlsx
- History
- Source
- Diff
./trunk/data/.../TutorialPipingResult.xlsx

6:03 pm

John Bokma

More
4524
changed 81 files
trunk

Step 19: Moved the tutorials for DAMLive to DamLive (Remove from DAMUI part). Adapt the Piping benchmarks to the actual used Piping models, removed all incomplete data for this.

Related to Issue [MWDAM-1624]

- too large
./trunk/data/benchmarks/PipingVoorbeeld1_geometry.damx
- History
- Source
- Diff
./trunk/.../PipingVoorbeeld1_geometry.damx
- too large
./trunk/data/benchmarks/PipingVoorbeeld1_geometry_VNK.damx
- History
- Source
- Diff
./trunk/.../PipingVoorbeeld1_geometry_VNK.damx
- binary
./trunk/data/DamEngineTestProjects/OverzichtDataDAM.xlsx
- History
- Source
- Diff
./trunk/data/.../OverzichtDataDAM.xlsx
- binary
./trunk/data/benchmarks/BenchmarksPipingResult.xlsx
- History
- Source
- Diff
./trunk/data/.../BenchmarksPipingResult.xlsx
- too large
./trunk/data/benchmarks/Piping_SellWBI_NoAdaptGeometry.damx
- History
- Source
./trunk/.../Piping_SellWBI_NoAdaptGeometry.damx
- binary
./trunk/data/benchmarks/PipingVoorbeeld1_geometry_4krachten0.soilmaterials.mdb
- History
- Source
- Diff
./trunk/.../PipingVoorbeeld1_geometry_4krachten0.soilmaterials.mdb
- too large
./trunk/data/benchmarks/PipingVoorbeeld1_geometry_Bligh.damx
- History
- Source
- Diff
./trunk/.../PipingVoorbeeld1_geometry_Bligh.damx
- too large
./trunk/data/benchmarks/Piping_SellWBI_AdaptGeometry.damx
- History
- Source
./trunk/data/.../Piping_SellWBI_AdaptGeometry.damx
- too large
./trunk/data/benchmarks/Piping_Bligh_AdaptGeometry.damx
- History
- Source
./trunk/data/.../Piping_Bligh_AdaptGeometry.damx
./trunk/data/Tutorials/DAMLive
- History
- Source
- Diff
./trunk/data/Tutorials/DAMLive
- binary
./trunk/data/benchmarks/PipingVoorbeeld1_geometry_Bligh0.soilmaterials.mdb
- History
- Source
- Diff
./trunk/.../PipingVoorbeeld1_geometry_Bligh0.soilmaterials.mdb
- too large
./trunk/data/benchmarks/PipingVoorbeeld1_geometry_4krachten.damx
- History
- Source
- Diff
./trunk/.../PipingVoorbeeld1_geometry_4krachten.damx
- binary
./trunk/data/benchmarks/PipingVoorbeeld1_geometry_VNK0.soilmaterials.mdb
- History
- Source
- Diff
./trunk/.../PipingVoorbeeld1_geometry_VNK0.soilmaterials.mdb
./trunk/data/benchmarks/PipingVoorbeeld1_geometry_4krachten.geometries2D.0
- History
- Source
- Diff
./trunk/.../PipingVoorbeeld1_geometry_4krachten.geometries2D.0
./trunk/data/benchmarks/PipingVoorbeeld1_geometry_VNK.geometries2D.0
- History
- Source
- Diff
./trunk/.../PipingVoorbeeld1_geometry_VNK.geometries2D.0
… 66 more files in changeset.

10:51 am

John Bokma

More
4521
added 14 files
trunk

Step 17: Added the test data for Piping Test 2.

Related to Issue [MWDAM-1624]

- binary
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2/soilmaterials.mdb
- History
- Source
- Diff
./trunk/data/.../soilmaterials.mdb
- -0
- +25
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2/soilmaterials.mds
- History
- Source
- Diff
./trunk/data/.../soilmaterials.mds
- binary
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 20.soilmaterials.mdb
- History
- Source
- Diff
./trunk/.../Integratietest piping 20.soilmaterials.mdb
- -0
- +2
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2/characteristicpoints.csv
- History
- Source
- Diff
./trunk/data/.../characteristicpoints.csv
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2
- History
- Source
- Diff
./trunk/data/.../Integratietest piping 2
- -0
- +8
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2.defx
- History
- Source
- Diff
./trunk/data/.../Integratietest piping 2.defx
- -0
- +6
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2/soilprofiles.csv
- History
- Source
- Diff
./trunk/data/.../soilprofiles.csv
- -0
- +3
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2/segments.csv
- History
- Source
- Diff
./trunk/data/.../segments.csv
- -0
- +2
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2/locations.csv
- History
- Source
- Diff
./trunk/data/.../locations.csv
- -0
- +2
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2/surfacelines.csv
- History
- Source
- Diff
./trunk/data/.../surfacelines.csv
- too large
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2.damx
- History
- Source
- Diff
./trunk/data/.../Integratietest piping 2.damx
- binary
./trunk/data/benchmarks/Piping/Test 2/Results piping test 2.csv
- History
- Source
- Diff
./trunk/data/.../Results piping test 2.csv
./trunk/data/benchmarks/Piping/Test 2
- History
- Source
- Diff
./trunk/data/benchmarks/Piping/Test 2
- -0
- +2
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2/scenarios.csv
- History
- Source
- Diff
./trunk/data/.../scenarios.csv

5:42 pm

John Bokma

More
4517
changed 175 files
trunk

Step 16: Remove some more calculation files

Related to Issue [MWDAM-1624]

./trunk/data/benchmarks/Piping/Test 4
- History
- Source
- Diff
./trunk/data/benchmarks/Piping/Test 4
./trunk/data/benchmarks/Piping/Test 2
- History
- Source
- Diff
./trunk/data/benchmarks/Piping/Test 2
./trunk/data/benchmarks/Piping/Test 3/Integratietest piping 3.Calc
- History
- Source
- Diff
./trunk/data/.../Integratietest piping 3.Calc
./trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1
- History
- Source
- Diff
./trunk/data/.../Dijkring13-Sec1
./trunk/data/benchmarks/Piping/Test 5
- History
- Source
- Diff
./trunk/data/benchmarks/Piping/Test 5
./trunk/data/benchmarks/Piping
- History
- Source
- Diff
./trunk/data/benchmarks/Piping
./trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1/DatabronbestandMultiCalc23Core
- History
- Source
- Diff
./trunk/.../DatabronbestandMultiCalc23Core
./trunk/data/benchmarks/Piping/Test 5/Integratietest piping 5.Calc
- History
- Source
- Diff
./trunk/data/.../Integratietest piping 5.Calc
./trunk/data/benchmarks/Piping/Test 4/Integratietest piping 4.Calc
- History
- Source
- Diff
./trunk/data/.../Integratietest piping 4.Calc
./trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1/DatabronbestandMultiCalcVanuitEngineZonder ValidateFoutInStixWriter
- History
- Source
- Diff
./trunk/.../DatabronbestandMultiCalcVanuitEngineZonder ValidateFoutInStixWriter
./trunk/data/benchmarks/Piping/Test 3
- History
- Source
- Diff
./trunk/data/benchmarks/Piping/Test 3
- -2
- +0
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2/surfacelines.csv
- History
- Source
- Diff
./trunk/data/.../surfacelines.csv
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2
- History
- Source
- Diff
./trunk/data/.../Integratietest piping 2
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2.Calc/Piping/Bligh
- History
- Source
- Diff
./trunk/data/benchmarks/.../Piping/Bligh
./trunk/data/benchmarks/Piping/Test 2/Integratietest piping 2.Calc/Piping
- History
- Source
- Diff
./trunk/data/.../Piping
… 160 more files in changeset.

5:34 pm

John Bokma

More
4516
changed 308 files
trunk

Step 15: Remove calculation files

Related to Issue [MWDAM-1624]

./trunk/data/benchmarks/Opdrijfberekeningen/02 Situatie met opdrijven (1D)/Databronbestand.Calc
- History
- Source
- Diff
./trunk/data/.../Databronbestand.Calc
./trunk/data/benchmarks/Opdrijfberekeningen/02 Situatie met opdrijven (1D)
- History
- Source
- Diff
./trunk/.../02 Situatie met opdrijven (1D)
./trunk/data/benchmarks/Opdrijfberekeningen/03 Situatie met een labiel evenwicht (1D)
- History
- Source
- Diff
./trunk/.../03 Situatie met een labiel evenwicht (1D)
./trunk/data/benchmarks/Opdrijfberekeningen/01 Situatie zonder opdrijven (1D)/Databronbestand.Calc
- History
- Source
- Diff
./trunk/data/.../Databronbestand.Calc
./trunk/data/benchmarks/Opdrijfberekeningen/04 Situatie met een schuine slootbodem en opdrijven op 1 locatie (1D)
- History
- Source
- Diff
./trunk/.../04 Situatie met een schuine slootbodem en opdrijven op 1 locatie (1D)
./trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1/Databronbestand.Calc
- History
- Source
- Diff
./trunk/data/.../Databronbestand.Calc
./trunk/data/benchmarks/Opdrijfberekeningen/03 Situatie met een labiel evenwicht (1D)/Databronbestand.Calc
- History
- Source
- Diff
./trunk/data/.../Databronbestand.Calc
./trunk/data/benchmarks/Opdrijfberekeningen/06 Situatie met verschillende opdrijflocaties (1D)/Databronbestand.Calc
- History
- Source
- Diff
./trunk/data/.../Databronbestand.Calc
./trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1/DatabronbestandMulti.Calc
- History
- Source
- Diff
./trunk/data/.../DatabronbestandMulti.Calc
./trunk/data/benchmarks/Opdrijfberekeningen/01 Situatie zonder opdrijven (1D)
- History
- Source
- Diff
./trunk/.../01 Situatie zonder opdrijven (1D)
./trunk/data/benchmarks/Opdrijfberekeningen/Dijkring13-Sec1
- History
- Source
- Diff
./trunk/data/.../Dijkring13-Sec1
./trunk/data/benchmarks/Opdrijfberekeningen/05 Situatie met grondlagen boven en onder het freatisch vlak (1D)/Databronbestand.Calc
- History
- Source
- Diff
./trunk/data/.../Databronbestand.Calc
./trunk/data/benchmarks/Opdrijfberekeningen/06 Situatie met verschillende opdrijflocaties (1D)
- History
- Source
- Diff
./trunk/.../06 Situatie met verschillende opdrijflocaties (1D)
./trunk/data/benchmarks/Opdrijfberekeningen/05 Situatie met grondlagen boven en onder het freatisch vlak (1D)
- History
- Source
- Diff
./trunk/.../05 Situatie met grondlagen boven en onder het freatisch vlak (1D)
./trunk/data/benchmarks/Opdrijfberekeningen/04 Situatie met een schuine slootbodem en opdrijven op 1 locatie (1D)/Databronbestand.Calc
- History
- Source
- Diff
./trunk/data/.../Databronbestand.Calc
… 293 more files in changeset.

5:23 pm

John Bokma

More
4515
changed 3 files
trunk

Step 14: Updated some more test projects for the moved files.

Related to Issue [MWDAM-1624]

- -4
- +6
./trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs
- History
- Source
- Diff
./trunk/src/.../WaterBoardImporterTests.cs
- -10
- +10
./trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs
- History
- Source
- Diff
./trunk/src/.../DamCalculationBenchmarkTest.cs
- -6
- +9
./trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs
- History
- Source
- Diff
./trunk/src/.../Deltares.Dam.Data/Dike.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)

Tom The

Tom The

estrada

Tom The

Tom The

Tom The

Tom The

Tom The

John Bokma

Tom The

Tom The

Tom The

Tom The

John Bokma

John Bokma

Tom The

Tom The

John Bokma

John Bokma

John Bokma

John Bokma

John Bokma

John Bokma

Rob Brinkman

John Bokma

John Bokma

John Bokma

John Bokma

John Bokma

John Bokma