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

Carbon material was changed

Browse Source
This commit is contained in:
Evgeny Redikultsev
2023-06-11 13:27:42 +05:00
parent 90843ea409
commit 5a9ced0870
12 changed files with 150 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
StructureHelper/Windows/MainWindow/Materials/HeadMaterialView.xaml
View File

@@ -7,40 +7,43 @@
xmlns:vm="clr-namespace:StructureHelper.Windows.ViewModels.Materials"
d:DataContext="{d:DesignInstance vm:HeadMaterialViewModel}"
mc:Ignorable="d"
Title="Material properties" Height="350" Width="300" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
Title="Material properties"
Height="350" Width="300"
MinWidth="300" MaxWidth="400" MinHeight="350" MaxHeight="500"
WindowStartupLocation="CenterScreen">
<Window.Resources>
<ResourceDictionary Source="/Infrastructure/UI/Resources/Materials.xaml"/>
</Window.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="46"/>
<RowDefinition/>
<RowDefinition Height="1"/>
</Grid.RowDefinitions>
<ScrollViewer>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="22"/>
<RowDefinition Height="22"/>
<RowDefinition Height="46"/>
<RowDefinition/>
<RowDefinition Height="1"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Text="Name"/>
<TextBlock Grid.Row="1" Text="Color"/>
<TextBox Grid.Row="0" Grid.Column="1" Margin="1" Text="{Binding Name}"/>
<StackPanel Grid.Column="1" Grid.Row="1" Orientation="Horizontal">
<Rectangle Width="100" Margin="1" Stroke="Black">
<Rectangle.Fill>
<SolidColorBrush Color="{Binding Color}"/>
</Rectangle.Fill>
</Rectangle>
<Button Width="50" Margin="1" Content="..." Command="{Binding EditColorCommand}"/>
</StackPanel>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="22"/>
<RowDefinition Height="22"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Text="Name"/>
<TextBlock Grid.Row="1" Text="Color"/>
<TextBox Grid.Row="0" Grid.Column="1" Margin="1" Text="{Binding Name}"/>
<StackPanel Grid.Column="1" Grid.Row="1" Orientation="Horizontal">
<Rectangle Width="100" Margin="1" Stroke="Black">
<Rectangle.Fill>
<SolidColorBrush Color="{Binding Color}"/>
</Rectangle.Fill>
</Rectangle>
<Button Width="50" Margin="1" Content="..." Command="{Binding EditColorCommand}"/>
</StackPanel>
</Grid>
<StackPanel Grid.Row="1" x:Name="StpMaterialProperties"/>
</Grid>
<StackPanel Grid.Row="1" x:Name="StpMaterialProperties">
</StackPanel>
</Grid>
</ScrollViewer>
</Window>

7
StructureHelper/Windows/MainWindow/Materials/HeadMaterialView.xaml.cs
View File

@@ -62,6 +62,13 @@ namespace StructureHelper.Windows.MainWindow.Materials
var binding = new Binding();
binding.Source = vm.HelperMaterialViewModel;
bindings.Add(templateName, binding);
if (helperMaterial is IFRMaterial)
{
templateName = "CarbonProperties";
var carbonBinding = new Binding();
carbonBinding.Source = vm.HelperMaterialViewModel as FRViewModel;
bindings.Add(templateName, carbonBinding);
}
templateName = "DirectSafetyFactors";
var frBinding = new Binding();
frBinding.Source = (vm.HelperMaterialViewModel as ElasticViewModel).SafetyFactors;