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

Carbon Fiber Material was Added

Browse Source
This commit is contained in:
Evgeny Redikultsev
2023-06-10 22:26:15 +05:00
parent 79c24f2cd5
commit 90843ea409
67 changed files with 815 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
StructureHelper/Infrastructure/Enums/MaterialType.cs
View File

@@ -10,6 +10,8 @@ namespace StructureHelper.Infrastructure.Enums
{
Concrete,
Reinforcement,
Elastic
Elastic,
CarbonFiber,
GlassFiber
}
}

18
StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs
View File

@@ -81,33 +81,33 @@ namespace StructureHelper.Infrastructure.UI.DataContexts
}
public double InvertedCenterY => - CenterY;
public double PrestrainKx
{ get => primitive.UsersPrestrain.Kx;
{ get => primitive.UsersPrestrain.Mx;
set
{
primitive.UsersPrestrain.Kx = value;
primitive.UsersPrestrain.Mx = value;
OnPropertyChanged(nameof(PrestrainKx));
}
}
public double PrestrainKy
{ get => primitive.UsersPrestrain.Ky;
{ get => primitive.UsersPrestrain.My;
set
{
primitive.UsersPrestrain.Ky = value;
primitive.UsersPrestrain.My = value;
OnPropertyChanged(nameof(PrestrainKy));
}
}
public double PrestrainEpsZ
{ get => primitive.UsersPrestrain.EpsZ;
{ get => primitive.UsersPrestrain.Nz;
set
{
primitive.UsersPrestrain.EpsZ = value;
primitive.UsersPrestrain.Nz = value;
OnPropertyChanged(nameof(PrestrainEpsZ));
}
}
public double AutoPrestrainKx => primitive.AutoPrestrain.Kx;
public double AutoPrestrainKy => primitive.AutoPrestrain.Ky;
public double AutoPrestrainEpsZ => primitive.AutoPrestrain.EpsZ;
public double AutoPrestrainKx => primitive.AutoPrestrain.Mx;
public double AutoPrestrainKy => primitive.AutoPrestrain.My;
public double AutoPrestrainEpsZ => primitive.AutoPrestrain.Nz;
public IHeadMaterial HeadMaterial
{

17
StructureHelper/Infrastructure/UI/Resources/Materials.xaml
View File

@@ -13,6 +13,7 @@
</ComboBox>
</StackPanel>
</DataTemplate>
<DataTemplate x:Key="SafetyFactors">
<Grid>
<Grid.RowDefinitions>
@@ -23,6 +24,20 @@
<ContentControl Grid.Row="1" ContentTemplate="{StaticResource MaterialSafetyFactors}" Content="{Binding DataContext, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=Window}}"/>
</Grid>
</DataTemplate>
<DataTemplate x:Key="DirectSafetyFactors">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition Height="30"/>
<RowDefinition Height="200"/>
</Grid.RowDefinitions>
<Button Content="Show Safety Factors" Command="{Binding ShowSafetyFactors}"/>
<Button Grid.Row="1" Content="Show Partial Factors" Command="{Binding ShowPartialFactors}"/>
<ContentControl Grid.Row="2" ContentTemplate="{StaticResource MaterialSafetyFactors}" Content="{Binding}"/>
</Grid>
</DataTemplate>
<DataTemplate x:Key="ConcreteLibMaterial">
<StackPanel>
<TextBlock Text="Library material"/>
@@ -36,6 +51,7 @@
<ContentControl ContentTemplate="{StaticResource SafetyFactors}"/>
</StackPanel>
</DataTemplate>
<DataTemplate x:Key="ConcreteMaterial">
<StackPanel>
<ContentControl ContentTemplate="{StaticResource LibraryMaterial}" Content="{Binding}"/>
@@ -82,6 +98,7 @@
<ContentControl ContentTemplate="{StaticResource SafetyFactors}"/>
</StackPanel>
</DataTemplate>
<DataTemplate x:Key="ElasticMaterial">
<Grid>
<Grid.ColumnDefinitions>