missing attribute

#685
strusoft · Feb 2, 2023 · 5e3a250 · 5e3a250
1 parent d34b67e
commit 5e3a250
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 14 deletions.
diff --git a/FemDesign.Core/Bars/Bar.cs b/FemDesign.Core/Bars/Bar.cs
@@ -98,6 +98,8 @@ public List<Reinforcement.BarReinforcement> LongitudinalBars
             }
         }
 
+        [XmlAttribute("name")]
+        public string _name; // identifier
         public string Name
         {
             get

diff --git a/FemDesign.Core/Foundations/Foundations.cs b/FemDesign.Core/Foundations/Foundations.cs
@@ -13,20 +13,19 @@ public partial class Foundations
         public List<IsolatedFoundation> IsolatedFoundations = new List<IsolatedFoundation>();
 
         [XmlElement("wall_foundation")]
-        private List<StruSoft.Interop.StruXml.Data.Lnfoundation_type> wall_foundationField = new List<StruSoft.Interop.StruXml.Data.Lnfoundation_type>();
+        public List<StruSoft.Interop.StruXml.Data.Lnfoundation_type> wall_foundationField = new List<StruSoft.Interop.StruXml.Data.Lnfoundation_type>();
 
         [XmlElement("foundation_slab")]
-        private List<StruSoft.Interop.StruXml.Data.Sffoundation_type> foundation_slabField = new List<StruSoft.Interop.StruXml.Data.Sffoundation_type>();
+        public List<StruSoft.Interop.StruXml.Data.Sffoundation_type> foundation_slabField = new List<StruSoft.Interop.StruXml.Data.Sffoundation_type>();
 
 
-        public List<GenericClasses.IFoundationElement> GetFoundations()
+        public List<dynamic> GetFoundations()
         {
-            var objs = new List<GenericClasses.IFoundationElement>();
+            var objs = new List<dynamic>();
             objs.AddRange(this.IsolatedFoundations);
-            //objs.AddRange(this.wall_foundationField); // to implement
-            //objs.AddRange(this.foundation_slabField); // to implement
+            objs.AddRange(this.wall_foundationField); // to implement
+            objs.AddRange(this.foundation_slabField); // to implement
             return objs;
         }
-
     }
-}
+}
diff --git a/FemDesign.Core/Foundations/IsolatedFoundation.cs b/FemDesign.Core/Foundations/IsolatedFoundation.cs
@@ -20,7 +20,8 @@ public partial class IsolatedFoundation : NamedEntityBase, IStructureElement, IF
         protected override int GetUniqueInstanceCount() => ++_instance;
 
         [XmlAttribute("bedding_modulus")]
-        public double BeddingModulus { get; set; }
+        [DefaultValue(10000)]
+        public double BeddingModulus { get; set; } = 10000;
 
         [XmlAttribute("stage")]
         [DefaultValue(1)]

diff --git a/FemDesign.Core/Geometry/Edge.cs b/FemDesign.Core/Geometry/Edge.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using System.ComponentModel;
 
 namespace FemDesign.Geometry
 {
@@ -107,10 +108,13 @@ public string Type
             set { this._type = RestrictedString.EdgeType(value); }
         }
         [XmlAttribute("radius")]
+        [DefaultValue(0)]
         public double Radius { get; set; }   // optional. double
         [XmlAttribute("start_angle")]
+        [DefaultValue(0)]
         public double StartAngle { get; set; } // optional. double
         [XmlAttribute("end_angle")]
+        [DefaultValue(0)]
         public double EndAngle { get; set; } // optional. double
         [XmlIgnore]
         public double Length

diff --git a/FemDesign.Core/Model/Model.cs b/FemDesign.Core/Model/Model.cs
@@ -2207,9 +2207,9 @@ private bool SurfaceReinforcementParametersInModel(Reinforcement.SurfaceReinforc
 
 
         /// <summary>
-        /// Add Support to Model
+        /// Add Foundation to the Model
         /// </summary>
-        /// <param name="obj">PointSupport, LineSupport or SurfaceSupport</param>
+        /// <param name="obj">Isolated Foundation, Line Foundation or Slab Foundation</param>
         /// <param name="overwrite"></param>
         private void AddFoundation(IFoundationElement obj, bool overwrite)
         {
@@ -3711,7 +3711,7 @@ internal void GetLoads()
 
             var mapCase = this.Entities.Loads.LoadCases?.ToDictionary(x => x.Guid);
 
-            foreach (LoadBase load in loads)
+            foreach (var load in loads.OfType<LoadBase>())
             {
                 load.LoadCase = mapCase[load.LoadCaseGuid].DeepClone();
             }

diff --git a/FemDesign.Core/Reinforcement/ShearControlRegion.cs b/FemDesign.Core/Reinforcement/ShearControlRegion.cs
@@ -41,7 +41,7 @@ public double X
         }
 
         [XmlAttribute("physical_extension")]
-        public double _physicalExtension { get; set; }
+        public double _physicalExtension { get; set; } = 0.01;
 
         [XmlIgnore]
         public double PhysicalExtension

diff --git a/FemDesign.Core/Shells/Panel.cs b/FemDesign.Core/Shells/Panel.cs
@@ -3,7 +3,7 @@
 using System.Globalization;
 using System.Xml.Serialization;
 using FemDesign.GenericClasses;
-
+using System.ComponentModel;
 
 namespace FemDesign.Shells
 {
@@ -325,6 +325,7 @@ public double UniformAvgMeshSize
 
 
         [XmlAttribute("ignored_distance")]
+        [DefaultValue(0.02)]
         public double _ignoredDistance = 0.02;
 
         [XmlIgnore]
@@ -341,6 +342,7 @@ public double IgnoredDistance
         }
 
         [XmlAttribute("ignored_in_stability")]
+        [DefaultValue(false)]
         public bool IgnoredInStability { get; set; } = false;
 
         /// <summary>

diff --git a/FemDesign.Core/Shells/Slab.cs b/FemDesign.Core/Shells/Slab.cs
@@ -14,6 +14,8 @@ namespace FemDesign.Shells
     [System.Serializable]
     public partial class Slab : EntityBase, INamedEntity, IStructureElement, IStageElement, IShell
     {
+        [XmlAttribute("name")]
+        public string _name; // identifier
         public string Name
         {
             get
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,6 +98,8 @@ public List<Reinforcement.BarReinforcement> LongitudinalBars @@
                 }
             }
+            [XmlAttribute("name")]
+            public string _name; // identifier
             public string Name
             {
                 get
@@ Expand Down @@