Добавлены сервисы CalculationService, PrimitiveService, Common-сборка с типами

Необходимо реализовать в дальнейшем GetInnerPoints в PrimitiveService

StructureHelperCommon/Models/Entities/INdmPrimitive.cs

@@ -0,0 +1,14 @@
+using StructureHelperCommon.Models.Materials;
+using StructureHelperCommon.Models.Shapes;
+
+namespace StructureHelperCommon.Models.Entities
+{
+    public interface INdmPrimitive
+    {
+        ICenter Center { get; set; }
+        IShape Shape { get; set; }
+        IPrimitiveMaterial PrimitiveMaterial {get;set;}
+        double NdmMaxSize { get; set; }
+        int NdmMinDivision { get; set; }
+    }
+}

StructureHelperCommon/Models/Entities/NdmPrimitive.cs

@@ -0,0 +1,14 @@
+using StructureHelperCommon.Models.Materials;
+using StructureHelperCommon.Models.Shapes;
+
+namespace StructureHelperCommon.Models.Entities
+{
+    public class NdmPrimitive : INdmPrimitive
+    {
+        public ICenter Center { get; set; }
+        public IShape Shape { get; set; }
+        public IPrimitiveMaterial PrimitiveMaterial { get; set; }
+        public double NdmMaxSize { get; set; }
+        public int NdmMinDivision { get; set; }
+    }
+}

StructureHelperCommon/Models/Materials/IPrimitiveMaterial.cs

@@ -0,0 +1,10 @@
+namespace StructureHelperCommon.Models.Materials
+{
+    public interface IPrimitiveMaterial
+    {
+        string Id { get;}
+        MaterialTypes MaterialType { get; }
+        string ClassName { get; }
+        double Strength { get; }
+    }
+}

StructureHelperCommon/Models/Materials/MaterialTypes.cs

@@ -0,0 +1,10 @@
+namespace StructureHelperCommon.Models.Materials
+{
+    public enum MaterialTypes
+    {
+        Concrete,
+        Reinforcement,
+        //Steel,
+        //CarbonFiber,
+    }
+}

StructureHelperCommon/Models/Materials/PrimitiveMaterial.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace StructureHelperCommon.Models.Materials
+{
+    public class PrimitiveMaterial : IPrimitiveMaterial
+    {
+        public string Id { get; }
+        public MaterialTypes MaterialType { get; set; }
+        public string ClassName { get; set; }
+        public double Strength { get; set; }
+
+        public PrimitiveMaterial()
+        {
+            Id = Convert.ToString(Guid.NewGuid());
+        }
+    }
+}

StructureHelperCommon/Models/NdmPrimitives/IPrimitive.cs

@@ -0,0 +1,10 @@
+using StructureHelperCommon.Models.Entities;
+using StructureHelperCommon.Models.Shapes;
+
+namespace StructureHelperCommon.Models.NdmPrimitives
+{
+    public interface IPrimitive : ICenterShape
+    {
+        INdmPrimitive GetNdmPrimitive();
+    }
+}

StructureHelperCommon/Models/NdmPrimitives/PointPrimitive.cs

@@ -0,0 +1,30 @@
+using StructureHelperCommon.Models.Entities;
+using StructureHelperCommon.Models.Materials;
+using StructureHelperCommon.Models.Shapes;
+
+namespace StructureHelperCommon.Models.NdmPrimitives
+{
+    public class PointPrimitive : PrimitiveBase<IPoint>, IPoint
+    {
+        public double Area
+        {
+            get => _shape.Area;
+            set => _shape.Area = value;
+        }
+
+        public PointPrimitive(ICenter center, IPoint shape) : base(center, shape) { }
+        public override INdmPrimitive GetNdmPrimitive()
+        {
+            double strength = 400e6d;
+            string materialName = "s400";
+            IPrimitiveMaterial primitiveMaterial = new PrimitiveMaterial() { MaterialType = GetMaterialTypes(), ClassName = materialName, Strength = strength }; ;
+            INdmPrimitive ndmPrimitive = new NdmPrimitive() { Center = _center, Shape = _shape, PrimitiveMaterial = primitiveMaterial };
+            return ndmPrimitive;
+        }
+
+        private MaterialTypes GetMaterialTypes()
+        {
+            return MaterialTypes.Reinforcement;
+        }
+    }
+}

StructureHelperCommon/Models/NdmPrimitives/PrimitiveBase.cs

@@ -0,0 +1,22 @@
+using StructureHelperCommon.Models.Entities;
+using StructureHelperCommon.Models.Shapes;
+
+namespace StructureHelperCommon.Models.NdmPrimitives
+{
+    public abstract class PrimitiveBase<T> : IPrimitive where T : IShape
+    {
+        protected ICenter _center;
+        protected T _shape;
+
+        public ICenter Center => _center;
+        public IShape Shape => _shape;
+
+        protected PrimitiveBase(ICenter center, T shape)
+        {
+            _center = center;
+            _shape = shape;
+        }
+
+        public abstract INdmPrimitive GetNdmPrimitive();
+    }
+}

StructureHelperCommon/Models/NdmPrimitives/RectanglePrimitive.cs

@@ -0,0 +1,31 @@
+using StructureHelperCommon.Models.Entities;
+using StructureHelperCommon.Models.Materials;
+using StructureHelperCommon.Models.Shapes;
+
+namespace StructureHelperCommon.Models.NdmPrimitives
+{
+    public class RectanglePrimitive : PrimitiveBase<IRectangle>, IRectangle
+    {
+        public RectanglePrimitive(ICenter center, IRectangle shape) : base(center, shape) { }
+
+        public double Width => _shape.Width;
+
+        public double Height => _shape.Height;
+
+        public double Angle => _shape.Angle;
+
+        public override INdmPrimitive GetNdmPrimitive()
+        {
+            double strength = 40e6d;
+            string materialName = "C40/45";
+            IPrimitiveMaterial primitiveMaterial = new PrimitiveMaterial() { MaterialType = GetMaterialTypes(), ClassName = materialName, Strength = strength }; ;
+            INdmPrimitive ndmPrimitive = new NdmPrimitive() { Center = _center, Shape = _shape, PrimitiveMaterial = primitiveMaterial, NdmMaxSize = 1, NdmMinDivision = 20 };
+            return ndmPrimitive;
+        }
+
+        private MaterialTypes GetMaterialTypes()
+        {
+            return MaterialTypes.Concrete;
+        }
+    }
+}

StructureHelperCommon/Models/Shapes/Center.cs

@@ -0,0 +1,11 @@
+namespace StructureHelperCommon.Models.Shapes
+{
+    /// <inheritdoc />
+    public class Center : ICenter
+    {
+        /// <inheritdoc />
+        public double X { get; set; }
+        /// <inheritdoc />
+        public double Y { get; set; }
+    }
+}

StructureHelperCommon/Models/Shapes/ICenter.cs

@@ -0,0 +1,20 @@
+namespace StructureHelperCommon.Models.Shapes
+{
+    /// <summary>
+    /// Interface for point of center of some shape
+    /// Интерфейс для точки центра некоторой формы
+    /// </summary>
+    public interface ICenter
+    {
+        /// <summary>
+        /// Coordinate of center of rectangle by local axis X, m
+        /// Координата центра вдоль локальной оси X, м
+        /// </summary>
+        double X { get;}
+        /// <summary>
+        /// Coordinate of center of rectangle by local axis Y, m
+        /// Координата центра вдоль локальной оси Y, м
+        /// </summary>
+        double Y { get;}
+    }
+}

StructureHelperCommon/Models/Shapes/ICenterShape.cs

@@ -0,0 +1,8 @@
+namespace StructureHelperCommon.Models.Shapes
+{
+    public interface ICenterShape
+    {
+        ICenter Center {get;}
+        IShape Shape { get;}
+    }
+}

StructureHelperCommon/Models/Shapes/ICircle.cs

@@ -0,0 +1,7 @@
+namespace StructureHelperCommon.Models.Shapes
+{
+    public interface ICircle : IShape
+    {
+        double Diameter { get; set; }
+    }
+}

StructureHelperCommon/Models/Shapes/IPoint.cs

@@ -0,0 +1,7 @@
+namespace StructureHelperCommon.Models.Shapes
+{
+    public interface IPoint : IShape
+    {
+        double Area { get; set; }
+    }
+}

StructureHelperCommon/Models/Shapes/IRectangle.cs

@@ -0,0 +1,18 @@
+namespace StructureHelperCommon.Models.Shapes
+{
+    public interface IRectangle : IShape
+    {
+        /// <summary>
+        /// Width of rectangle, m
+        /// </summary>
+        double Width { get; }
+        /// <summary>
+        /// Height of rectangle, m
+        /// </summary>
+        double Height { get; }
+        /// <summary>
+        /// Angle of rotating rectangle, rad
+        /// </summary>
+        double Angle { get; }
+    }
+}

StructureHelperCommon/Models/Shapes/IShape.cs

@@ -0,0 +1,6 @@
+namespace StructureHelperCommon.Models.Shapes
+{
+    public interface IShape
+    {
+    }
+}

StructureHelperCommon/Models/Shapes/Point.cs

@@ -0,0 +1,7 @@
+namespace StructureHelperCommon.Models.Shapes
+{
+    public class Point : IPoint
+    {
+        public double Area { get; set; }
+    }
+}

StructureHelperCommon/Models/Shapes/Rectangle.cs

@@ -0,0 +1,13 @@
+namespace StructureHelperCommon.Models.Shapes
+{
+    /// <inheritdoc />
+    public class Rectangle : IRectangle
+    {
+        /// <inheritdoc />
+        public double Width { get; set; }
+        /// <inheritdoc />
+        public double Height { get; set; }
+        /// <inheritdoc />
+        public double Angle { get; set; }
+    }
+}