Add trace force results
This commit is contained in:
@@ -155,7 +155,7 @@ namespace StructureHelper.Windows.CalculationWindows.ProgressViews
|
|||||||
|
|
||||||
private Table GetBlockByTableEntry(TableLogEntry tableEntry)
|
private Table GetBlockByTableEntry(TableLogEntry tableEntry)
|
||||||
{
|
{
|
||||||
const int columnWidth = 150;
|
const double defaultColumnWidth = 150d;
|
||||||
var rows = tableEntry.Table.GetAllRows();
|
var rows = tableEntry.Table.GetAllRows();
|
||||||
int columnCount = tableEntry.Table.RowSize;
|
int columnCount = tableEntry.Table.RowSize;
|
||||||
var table = new Table();
|
var table = new Table();
|
||||||
@@ -168,7 +168,7 @@ namespace StructureHelper.Windows.CalculationWindows.ProgressViews
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
tableColumn.Width = new GridLength(columnWidth);
|
tableColumn.Width = new GridLength(defaultColumnWidth);
|
||||||
}
|
}
|
||||||
table.Columns.Add(tableColumn);
|
table.Columns.Add(tableColumn);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using StructureHelper.Models.Materials;
|
using LoaderCalculator.Data.Materials;
|
||||||
|
using StructureHelper.Models.Materials;
|
||||||
using StructureHelperCommon.Infrastructures.Exceptions;
|
using StructureHelperCommon.Infrastructures.Exceptions;
|
||||||
using StructureHelperCommon.Models;
|
using StructureHelperCommon.Models;
|
||||||
using StructureHelperCommon.Models.Materials.Libraries;
|
using StructureHelperCommon.Models.Materials.Libraries;
|
||||||
@@ -9,6 +10,7 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Documents;
|
||||||
using System.Windows.Shapes;
|
using System.Windows.Shapes;
|
||||||
|
|
||||||
namespace StructureHelperLogics.Models.Materials
|
namespace StructureHelperLogics.Models.Materials
|
||||||
@@ -49,6 +51,37 @@ namespace StructureHelperLogics.Models.Materials
|
|||||||
traceLoggerEntries.Add(table);
|
traceLoggerEntries.Add(table);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private List<IShTableRow<ITraceLoggerEntry>> ProcessLibMaterial(ILibMaterial libMaterial)
|
||||||
|
{
|
||||||
|
List<IShTableRow<ITraceLoggerEntry>> rows = new();
|
||||||
|
ShTableRow<ITraceLoggerEntry> ndmRow;
|
||||||
|
ndmRow = new(rowSize);
|
||||||
|
ndmRow.Elements[0].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = "Material kind name",
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
ndmRow.Elements[1].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = libMaterial.MaterialEntity.Name,
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
rows.Add(ndmRow);
|
||||||
|
ndmRow = new(rowSize);
|
||||||
|
ndmRow.Elements[0].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = "Material logic name",
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
ndmRow.Elements[1].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = libMaterial.MaterialLogic.Name,
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
rows.Add(ndmRow);
|
||||||
|
return rows;
|
||||||
|
}
|
||||||
|
|
||||||
private void Check()
|
private void Check()
|
||||||
{
|
{
|
||||||
if (Collection is null)
|
if (Collection is null)
|
||||||
@@ -83,10 +116,65 @@ namespace StructureHelperLogics.Models.Materials
|
|||||||
return ndmRow;
|
return ndmRow;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<IShTableRow<ITraceLoggerEntry>> GetCommonRows(IHeadMaterial headMaterial)
|
private List<IShTableRow<ITraceLoggerEntry>> GetCommonRows(IHeadMaterial headMateial)
|
||||||
{
|
{
|
||||||
List<IShTableRow<ITraceLoggerEntry>> rows = new();
|
List<IShTableRow<ITraceLoggerEntry>> rows = new();
|
||||||
rows.AddRange(ProcessSafetyFactors(headMaterial.HelperMaterial.SafetyFactors));
|
var helperMaterial = headMateial.HelperMaterial;
|
||||||
|
if (helperMaterial is not null)
|
||||||
|
{
|
||||||
|
if (helperMaterial is ILibMaterial libMaterial)
|
||||||
|
{
|
||||||
|
rows.AddRange(ProcessLibMaterial(libMaterial));
|
||||||
|
}
|
||||||
|
if (helperMaterial is IElasticMaterial elastic)
|
||||||
|
{
|
||||||
|
rows.AddRange(ProcessElasticMaterial(elastic));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rows.AddRange(ProcessSafetyFactors(headMateial.HelperMaterial.SafetyFactors));
|
||||||
|
return rows;
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerable<IShTableRow<ITraceLoggerEntry>> ProcessElasticMaterial(IElasticMaterial elastic)
|
||||||
|
{
|
||||||
|
List<IShTableRow<ITraceLoggerEntry>> rows = new();
|
||||||
|
ShTableRow<ITraceLoggerEntry> ndmRow;
|
||||||
|
ndmRow = new(rowSize);
|
||||||
|
ndmRow.Elements[0].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = "Initial Young's modulus, Pa",
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
ndmRow.Elements[1].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = elastic.Modulus.ToString(),
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
rows.Add(ndmRow);
|
||||||
|
ndmRow = new(rowSize);
|
||||||
|
ndmRow.Elements[0].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = "Compressive strength, Pa",
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
ndmRow.Elements[1].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = elastic.CompressiveStrength.ToString(),
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
rows.Add(ndmRow);
|
||||||
|
ndmRow = new(rowSize);
|
||||||
|
ndmRow.Elements[0].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = "Tensile strength, Pa",
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
ndmRow.Elements[1].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = elastic.TensileStrength.ToString(),
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
rows.Add(ndmRow);
|
||||||
return rows;
|
return rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,9 +34,23 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
|
|||||||
TraceInputData();
|
TraceInputData();
|
||||||
GetCombinations();
|
GetCombinations();
|
||||||
CalculateResult();
|
CalculateResult();
|
||||||
|
TraceResult();
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void TraceResult()
|
||||||
|
{
|
||||||
|
TraceForcesResultLogic traceLogic = new()
|
||||||
|
{
|
||||||
|
Collection = result.ForcesResultList
|
||||||
|
};
|
||||||
|
List<ITraceLoggerEntry> traceEntries = traceLogic.GetTraceEntries();
|
||||||
|
foreach (var item in traceEntries)
|
||||||
|
{
|
||||||
|
TraceLogger?.AddEntry(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void TraceInputData()
|
private void TraceInputData()
|
||||||
{
|
{
|
||||||
TracePrimitiveFactory tracePrimitiveFactory = new()
|
TracePrimitiveFactory tracePrimitiveFactory = new()
|
||||||
|
|||||||
@@ -0,0 +1,120 @@
|
|||||||
|
using StructureHelper.Models.Materials;
|
||||||
|
using StructureHelperCommon.Infrastructures.Exceptions;
|
||||||
|
using StructureHelperCommon.Models;
|
||||||
|
using StructureHelperCommon.Models.Tables;
|
||||||
|
using StructureHelperLogics.Models.Materials;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
|
||||||
|
{
|
||||||
|
public class TraceForcesResultLogic : ITraceEntityFactory<IForcesTupleResult>
|
||||||
|
{
|
||||||
|
const int rowSize = 4;
|
||||||
|
private List<ITraceLoggerEntry> traceLoggerEntries;
|
||||||
|
public IEnumerable<IForcesTupleResult>? Collection { get; set; }
|
||||||
|
public int Priority { get; set; } = LoggerService.GetPriorityByStatus(TraceLogStatuses.Info);
|
||||||
|
|
||||||
|
public List<ITraceLoggerEntry> GetTraceEntries()
|
||||||
|
{
|
||||||
|
Check();
|
||||||
|
traceLoggerEntries = new();
|
||||||
|
traceLoggerEntries.Add(new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = $"There are totally {Collection.Count()} result(s), {Collection.Count(x => x.IsValid == true)} valid result(s), {Collection.Count(x => x.IsValid == false)} invalid result(s)",
|
||||||
|
Priority = Priority
|
||||||
|
}
|
||||||
|
);
|
||||||
|
ProcessCollection();
|
||||||
|
return traceLoggerEntries;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ProcessCollection()
|
||||||
|
{
|
||||||
|
var table = new TableLogEntry(rowSize)
|
||||||
|
{
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
table.ColumnWidth[2] = 250;
|
||||||
|
table.ColumnWidth[3] = 250;
|
||||||
|
table.Table.AddRow(GetHeader());
|
||||||
|
foreach (var item in Collection)
|
||||||
|
{
|
||||||
|
table.Table.AddRows(ProcessForceTupleResult(item));
|
||||||
|
}
|
||||||
|
traceLoggerEntries.Add(table);
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerable<IShTableRow<ITraceLoggerEntry>> ProcessForceTupleResult(IForcesTupleResult item)
|
||||||
|
{
|
||||||
|
List<IShTableRow<ITraceLoggerEntry>> rows = new();
|
||||||
|
int priority = Priority;
|
||||||
|
if (item.IsValid == false)
|
||||||
|
{
|
||||||
|
priority = LoggerService.GetPriorityByStatus(TraceLogStatuses.Error);
|
||||||
|
}
|
||||||
|
ShTableRow<ITraceLoggerEntry> ndmRow;
|
||||||
|
ndmRow = new(rowSize);
|
||||||
|
ndmRow.Elements[0].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = "Limit state: " + item.DesignForceTuple.LimitState.ToString() + ", Calculation term: " + item.DesignForceTuple.CalcTerm,
|
||||||
|
Priority = priority
|
||||||
|
};
|
||||||
|
ndmRow.Elements[1].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = "Mx = " + item.DesignForceTuple.ForceTuple.Mx.ToString() + "N*m, My = " + item.DesignForceTuple.ForceTuple.My.ToString() + "N*m, Nz =" + item.DesignForceTuple.ForceTuple.Nz.ToString() + "N, ",
|
||||||
|
Priority = priority
|
||||||
|
};
|
||||||
|
ndmRow.Elements[2].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = "Kx = " + item.LoaderResults.StrainMatrix.Kx + "(1/m), Ky = " + item.LoaderResults.StrainMatrix.Ky + "(1/m), EpsZ = " + item.LoaderResults.StrainMatrix.EpsZ + "(dimensionless)",
|
||||||
|
Priority = priority
|
||||||
|
};
|
||||||
|
ndmRow.Elements[3].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = item.Description,
|
||||||
|
Priority = priority
|
||||||
|
};
|
||||||
|
rows.Add(ndmRow);
|
||||||
|
return rows;
|
||||||
|
}
|
||||||
|
|
||||||
|
private IShTableRow<ITraceLoggerEntry> GetHeader()
|
||||||
|
{
|
||||||
|
const CellRole cellRole = CellRole.Header;
|
||||||
|
string[] ColumnList = new string[]
|
||||||
|
{
|
||||||
|
"Conditions",
|
||||||
|
"Forces",
|
||||||
|
"Curvatures",
|
||||||
|
"Description"
|
||||||
|
};
|
||||||
|
var ndmRow = new ShTableRow<ITraceLoggerEntry>(rowSize);
|
||||||
|
foreach (var item in ndmRow.Elements)
|
||||||
|
{
|
||||||
|
item.Role = cellRole;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < rowSize; i++)
|
||||||
|
{
|
||||||
|
ndmRow.Elements[i].Value = new StringLogEntry()
|
||||||
|
{
|
||||||
|
Message = ColumnList[i],
|
||||||
|
Priority = Priority
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return ndmRow;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Check()
|
||||||
|
{
|
||||||
|
if (Collection is null)
|
||||||
|
{
|
||||||
|
throw new StructureHelperException(ErrorStrings.ParameterIsNull + ": Collection of primitives");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -83,7 +83,7 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
|
|||||||
};
|
};
|
||||||
ndmRow.Elements[1].Value = new StringLogEntry()
|
ndmRow.Elements[1].Value = new StringLogEntry()
|
||||||
{
|
{
|
||||||
Message = rectShape.Width.ToString(),
|
Message = rectShape.Width.ToString() + "(m)",
|
||||||
Priority = Priority
|
Priority = Priority
|
||||||
};
|
};
|
||||||
rows.Add(ndmRow);
|
rows.Add(ndmRow);
|
||||||
@@ -102,7 +102,7 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
|
|||||||
};
|
};
|
||||||
ndmRow.Elements[1].Value = new StringLogEntry()
|
ndmRow.Elements[1].Value = new StringLogEntry()
|
||||||
{
|
{
|
||||||
Message = point.Area.ToString(),
|
Message = point.Area.ToString() + "(m^2)",
|
||||||
Priority = Priority
|
Priority = Priority
|
||||||
};
|
};
|
||||||
rows.Add(ndmRow);
|
rows.Add(ndmRow);
|
||||||
@@ -133,7 +133,7 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
|
|||||||
};
|
};
|
||||||
ndmRow.Elements[1].Value = new StringLogEntry()
|
ndmRow.Elements[1].Value = new StringLogEntry()
|
||||||
{
|
{
|
||||||
Message = "X = " + ndmPrimitive.Center.X.ToString() + ", Y = " + ndmPrimitive.Center.Y.ToString(),
|
Message = "X = " + ndmPrimitive.Center.X.ToString() + "(m)" + ", Y = " + ndmPrimitive.Center.Y.ToString() + "(m)",
|
||||||
Priority = Priority
|
Priority = Priority
|
||||||
};
|
};
|
||||||
rows.Add(ndmRow);
|
rows.Add(ndmRow);
|
||||||
@@ -152,7 +152,7 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
|
|||||||
};
|
};
|
||||||
ndmRow.Elements[1].Value = new StringLogEntry()
|
ndmRow.Elements[1].Value = new StringLogEntry()
|
||||||
{
|
{
|
||||||
Message = rectShape.Width.ToString(),
|
Message = rectShape.Height.ToString() + "(m)",
|
||||||
Priority = Priority
|
Priority = Priority
|
||||||
};
|
};
|
||||||
rows.Add(ndmRow);
|
rows.Add(ndmRow);
|
||||||
@@ -164,7 +164,7 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
|
|||||||
};
|
};
|
||||||
ndmRow.Elements[1].Value = new StringLogEntry()
|
ndmRow.Elements[1].Value = new StringLogEntry()
|
||||||
{
|
{
|
||||||
Message = rectShape.Height.ToString(),
|
Message = rectShape.Width.ToString() + "(m)",
|
||||||
Priority = Priority
|
Priority = Priority
|
||||||
};
|
};
|
||||||
rows.Add(ndmRow);
|
rows.Add(ndmRow);
|
||||||
|
|||||||
Reference in New Issue
Block a user