avpon/StructureHelper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change table UI and VM, add parser dll, add modulus

Browse Source
This commit is contained in:
Иван Ивашкин
2025-04-22 17:09:06 +05:00
parent 9a2cfbb08e
commit 776fc4c494
11 changed files with 251 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
StructureHelperLogics/Models/Materials/Factories/HeadMaterialFactory.cs
View File

@@ -108,17 +108,18 @@ namespace StructureHelperLogics.Models.Materials
}
private static IHeadMaterial GetFunction()
{
var functionSelectionView = new FunctionSelectionView();
functionSelectionView.ShowDialog();
var functionMaterialCreationView = new FunctionMaterialCreationView();
functionMaterialCreationView.ShowDialog();
var material = new HeadMaterial();
material.HelperMaterial = new FunctionMaterial()
{
Modulus = 2e11d,
CompressiveStrength = 4e8d,
TensileStrength = 4e8d,
FunctionStorage = functionSelectionView.ViewModel.FunctionStorage,
material.HelperMaterial = new FunctionMaterial()
{
Modulus = functionMaterialCreationView.ViewModel.Modulus,
CompressiveStrength = 4e8d,
TensileStrength = 4e8d,
//FunctionStorage = functionMaterialCreationView.ViewModel.FunctionStorage,
MaterialSettings = functionMaterialCreationView.ViewModel.MaterialSettingsList.ToList(),
};
if (functionSelectionView.DialogResult == true)
if (functionMaterialCreationView.DialogResult == true)
{
material.SuccessfullyCreated = true;
}

2
StructureHelperLogics/Models/Materials/FunctionMaterial.cs
View File

@@ -3,6 +3,7 @@ using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Settings;
using StructureHelperCommon.Models.Functions;
using StructureHelperCommon.Models.Materials;
using StructureHelperCommon.Models.Materials.Libraries;
using StructureHelperLogics.Models.Materials.Logics;
using System;
@@ -22,6 +23,7 @@ namespace StructureHelperLogics.Models.Materials
public List<IMaterialSafetyFactor> SafetyFactors { get; } = new();
public IOneVariableFunction Function { get; set; }
public FunctionStorage FunctionStorage { get; set; }
public List<MaterialSettings> MaterialSettings { get; set; }
public Guid Id { get; }

2
StructureHelperLogics/Models/Materials/IFunctionMaterial.cs
View File

@@ -17,5 +17,7 @@ namespace StructureHelperLogics.Models.Materials
List<IMaterialSafetyFactor> SafetyFactors { get; }
public FunctionStorage FunctionStorage { get; set; }
public IOneVariableFunction Function { get; set; }
}
}