diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/CrackDiagramLogic.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/CrackDiagramLogic.cs index d16f1db..7018349 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/CrackDiagramLogic.cs +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/CrackDiagramLogic.cs @@ -26,9 +26,9 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews static readonly CrackForceBynarySearchCalculator calculator = new(); private ITriangulatePrimitiveLogic triangulateLogic; - private List ValidTupleList { get; set; } + private List ValidTupleList { get; set; } ArrayParameter arrayParameter; - private IEnumerable TupleList { get; set; } + private IEnumerable TupleList { get; set; } private IEnumerable NdmPrimitives { get; set; } private static GeometryNames GeometryNames => ProgramSetting.GeometryNames; @@ -40,7 +40,7 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews public IShiftTraceLogger? TraceLogger { get; set; } - public CrackDiagramLogic(IEnumerable tupleList, IEnumerable ndmPrimitives) + public CrackDiagramLogic(IEnumerable tupleList, IEnumerable ndmPrimitives) { TupleList = tupleList; NdmPrimitives = ndmPrimitives; @@ -92,20 +92,20 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews "Errors appeared during showing a graph, see detailed information"); } - private void CalculateWithCrack(List validTupleList, IEnumerable ndmPrimitives, IUnit unitForce, IUnit unitMoment, IUnit unitCurvature) + private void CalculateWithCrack(List validTupleList, IEnumerable ndmPrimitives, IUnit unitForce, IUnit unitMoment, IUnit unitCurvature) { var data = arrayParameter.Data; for (int i = 0; i < validTupleList.Count(); i++) { var valueList = new List { - validTupleList[i].DesignForceTuple.ForceTuple.Mx * unitMoment.Multiplyer, - validTupleList[i].DesignForceTuple.ForceTuple.My * unitMoment.Multiplyer, - validTupleList[i].DesignForceTuple.ForceTuple.Nz * unitForce.Multiplyer + validTupleList[i].ForcesTupleResult.ForceTuple.Mx * unitMoment.Multiplyer, + validTupleList[i].ForcesTupleResult.ForceTuple.My * unitMoment.Multiplyer, + validTupleList[i].ForcesTupleResult.ForceTuple.Nz * unitForce.Multiplyer }; - calculator.InputData.EndTuple = validTupleList[i].DesignForceTuple.ForceTuple; - var limitState = validTupleList[i].DesignForceTuple.LimitState; - var calcTerm = validTupleList[i].DesignForceTuple.CalcTerm; + calculator.InputData.EndTuple = validTupleList[i].ForcesTupleResult.ForceTuple; + var limitState = validTupleList[i].StateCalcTermPair.LimitState; + var calcTerm = validTupleList[i].StateCalcTermPair.CalcTerm; triangulateLogic = new TriangulatePrimitiveLogic() { Primitives = ndmPrimitives, diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorViewModel.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorViewModel.cs index f1b8476..4d9939a 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorViewModel.cs +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorViewModel.cs @@ -1,10 +1,6 @@ -using StructureHelper.Infrastructure.UI.DataContexts; -using StructureHelper.Windows.ViewModels.NdmCrossSections; -using StructureHelperCommon.Infrastructures.Enums; -using StructureHelperCommon.Models.Forces; +using StructureHelperCommon.Models.Forces; using StructureHelperLogics.NdmCalculations.Analyses.ByForces; using StructureHelperLogics.NdmCalculations.Primitives; -using System; using System.Collections.Generic; diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/DiagramFactory.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/DiagramFactory.cs index 2b74dd7..94179fc 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/DiagramFactory.cs +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/DiagramFactory.cs @@ -21,14 +21,14 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews /// /// Collection of force results /// - public List TupleList { get; set; } + public List TupleResultList { get; set; } //public Action SetProgress { get; set; } public ArrayParameter GetCommonArray() { var labels = LabelsFactory.GetCommonLabels(); - arrayParameter = new ArrayParameter(TupleList.Count(), labels); + arrayParameter = new ArrayParameter(TupleResultList.Count(), labels); Calculate(); return arrayParameter; } @@ -36,7 +36,7 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews private void Calculate() { var data = arrayParameter.Data; - for (int i = 0; i < TupleList.Count(); i++) + for (int i = 0; i < TupleResultList.Count(); i++) { var valueList = ProcessResult(i); for (int j = 0; j < valueList.Count; j++) @@ -56,12 +56,12 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews return new List { - TupleList[i].DesignForceTuple.ForceTuple.Mx * unitMoment.Multiplyer, - TupleList[i].DesignForceTuple.ForceTuple.My * unitMoment.Multiplyer, - TupleList[i].DesignForceTuple.ForceTuple.Nz * unitForce.Multiplyer, - TupleList[i].LoaderResults.ForceStrainPair.StrainMatrix.Kx * unitCurvature.Multiplyer, - TupleList[i].LoaderResults.ForceStrainPair.StrainMatrix.Ky * unitCurvature.Multiplyer, - TupleList[i].LoaderResults.ForceStrainPair.StrainMatrix.EpsZ + TupleResultList[i].ForcesTupleResult.ForceTuple.Mx * unitMoment.Multiplyer, + TupleResultList[i].ForcesTupleResult.ForceTuple.My * unitMoment.Multiplyer, + TupleResultList[i].ForcesTupleResult.ForceTuple.Nz * unitForce.Multiplyer, + TupleResultList[i].ForcesTupleResult.LoaderResults.ForceStrainPair.StrainMatrix.Kx * unitCurvature.Multiplyer, + TupleResultList[i].ForcesTupleResult.LoaderResults.ForceStrainPair.StrainMatrix.Ky * unitCurvature.Multiplyer, + TupleResultList[i].ForcesTupleResult.LoaderResults.ForceStrainPair.StrainMatrix.EpsZ }; } } diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/IValuePointDiagramLogic.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/IValuePointDiagramLogic.cs index a4919bf..ab7ff7e 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/IValuePointDiagramLogic.cs +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/IValuePointDiagramLogic.cs @@ -8,9 +8,9 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu { public interface IValuePointDiagramLogic { - ForceCalculator Calculator { get; set; } + IForceCalculator Calculator { get; set; } PointPrimitiveLogic PrimitiveLogic { get; set; } - IEnumerable TupleList { get; set; } + IEnumerable TupleList { get; set; } ValueDelegatesLogic ValueDelegatesLogic { get; set; } GenericResult> GetArrayParameter(); diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/InterpolateValuePointsLogic.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/InterpolateValuePointsLogic.cs index 09ac179..02f45b0 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/InterpolateValuePointsLogic.cs +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/InterpolateValuePointsLogic.cs @@ -1,17 +1,14 @@ -using StructureHelper.Windows.Forces; +using StructureHelper.Infrastructure.UI.DataContexts; +using StructureHelper.Windows.Forces; using StructureHelperCommon.Infrastructures.Exceptions; -using StructureHelperCommon.Models.Forces; -using StructureHelperLogics.NdmCalculations.Analyses.ByForces.Logics; -using StructureHelperLogics.NdmCalculations.Analyses.ByForces; -using StructureHelperLogics.NdmCalculations.Primitives; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using StructureHelper.Infrastructure.UI.DataContexts; using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Models.Calculators; +using StructureHelperCommon.Models.Forces; +using StructureHelperLogics.NdmCalculations.Analyses.ByForces; +using StructureHelperLogics.NdmCalculations.Analyses.ByForces.Logics; +using StructureHelperLogics.NdmCalculations.Primitives; +using System.Collections.Generic; +using System.Linq; namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalculatorViews.ForceResultLogic { @@ -21,9 +18,9 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu private ValuePointsInterpolateViewModel viewModel; private IResult result; private ValuePointsInterpolationInputData inputData; - public IForcesTupleResult SelectedResult { get; set; } + public IExtendedForceTupleCalculatorResult SelectedResult { get; set; } public IEnumerable NdmPrimitives { get; set; } - public ForceCalculator ForceCalculator { get; set; } + public IForceCalculator ForceCalculator { get; set; } public ILongProcessLogic ProgressLogic { get; set; } @@ -31,20 +28,20 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu public void InterpolateValuePoints() { - var tuple = SelectedResult.DesignForceTuple ?? throw new StructureHelperException(ErrorStrings.NullReference + ": Design force combination"); + var tuple = SelectedResult.ForcesTupleResult.ForceTuple ?? throw new StructureHelperException(ErrorStrings.NullReference + ": Design force combination"); PrepareInputData(tuple); viewModel = new ValuePointsInterpolateViewModel(inputData); if (ShowDialog() == false) { return; }; ShowDiagram(result); } - private void PrepareInputData(IDesignForceTuple tuple) + private void PrepareInputData(IForceTuple endTuple) { inputData = new ValuePointsInterpolationInputData() { - FinishDesignForce = tuple.Clone() as IDesignForceTuple, - LimitState = tuple.LimitState, - CalcTerm = tuple.CalcTerm, + StartForceTuple = new ForceTuple(), + FinishForceTuple = endTuple.Clone() as IForceTuple, + StateCalcTermPair = SelectedResult.StateCalcTermPair, }; inputData.PrimitiveBases.AddRange(PrimitiveOperations.ConvertNdmPrimitivesToPrimitiveBase(NdmPrimitives)); } @@ -54,7 +51,7 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu var wnd = new ValuePointsInterpolateView(viewModel); wnd.ShowDialog(); if (wnd.DialogResult != true) { return false; } - interpolationLogic = new InterpolationProgressLogic(ForceCalculator, viewModel.ForceInterpolationViewModel.Result); + interpolationLogic = new InterpolationProgressLogic(ForceCalculator, SelectedResult.StateCalcTermPair, viewModel.ForceInterpolationViewModel.Result); ProgressLogic = interpolationLogic; ShowProgressLogic = new(interpolationLogic) { @@ -68,17 +65,17 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu private void ShowDiagram(IResult result) { if (result.IsValid == false) { return; } - if (result is not IForcesResults) + if (result is not IForceCalculatorResult) { - throw new StructureHelperException(ErrorStrings.ExpectedWas(typeof(IForcesResults), result)); + throw new StructureHelperException(ErrorStrings.ExpectedWas(typeof(IForceCalculatorResult), result)); } - var tupleResult = result as IForcesResults; + var tupleResult = result as IForceCalculatorResult; var pointGraphLogic = new ShowValuePointDiagramLogic() { Calculator = interpolationLogic.InterpolateCalculator, PrimitiveLogic = viewModel.PrimitiveLogic, ValueDelegatesLogic = viewModel.ValueDelegatesLogic, - TupleList = tupleResult.ForcesResultList + TupleResultList = tupleResult.ForcesResultList }; pointGraphLogic.ShowWindow(); } diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowCrackResultLogic.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowCrackResultLogic.cs index b1ef3ef..f55efbc 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowCrackResultLogic.cs +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowCrackResultLogic.cs @@ -25,15 +25,15 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu public CalcTerms CalcTerm { get; set; } public IForceTuple ForceTuple { get; set; } public IEnumerable ndmPrimitives { get; set; } - public void Show(IDesignForceTuple finishDesignTuple) + public void Show(IForceTuple finishDesignTuple) { - var viewModel = new InterpolateTuplesViewModel(finishDesignTuple, null); + var viewModel = new InterpolateTuplesViewModel(new ForceTuple(), finishDesignTuple, 100); viewModel.ForceInterpolationViewModel.StepCountVisible = false; var wndTuples = new InterpolateTuplesView(viewModel); wndTuples.ShowDialog(); if (wndTuples.DialogResult != true) return; - var startDesignTuple = viewModel.ForceInterpolationViewModel.StartDesignForce.ForceTuple; - var endDesignTuple = viewModel.ForceInterpolationViewModel.FinishDesignForce.ForceTuple; + var startDesignTuple = viewModel.ForceInterpolationViewModel.StartDesignForce; + var endDesignTuple = viewModel.ForceInterpolationViewModel.FinishDesignForce; FindCrackFactor(endDesignTuple, startDesignTuple); } diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowDiagramLogic.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowDiagramLogic.cs index 033e827..b61acc5 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowDiagramLogic.cs +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowDiagramLogic.cs @@ -1,12 +1,9 @@ using StructureHelper.Windows.Graphs; using StructureHelper.Windows.ViewModels.Errors; -using StructureHelperCommon.Infrastructures.Enums; using StructureHelperCommon.Infrastructures.Exceptions; using StructureHelperCommon.Infrastructures.Interfaces; -using StructureHelperCommon.Infrastructures.Settings; using StructureHelperCommon.Models; using StructureHelperCommon.Models.Parameters; -using StructureHelperCommon.Services.Units; using StructureHelperLogics.NdmCalculations.Analyses.ByForces; using StructureHelperLogics.NdmCalculations.Primitives; using System; @@ -19,9 +16,9 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu internal class ShowDiagramLogic : ILongProcessLogic { private ArrayParameter arrayParameter; - private IEnumerable tupleList; + private IEnumerable tupleList; private IEnumerable ndmPrimitives; - private List validTupleList; + private List validTupleList; public int StepCount => validTupleList.Count(); @@ -60,13 +57,13 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu var factory = new DiagramFactory() { - TupleList = validTupleList, + TupleResultList = validTupleList, //SetProgress = SetProgress, }; arrayParameter = factory.GetCommonArray(); } - public ShowDiagramLogic(IEnumerable tupleList, IEnumerable ndmPrimitives) + public ShowDiagramLogic(IEnumerable tupleList, IEnumerable ndmPrimitives) { this.tupleList = tupleList; this.ndmPrimitives = ndmPrimitives; diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowValuePointDiagramLogic.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowValuePointDiagramLogic.cs index abcc47d..0df8a06 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowValuePointDiagramLogic.cs +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowValuePointDiagramLogic.cs @@ -1,27 +1,12 @@ -using LoaderCalculator.Data.Materials.MaterialBuilders; -using LoaderCalculator.Data.Ndms; -using StructureHelper.Infrastructure.UI.DataContexts; -using StructureHelper.Services.ResultViewers; -using StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalculatorViews.ForceResultLogic; +using StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalculatorViews.ForceResultLogic; using StructureHelper.Windows.Forces; using StructureHelper.Windows.Graphs; using StructureHelper.Windows.ViewModels.Errors; -using StructureHelperCommon.Infrastructures.Enums; using StructureHelperCommon.Infrastructures.Exceptions; -using StructureHelperCommon.Infrastructures.Interfaces; -using StructureHelperCommon.Models; using StructureHelperCommon.Models.Calculators; -using StructureHelperCommon.Models.Forces; using StructureHelperCommon.Models.Parameters; -using StructureHelperCommon.Models.Shapes; using StructureHelperLogics.NdmCalculations.Analyses.ByForces; -using StructureHelperLogics.NdmCalculations.Primitives; -using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; //Copyright (c) 2023 Redikultsev Evgeny, Ekaterinburg, Russia //All rights reserved. @@ -33,8 +18,8 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews private ArrayParameter arrayParameter; private IValuePointDiagramLogic pointDiagramLogic; - public IEnumerable TupleList { get; set; } - public ForceCalculator Calculator { get; set; } + public IEnumerable TupleResultList { get; set; } + public IForceCalculator Calculator { get; set; } public PointPrimitiveLogic PrimitiveLogic { get; set; } public ValueDelegatesLogic ValueDelegatesLogic { get; set; } @@ -77,7 +62,7 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews private GenericResult> GetResult() { - pointDiagramLogic.TupleList = TupleList; + pointDiagramLogic.TupleList = TupleResultList; pointDiagramLogic.PrimitiveLogic = PrimitiveLogic; pointDiagramLogic.Calculator = Calculator; pointDiagramLogic.ValueDelegatesLogic = ValueDelegatesLogic; diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ValuePointDiagramLogic.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ValuePointDiagramLogic.cs index 6ab9ef0..a9355e1 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ValuePointDiagramLogic.cs +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ValuePointDiagramLogic.cs @@ -1,5 +1,4 @@ using LoaderCalculator.Data.Ndms; -using StructureHelper.Infrastructure.UI.DataContexts; using StructureHelper.Services.ResultViewers; using StructureHelper.Windows.Forces; using StructureHelperCommon.Infrastructures.Exceptions; @@ -10,9 +9,6 @@ using StructureHelperLogics.NdmCalculations.Primitives; using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Media; namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalculatorViews.ForceResultLogic { @@ -20,13 +16,13 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu { private ArrayParameter arrayParameter; private List<(INamedAreaPoint areaPoint, INdmPrimitive ndmPrimitive)> pointCollection; - private List validTuplesList; + private List validTuplesList; private ArrayParameter arrayOfValuesByPoint; private IEnumerable selectedDelegates; private string exceptionMessage; - public IEnumerable TupleList { get; set; } - public ForceCalculator Calculator { get; set; } + public IEnumerable TupleList { get; set; } + public IForceCalculator Calculator { get; set; } public PointPrimitiveLogic PrimitiveLogic { get; set; } public ValueDelegatesLogic ValueDelegatesLogic { get; set; } @@ -106,14 +102,14 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu } } } - private void ProcessPointByTuple(IForcesTupleResult tuple, int i) + private void ProcessPointByTuple(IExtendedForceTupleCalculatorResult tupleResult, int i) { var values = new List(); - var strainMatrix = tuple.LoaderResults.ForceStrainPair.StrainMatrix; + var strainMatrix = tupleResult.ForcesTupleResult.LoaderResults.ForceStrainPair.StrainMatrix; foreach (var valuePoint in pointCollection) { - var ndm = GetMockNdm(valuePoint, tuple); + var ndm = GetMockNdm(valuePoint, tupleResult); foreach (var valDelegate in selectedDelegates) { @@ -127,7 +123,7 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu { var factory = new DiagramFactory() { - TupleList = validTuplesList, + TupleResultList = validTuplesList, //SetProgress = SetProgress, }; arrayParameter = factory.GetCommonArray(); @@ -135,10 +131,10 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu var labels = GetValueLabels(selectedDelegates); arrayOfValuesByPoint = new ArrayParameter(validTuplesList.Count(), labels); } - private INdm GetMockNdm((INamedAreaPoint areaPoint, INdmPrimitive ndmPrimitive) valuePoint, IForcesTupleResult tuple) + private INdm GetMockNdm((INamedAreaPoint areaPoint, INdmPrimitive ndmPrimitive) valuePoint, IExtendedForceTupleCalculatorResult tupleResult) { - var limitState = tuple.DesignForceTuple.LimitState; - var calcTerm = tuple.DesignForceTuple.CalcTerm; + var limitState = tupleResult.StateCalcTermPair.LimitState; + var calcTerm = tupleResult.StateCalcTermPair.CalcTerm; var material = valuePoint.ndmPrimitive.NdmElement.HeadMaterial.GetLoaderMaterial(limitState, calcTerm); var userPrestrain = valuePoint.ndmPrimitive.NdmElement.UsersPrestrain; var autoPrestrain = valuePoint.ndmPrimitive.NdmElement.AutoPrestrain; diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml index 722b3f1..baead56 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml @@ -37,7 +37,7 @@