LimitCurveDiagram was repeired (didn't take into account constZ factor)
This commit is contained in:
@@ -37,7 +37,11 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
|
||||
{
|
||||
if (TraceLogger is not null)
|
||||
{
|
||||
logger = new ShiftTraceLogger() { ShiftPriority = 500, KeepErrorStatus = false };
|
||||
logger = new ShiftTraceLogger()
|
||||
{
|
||||
ShiftPriority = 500,
|
||||
KeepErrorStatus = false
|
||||
};
|
||||
//calculator.TraceLogger = logger; // too much results
|
||||
//ConvertLogic.TraceLogger = logger; //wrong work in different threads
|
||||
}
|
||||
|
||||
@@ -135,5 +135,22 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
|
||||
ActionToOutputResults?.Invoke(result);
|
||||
}
|
||||
|
||||
public override bool Equals(object? obj)
|
||||
{
|
||||
if (obj is null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if (obj is LimitCurvesCalculator)
|
||||
{
|
||||
var item = obj as LimitCurvesCalculator;
|
||||
if (item.Id == Id)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
};
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
using StructureHelperCommon.Infrastructures.Enums;
|
||||
using StructureHelperCommon.Infrastructures.Interfaces;
|
||||
using StructureHelperLogics.NdmCalculations.Analyses.ByForces.LimitCurve;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using StructureHelperCommon.Infrastructures.Interfaces;
|
||||
using StructureHelperCommon.Models.Parameters;
|
||||
|
||||
namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces.Logics
|
||||
{
|
||||
@@ -22,6 +16,16 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces.Logics
|
||||
targetObject.PredicateEntries.Clear();
|
||||
targetObject.PredicateEntries.AddRange(sourceObject.PredicateEntries);
|
||||
targetObject.PointCount = sourceObject.PointCount;
|
||||
targetObject.PrimitiveSeries.Clear();
|
||||
foreach (var item in sourceObject.PrimitiveSeries)
|
||||
{
|
||||
var newItem = new NamedCollection<Primitives.INdmPrimitive>()
|
||||
{
|
||||
Name = item.Name
|
||||
};
|
||||
newItem.Collection.AddRange(item.Collection);
|
||||
targetObject.PrimitiveSeries.Add(newItem);
|
||||
}
|
||||
surroundDataUpdateStrategy.Update(targetObject.SurroundData, sourceObject.SurroundData);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user