diff --git a/StructureHelper/Documentation/Manuals/Руководство пользователя.docx b/StructureHelper/Documentation/Manuals/Руководство пользователя.docx index 7d9ef22..5d654f3 100644 Binary files a/StructureHelper/Documentation/Manuals/Руководство пользователя.docx and b/StructureHelper/Documentation/Manuals/Руководство пользователя.docx differ diff --git a/StructureHelper/Properties/AssemblyInfo.cs b/StructureHelper/Properties/AssemblyInfo.cs index 6d61ae9..25e9474 100644 --- a/StructureHelper/Properties/AssemblyInfo.cs +++ b/StructureHelper/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows; // Можно задать все значения или принять номера сборки и редакции по умолчанию // используя "*", как показано ниже: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2023.01.08.01")] -[assembly: AssemblyFileVersion("2023.01.08.01")] +[assembly: AssemblyVersion("2025.06.23.01")] +[assembly: AssemblyFileVersion("2025.06.23.01")] diff --git a/StructureHelper/StructureHelper.csproj b/StructureHelper/StructureHelper.csproj index 66e8f1b..a976cd8 100644 --- a/StructureHelper/StructureHelper.csproj +++ b/StructureHelper/StructureHelper.csproj @@ -10,6 +10,7 @@ 7.0 false Infrastructure\UI\Icons\SH_лого_16.ico + diff --git a/StructureHelper/Windows/MainWindow/AboutView.xaml b/StructureHelper/Windows/MainWindow/AboutView.xaml index 360c4c0..ab2a6aa 100644 --- a/StructureHelper/Windows/MainWindow/AboutView.xaml +++ b/StructureHelper/Windows/MainWindow/AboutView.xaml @@ -7,7 +7,7 @@ xmlns:vm="clr-namespace:StructureHelper.Windows.ViewModels.Help" mc:Ignorable="d" 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"> @@ -15,6 +15,8 @@ + + @@ -23,6 +25,10 @@ - - + + + + diff --git a/StructureHelper/Windows/MainWindow/AnalysesManagerViewModel.cs b/StructureHelper/Windows/MainWindow/AnalysesManagerViewModel.cs index 00f08e4..00c24d4 100644 --- a/StructureHelper/Windows/MainWindow/AnalysesManagerViewModel.cs +++ b/StructureHelper/Windows/MainWindow/AnalysesManagerViewModel.cs @@ -4,15 +4,35 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Input; namespace StructureHelper.Windows.MainWindow { public class AnalysesManagerViewModel : ViewModelBase { + private RelayCommand showAboutCommand; + public FileLogic FileLogic { get; } public DiagramLogic DiagramLogic { 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() { FileLogic = new() { ParentVM = this }; diff --git a/StructureHelper/Windows/ViewModels/Help/AboutViewModel.cs b/StructureHelper/Windows/ViewModels/Help/AboutViewModel.cs index 39408e7..81a7bbe 100644 --- a/StructureHelper/Windows/ViewModels/Help/AboutViewModel.cs +++ b/StructureHelper/Windows/ViewModels/Help/AboutViewModel.cs @@ -11,7 +11,7 @@ namespace StructureHelper.Windows.ViewModels.Help { internal class AboutViewModel : OkCancelViewModelBase { - public string Authors => "Redikultsev Evgeny, Petrov Sergey, Smirnov Nikolay"; + public string Authors => "Redikultsev Evgeny"; public string Version { get diff --git a/StructureHelperLogics/Models/BeamShears/IBeamShearSectionLogicResult.cs b/StructureHelperLogics/Models/BeamShears/IBeamShearSectionLogicResult.cs index 9672325..4953634 100644 --- a/StructureHelperLogics/Models/BeamShears/IBeamShearSectionLogicResult.cs +++ b/StructureHelperLogics/Models/BeamShears/IBeamShearSectionLogicResult.cs @@ -1,21 +1,36 @@ using StructureHelperCommon.Models; 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 { + /// + /// Implements result of calculating of strength of inclined section fore shear + /// public interface IBeamShearSectionLogicResult : IResult { + /// + /// Reference back to input data for calculating + /// IBeamShearSectionLogicInputData InputData { get; set; } + /// + /// Ultimate shear force due to cocrete + /// public double ConcreteStrength { get; set; } + /// + /// Ultimate shear force due to stirrups + /// public double StirrupStrength { get; set; } + /// + /// Total ultimate strength + /// public double TotalStrength { get; set; } + /// + /// Ration of load to total strength + /// public double FactorOfUsing { get; } + /// + /// Trace of calculating + /// public IShiftTraceLogger TraceLogger { get; } } } diff --git a/StructureHelperLogics/Models/BeamShears/IInclinedSection.cs b/StructureHelperLogics/Models/BeamShears/IInclinedSection.cs index 470fb39..cb58e33 100644 --- a/StructureHelperLogics/Models/BeamShears/IInclinedSection.cs +++ b/StructureHelperLogics/Models/BeamShears/IInclinedSection.cs @@ -4,7 +4,7 @@ using StructureHelperCommon.Infrastructures.Interfaces; namespace StructureHelperLogics.Models.BeamShears { /// - /// Implement parameers of inclined cross-section for beam shear calculating + /// Implement parameters of inclined cross-section for beam shear calculating /// public interface IInclinedSection : IEffectiveDepth { diff --git a/StructureHelperLogics/Models/BeamShears/BeamShearCalculatorLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/BeamShearCalculatorLogic.cs similarity index 100% rename from StructureHelperLogics/Models/BeamShears/BeamShearCalculatorLogic.cs rename to StructureHelperLogics/Models/BeamShears/Logics/BeamShearCalculatorLogic.cs diff --git a/StructureHelperLogics/Models/BeamShears/Logics/BeamShearSectionLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/BeamShearSectionLogic.cs index 57b25c2..c57f7f7 100644 --- a/StructureHelperLogics/Models/BeamShears/Logics/BeamShearSectionLogic.cs +++ b/StructureHelperLogics/Models/BeamShears/Logics/BeamShearSectionLogic.cs @@ -1,5 +1,4 @@ -using StructureHelperCommon.Infrastructures.Exceptions; -using StructureHelperCommon.Infrastructures.Interfaces; +using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Models; using StructureHelperCommon.Models.Calculators; using StructureHelperCommon.Models.Loggers; diff --git a/StructureHelperLogics/Models/BeamShears/Logics/CoordinateByLevelLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/CoordinateByLevelLogic.cs index d5f97bb..397327e 100644 --- a/StructureHelperLogics/Models/BeamShears/Logics/CoordinateByLevelLogic.cs +++ b/StructureHelperLogics/Models/BeamShears/Logics/CoordinateByLevelLogic.cs @@ -1,13 +1,9 @@ using StructureHelperCommon.Infrastructures.Exceptions; using StructureHelperCommon.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StructureHelperLogics.Models.BeamShears { + /// public class CoordinateByLevelLogic : ICoordinateByLevelLogic { public IShiftTraceLogger? TraceLogger { get; set; } @@ -17,6 +13,7 @@ namespace StructureHelperLogics.Models.BeamShears TraceLogger = traceLogger; } + /// public double GetCoordinate(double startCoord, double endCoord, double relativeLevel) { CheckRelativeLevel(relativeLevel); diff --git a/StructureHelperLogics/Models/BeamShears/Logics/ICoordinateByLevelLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/ICoordinateByLevelLogic.cs index 14479d9..6f5920e 100644 --- a/StructureHelperLogics/Models/BeamShears/Logics/ICoordinateByLevelLogic.cs +++ b/StructureHelperLogics/Models/BeamShears/Logics/ICoordinateByLevelLogic.cs @@ -1,14 +1,19 @@ using StructureHelperCommon.Infrastructures.Interfaces; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace StructureHelperLogics.Models.BeamShears { + /// + /// Implements logic of calculating of coordinate of point where source level intersect inclinid section + /// public interface ICoordinateByLevelLogic : ILogic { + /// + /// Calculates coordinate of point where aource level intersect inclined section + /// + /// Start coordinate of inclined section + /// End coordinate of inclined section + /// Source relative level, 0.5 - top level, -0.5 bottom level + /// double GetCoordinate(double startCoord, double endCoord, double relativeLevel); } } diff --git a/StructureHelperLogics/Models/BeamShears/Logics/IDirectShearForceLogicInputData.cs b/StructureHelperLogics/Models/BeamShears/Logics/IDirectShearForceLogicInputData.cs index 1731611..19a115d 100644 --- a/StructureHelperLogics/Models/BeamShears/Logics/IDirectShearForceLogicInputData.cs +++ b/StructureHelperLogics/Models/BeamShears/Logics/IDirectShearForceLogicInputData.cs @@ -4,6 +4,9 @@ using StructureHelperCommon.Models.Forces; namespace StructureHelperLogics.Models.BeamShears { + /// + /// Implements input data fore calculating forces at the and of inclined section + /// public interface IDirectShearForceLogicInputData : IInputData { IBeamShearAction BeamShearAction { get; set; } diff --git a/StructureHelperLogics/Models/BeamShears/Logics/StirrupBySearchLogic.cs b/StructureHelperLogics/Models/BeamShears/Logics/StirrupBySearchLogic.cs index ea37ac1..c49cf7e 100644 --- a/StructureHelperLogics/Models/BeamShears/Logics/StirrupBySearchLogic.cs +++ b/StructureHelperLogics/Models/BeamShears/Logics/StirrupBySearchLogic.cs @@ -1,7 +1,6 @@ using StructureHelperCommon.Infrastructures.Exceptions; using StructureHelperCommon.Models; using StructureHelperCommon.Models.Calculators; -using StructureHelperLogics.Models.BeamShears.Logics; namespace StructureHelperLogics.Models.BeamShears {