Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u -r2286 -r2398
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 2286)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml (.../Translations.xml) (revision 2398)
@@ -557,8 +557,8 @@
-
-
+
+
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs
===================================================================
diff -u -r2292 -r2398
--- DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs (.../DamContext.cs) (revision 2292)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs (.../DamContext.cs) (revision 2398)
@@ -207,6 +207,14 @@
{
return false;
}
+ var specification = source as DamProjectCalculationSpecification;
+ if (specification != null)
+ {
+ if (member == "SelectedStabilityKernelType")
+ {
+ return Wti;
+ }
+ }
return base.IsEnabled(source, member);
}
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r2271 -r2398
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 2271)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 2398)
@@ -404,7 +404,8 @@
// }
// For easy testing purposes, make sure kernel selection option is true
projectData.DamProjectCalculationSpecification.VisibleEnabledProvider = this;
- StabilityKernelTypeSpecificationsVisible = true;
+ // For now, make sure stability kernel selection is not possible. Enable this when 2019 is fully available.
+ StabilityKernelTypeSpecificationsVisible = false;
Context.CurrentContext = new DamContext
{
Wti = StabilityKernelTypeSpecificationsVisible
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs
===================================================================
diff -u -r2168 -r2398
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2168)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 2398)
@@ -50,17 +50,6 @@
[XmlOldName("DamClassic")]
DamClassicStability,
- // DAM classic .Net uses the .Net version of DGS which is based on the old Delphi code to solve the calculation
- DamClassicDotNet,
-
- // DAM classic WTI uses the .Net version of DGS which is based on the new C# code to solve the calculation
- DamClassicWti,
-
- // The advanced models use the geotechnics and DGS classes to generate the required data from input,
- // using the waternet only. This requires the -rto option for starting
- // Advanced .Net uses the .Net version of DGS which is based on the old Delphi code to solve the calculation
- AdvancedDotNet,
-
// WtiMacroStabilityKernel uses the latest MacroStability kernel as used by the new C# version of DGeoStabilty.
[XmlOldName("AdvancedWti")]
WtiMacroStabilityKernel
Index: DamClients/DamUI/trunk/src/Dam/Forms/StabilityKernelTypeSpecificationsControl.Designer.cs
===================================================================
diff -u -r2088 -r2398
--- DamClients/DamUI/trunk/src/Dam/Forms/StabilityKernelTypeSpecificationsControl.Designer.cs (.../StabilityKernelTypeSpecificationsControl.Designer.cs) (revision 2088)
+++ DamClients/DamUI/trunk/src/Dam/Forms/StabilityKernelTypeSpecificationsControl.Designer.cs (.../StabilityKernelTypeSpecificationsControl.Designer.cs) (revision 2398)
@@ -75,14 +75,14 @@
this.StabilityKernelGroupControl.Margin = new System.Windows.Forms.Padding(4);
this.StabilityKernelGroupControl.Name = "StabilityKernelGroupControl";
this.StabilityKernelGroupControl.ShowCaption = false;
- this.StabilityKernelGroupControl.Size = new System.Drawing.Size(269, 43);
+ this.StabilityKernelGroupControl.Size = new System.Drawing.Size(290, 38);
this.StabilityKernelGroupControl.TabIndex = 11;
this.StabilityKernelGroupControl.Text = "groupControl1";
//
// StabilityKernelTypeComboBox
//
this.StabilityKernelTypeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.StabilityKernelTypeComboBox.Location = new System.Drawing.Point(129, 6);
+ this.StabilityKernelTypeComboBox.Location = new System.Drawing.Point(151, 6);
this.StabilityKernelTypeComboBox.Margin = new System.Windows.Forms.Padding(4);
this.StabilityKernelTypeComboBox.Name = "StabilityKernelTypeComboBox";
this.StabilityKernelTypeComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -96,7 +96,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.StabilityKernelGroupControl);
this.Name = "StabilityKernelTypeSpecificationsControl";
- this.Size = new System.Drawing.Size(269, 43);
+ this.Size = new System.Drawing.Size(290, 38);
((System.ComponentModel.ISupportInitialize)(this.StabilityKernelGroupControl)).EndInit();
this.StabilityKernelGroupControl.ResumeLayout(false);
this.StabilityKernelGroupControl.PerformLayout();
Index: DamClients/DamUI/trunk/src/Dam/Forms/StabilityKernelTypeSpecificationsControl.cs
===================================================================
diff -u -r2088 -r2398
--- DamClients/DamUI/trunk/src/Dam/Forms/StabilityKernelTypeSpecificationsControl.cs (.../StabilityKernelTypeSpecificationsControl.cs) (revision 2088)
+++ DamClients/DamUI/trunk/src/Dam/Forms/StabilityKernelTypeSpecificationsControl.cs (.../StabilityKernelTypeSpecificationsControl.cs) (revision 2398)
@@ -21,7 +21,6 @@
using System.Windows.Forms;
using Deltares.Dam.Data;
-using Deltares.Standard;
using Deltares.Standard.Forms;
using Deltares.Standard.Forms.DExpress;
@@ -35,8 +34,9 @@
public StabilityKernelTypeSpecificationsControl()
{
InitializeComponent();
- BindSupport.BindTextAndValue(this, this.StabilityKernelLabel,
- this.StabilityKernelTypeComboBox, p => p.SelectedStabilityKernelType);
+ BindSupport.BindTextAndValue(this, StabilityKernelLabel,
+ StabilityKernelTypeComboBox, p => p.SelectedStabilityKernelType);
+ FormsSupport.RepairRightAnchoredControls(this);
}
public object SelectedObject
@@ -52,6 +52,7 @@
}
}
}
+
public bool IsVisible
{
get