Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs
===================================================================
diff -u -r6946 -r6964
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs	(.../DamProjectCalculationOptionsPropertyControl.cs)	(revision 6946)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs	(.../DamProjectCalculationOptionsPropertyControl.cs)	(revision 6964)
@@ -30,14 +30,14 @@
 {
     public partial class DamProjectCalculationOptionsPropertyControl : UserControl, IPropertyControl
     {
-        private DamFailureMechanismeCalculationSpecification currentSpecification;
-
+        private DamStabilityParameters currentSpecification;
+        private DamProjectCalculationSpecification currentCalculatioSpecification;
         public DamProjectCalculationOptionsPropertyControl()
         {
             InitializeComponent();
 
-            BindSupport.BindTextAndValue<DamFailureMechanismeCalculationSpecification>(SearchMethodPanelControl, SearchMethodLabel, SearchMethodCombobox, p => p.SearchMethod);
-            BindSupport.BindTextAndValue<DamFailureMechanismeCalculationSpecification>(SearchMethodPanelControl, IsUpliftVanRunOnlyWhenUpliftOccursLabel, IsUpliftVanRunOnlyWhenUpliftOccursCheckBox, p => p.IsUpliftVanRunOnlyWhenUpliftOccurs);
+            BindSupport.BindTextAndValue<DamStabilityParameters>(SearchMethodPanelControl, SearchMethodLabel, SearchMethodCombobox, p => p.SearchMethod);
+            BindSupport.BindTextAndValue<DamStabilityParameters>(SearchMethodPanelControl, IsUpliftVanRunOnlyWhenUpliftOccursLabel, IsUpliftVanRunOnlyWhenUpliftOccursCheckBox, p => p.IsUpliftVanRunOnlyWhenUpliftOccurs);
 
             BindSupport.BindTextAndValue<SlipCircleDefinition>(CircleDefinitionPanelControl, UpliftVanGridCreationLabel, UpliftVanGridCreationComboBox, p => p.UpliftVanGridSizeDetermination);
 
@@ -78,7 +78,7 @@
             }
             set
             {
-                if (value is DamFailureMechanismeCalculationSpecification specification)
+                if (value is DamStabilityParameters specification)
                 {
                     currentSpecification = specification;
                     BindSupport.Assign(SearchMethodPanelControl, currentSpecification);
@@ -97,15 +97,22 @@
 
         private void DataEventPublisher_OnAfterChange(object sender, PublishEventArgs e)
         {
-            if (sender is DamFailureMechanismeCalculationSpecification specification)
+            if (sender is DamStabilityParameters specification)
             {
                 currentSpecification = specification;
                 SetSelectedDamCalculationSpecification();
             }
 
+            if (sender is DamProjectCalculationSpecification calculationSpecification)
+            {
+                currentSpecification = calculationSpecification.DamStabilityParameters;
+                SetSelectedDamCalculationSpecification();
+            }
+
             if (sender is DamProject pd)
             {
-                currentSpecification = pd.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification;
+                currentCalculatioSpecification = pd.DamProjectData.DamProjectCalculationSpecification;
+                currentSpecification = pd.DamProjectData.DamProjectCalculationSpecification.DamStabilityParameters;
                 SetSelectedDamCalculationSpecification();
             }
         }
@@ -114,7 +121,7 @@
         {
             if (currentSpecification != null)
             {
-                currentSpecification.SlipCircleDefinition.Specification = currentSpecification;
+                currentSpecification.SlipCircleDefinition.Specification = currentCalculatioSpecification;
                 if (SearchMethodPanelControl.InvokeRequired)
                 {
                     Action action = () => BindSupport.Assign(SearchMethodPanelControl, currentSpecification);
@@ -135,12 +142,6 @@
                     BindSupport.Assign(CircleDefinitionPanelControl, currentSpecification.SlipCircleDefinition);
                 }
 
-//                if (selection.FailureMechanismSystemType != FailureMechanismSystemType.Piping && firstEdit)
-//                {
-//                    // this is a hack to force update on ill placed edits.
-//                    this.Width = this.Width + 1;
-//                    firstEdit = false;
-//                }
             }
         }
     }