diff --git a/StructureHelper/StructureHelper.csproj.user b/StructureHelper/StructureHelper.csproj.user
index b525da0..65eb1d7 100644
--- a/StructureHelper/StructureHelper.csproj.user
+++ b/StructureHelper/StructureHelper.csproj.user
@@ -24,6 +24,9 @@
Code
+
+ Code
+
Code
@@ -161,6 +164,9 @@
Designer
+
+ Designer
+
Designer
diff --git a/StructureHelper/Windows/BeamShears/BeamShearActionView.xaml b/StructureHelper/Windows/BeamShears/BeamShearActionView.xaml
index 9111a61..3a0160f 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearActionView.xaml
+++ b/StructureHelper/Windows/BeamShears/BeamShearActionView.xaml
@@ -31,8 +31,29 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -48,12 +69,12 @@
-
+
-
+
diff --git a/StructureHelper/Windows/BeamShears/BeamShearActionViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearActionViewModel.cs
index 79902cb..e10d8ba 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearActionViewModel.cs
+++ b/StructureHelper/Windows/BeamShears/BeamShearActionViewModel.cs
@@ -1,4 +1,6 @@
-using StructureHelper.Windows.ViewModels;
+using StructureHelper.Windows.Forces;
+using StructureHelper.Windows.ViewModels;
+using StructureHelper.Windows.ViewModels.Forces;
using StructureHelperCommon.Models.Forces;
using System;
using System.Collections.Generic;
@@ -21,12 +23,16 @@ namespace StructureHelper.Windows.BeamShears
shearAction.Name = value;
}
}
- public BeamShearAxisActionViewModel YAxisAction { get; private set; }
+
+ public FactoredForceTupleViewModel ExternalForces { get; private set; }
+
+ public BeamShearAxisActionViewModel SupportAction { get; private set; }
public BeamShearActionViewModel(IBeamShearAction shearAction)
{
this.shearAction = shearAction;
- YAxisAction = new(this.shearAction.YAxisShearAction);
+ SupportAction = new(this.shearAction.SupportAction);
+ ExternalForces = new(this.shearAction.ExternalForce);
}
}
}
diff --git a/StructureHelper/Windows/BeamShears/BeamShearAxisActionViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearAxisActionViewModel.cs
index 4ac0af0..a37aa77 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearAxisActionViewModel.cs
+++ b/StructureHelper/Windows/BeamShears/BeamShearAxisActionViewModel.cs
@@ -1,11 +1,10 @@
using StructureHelper.Infrastructure;
using StructureHelper.Windows.Forces;
+using StructureHelper.Windows.ViewModels.Forces;
using StructureHelperCommon.Models.Forces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
+//Copyright (c) 2025 Redikultsev Evgeny, Ekaterinburg, Russia
+//All rights reserved.
namespace StructureHelper.Windows.BeamShears
{
@@ -13,21 +12,13 @@ namespace StructureHelper.Windows.BeamShears
{
private readonly IBeamShearAxisAction beamShearAxisAction;
- public double SupportShearForce
- {
- get => beamShearAxisAction.SupportShearForce;
- set
- {
- beamShearAxisAction.SupportShearForce = value;
- }
- }
- public FactoredCombinationPropertyVM CombinationProperty { get; }
+ public FactoredForceTupleViewModel SupportForces { get; private set; }
public BeamShearLoadsViewModel ShearLoads { get; }
public BeamShearAxisActionViewModel(IBeamShearAxisAction beamShearAxisAction)
{
this.beamShearAxisAction = beamShearAxisAction;
- CombinationProperty = new(this.beamShearAxisAction.FactoredCombinationProperty);
+ SupportForces = new(this.beamShearAxisAction.SupportForce);
ShearLoads = new(this.beamShearAxisAction.ShearLoads);
}
}
diff --git a/StructureHelper/Windows/BeamShears/BeamShearLoadsViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearLoadsViewModel.cs
index 4baef3f..00b9906 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearLoadsViewModel.cs
+++ b/StructureHelper/Windows/BeamShears/BeamShearLoadsViewModel.cs
@@ -14,10 +14,10 @@ using System.Windows.Forms;
namespace StructureHelper.Windows.BeamShears
{
- public class BeamShearLoadsViewModel : SelectItemVM
+ public class BeamShearLoadsViewModel : SelectItemVM
{
- private IUpdateStrategy updateStrategy;
- public BeamShearLoadsViewModel(List collection) : base(collection)
+ private IUpdateStrategy updateStrategy;
+ public BeamShearLoadsViewModel(List collection) : base(collection)
{
}
public override void AddMethod(object parameter)
@@ -41,7 +41,7 @@ namespace StructureHelper.Windows.BeamShears
{
if (SelectedItem is null) { return; }
Window window;
- IBeamShearLoad temporaryShearLoad = SelectedItem.Clone() as IBeamShearLoad;
+ IBeamSpanLoad temporaryShearLoad = SelectedItem.Clone() as IBeamSpanLoad;
if (SelectedItem is IDistributedLoad distributedLoad)
{
window = new DistributedLoadView(distributedLoad);
diff --git a/StructureHelper/Windows/BeamShears/BeamShearView.xaml b/StructureHelper/Windows/BeamShears/BeamShearView.xaml
index 354594e..dc86b6f 100644
--- a/StructureHelper/Windows/BeamShears/BeamShearView.xaml
+++ b/StructureHelper/Windows/BeamShears/BeamShearView.xaml
@@ -11,9 +11,9 @@
Title="Beam Shear Analysis" Height="450" Width="800" MinHeight="250" MinWidth="400" MaxHeight="1000" MaxWidth="1500" WindowStartupLocation="CenterScreen">
-
+