Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll
===================================================================
diff -u -r5677 -r5711
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.dll
===================================================================
diff -u -r5688 -r5711
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll
===================================================================
diff -u -r5677 -r5711
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.MacroStability.CSharpWrapper.dll
===================================================================
diff -u -r5677 -r5711
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Calculators.dll
===================================================================
diff -u -r5677 -r5711
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Interface.dll
===================================================================
diff -u -r5677 -r5711
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Data.dll
===================================================================
diff -u -r5677 -r5711
Binary files differ
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r5536 -r5711
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 5536)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 5711)
@@ -227,12 +227,12 @@
-
+
-
@@ -244,6 +244,7 @@
nl-NL="Aantal horizontale punten grid rechts (UV)"/>
+
-
+ nl-NL="Afstand tangent lijnen (UV)"/>
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.DamEngine.Io.dll
===================================================================
diff -u -r5677 -r5711
Binary files differ
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs
===================================================================
diff -u -r5705 -r5711
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 5705)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs (.../MStabParameters.cs) (revision 5711)
@@ -417,7 +417,7 @@
switch (property)
{
// Uplift Van
- case "GridSizeDetermination":
+ case "UpliftVanGridSizeDetermination":
return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
case "UpliftVanTangentLinesDefinition":
return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
@@ -489,18 +489,16 @@
return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified;
// Bishop
- case "BishopTangentLinesDefinition":
- return true;
case "BishopTangentLinesDistance":
return BishopSearchAreaDetermination == GridSizeDetermination.Specified;
case "BishopGridVerticalPointCount":
- return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified;
+ return BishopSearchAreaDetermination == GridSizeDetermination.Specified;
case "BishopGridVerticalPointDistance":
- return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified;
+ return BishopSearchAreaDetermination == GridSizeDetermination.Specified;
case "BishopGridHorizontalPointCount":
- return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified;
+ return BishopSearchAreaDetermination == GridSizeDetermination.Specified;
case "BishopGridHorizontalPointDistance":
- return UpliftVanGridSizeDetermination == GridSizeDetermination.Specified;
+ return BishopSearchAreaDetermination == GridSizeDetermination.Specified;
default: return true;
}
}
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Io.dll
===================================================================
diff -u -r5688 -r5711
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Data.dll
===================================================================
diff -u -r5688 -r5711
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Interface.resources.dll
===================================================================
diff -u -r5688 -r5711
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll
===================================================================
diff -u -r5677 -r5711
Binary files differ
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.StixFileWriter.dll
===================================================================
diff -u -r5677 -r5711
Binary files differ
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs
===================================================================
diff -u -r5705 -r5711
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs (.../DamProjectCalculationOptionsPropertyControl.Designer.cs) (revision 5705)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.Designer.cs (.../DamProjectCalculationOptionsPropertyControl.Designer.cs) (revision 5711)
@@ -282,7 +282,52 @@
this.GridVerticalPointCountBishopLabel.Size = new System.Drawing.Size(164, 16);
this.GridVerticalPointCountBishopLabel.TabIndex = 187;
this.GridVerticalPointCountBishopLabel.Text = "GridVerticalPointCountBishop";
+ //
+ // DistanceTangentLinesBishopEdit
//
+ this.DistanceTangentLinesBishopEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.DistanceTangentLinesBishopEdit.EditValue = new decimal(new int[] {
+ 0,
+ 0,
+ 0,
+ 0});
+ this.DistanceTangentLinesBishopEdit.Location = new System.Drawing.Point(233, 402);
+ this.DistanceTangentLinesBishopEdit.Margin = new System.Windows.Forms.Padding(4);
+ this.DistanceTangentLinesBishopEdit.Name = "DistanceTangentLinesBishopEdit";
+ this.DistanceTangentLinesBishopEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Ellipsis, "", -1, true, false, false, DevExpress.XtraEditors.ImageLocation.MiddleCenter, null, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject12, "", null, null, false)});
+ this.DistanceTangentLinesBishopEdit.Size = new System.Drawing.Size(85, 22);
+ this.DistanceTangentLinesBishopEdit.TabIndex = 168;
+ //
+ // DistanceTangentLinesBishopLabel
+ //
+ this.DistanceTangentLinesBishopLabel.Location = new System.Drawing.Point(6, 405);
+ this.DistanceTangentLinesBishopLabel.Margin = new System.Windows.Forms.Padding(4);
+ this.DistanceTangentLinesBishopLabel.Name = "DistanceTangentLinesBishopLabel";
+ this.DistanceTangentLinesBishopLabel.Size = new System.Drawing.Size(140, 16);
+ this.DistanceTangentLinesBishopLabel.TabIndex = 169;
+ this.DistanceTangentLinesBishopLabel.Text = "DistanceTangentLinesUV";
+ //
+ // BishopSearchAreaCreationComboBox
+ //
+ this.BishopSearchAreaCreationComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.BishopSearchAreaCreationComboBox.Location = new System.Drawing.Point(233, 369);
+ this.BishopSearchAreaCreationComboBox.Margin = new System.Windows.Forms.Padding(4);
+ this.BishopSearchAreaCreationComboBox.Name = "BishopSearchAreaCreationComboBox";
+ this.BishopSearchAreaCreationComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.BishopSearchAreaCreationComboBox.Size = new System.Drawing.Size(85, 22);
+ this.BishopSearchAreaCreationComboBox.TabIndex = 166;
+ //
+ // BishopSearchAreaCreationLabel
+ //
+ this.BishopSearchAreaCreationLabel.Location = new System.Drawing.Point(6, 372);
+ this.BishopSearchAreaCreationLabel.Margin = new System.Windows.Forms.Padding(4);
+ this.BishopSearchAreaCreationLabel.Name = "BishopSearchAreaCreationLabel";
+ this.BishopSearchAreaCreationLabel.Size = new System.Drawing.Size(97, 16);
+ this.BishopSearchAreaCreationLabel.TabIndex = 167;
+ this.BishopSearchAreaCreationLabel.Text = "Tangent lines UV";
+ //
// RightGridHorizontalPointDistanceUVEdit
//
this.RightGridHorizontalPointDistanceUVEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -291,7 +336,7 @@
0,
0,
0});
- this.RightGridHorizontalPointDistanceUVEdit.Location = new System.Drawing.Point(233, 402);
+ this.RightGridHorizontalPointDistanceUVEdit.Location = new System.Drawing.Point(233, 336);
this.RightGridHorizontalPointDistanceUVEdit.Margin = new System.Windows.Forms.Padding(4);
this.RightGridHorizontalPointDistanceUVEdit.Name = "RightGridHorizontalPointDistanceUVEdit";
this.RightGridHorizontalPointDistanceUVEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -301,7 +346,7 @@
//
// RightGridHorizontalPointDistanceUVLabel
//
- this.RightGridHorizontalPointDistanceUVLabel.Location = new System.Drawing.Point(6, 405);
+ this.RightGridHorizontalPointDistanceUVLabel.Location = new System.Drawing.Point(6, 339);
this.RightGridHorizontalPointDistanceUVLabel.Margin = new System.Windows.Forms.Padding(4);
this.RightGridHorizontalPointDistanceUVLabel.Name = "RightGridHorizontalPointDistanceUVLabel";
this.RightGridHorizontalPointDistanceUVLabel.Size = new System.Drawing.Size(201, 16);
@@ -316,7 +361,7 @@
0,
0,
0});
- this.RightGridHorizontalPointCountUVEdit.Location = new System.Drawing.Point(233, 369);
+ this.RightGridHorizontalPointCountUVEdit.Location = new System.Drawing.Point(233, 303);
this.RightGridHorizontalPointCountUVEdit.Margin = new System.Windows.Forms.Padding(4);
this.RightGridHorizontalPointCountUVEdit.Name = "RightGridHorizontalPointCountUVEdit";
this.RightGridHorizontalPointCountUVEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -326,7 +371,7 @@
//
// RightGridHorizontalPointCountUVLabel
//
- this.RightGridHorizontalPointCountUVLabel.Location = new System.Drawing.Point(6, 372);
+ this.RightGridHorizontalPointCountUVLabel.Location = new System.Drawing.Point(6, 306);
this.RightGridHorizontalPointCountUVLabel.Margin = new System.Windows.Forms.Padding(4);
this.RightGridHorizontalPointCountUVLabel.Name = "RightGridHorizontalPointCountUVLabel";
this.RightGridHorizontalPointCountUVLabel.Size = new System.Drawing.Size(186, 16);
@@ -341,7 +386,7 @@
0,
0,
0});
- this.RightGridVerticalPointDistanceUVEdit.Location = new System.Drawing.Point(233, 336);
+ this.RightGridVerticalPointDistanceUVEdit.Location = new System.Drawing.Point(233, 270);
this.RightGridVerticalPointDistanceUVEdit.Margin = new System.Windows.Forms.Padding(4);
this.RightGridVerticalPointDistanceUVEdit.Name = "RightGridVerticalPointDistanceUVEdit";
this.RightGridVerticalPointDistanceUVEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -351,7 +396,7 @@
//
// RightGridVerticalPointDistanceUVLabel
//
- this.RightGridVerticalPointDistanceUVLabel.Location = new System.Drawing.Point(6, 339);
+ this.RightGridVerticalPointDistanceUVLabel.Location = new System.Drawing.Point(6, 273);
this.RightGridVerticalPointDistanceUVLabel.Margin = new System.Windows.Forms.Padding(4);
this.RightGridVerticalPointDistanceUVLabel.Name = "RightGridVerticalPointDistanceUVLabel";
this.RightGridVerticalPointDistanceUVLabel.Size = new System.Drawing.Size(187, 16);
@@ -366,7 +411,7 @@
0,
0,
0});
- this.RightGridVerticalPointCountUVEdit.Location = new System.Drawing.Point(233, 303);
+ this.RightGridVerticalPointCountUVEdit.Location = new System.Drawing.Point(233, 237);
this.RightGridVerticalPointCountUVEdit.Margin = new System.Windows.Forms.Padding(4);
this.RightGridVerticalPointCountUVEdit.Name = "RightGridVerticalPointCountUVEdit";
this.RightGridVerticalPointCountUVEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -376,7 +421,7 @@
//
// RightGridVerticalPointCountUVLabel
//
- this.RightGridVerticalPointCountUVLabel.Location = new System.Drawing.Point(6, 306);
+ this.RightGridVerticalPointCountUVLabel.Location = new System.Drawing.Point(6, 240);
this.RightGridVerticalPointCountUVLabel.Margin = new System.Windows.Forms.Padding(4);
this.RightGridVerticalPointCountUVLabel.Name = "RightGridVerticalPointCountUVLabel";
this.RightGridVerticalPointCountUVLabel.Size = new System.Drawing.Size(172, 16);
@@ -391,7 +436,7 @@
0,
0,
0});
- this.LeftGridHorizontalPointDistanceUVEdit.Location = new System.Drawing.Point(233, 270);
+ this.LeftGridHorizontalPointDistanceUVEdit.Location = new System.Drawing.Point(233, 204);
this.LeftGridHorizontalPointDistanceUVEdit.Margin = new System.Windows.Forms.Padding(4);
this.LeftGridHorizontalPointDistanceUVEdit.Name = "LeftGridHorizontalPointDistanceUVEdit";
this.LeftGridHorizontalPointDistanceUVEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -401,7 +446,7 @@
//
// LeftGridHorizontalPointDistanceUVLabel
//
- this.LeftGridHorizontalPointDistanceUVLabel.Location = new System.Drawing.Point(6, 273);
+ this.LeftGridHorizontalPointDistanceUVLabel.Location = new System.Drawing.Point(6, 207);
this.LeftGridHorizontalPointDistanceUVLabel.Margin = new System.Windows.Forms.Padding(4);
this.LeftGridHorizontalPointDistanceUVLabel.Name = "LeftGridHorizontalPointDistanceUVLabel";
this.LeftGridHorizontalPointDistanceUVLabel.Size = new System.Drawing.Size(193, 16);
@@ -416,7 +461,7 @@
0,
0,
0});
- this.LeftGridHorizontalPointCountUVEdit.Location = new System.Drawing.Point(233, 237);
+ this.LeftGridHorizontalPointCountUVEdit.Location = new System.Drawing.Point(233, 171);
this.LeftGridHorizontalPointCountUVEdit.Margin = new System.Windows.Forms.Padding(4);
this.LeftGridHorizontalPointCountUVEdit.Name = "LeftGridHorizontalPointCountUVEdit";
this.LeftGridHorizontalPointCountUVEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -426,7 +471,7 @@
//
// LeftGridHorizontalPointCountUVLabel
//
- this.LeftGridHorizontalPointCountUVLabel.Location = new System.Drawing.Point(6, 240);
+ this.LeftGridHorizontalPointCountUVLabel.Location = new System.Drawing.Point(6, 174);
this.LeftGridHorizontalPointCountUVLabel.Margin = new System.Windows.Forms.Padding(4);
this.LeftGridHorizontalPointCountUVLabel.Name = "LeftGridHorizontalPointCountUVLabel";
this.LeftGridHorizontalPointCountUVLabel.Size = new System.Drawing.Size(178, 16);
@@ -441,7 +486,7 @@
0,
0,
0});
- this.LeftGridVerticalPointDistanceUVEdit.Location = new System.Drawing.Point(233, 204);
+ this.LeftGridVerticalPointDistanceUVEdit.Location = new System.Drawing.Point(233, 138);
this.LeftGridVerticalPointDistanceUVEdit.Margin = new System.Windows.Forms.Padding(4);
this.LeftGridVerticalPointDistanceUVEdit.Name = "LeftGridVerticalPointDistanceUVEdit";
this.LeftGridVerticalPointDistanceUVEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -451,7 +496,7 @@
//
// LeftGridVerticalPointDistanceUVLabel
//
- this.LeftGridVerticalPointDistanceUVLabel.Location = new System.Drawing.Point(6, 207);
+ this.LeftGridVerticalPointDistanceUVLabel.Location = new System.Drawing.Point(6, 141);
this.LeftGridVerticalPointDistanceUVLabel.Margin = new System.Windows.Forms.Padding(4);
this.LeftGridVerticalPointDistanceUVLabel.Name = "LeftGridVerticalPointDistanceUVLabel";
this.LeftGridVerticalPointDistanceUVLabel.Size = new System.Drawing.Size(156, 16);
@@ -466,7 +511,7 @@
0,
0,
0});
- this.LeftGridVerticalPointCountUVEdit.Location = new System.Drawing.Point(233, 171);
+ this.LeftGridVerticalPointCountUVEdit.Location = new System.Drawing.Point(233, 105);
this.LeftGridVerticalPointCountUVEdit.Margin = new System.Windows.Forms.Padding(4);
this.LeftGridVerticalPointCountUVEdit.Name = "LeftGridVerticalPointCountUVEdit";
this.LeftGridVerticalPointCountUVEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -476,71 +521,47 @@
//
// LeftGridVerticalPointCountUVLabel
//
- this.LeftGridVerticalPointCountUVLabel.Location = new System.Drawing.Point(6, 174);
+ this.LeftGridVerticalPointCountUVLabel.Location = new System.Drawing.Point(6, 108);
this.LeftGridVerticalPointCountUVLabel.Margin = new System.Windows.Forms.Padding(4);
this.LeftGridVerticalPointCountUVLabel.Name = "LeftGridVerticalPointCountUVLabel";
this.LeftGridVerticalPointCountUVLabel.Size = new System.Drawing.Size(164, 16);
this.LeftGridVerticalPointCountUVLabel.TabIndex = 171;
this.LeftGridVerticalPointCountUVLabel.Text = "LeftGridVerticalPointCountUV";
+
//
- // DistanceTangentLinesBishopEdit
+ // UpliftVanGridCreationComboBox
//
- this.DistanceTangentLinesBishopEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.DistanceTangentLinesBishopEdit.EditValue = new decimal(new int[] {
- 0,
- 0,
- 0,
- 0});
- this.DistanceTangentLinesBishopEdit.Location = new System.Drawing.Point(233, 105);
- this.DistanceTangentLinesBishopEdit.Margin = new System.Windows.Forms.Padding(4);
- this.DistanceTangentLinesBishopEdit.Name = "DistanceTangentLinesBishopEdit";
- this.DistanceTangentLinesBishopEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Ellipsis, "", -1, true, false, false, DevExpress.XtraEditors.ImageLocation.MiddleCenter, null, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject12, "", null, null, false)});
- this.DistanceTangentLinesBishopEdit.Size = new System.Drawing.Size(85, 22);
- this.DistanceTangentLinesBishopEdit.TabIndex = 168;
- //
- // DistanceTangentLinesBishopLabel
- //
- this.DistanceTangentLinesBishopLabel.Location = new System.Drawing.Point(6, 108);
- this.DistanceTangentLinesBishopLabel.Margin = new System.Windows.Forms.Padding(4);
- this.DistanceTangentLinesBishopLabel.Name = "DistanceTangentLinesBishopLabel";
- this.DistanceTangentLinesBishopLabel.Size = new System.Drawing.Size(140, 16);
- this.DistanceTangentLinesBishopLabel.TabIndex = 169;
- this.DistanceTangentLinesBishopLabel.Text = "DistanceTangentLinesUV";
- //
- // BishopSearchAreaCreationComboBox
- //
- this.BishopSearchAreaCreationComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.BishopSearchAreaCreationComboBox.Location = new System.Drawing.Point(233, 72);
- this.BishopSearchAreaCreationComboBox.Margin = new System.Windows.Forms.Padding(4);
- this.BishopSearchAreaCreationComboBox.Name = "BishopSearchAreaCreationComboBox";
- this.BishopSearchAreaCreationComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.UpliftVanGridCreationComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.UpliftVanGridCreationComboBox.Location = new System.Drawing.Point(233, 72);
+ this.UpliftVanGridCreationComboBox.Margin = new System.Windows.Forms.Padding(4);
+ this.UpliftVanGridCreationComboBox.Name = "UpliftVanGridCreationComboBox";
+ this.UpliftVanGridCreationComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.BishopSearchAreaCreationComboBox.Size = new System.Drawing.Size(85, 22);
- this.BishopSearchAreaCreationComboBox.TabIndex = 166;
+ this.UpliftVanGridCreationComboBox.Size = new System.Drawing.Size(85, 22);
+ this.UpliftVanGridCreationComboBox.TabIndex = 162;
//
- // BishopSearchAreaCreationLabel
+ // UpliftVanGridCreationLabel
//
- this.BishopSearchAreaCreationLabel.Location = new System.Drawing.Point(6, 75);
- this.BishopSearchAreaCreationLabel.Margin = new System.Windows.Forms.Padding(4);
- this.BishopSearchAreaCreationLabel.Name = "BishopSearchAreaCreationLabel";
- this.BishopSearchAreaCreationLabel.Size = new System.Drawing.Size(97, 16);
- this.BishopSearchAreaCreationLabel.TabIndex = 167;
- this.BishopSearchAreaCreationLabel.Text = "Tangent lines UV";
+ this.UpliftVanGridCreationLabel.Location = new System.Drawing.Point(6, 75);
+ this.UpliftVanGridCreationLabel.Margin = new System.Windows.Forms.Padding(4);
+ this.UpliftVanGridCreationLabel.Name = "UpliftVanGridCreationLabel";
+ this.UpliftVanGridCreationLabel.Size = new System.Drawing.Size(73, 16);
+ this.UpliftVanGridCreationLabel.TabIndex = 163;
+ this.UpliftVanGridCreationLabel.Text = "Grid creation";
//
// DistanceTangentLinesUVEdit
//
this.DistanceTangentLinesUVEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.DistanceTangentLinesUVEdit.EditValue = new decimal(new int[] {
- 0,
- 0,
- 0,
- 0});
+ 0,
+ 0,
+ 0,
+ 0});
this.DistanceTangentLinesUVEdit.Location = new System.Drawing.Point(233, 39);
this.DistanceTangentLinesUVEdit.Margin = new System.Windows.Forms.Padding(4);
this.DistanceTangentLinesUVEdit.Name = "DistanceTangentLinesUVEdit";
this.DistanceTangentLinesUVEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Ellipsis, "", -1, true, false, false, DevExpress.XtraEditors.ImageLocation.MiddleCenter, null, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, "", null, null, false)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Ellipsis, "", -1, true, false, false, DevExpress.XtraEditors.ImageLocation.MiddleCenter, null, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, "", null, null, false)});
this.DistanceTangentLinesUVEdit.Size = new System.Drawing.Size(85, 22);
this.DistanceTangentLinesUVEdit.TabIndex = 164;
//
@@ -553,26 +574,6 @@
this.DistanceTangentLinesUVLabel.TabIndex = 165;
this.DistanceTangentLinesUVLabel.Text = "DistanceTangentLinesUV";
//
- // UpliftVanGridCreationComboBox
- //
- this.UpliftVanGridCreationComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.UpliftVanGridCreationComboBox.Location = new System.Drawing.Point(233, 138);
- this.UpliftVanGridCreationComboBox.Margin = new System.Windows.Forms.Padding(4);
- this.UpliftVanGridCreationComboBox.Name = "UpliftVanGridCreationComboBox";
- this.UpliftVanGridCreationComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.UpliftVanGridCreationComboBox.Size = new System.Drawing.Size(85, 22);
- this.UpliftVanGridCreationComboBox.TabIndex = 162;
- //
- // UpliftVanGridCreationLabel
- //
- this.UpliftVanGridCreationLabel.Location = new System.Drawing.Point(6, 141);
- this.UpliftVanGridCreationLabel.Margin = new System.Windows.Forms.Padding(4);
- this.UpliftVanGridCreationLabel.Name = "UpliftVanGridCreationLabel";
- this.UpliftVanGridCreationLabel.Size = new System.Drawing.Size(73, 16);
- this.UpliftVanGridCreationLabel.TabIndex = 163;
- this.UpliftVanGridCreationLabel.Text = "Grid creation";
- //
// TangentLineUpliftVanComboBox
//
this.TangentLineUpliftVanComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
Index: DamClients/DamUI/trunk/lib/DamEngine/Deltares.MacroStability.CSharpWrapper.dll
===================================================================
diff -u -r5677 -r5711
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.StixFileWriter.dll
===================================================================
diff -u -r5677 -r5711
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/Deltares.DamEngine.Interface.dll
===================================================================
diff -u -r5688 -r5711
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Data.resources.dll
===================================================================
diff -u -r5688 -r5711
Binary files differ
Index: DamClients/DamLive/trunk/lib/DamEngine/nl-NL/Deltares.DamEngine.Calculators.resources.dll
===================================================================
diff -u -r5688 -r5711
Binary files differ