Z-Index was added

This commit is contained in:
Evgeny Redikultsev
2022-11-10 22:06:27 +05:00
parent 5d19958fd7
commit 1d7a97f4fd
28 changed files with 93 additions and 147 deletions

View File

@@ -0,0 +1,17 @@
using StructureHelperLogics.Models.Materials;
using StructureHelperCommon.Models.Shapes;
namespace StructureHelperLogics.Models.Primitives
{
public interface INdmPrimitive
{
ICenter Center { get; set; }
IShape Shape { get; set; }
IPrimitiveMaterial PrimitiveMaterial {get;set;}
double NdmMaxSize { get; set; }
int NdmMinDivision { get; set; }
double PrestrainKx { get; set; }
double PrestrainKy { get; set; }
double PrestrainEpsZ { get; set; }
}
}

View File

@@ -0,0 +1,17 @@
using StructureHelperLogics.Models.Materials;
using StructureHelperCommon.Models.Shapes;
namespace StructureHelperLogics.Models.Primitives
{
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; }
public double PrestrainKx { get; set; }
public double PrestrainKy { get; set; }
public double PrestrainEpsZ { get; set; }
}
}

View File

@@ -1,8 +1,7 @@
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using StructureHelperCommon.Models.Entities;
using StructureHelperCommon.Models.NdmPrimitives;
using StructureHelperCommon.Models.Shapes;
using StructureHelperLogics.Models.Primitives;
namespace StructureHelperLogics.NdmCalculations.Triangulations
{

View File

@@ -1,8 +1,8 @@
using System;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using StructureHelperCommon.Models.Entities;
using StructureHelperCommon.Models.Shapes;
using StructureHelperLogics.Models.Primitives;
namespace StructureHelperLogics.NdmCalculations.Triangulations
{

View File

@@ -6,9 +6,9 @@ using LoaderCalculator.Data.Ndms;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Strings;
using StructureHelperCommon.Models.Entities;
using StructureHelperCommon.Models.Materials;
using StructureHelperLogics.Models.Materials;
using StructureHelperCommon.Models.Shapes;
using StructureHelperLogics.Models.Primitives;
namespace StructureHelperLogics.NdmCalculations.Triangulations
{
@@ -29,7 +29,11 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
}
return ndms;
}
/// <summary>
/// Returns dictionary of unique materials by collection of primitives
/// </summary>
/// <param name="ndmPrimitives"></param>
/// <returns></returns>
private static Dictionary<string, IPrimitiveMaterial> GetPrimitiveMaterials(IEnumerable<INdmPrimitive> ndmPrimitives)
{
Dictionary<string, IPrimitiveMaterial> primitiveMaterials = new Dictionary<string, IPrimitiveMaterial>();
@@ -40,7 +44,13 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
}
return primitiveMaterials;
}
/// <summary>
/// Return dictionary of ndm-materials by dictionary of primirive materials
/// </summary>
/// <param name="PrimitiveMaterials"></param>
/// <param name="options"></param>
/// <returns></returns>
/// <exception cref="StructureHelperException"></exception>
private static Dictionary<string, IMaterial> GetMaterials(Dictionary<string, IPrimitiveMaterial> PrimitiveMaterials, ITriangulationOptions options)
{
Dictionary<string, IMaterial> materials = new Dictionary<string, IMaterial>();
@@ -49,7 +59,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
foreach (string id in keyCollection)
{
IPrimitiveMaterial primitiveMaterial;
if (PrimitiveMaterials.TryGetValue(id, out primitiveMaterial) == false) { throw new Exception("Material dictionary is not valid"); }
if (PrimitiveMaterials.TryGetValue(id, out primitiveMaterial) == false) { throw new StructureHelperException("Material dictionary is not valid"); }
material = GetMaterial(primitiveMaterial, options);
materials.Add(id, material);
}