Add beam shear result view
This commit is contained in:
@@ -10,6 +10,7 @@
|
|||||||
<ResourceDictionary Source="Infrastructure/UI/Styles.xaml"/>
|
<ResourceDictionary Source="Infrastructure/UI/Styles.xaml"/>
|
||||||
<ResourceDictionary Source="Infrastructure/UI/Resources/DataGridStyles.xaml"/>
|
<ResourceDictionary Source="Infrastructure/UI/Resources/DataGridStyles.xaml"/>
|
||||||
<ResourceDictionary Source="Infrastructure/UI/Resources/ButtonStyles.xaml"/>
|
<ResourceDictionary Source="Infrastructure/UI/Resources/ButtonStyles.xaml"/>
|
||||||
|
<ResourceDictionary Source="Infrastructure/UI/Resources/StatusBarStyles.xaml"/>
|
||||||
<ResourceDictionary Source="Infrastructure/UI/Resources/Converters.xaml"/>
|
<ResourceDictionary Source="Infrastructure/UI/Resources/Converters.xaml"/>
|
||||||
<ResourceDictionary Source="Infrastructure/UI/Resources/DataGridTemplates.xaml"/>
|
<ResourceDictionary Source="Infrastructure/UI/Resources/DataGridTemplates.xaml"/>
|
||||||
<ResourceDictionary Source="Infrastructure/UI/Resources/PrimitiveTemplates.xaml"/>
|
<ResourceDictionary Source="Infrastructure/UI/Resources/PrimitiveTemplates.xaml"/>
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
|
|
||||||
|
<DataTemplate x:Key="ResultValidness">
|
||||||
|
<StatusBar Grid.Row="1">
|
||||||
|
<StatusBarItem>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<TextBlock Text="Valid result(s): "/>
|
||||||
|
<TextBlock Text="{Binding ValidResultCount}"/>
|
||||||
|
</StackPanel>
|
||||||
|
</StatusBarItem>
|
||||||
|
<StatusBarItem>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<TextBlock Text="Invalid result(s): "/>
|
||||||
|
<TextBlock Text="{Binding InvalidResultCount}"/>
|
||||||
|
</StackPanel>
|
||||||
|
</StatusBarItem>
|
||||||
|
<StatusBarItem>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<TextBlock Text="Total: "/>
|
||||||
|
<TextBlock Text="{Binding TotalResultCount}"/>
|
||||||
|
</StackPanel>
|
||||||
|
</StatusBarItem>
|
||||||
|
</StatusBar>
|
||||||
|
</DataTemplate>
|
||||||
|
</ResourceDictionary>
|
||||||
@@ -18,6 +18,9 @@
|
|||||||
<Compile Update="Windows\BeamShears\BeamShearCalculatorView.xaml.cs">
|
<Compile Update="Windows\BeamShears\BeamShearCalculatorView.xaml.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Update="Windows\BeamShears\BeamShearResultView.xaml.cs">
|
||||||
|
<SubType>Code</SubType>
|
||||||
|
</Compile>
|
||||||
<Compile Update="Windows\BeamShears\BeamShearView.xaml.cs">
|
<Compile Update="Windows\BeamShears\BeamShearView.xaml.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
@@ -161,6 +164,9 @@
|
|||||||
<Page Update="Infrastructure\UI\Resources\ServiceColors.xaml">
|
<Page Update="Infrastructure\UI\Resources\ServiceColors.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
|
<Page Update="Infrastructure\UI\Resources\StatusBarStyles.xaml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</Page>
|
||||||
<Page Update="Windows\Arrays\ArrayView.xaml">
|
<Page Update="Windows\Arrays\ArrayView.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
@@ -170,6 +176,9 @@
|
|||||||
<Page Update="Windows\BeamShears\BeamShearCalculatorView.xaml">
|
<Page Update="Windows\BeamShears\BeamShearCalculatorView.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
|
<Page Update="Windows\BeamShears\BeamShearResultView.xaml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</Page>
|
||||||
<Page Update="Windows\BeamShears\BeamShearView.xaml">
|
<Page Update="Windows\BeamShears\BeamShearView.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
|
|||||||
60
StructureHelper/Windows/BeamShears/BeamShearResultView.xaml
Normal file
60
StructureHelper/Windows/BeamShears/BeamShearResultView.xaml
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
<Window x:Class="StructureHelper.Windows.BeamShears.BeamShearResultView"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:local="clr-namespace:StructureHelper.Windows.BeamShears"
|
||||||
|
xmlns:uc="clr-namespace:StructureHelper.Windows.UserControls"
|
||||||
|
d:DataContext="{d:DesignInstance local:BeamShearResultViewModel}"
|
||||||
|
mc:Ignorable="d"
|
||||||
|
Title="BeamShearResultView" Height="450" Width="800" MinHeight="400" MinWidth="600" MaxHeight="900" MaxWidth="1200">
|
||||||
|
<DockPanel>
|
||||||
|
<ToolBarTray DockPanel.Dock="Top">
|
||||||
|
<ToolBar Name="Sections">
|
||||||
|
<Button Style="{DynamicResource ToolButton}" Command="{Binding SetPrestrainCommand}">
|
||||||
|
<Button.ToolTip>
|
||||||
|
<uc:ButtonToolTipEh HeaderText="Set prestrain"
|
||||||
|
IconContent="{StaticResource Prestrain}"
|
||||||
|
DescriptionText="Set strain from selected combination as auto prestrain (not available if selected result is invalid)"/>
|
||||||
|
</Button.ToolTip>
|
||||||
|
<Viewbox>
|
||||||
|
<ContentControl ContentTemplate="{StaticResource Prestrain}"/>
|
||||||
|
</Viewbox>
|
||||||
|
</Button>
|
||||||
|
</ToolBar>
|
||||||
|
</ToolBarTray>
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition/>
|
||||||
|
<RowDefinition Height="22"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<DataGrid x:Name="ResultGrid" IsReadOnly="True" AutoGenerateColumns="False" ItemsSource="{Binding ActionResults}" SelectedItem="{Binding SelectedResult}" >
|
||||||
|
<DataGrid.RowStyle>
|
||||||
|
<Style TargetType="DataGridRow">
|
||||||
|
<Style.Triggers>
|
||||||
|
<DataTrigger Binding="{Binding IsValid}" Value="false">
|
||||||
|
<Setter Property="Background" Value="Pink"/>
|
||||||
|
</DataTrigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
</DataGrid.RowStyle>
|
||||||
|
<DataGrid.Columns>
|
||||||
|
<DataGridCheckBoxColumn Header="Valid" Binding="{Binding Path=IsValid}"/>
|
||||||
|
<DataGridTextColumn Header="Action" Width="170" Binding="{Binding BeamShearAction.Name}"/>
|
||||||
|
<DataGridTextColumn Header="LimitState" Width="70" Binding="{Binding LimitState}"/>
|
||||||
|
<DataGridTextColumn Header="Duration" Width="70" Binding="{Binding CalcTerm}"/>
|
||||||
|
<!--<DataGridTextColumn Header="Moment Mx" Width="90" Binding="{Binding DesignForceTuple.ForceTuple.Mx, Converter={StaticResource MomentConverter}}"/>
|
||||||
|
<DataGridTextColumn Header="Moment My" Width="90" Binding="{Binding DesignForceTuple.ForceTuple.My, Converter={StaticResource MomentConverter}}"/>
|
||||||
|
<DataGridTextColumn Header="Force Nz" Width="90" Binding="{Binding DesignForceTuple.ForceTuple.Nz, Converter={StaticResource ForceConverter}}"/>
|
||||||
|
<DataGridTextColumn Header="Kx" Width="90" Binding="{Binding LoaderResults.ForceStrainPair.StrainMatrix.Kx}"/>
|
||||||
|
<DataGridTextColumn Header="Ky" Width="90" Binding="{Binding LoaderResults.ForceStrainPair.StrainMatrix.Ky}"/>
|
||||||
|
<DataGridTextColumn Header="EpsZ" Width="90" Binding="{Binding LoaderResults.ForceStrainPair.StrainMatrix.EpsZ}"/>
|
||||||
|
<DataGridTextColumn Header="Accuracy" Width="90" Binding="{Binding LoaderResults.AccuracyRate}"/>
|
||||||
|
<DataGridTextColumn Header="Max Iteration" Width="90" Binding="{Binding LoaderResults.IterationCounter}"/>-->
|
||||||
|
<DataGridTextColumn Header="Description" Width="300" Binding="{Binding Description}"/>
|
||||||
|
</DataGrid.Columns>
|
||||||
|
</DataGrid>
|
||||||
|
<ContentControl Grid.Row="1" ContentTemplate="{StaticResource ResultValidness}" Content="{Binding ValidResultCounter}"/>
|
||||||
|
</Grid>
|
||||||
|
</DockPanel>
|
||||||
|
</Window>
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
using StructureHelperLogics.Models.BeamShears;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Data;
|
||||||
|
using System.Windows.Documents;
|
||||||
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
using System.Windows.Shapes;
|
||||||
|
|
||||||
|
namespace StructureHelper.Windows.BeamShears
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Interaction logic for BeamShearResultView.xaml
|
||||||
|
/// </summary>
|
||||||
|
public partial class BeamShearResultView : Window
|
||||||
|
{
|
||||||
|
private BeamShearResultViewModel viewModel;
|
||||||
|
|
||||||
|
public BeamShearResultView(BeamShearResultViewModel viewModel)
|
||||||
|
{
|
||||||
|
this.viewModel = viewModel;
|
||||||
|
this.DataContext = this.viewModel;
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
|
||||||
|
public BeamShearResultView(IBeamShearCalculatorResult result) : this(new BeamShearResultViewModel(result))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
using StructureHelper.Infrastructure;
|
||||||
|
using StructureHelper.Windows.CalculationWindows.CalculatorsViews;
|
||||||
|
using StructureHelperLogics.Models.BeamShears;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
|
namespace StructureHelper.Windows.BeamShears
|
||||||
|
{
|
||||||
|
public class BeamShearResultViewModel : ViewModelBase
|
||||||
|
{
|
||||||
|
private IBeamShearCalculatorResult result;
|
||||||
|
public IBeamShearActionResult SelectedResult { get; set; }
|
||||||
|
public List<IBeamShearActionResult> ActionResults => result.ActionResults;
|
||||||
|
public ValidResultCounterVM ValidResultCounter { get; }
|
||||||
|
|
||||||
|
public BeamShearResultViewModel(IBeamShearCalculatorResult result)
|
||||||
|
{
|
||||||
|
this.result = result;
|
||||||
|
ValidResultCounter = new(this.result.ActionResults);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,6 +4,7 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:StructureHelper.Windows.BeamShears"
|
xmlns:local="clr-namespace:StructureHelper.Windows.BeamShears"
|
||||||
|
xmlns:uc="clr-namespace:StructureHelper.Windows.UserControls"
|
||||||
d:DataContext="{d:DesignInstance local:ConcentratedForceViewModel}"
|
d:DataContext="{d:DesignInstance local:ConcentratedForceViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="ConcentratedForceView" Height="200" Width="300" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
|
Title="ConcentratedForceView" Height="200" Width="300" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
|
||||||
@@ -12,30 +13,53 @@
|
|||||||
<RowDefinition/>
|
<RowDefinition/>
|
||||||
<RowDefinition Height="40"/>
|
<RowDefinition Height="40"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid>
|
<TabControl>
|
||||||
<Grid.ColumnDefinitions>
|
<TabItem Header="Main">
|
||||||
<ColumnDefinition Width="150"/>
|
<Grid>
|
||||||
<ColumnDefinition/>
|
<Grid.ColumnDefinitions>
|
||||||
</Grid.ColumnDefinitions>
|
<ColumnDefinition Width="150"/>
|
||||||
<Grid.RowDefinitions>
|
<ColumnDefinition/>
|
||||||
<RowDefinition Height="25"/>
|
</Grid.ColumnDefinitions>
|
||||||
<RowDefinition Height="25"/>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="25"/>
|
<RowDefinition Height="25"/>
|
||||||
<RowDefinition Height="25"/>
|
<RowDefinition Height="25"/>
|
||||||
<RowDefinition Height="25"/>
|
<RowDefinition Height="25"/>
|
||||||
<RowDefinition/>
|
<RowDefinition Height="25"/>
|
||||||
</Grid.RowDefinitions>
|
<RowDefinition Height="25"/>
|
||||||
<TextBlock Text="Name"/>
|
<RowDefinition/>
|
||||||
<TextBox Grid.Column="1" Text="{Binding Name}"/>
|
</Grid.RowDefinitions>
|
||||||
<TextBlock Grid.Row="1" Text="Load value"/>
|
<TextBlock Text="Name"/>
|
||||||
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding ForceValue, Converter={StaticResource ForceConverter}}"/>
|
<TextBox Grid.Column="1" Text="{Binding Name}"/>
|
||||||
<TextBlock Grid.Row="2" Text="Substract ratio"/>
|
<TextBlock Grid.Row="1" Text="Load value"/>
|
||||||
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding LoadRatio, Converter={StaticResource PlainDouble}}"/>
|
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding ForceValue, Converter={StaticResource ForceConverter}}"/>
|
||||||
<TextBlock Grid.Row="3" Text="Relative applying level"/>
|
</Grid>
|
||||||
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding RelativeLevel, Converter={StaticResource PlainDouble}}"/>
|
</TabItem>
|
||||||
<TextBlock Grid.Row="4" Text="Force point"/>
|
<TabItem Header="Factors">
|
||||||
<TextBox Grid.Row="4" Grid.Column="1" Text="{Binding ForceCoordinate, Converter={StaticResource LengthConverter}}"/>
|
<uc:FactoredCombination Grid.Row="1" DataContext="{Binding CombinationProperty}"/>
|
||||||
</Grid>
|
</TabItem>
|
||||||
|
<TabItem Header="Misc.">
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="150"/>
|
||||||
|
<ColumnDefinition/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="25"/>
|
||||||
|
<RowDefinition Height="25"/>
|
||||||
|
<RowDefinition Height="25"/>
|
||||||
|
<RowDefinition Height="25"/>
|
||||||
|
<RowDefinition Height="25"/>
|
||||||
|
<RowDefinition/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<TextBlock Grid.Row="0" Text="Substract ratio"/>
|
||||||
|
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding LoadRatio, Converter={StaticResource PlainDouble}}"/>
|
||||||
|
<TextBlock Grid.Row="1" Text="Relative applying level"/>
|
||||||
|
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding RelativeLevel, Converter={StaticResource PlainDouble}}"/>
|
||||||
|
<TextBlock Grid.Row="2" Text="Force point"/>
|
||||||
|
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding ForceCoordinate, Converter={StaticResource LengthConverter}}"/>
|
||||||
|
</Grid>
|
||||||
|
</TabItem>
|
||||||
|
</TabControl>
|
||||||
<ContentControl Grid.Row="1" ContentTemplate="{StaticResource OkCancelButtons}" Content="{Binding}"/>
|
<ContentControl Grid.Row="1" ContentTemplate="{StaticResource OkCancelButtons}" Content="{Binding}"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using StructureHelper.Windows.ViewModels;
|
using StructureHelper.Windows.Forces;
|
||||||
|
using StructureHelper.Windows.ViewModels;
|
||||||
using StructureHelperCommon.Models.Forces;
|
using StructureHelperCommon.Models.Forces;
|
||||||
|
|
||||||
namespace StructureHelper.Windows.BeamShears
|
namespace StructureHelper.Windows.BeamShears
|
||||||
@@ -57,9 +58,12 @@ namespace StructureHelper.Windows.BeamShears
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public FactoredCombinationPropertyVM CombinationProperty { get; }
|
||||||
|
|
||||||
public ConcentratedForceViewModel(IConcentratedForce concenratedForce)
|
public ConcentratedForceViewModel(IConcentratedForce concenratedForce)
|
||||||
{
|
{
|
||||||
this.concenratedForce = concenratedForce;
|
this.concenratedForce = concenratedForce;
|
||||||
|
CombinationProperty = new(this.concenratedForce.CombinationProperty);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:StructureHelper.Windows.BeamShears"
|
xmlns:local="clr-namespace:StructureHelper.Windows.BeamShears"
|
||||||
|
xmlns:uc="clr-namespace:StructureHelper.Windows.UserControls"
|
||||||
d:DataContext="{d:DesignInstance local:DistributedLoadViewModel}"
|
d:DataContext="{d:DesignInstance local:DistributedLoadViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="Uniformly Distributed Load" Height="250" Width="300" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
|
Title="Uniformly Distributed Load" Height="250" Width="300" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
|
||||||
@@ -12,33 +13,58 @@
|
|||||||
<RowDefinition/>
|
<RowDefinition/>
|
||||||
<RowDefinition Height="40"/>
|
<RowDefinition Height="40"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid>
|
<TabControl>
|
||||||
<Grid.ColumnDefinitions>
|
<TabItem Header="Main">
|
||||||
<ColumnDefinition Width="150"/>
|
<Grid>
|
||||||
<ColumnDefinition/>
|
<Grid.ColumnDefinitions>
|
||||||
</Grid.ColumnDefinitions>
|
<ColumnDefinition Width="150"/>
|
||||||
<Grid.RowDefinitions>
|
<ColumnDefinition/>
|
||||||
<RowDefinition Height="25"/>
|
</Grid.ColumnDefinitions>
|
||||||
<RowDefinition Height="25"/>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="25"/>
|
<RowDefinition Height="25"/>
|
||||||
<RowDefinition Height="25"/>
|
<RowDefinition Height="25"/>
|
||||||
<RowDefinition Height="25"/>
|
<RowDefinition Height="25"/>
|
||||||
<RowDefinition Height="25"/>
|
<RowDefinition Height="25"/>
|
||||||
<RowDefinition/>
|
<RowDefinition Height="25"/>
|
||||||
</Grid.RowDefinitions>
|
<RowDefinition Height="25"/>
|
||||||
<TextBlock Text="Name"/>
|
<RowDefinition/>
|
||||||
<TextBox Grid.Column="1" Text="{Binding Name}"/>
|
</Grid.RowDefinitions>
|
||||||
<TextBlock Grid.Row="1" Text="Load value"/>
|
<TextBlock Text="Name"/>
|
||||||
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding LoadValue, Converter={StaticResource DistributedLoadConverter}}"/>
|
<TextBox Grid.Column="1" Text="{Binding Name}"/>
|
||||||
<TextBlock Grid.Row="2" Text="Substract ratio"/>
|
<TextBlock Grid.Row="1" Text="Load value"/>
|
||||||
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding LoadRatio, Converter={StaticResource PlainDouble}}"/>
|
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding LoadValue, Converter={StaticResource DistributedLoadConverter}}"/>
|
||||||
<TextBlock Grid.Row="3" Text="Relative applying level"/>
|
</Grid>
|
||||||
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding RelativeLevel, Converter={StaticResource PlainDouble}}"/>
|
</TabItem>
|
||||||
<TextBlock Grid.Row="4" Text="Start point"/>
|
<TabItem Header="Factors">
|
||||||
<TextBox Grid.Row="4" Grid.Column="1" Text="{Binding StartCoordinate, Converter={StaticResource LengthConverter}}"/>
|
<uc:FactoredCombination Grid.Row="1" DataContext="{Binding CombinationProperty}"/>
|
||||||
<TextBlock Grid.Row="5" Text="End point"/>
|
</TabItem>
|
||||||
<TextBox Grid.Row="5" Grid.Column="1" Text="{Binding EndCoordinate, Converter={StaticResource LengthConverter}}"/>
|
<TabItem Header="Misc.">
|
||||||
</Grid>
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="150"/>
|
||||||
|
<ColumnDefinition/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="25"/>
|
||||||
|
<RowDefinition Height="25"/>
|
||||||
|
<RowDefinition Height="25"/>
|
||||||
|
<RowDefinition Height="25"/>
|
||||||
|
<RowDefinition Height="25"/>
|
||||||
|
<RowDefinition Height="25"/>
|
||||||
|
<RowDefinition/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<TextBlock Grid.Row="0" Text="Substract ratio"/>
|
||||||
|
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding LoadRatio, Converter={StaticResource PlainDouble}}"/>
|
||||||
|
<TextBlock Grid.Row="1" Text="Relative applying level"/>
|
||||||
|
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding RelativeLevel, Converter={StaticResource PlainDouble}}"/>
|
||||||
|
<TextBlock Grid.Row="2" Text="Start point"/>
|
||||||
|
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding StartCoordinate, Converter={StaticResource LengthConverter}}"/>
|
||||||
|
<TextBlock Grid.Row="3" Text="End point"/>
|
||||||
|
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding EndCoordinate, Converter={StaticResource LengthConverter}}"/>
|
||||||
|
</Grid>
|
||||||
|
</TabItem>
|
||||||
|
</TabControl>
|
||||||
|
|
||||||
<ContentControl Grid.Row="1" ContentTemplate="{StaticResource OkCancelButtons}" Content="{Binding}"/>
|
<ContentControl Grid.Row="1" ContentTemplate="{StaticResource OkCancelButtons}" Content="{Binding}"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using StructureHelper.Windows.ViewModels;
|
using StructureHelper.Windows.Forces;
|
||||||
|
using StructureHelper.Windows.ViewModels;
|
||||||
using StructureHelperCommon.Models.Forces;
|
using StructureHelperCommon.Models.Forces;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@@ -70,10 +71,12 @@ namespace StructureHelper.Windows.BeamShears
|
|||||||
distributedLoad.EndCoordinate = value;
|
distributedLoad.EndCoordinate = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public FactoredCombinationPropertyVM CombinationProperty { get; }
|
||||||
|
|
||||||
public DistributedLoadViewModel(IDistributedLoad distributedLoad)
|
public DistributedLoadViewModel(IDistributedLoad distributedLoad)
|
||||||
{
|
{
|
||||||
this.distributedLoad = distributedLoad;
|
this.distributedLoad = distributedLoad;
|
||||||
|
CombinationProperty = new(this.distributedLoad.CombinationProperty);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -148,10 +148,6 @@
|
|||||||
</ToolBar>
|
</ToolBar>
|
||||||
</ToolBarTray>
|
</ToolBarTray>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition/>
|
|
||||||
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition/>
|
<RowDefinition/>
|
||||||
<RowDefinition Height="22"/>
|
<RowDefinition Height="22"/>
|
||||||
@@ -181,26 +177,7 @@
|
|||||||
<DataGridTextColumn Header="Description" Width="300" Binding="{Binding Description}"/>
|
<DataGridTextColumn Header="Description" Width="300" Binding="{Binding Description}"/>
|
||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
</DataGrid>
|
</DataGrid>
|
||||||
<StatusBar Grid.Row="1">
|
<ContentControl Grid.Row="1" ContentTemplate="{StaticResource ResultValidness}" Content="{Binding ValidResultCounter}"/>
|
||||||
<StatusBarItem>
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<TextBlock Text="Valid result(s): "/>
|
|
||||||
<TextBlock Text="{Binding ValidResultCount}"/>
|
|
||||||
</StackPanel>
|
|
||||||
</StatusBarItem>
|
|
||||||
<StatusBarItem>
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<TextBlock Text="Invalid result(s): "/>
|
|
||||||
<TextBlock Text="{Binding InvalidResultCount}"/>
|
|
||||||
</StackPanel>
|
|
||||||
</StatusBarItem>
|
|
||||||
<StatusBarItem>
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<TextBlock Text="Total: "/>
|
|
||||||
<TextBlock Text="{Binding TotalResultCount}"/>
|
|
||||||
</StackPanel>
|
|
||||||
</StatusBarItem>
|
|
||||||
</StatusBar>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
using LoaderCalculator.Data.Matrix;
|
using LoaderCalculator.Data.Matrix;
|
||||||
using LoaderCalculator.Data.Ndms;
|
using LoaderCalculator.Data.Ndms;
|
||||||
using StructureHelper.Infrastructure;
|
using StructureHelper.Infrastructure;
|
||||||
using StructureHelper.Infrastructure.UI.DataContexts;
|
|
||||||
using StructureHelper.Services.Exports;
|
using StructureHelper.Services.Exports;
|
||||||
using StructureHelper.Services.Reports;
|
using StructureHelper.Services.Reports;
|
||||||
using StructureHelper.Services.Reports.CalculationReports;
|
using StructureHelper.Services.Reports.CalculationReports;
|
||||||
@@ -33,6 +32,9 @@ using System.Linq;
|
|||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
|
|
||||||
|
//Copyright (c) 2025 Redikultsev Evgeny, Ekaterinburg, Russia
|
||||||
|
//All rights reserved.
|
||||||
|
|
||||||
namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalculatorViews
|
namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalculatorViews
|
||||||
{
|
{
|
||||||
public class ForcesResultsViewModel : ViewModelBase
|
public class ForcesResultsViewModel : ViewModelBase
|
||||||
@@ -62,14 +64,12 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu
|
|||||||
private ICommand? showGraphsCommand;
|
private ICommand? showGraphsCommand;
|
||||||
private ICommand? showCrackResult;
|
private ICommand? showCrackResult;
|
||||||
private ICommand? showCrackGraphsCommand;
|
private ICommand? showCrackGraphsCommand;
|
||||||
private ICommand? showCrackWidthResult;
|
//private ICommand? showCrackWidthResult;
|
||||||
private ICommand? showInteractionDiagramCommand;
|
private ICommand? showInteractionDiagramCommand;
|
||||||
private ICommand? graphValuepointsCommand;
|
private ICommand? graphValuepointsCommand;
|
||||||
private ICommand showForceResultCommand;
|
private ICommand showForceResultCommand;
|
||||||
|
|
||||||
public int ValidResultCount => resultModel.ForcesResultList.Count(x => x.IsValid == true);
|
public ValidResultCounterVM ValidResultCounter { get; }
|
||||||
public int InvalidResultCount => resultModel.ForcesResultList.Count(x => x.IsValid == false);
|
|
||||||
public int TotalResultCount => resultModel.ForcesResultList.Count;
|
|
||||||
|
|
||||||
public IForcesResults ForcesResults
|
public IForcesResults ForcesResults
|
||||||
{
|
{
|
||||||
@@ -430,6 +430,7 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu
|
|||||||
{
|
{
|
||||||
this.forceCalculator = forceCalculator;
|
this.forceCalculator = forceCalculator;
|
||||||
resultModel = forceCalculator.Result as IForcesResults;
|
resultModel = forceCalculator.Result as IForcesResults;
|
||||||
|
ValidResultCounter = new(resultModel.ForcesResultList);
|
||||||
ndmPrimitives = forceCalculator.InputData.Primitives;
|
ndmPrimitives = forceCalculator.InputData.Primitives;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
using StructureHelper.Infrastructure;
|
||||||
|
using StructureHelperCommon.Models.Calculators;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Summary status bar for collection of results
|
||||||
|
/// </summary>
|
||||||
|
public class ValidResultCounterVM : ViewModelBase
|
||||||
|
{
|
||||||
|
private IEnumerable<IResult> results;
|
||||||
|
/// <summary>
|
||||||
|
/// Count of valid results in collection
|
||||||
|
/// </summary>
|
||||||
|
public int ValidResultCount => results.Count(x => x.IsValid == true);
|
||||||
|
/// <summary>
|
||||||
|
/// Count of invalid results in collection
|
||||||
|
/// </summary>
|
||||||
|
public int InvalidResultCount => results.Count(x => x.IsValid == false);
|
||||||
|
/// <summary>
|
||||||
|
/// Total count of results
|
||||||
|
/// </summary>
|
||||||
|
public int TotalResultCount => results.Count();
|
||||||
|
public ValidResultCounterVM(IEnumerable<IResult> results)
|
||||||
|
{
|
||||||
|
this.results = results;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using NLog;
|
using NLog;
|
||||||
|
using StructureHelperCommon.Infrastructures.Enums;
|
||||||
using StructureHelperCommon.Infrastructures.Interfaces;
|
using StructureHelperCommon.Infrastructures.Interfaces;
|
||||||
using StructureHelperCommon.Models.Forces.BeamShearActions;
|
using StructureHelperCommon.Models.Forces.BeamShearActions;
|
||||||
using System;
|
using System;
|
||||||
@@ -38,6 +39,9 @@ namespace StructureHelperCommon.Models.Forces
|
|||||||
}
|
}
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public double LoadRatio { get; set; } = 1;
|
public double LoadRatio { get; set; } = 1;
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public IFactoredCombinationProperty CombinationProperty { get; set; } = new FactoredCombinationProperty(Guid.NewGuid()) { LimitState = LimitStates.ULS, CalcTerm = CalcTerms.ShortTerm };
|
||||||
|
|
||||||
public ConcentratedForce(Guid id)
|
public ConcentratedForce(Guid id)
|
||||||
{
|
{
|
||||||
Id = id;
|
Id = id;
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
using StructureHelperCommon.Infrastructures.Interfaces;
|
using StructureHelperCommon.Infrastructures.Enums;
|
||||||
|
using StructureHelperCommon.Infrastructures.Interfaces;
|
||||||
using StructureHelperCommon.Models.Forces.BeamShearActions;
|
using StructureHelperCommon.Models.Forces.BeamShearActions;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
//Copyright (c) 2025 Redikultsev Evgeny, Ekaterinburg, Russia
|
||||||
using System.Text;
|
//All rights reserved.
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace StructureHelperCommon.Models.Forces
|
namespace StructureHelperCommon.Models.Forces
|
||||||
{
|
{
|
||||||
@@ -32,6 +32,8 @@ namespace StructureHelperCommon.Models.Forces
|
|||||||
public double EndCoordinate { get; set; } = double.PositiveInfinity;
|
public double EndCoordinate { get; set; } = double.PositiveInfinity;
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public double LoadRatio { get; set; } = 1;
|
public double LoadRatio { get; set; } = 1;
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public IFactoredCombinationProperty CombinationProperty { get; set; } = new FactoredCombinationProperty(Guid.NewGuid()) { LimitState = LimitStates.ULS, CalcTerm = CalcTerms.ShortTerm};
|
||||||
|
|
||||||
public DistributedLoad(Guid id)
|
public DistributedLoad(Guid id)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -19,5 +19,9 @@ namespace StructureHelperCommon.Models.Forces
|
|||||||
/// Ratio of substraction load from total shear force
|
/// Ratio of substraction load from total shear force
|
||||||
/// </summary>
|
/// </summary>
|
||||||
double LoadRatio { get; set; }
|
double LoadRatio { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Properties of combination of forces
|
||||||
|
/// </summary>
|
||||||
|
IFactoredCombinationProperty CombinationProperty { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
using StructureHelperCommon.Infrastructures.Enums;
|
||||||
|
using StructureHelperCommon.Models.Forces;
|
||||||
|
|
||||||
|
//Copyright (c) 2025 Redikultsev Evgeny, Ekaterinburg, Russia
|
||||||
|
//All rights reserved.
|
||||||
|
|
||||||
|
namespace StructureHelperLogics.Models.BeamShears
|
||||||
|
{
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public class BeamShearActionResult : IBeamShearActionResult
|
||||||
|
{
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public bool IsValid { get; set; }
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public string? Description { get; set; }
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public LimitStates LimitState { get; set; }
|
||||||
|
public CalcTerms CalcTerm { get; set; }
|
||||||
|
public IBeamShearAction BeamShearAction { get; set; }
|
||||||
|
public List<IBeamShearSectionLogicResult> SectionResults { get; set; } = new();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -53,7 +53,7 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
beamShearSectionLogic.InputData = sectionInputData;
|
beamShearSectionLogic.InputData = sectionInputData;
|
||||||
beamShearSectionLogic.Run();
|
beamShearSectionLogic.Run();
|
||||||
var sectionResult = beamShearSectionLogic.Result as IBeamShearSectionLogicResult;
|
var sectionResult = beamShearSectionLogic.Result as IBeamShearSectionLogicResult;
|
||||||
result.SectionResults.Add(sectionResult);
|
//result.ActionResults.Add(sectionResult);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,6 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
{
|
{
|
||||||
public bool IsValid { get; set; } = true;
|
public bool IsValid { get; set; } = true;
|
||||||
public string? Description { get; set; } = string.Empty;
|
public string? Description { get; set; } = string.Empty;
|
||||||
public List<IBeamShearSectionLogicResult> SectionResults { get; set; } = new();
|
public List<IBeamShearActionResult> ActionResults { get; set; } = new();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
using StructureHelperCommon.Infrastructures.Enums;
|
||||||
|
using StructureHelperCommon.Models.Calculators;
|
||||||
|
using StructureHelperCommon.Models.Forces;
|
||||||
|
using StructureHelperLogics.NdmCalculations.Analyses.ByForces;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace StructureHelperLogics.Models.BeamShears
|
||||||
|
{
|
||||||
|
public interface IBeamShearActionResult : IResult
|
||||||
|
{
|
||||||
|
LimitStates LimitState { get; set; }
|
||||||
|
CalcTerms CalcTerm { get; set; }
|
||||||
|
IBeamShearAction BeamShearAction { get; set; }
|
||||||
|
List<IBeamShearSectionLogicResult> SectionResults { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,6 +9,6 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
{
|
{
|
||||||
public interface IBeamShearCalculatorResult : IResult
|
public interface IBeamShearCalculatorResult : IResult
|
||||||
{
|
{
|
||||||
List<IBeamShearSectionLogicResult> SectionResults { get; set; }
|
List<IBeamShearActionResult> ActionResults { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public class GetDirectShearForceLogic : IGetDirectShearForceLogic
|
public class GetDirectShearForceLogic : IGetDirectShearForceLogic
|
||||||
{
|
{
|
||||||
ISumForceByShearLoadLogic summaryForceLogic;
|
private ISumForceByShearLoadLogic summaryForceLogic;
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public IShiftTraceLogger? TraceLogger { get; set; }
|
public IShiftTraceLogger? TraceLogger { get; set; }
|
||||||
@@ -88,26 +88,32 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
LimitState = LimitState,
|
LimitState = LimitState,
|
||||||
CalcTerm = CalcTerm
|
CalcTerm = CalcTerm
|
||||||
};
|
};
|
||||||
IForceTuple supportShearForce= forceTupleLogic.GetForceTuple();
|
IForceTuple supportShearForce = forceTupleLogic.GetForceTuple();
|
||||||
|
|
||||||
TraceLogger?.AddMessage($"Shear force at support Qmax = {supportShearForce.Qy}(N)");
|
TraceLogger?.AddMessage($"Shear force at support Qmax = {supportShearForce.Qy}(N)");
|
||||||
TraceLogger?.AddMessage($"Start of inclined section a,start = {InclinedSection.StartCoord}(m)");
|
TraceLogger?.AddMessage($"Start of inclined section a,start = {InclinedSection.StartCoord}(m)");
|
||||||
TraceLogger?.AddMessage($"End of inclined section a,end = {InclinedSection.EndCoord}(m)");
|
TraceLogger?.AddMessage($"End of inclined section a,end = {InclinedSection.EndCoord}(m)");
|
||||||
ForceTuple summarySpanShearForce = new (Guid.NewGuid());
|
ForceTuple summarySpanShearForce = GetSummarySpanShearForce(beamShearAxisAction.ShearLoads);
|
||||||
foreach (var item in beamShearAxisAction.ShearLoads)
|
TraceLogger?.AddMessage($"Summary span shear force deltaQ = {summarySpanShearForce.Qy}(N)");
|
||||||
{
|
IForceTuple shearForce = ForceTupleService.SumTuples(supportShearForce, summarySpanShearForce);
|
||||||
IForceTuple summarySpanLoad = summaryForceLogic.GetSumShearForce(item, InclinedSection.StartCoord, InclinedSection.EndCoord);
|
|
||||||
ForceTupleService.SumTupleToTarget(summarySpanLoad, summarySpanShearForce);
|
|
||||||
}
|
|
||||||
TraceLogger?.AddMessage($"Summary span force deltaQ = {summarySpanShearForce.Qy}(N)");
|
|
||||||
IForceTuple shearForce = ForceTupleService.SumTuples(supportShearForce,summarySpanShearForce);
|
|
||||||
TraceLogger?.AddMessage($"Summary shear force at the end of inclined section Q = {shearForce.Qy}(N)");
|
TraceLogger?.AddMessage($"Summary shear force at the end of inclined section Q = {shearForce.Qy}(N)");
|
||||||
return shearForce;
|
return shearForce;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private ForceTuple GetSummarySpanShearForce(IEnumerable<IBeamSpanLoad> spanLoads)
|
||||||
|
{
|
||||||
|
ForceTuple summarySpanShearForce = new(Guid.NewGuid());
|
||||||
|
foreach (var spanLoad in spanLoads)
|
||||||
|
{
|
||||||
|
IForceTuple summarySpanLoad = summaryForceLogic.GetSumShearForce(spanLoad, InclinedSection.StartCoord, InclinedSection.EndCoord);
|
||||||
|
ForceTupleService.SumTupleToTarget(summarySpanLoad, summarySpanShearForce);
|
||||||
|
}
|
||||||
|
return summarySpanShearForce;
|
||||||
|
}
|
||||||
|
|
||||||
private void InitializeStrategies()
|
private void InitializeStrategies()
|
||||||
{
|
{
|
||||||
summaryForceLogic ??= new SumForceByShearLoadLogic(TraceLogger);
|
summaryForceLogic ??= new SumForceByShearLoadLogic(TraceLogger) { LimitState = LimitState, CalcTerm = CalcTerm};
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using StructureHelperCommon.Infrastructures.Interfaces;
|
using StructureHelperCommon.Infrastructures.Enums;
|
||||||
|
using StructureHelperCommon.Infrastructures.Interfaces;
|
||||||
using StructureHelperCommon.Models.Forces;
|
using StructureHelperCommon.Models.Forces;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@@ -13,6 +14,8 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public interface ISumForceByShearLoadLogic : ILogic
|
public interface ISumForceByShearLoadLogic : ILogic
|
||||||
{
|
{
|
||||||
|
LimitStates LimitState { get; set; }
|
||||||
|
CalcTerms CalcTerm { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns summary force of action from start to end
|
/// Returns summary force of action from start to end
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
using StructureHelperCommon.Infrastructures.Exceptions;
|
using StructureHelperCommon.Infrastructures.Enums;
|
||||||
|
using StructureHelperCommon.Infrastructures.Exceptions;
|
||||||
using StructureHelperCommon.Models;
|
using StructureHelperCommon.Models;
|
||||||
using StructureHelperCommon.Models.Forces;
|
using StructureHelperCommon.Models.Forces;
|
||||||
|
using StructureHelperCommon.Models.Forces.Logics;
|
||||||
using StructureHelperCommon.Models.Loggers;
|
using StructureHelperCommon.Models.Loggers;
|
||||||
using StructureHelperCommon.Services.Forces;
|
using StructureHelperCommon.Services.Forces;
|
||||||
|
|
||||||
@@ -10,6 +12,8 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
{
|
{
|
||||||
private ICoordinateByLevelLogic coordinateByLevelLogic;
|
private ICoordinateByLevelLogic coordinateByLevelLogic;
|
||||||
public IShiftTraceLogger? TraceLogger { get; set; }
|
public IShiftTraceLogger? TraceLogger { get; set; }
|
||||||
|
public LimitStates LimitState { get; set; }
|
||||||
|
public CalcTerms CalcTerm { get; set; }
|
||||||
|
|
||||||
public SumConcentratedForceLogic(ICoordinateByLevelLogic coordinateByLevelLogic, IShiftTraceLogger? traceLogger)
|
public SumConcentratedForceLogic(ICoordinateByLevelLogic coordinateByLevelLogic, IShiftTraceLogger? traceLogger)
|
||||||
{
|
{
|
||||||
@@ -64,8 +68,10 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
}
|
}
|
||||||
if (concentratedForce.ForceCoordinate < limitCoordinate)
|
if (concentratedForce.ForceCoordinate < limitCoordinate)
|
||||||
{
|
{
|
||||||
totalLoad = ForceTupleService.MultiplyTupleByFactor(concentratedForce.ForceValue, concentratedForce.LoadRatio);
|
double loadFactor = GetLoadFactor(concentratedForce);
|
||||||
TraceLogger?.AddMessage($"Total load Q,tot = {concentratedForce.ForceValue.Qy}(N) * {concentratedForce.LoadRatio} = {totalLoad}(N)");
|
double sumFactor = concentratedForce.LoadRatio * loadFactor;
|
||||||
|
totalLoad = ForceTupleService.MultiplyTupleByFactor(concentratedForce.ForceValue, sumFactor);
|
||||||
|
TraceLogger?.AddMessage($"Total load Q,tot = {concentratedForce.ForceValue.Qy}(N) * {concentratedForce.LoadRatio} * {loadFactor} = {totalLoad}(N)");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -74,5 +80,16 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
}
|
}
|
||||||
return totalLoad;
|
return totalLoad;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private double GetLoadFactor(IBeamSpanLoad spanLoad)
|
||||||
|
{
|
||||||
|
var getFactorLogic = new GetFactorByFactoredCombinationProperty()
|
||||||
|
{
|
||||||
|
CombinationProperty = spanLoad.CombinationProperty,
|
||||||
|
LimitState = LimitState,
|
||||||
|
CalcTerm = CalcTerm
|
||||||
|
};
|
||||||
|
return getFactorLogic.GetFactor();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
using StructureHelperCommon.Infrastructures.Exceptions;
|
using StructureHelperCommon.Infrastructures.Enums;
|
||||||
|
using StructureHelperCommon.Infrastructures.Exceptions;
|
||||||
using StructureHelperCommon.Models;
|
using StructureHelperCommon.Models;
|
||||||
using StructureHelperCommon.Models.Forces;
|
using StructureHelperCommon.Models.Forces;
|
||||||
|
using StructureHelperCommon.Models.Forces.Logics;
|
||||||
using StructureHelperCommon.Models.Loggers;
|
using StructureHelperCommon.Models.Loggers;
|
||||||
using StructureHelperCommon.Services.Forces;
|
using StructureHelperCommon.Services.Forces;
|
||||||
|
|
||||||
@@ -10,6 +12,8 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
{
|
{
|
||||||
private ICoordinateByLevelLogic coordinateByLevelLogic;
|
private ICoordinateByLevelLogic coordinateByLevelLogic;
|
||||||
public IShiftTraceLogger? TraceLogger { get; set; }
|
public IShiftTraceLogger? TraceLogger { get; set; }
|
||||||
|
public LimitStates LimitState { get; set; }
|
||||||
|
public CalcTerms CalcTerm { get; set; }
|
||||||
|
|
||||||
public SumDistributedLoadLogic(IShiftTraceLogger? traceLogger)
|
public SumDistributedLoadLogic(IShiftTraceLogger? traceLogger)
|
||||||
{
|
{
|
||||||
@@ -55,10 +59,22 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
double loadEndCoord = Math.Min(distributedLoad.EndCoordinate, endCoordByLevel);
|
double loadEndCoord = Math.Min(distributedLoad.EndCoordinate, endCoordByLevel);
|
||||||
double loadLength = loadEndCoord - loadStartCoord;
|
double loadLength = loadEndCoord - loadStartCoord;
|
||||||
TraceLogger?.AddMessage($"Total length L,tot = {loadEndCoord}(m) - {loadStartCoord}(m) = {loadLength}(m)");
|
TraceLogger?.AddMessage($"Total length L,tot = {loadEndCoord}(m) - {loadStartCoord}(m) = {loadLength}(m)");
|
||||||
double sumFactor = distributedLoad.LoadRatio * loadLength;
|
double loadFactor = GetLoadFactor(distributedLoad);
|
||||||
|
double sumFactor = distributedLoad.LoadRatio * loadLength * loadFactor;
|
||||||
IForceTuple totalLoad = ForceTupleService.MultiplyTupleByFactor(distributedLoad.LoadValue, sumFactor);
|
IForceTuple totalLoad = ForceTupleService.MultiplyTupleByFactor(distributedLoad.LoadValue, sumFactor);
|
||||||
TraceLogger?.AddMessage($"Total load Q,tot = {distributedLoad.LoadValue.Qy}(N/m) * {distributedLoad.LoadRatio} * {loadLength}(m) = {totalLoad.Qy}(N)");
|
TraceLogger?.AddMessage($"Total load Q,tot = {distributedLoad.LoadValue.Qy}(N/m) * {distributedLoad.LoadRatio} * {loadLength}(m) * {loadFactor} = {totalLoad.Qy}(N)");
|
||||||
return totalLoad;
|
return totalLoad;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private double GetLoadFactor(IBeamSpanLoad spanLoad)
|
||||||
|
{
|
||||||
|
var getFactorLogic = new GetFactorByFactoredCombinationProperty()
|
||||||
|
{
|
||||||
|
CombinationProperty = spanLoad.CombinationProperty,
|
||||||
|
LimitState = LimitState,
|
||||||
|
CalcTerm = CalcTerm
|
||||||
|
};
|
||||||
|
return getFactorLogic.GetFactor();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
using StructureHelperCommon.Infrastructures.Exceptions;
|
using StructureHelperCommon.Infrastructures.Enums;
|
||||||
|
using StructureHelperCommon.Infrastructures.Exceptions;
|
||||||
using StructureHelperCommon.Models;
|
using StructureHelperCommon.Models;
|
||||||
using StructureHelperCommon.Models.Forces;
|
using StructureHelperCommon.Models.Forces;
|
||||||
|
using StructureHelperCommon.Models.Forces.Logics;
|
||||||
using StructureHelperCommon.Models.Loggers;
|
using StructureHelperCommon.Models.Loggers;
|
||||||
|
using StructureHelperCommon.Services.Forces;
|
||||||
|
|
||||||
namespace StructureHelperLogics.Models.BeamShears
|
namespace StructureHelperLogics.Models.BeamShears
|
||||||
{
|
{
|
||||||
@@ -10,6 +13,8 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
private ISumForceByShearLoadLogic sumDistributedLoadLogic;
|
private ISumForceByShearLoadLogic sumDistributedLoadLogic;
|
||||||
private ISumForceByShearLoadLogic sumConcentratedForceLogic;
|
private ISumForceByShearLoadLogic sumConcentratedForceLogic;
|
||||||
public IShiftTraceLogger? TraceLogger { get; set; }
|
public IShiftTraceLogger? TraceLogger { get; set; }
|
||||||
|
public LimitStates LimitState { get; set; }
|
||||||
|
public CalcTerms CalcTerm { get; set; }
|
||||||
|
|
||||||
public SumForceByShearLoadLogic(IShiftTraceLogger? traceLogger)
|
public SumForceByShearLoadLogic(IShiftTraceLogger? traceLogger)
|
||||||
{
|
{
|
||||||
@@ -46,17 +51,19 @@ namespace StructureHelperLogics.Models.BeamShears
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private IForceTuple GetConcentratedForceSum(IConcentratedForce concenratedForce, double startCoord, double endCoord)
|
private IForceTuple GetConcentratedForceSum(IConcentratedForce concentratedForce, double startCoord, double endCoord)
|
||||||
{
|
{
|
||||||
sumConcentratedForceLogic ??= new SumConcentratedForceLogic(TraceLogger);
|
sumConcentratedForceLogic ??= new SumConcentratedForceLogic(TraceLogger) { LimitState = LimitState, CalcTerm = CalcTerm};
|
||||||
IForceTuple sumForce = sumConcentratedForceLogic.GetSumShearForce(concenratedForce, startCoord, endCoord);
|
IForceTuple sumForce = sumConcentratedForceLogic.GetSumShearForce(concentratedForce, startCoord, endCoord);
|
||||||
TraceLogger?.AddMessage($"Sum of concentrated force Qcf = {sumForce.Qy}(N)");
|
TraceLogger?.AddMessage($"Sum of concentrated force Qcf = {sumForce.Qy}(N)");
|
||||||
return sumForce;
|
return sumForce;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private IForceTuple GetDistributedLoadSum(IDistributedLoad distributedLoad, double startCoord, double endCoord)
|
private IForceTuple GetDistributedLoadSum(IDistributedLoad distributedLoad, double startCoord, double endCoord)
|
||||||
{
|
{
|
||||||
sumDistributedLoadLogic ??= new SumDistributedLoadLogic(TraceLogger);
|
sumDistributedLoadLogic ??= new SumDistributedLoadLogic(TraceLogger) { LimitState = LimitState, CalcTerm = CalcTerm };
|
||||||
IForceTuple sumForce = sumDistributedLoadLogic.GetSumShearForce(distributedLoad, startCoord, endCoord);
|
IForceTuple sumForce = sumDistributedLoadLogic.GetSumShearForce(distributedLoad, startCoord, endCoord);
|
||||||
TraceLogger?.AddMessage($"Sum of uniformly distributed load Qud = {sumForce.Qy}(N)");
|
TraceLogger?.AddMessage($"Sum of uniformly distributed load Qud = {sumForce.Qy}(N)");
|
||||||
return sumForce;
|
return sumForce;
|
||||||
|
|||||||
Reference in New Issue
Block a user