Chang UserManualRus

This commit is contained in:
Evgeny Redikultsev
2025-06-22 16:25:55 +05:00
parent 1ebe1bbcd1
commit d45d37edb7
15 changed files with 83 additions and 26 deletions

View File

@@ -49,5 +49,5 @@ using System.Windows;
// Можно задать все значения или принять номера сборки и редакции по умолчанию // Можно задать все значения или принять номера сборки и редакции по умолчанию
// используя "*", как показано ниже: // используя "*", как показано ниже:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2023.01.08.01")] [assembly: AssemblyVersion("2025.06.23.01")]
[assembly: AssemblyFileVersion("2023.01.08.01")] [assembly: AssemblyFileVersion("2025.06.23.01")]

View File

@@ -10,6 +10,7 @@
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion> <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ApplicationIcon>Infrastructure\UI\Icons\SH_лого_16.ico</ApplicationIcon> <ApplicationIcon>Infrastructure\UI\Icons\SH_лого_16.ico</ApplicationIcon>
<AssemblyVersion></AssemblyVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -7,7 +7,7 @@
xmlns:vm="clr-namespace:StructureHelper.Windows.ViewModels.Help" xmlns:vm="clr-namespace:StructureHelper.Windows.ViewModels.Help"
mc:Ignorable="d" mc:Ignorable="d"
d:DataContext="{d:DesignInstance vm:AboutViewModel}" d:DataContext="{d:DesignInstance vm:AboutViewModel}"
Title="Structure Helper" Height="200" Width="400" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"> Title="Structure Helper" Height="250" Width="400" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="22"/> <RowDefinition Height="22"/>
@@ -15,6 +15,8 @@
<RowDefinition Height="22"/> <RowDefinition Height="22"/>
<RowDefinition Height="22"/> <RowDefinition Height="22"/>
<RowDefinition Height="22"/> <RowDefinition Height="22"/>
<RowDefinition Height="22"/>
<RowDefinition Height="22"/>
<RowDefinition/> <RowDefinition/>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
@@ -23,6 +25,10 @@
<TextBlock Grid.Row="2" Text="Version"/> <TextBlock Grid.Row="2" Text="Version"/>
<TextBlock Grid.Row="3" Text="{Binding Version}"/> <TextBlock Grid.Row="3" Text="{Binding Version}"/>
<TextBlock Grid.Row="4" Text="Copy Right (c) Redikultsev Evgeny"/> <TextBlock Grid.Row="4" Text="Copy Right (c) Redikultsev Evgeny"/>
<Button Grid.Row="6" Style="{StaticResource OkButton}" Click="Button_Click"/> <TextBlock Grid.Row="5" Text="www.structurehelper.ru"/>
<TextBlock Grid.Row="6" Text="https://vk.com/structurehelper"/>
<TextBlock Grid.Row="7" Text="https://t.me/StructureHelper"/>
<Button Grid.Row="8" Style="{StaticResource OkButton}" Click="Button_Click"/>
</Grid> </Grid>
</Window> </Window>

View File

@@ -51,7 +51,7 @@
</Viewbox> </Viewbox>
</Button> </Button>
</ToolBar> </ToolBar>
<ToolBar ToolTip="Cross-sections"> <ToolBar ToolTip="Types of Analyses">
<Button Style="{DynamicResource ToolButton}" Command="{Binding AnalysesLogic.AddAnalysisCommand}" CommandParameter="{x:Static enums:AnalysisTypes.CrossSection}"> <Button Style="{DynamicResource ToolButton}" Command="{Binding AnalysesLogic.AddAnalysisCommand}" CommandParameter="{x:Static enums:AnalysisTypes.CrossSection}">
<Button.ToolTip> <Button.ToolTip>
<uc:ButtonToolTipEh HeaderText="NDM Cross-Section Analysis" <uc:ButtonToolTipEh HeaderText="NDM Cross-Section Analysis"
@@ -73,6 +73,18 @@
</Viewbox> </Viewbox>
</Button> </Button>
</ToolBar> </ToolBar>
<ToolBar ToolTip="About...">
<Button Style="{DynamicResource ToolButton}" Command="{Binding ShowAboutCommand}">
<Button.ToolTip>
<uc:ButtonToolTipEh HeaderText="About..."
IconContent="{StaticResource GetArea}"
DescriptionText="Shows short details about program"/>
</Button.ToolTip>
<Viewbox>
<ContentControl ContentTemplate="{DynamicResource GetArea}"/>
</Viewbox>
</Button>
</ToolBar>
</ToolBarTray> </ToolBarTray>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>

View File

@@ -4,15 +4,35 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Input;
namespace StructureHelper.Windows.MainWindow namespace StructureHelper.Windows.MainWindow
{ {
public class AnalysesManagerViewModel : ViewModelBase public class AnalysesManagerViewModel : ViewModelBase
{ {
private RelayCommand showAboutCommand;
public FileLogic FileLogic { get; } public FileLogic FileLogic { get; }
public DiagramLogic DiagramLogic { get; } public DiagramLogic DiagramLogic { get; }
public AnalysesLogic AnalysesLogic { get; } public AnalysesLogic AnalysesLogic { get; }
public RelayCommand ShowAboutCommand
{
get
{
return showAboutCommand ??= new RelayCommand(obj =>
{
ShowAbout();
});
}
}
private void ShowAbout()
{
var wnd = new AboutView();
wnd.ShowDialog();
}
public AnalysesManagerViewModel() public AnalysesManagerViewModel()
{ {
FileLogic = new() { ParentVM = this }; FileLogic = new() { ParentVM = this };

View File

@@ -11,7 +11,7 @@ namespace StructureHelper.Windows.ViewModels.Help
{ {
internal class AboutViewModel : OkCancelViewModelBase internal class AboutViewModel : OkCancelViewModelBase
{ {
public string Authors => "Redikultsev Evgeny, Petrov Sergey, Smirnov Nikolay"; public string Authors => "Redikultsev Evgeny";
public string Version public string Version
{ {
get get

View File

@@ -1,21 +1,36 @@
using StructureHelperCommon.Models; using StructureHelperCommon.Models;
using StructureHelperCommon.Models.Calculators; using StructureHelperCommon.Models.Calculators;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.BeamShears namespace StructureHelperLogics.Models.BeamShears
{ {
/// <summary>
/// Implements result of calculating of strength of inclined section fore shear
/// </summary>
public interface IBeamShearSectionLogicResult : IResult public interface IBeamShearSectionLogicResult : IResult
{ {
/// <summary>
/// Reference back to input data for calculating
/// </summary>
IBeamShearSectionLogicInputData InputData { get; set; } IBeamShearSectionLogicInputData InputData { get; set; }
/// <summary>
/// Ultimate shear force due to cocrete
/// </summary>
public double ConcreteStrength { get; set; } public double ConcreteStrength { get; set; }
/// <summary>
/// Ultimate shear force due to stirrups
/// </summary>
public double StirrupStrength { get; set; } public double StirrupStrength { get; set; }
/// <summary>
/// Total ultimate strength
/// </summary>
public double TotalStrength { get; set; } public double TotalStrength { get; set; }
/// <summary>
/// Ration of load to total strength
/// </summary>
public double FactorOfUsing { get; } public double FactorOfUsing { get; }
/// <summary>
/// Trace of calculating
/// </summary>
public IShiftTraceLogger TraceLogger { get; } public IShiftTraceLogger TraceLogger { get; }
} }
} }

View File

@@ -4,7 +4,7 @@ using StructureHelperCommon.Infrastructures.Interfaces;
namespace StructureHelperLogics.Models.BeamShears namespace StructureHelperLogics.Models.BeamShears
{ {
/// <summary> /// <summary>
/// Implement parameers of inclined cross-section for beam shear calculating /// Implement parameters of inclined cross-section for beam shear calculating
/// </summary> /// </summary>
public interface IInclinedSection : IEffectiveDepth public interface IInclinedSection : IEffectiveDepth
{ {

View File

@@ -1,5 +1,4 @@
using StructureHelperCommon.Infrastructures.Exceptions; using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Models; using StructureHelperCommon.Models;
using StructureHelperCommon.Models.Calculators; using StructureHelperCommon.Models.Calculators;
using StructureHelperCommon.Models.Loggers; using StructureHelperCommon.Models.Loggers;

View File

@@ -1,13 +1,9 @@
using StructureHelperCommon.Infrastructures.Exceptions; using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Models; using StructureHelperCommon.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.BeamShears namespace StructureHelperLogics.Models.BeamShears
{ {
/// <inheritdoc/>
public class CoordinateByLevelLogic : ICoordinateByLevelLogic public class CoordinateByLevelLogic : ICoordinateByLevelLogic
{ {
public IShiftTraceLogger? TraceLogger { get; set; } public IShiftTraceLogger? TraceLogger { get; set; }
@@ -17,6 +13,7 @@ namespace StructureHelperLogics.Models.BeamShears
TraceLogger = traceLogger; TraceLogger = traceLogger;
} }
/// <inheritdoc/>
public double GetCoordinate(double startCoord, double endCoord, double relativeLevel) public double GetCoordinate(double startCoord, double endCoord, double relativeLevel)
{ {
CheckRelativeLevel(relativeLevel); CheckRelativeLevel(relativeLevel);

View File

@@ -1,14 +1,19 @@
using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Infrastructures.Interfaces;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperLogics.Models.BeamShears namespace StructureHelperLogics.Models.BeamShears
{ {
/// <summary>
/// Implements logic of calculating of coordinate of point where source level intersect inclinid section
/// </summary>
public interface ICoordinateByLevelLogic : ILogic public interface ICoordinateByLevelLogic : ILogic
{ {
/// <summary>
/// Calculates coordinate of point where aource level intersect inclined section
/// </summary>
/// <param name="startCoord">Start coordinate of inclined section</param>
/// <param name="endCoord">End coordinate of inclined section</param>
/// <param name="relativeLevel">Source relative level, 0.5 - top level, -0.5 bottom level</param>
/// <returns></returns>
double GetCoordinate(double startCoord, double endCoord, double relativeLevel); double GetCoordinate(double startCoord, double endCoord, double relativeLevel);
} }
} }

View File

@@ -4,6 +4,9 @@ using StructureHelperCommon.Models.Forces;
namespace StructureHelperLogics.Models.BeamShears namespace StructureHelperLogics.Models.BeamShears
{ {
/// <summary>
/// Implements input data fore calculating forces at the and of inclined section
/// </summary>
public interface IDirectShearForceLogicInputData : IInputData public interface IDirectShearForceLogicInputData : IInputData
{ {
IBeamShearAction BeamShearAction { get; set; } IBeamShearAction BeamShearAction { get; set; }

View File

@@ -1,7 +1,6 @@
using StructureHelperCommon.Infrastructures.Exceptions; using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Models; using StructureHelperCommon.Models;
using StructureHelperCommon.Models.Calculators; using StructureHelperCommon.Models.Calculators;
using StructureHelperLogics.Models.BeamShears.Logics;
namespace StructureHelperLogics.Models.BeamShears namespace StructureHelperLogics.Models.BeamShears
{ {