diff --git a/DataAccess/DTOs/DTOEntities/FactoredCombinationPropertyDTO.cs b/DataAccess/DTOs/DTOEntities/FactoredCombinationPropertyDTO.cs index 8bb4c3b..14dfa9f 100644 --- a/DataAccess/DTOs/DTOEntities/FactoredCombinationPropertyDTO.cs +++ b/DataAccess/DTOs/DTOEntities/FactoredCombinationPropertyDTO.cs @@ -20,5 +20,10 @@ namespace DataAccess.DTOs { Id = id; } + + public object Clone() + { + throw new NotImplementedException(); + } } } diff --git a/DataAccess/DTOs/DTOEntities/Obsolete/ForceCombinationByFactorV1_0DTO.cs b/DataAccess/DTOs/DTOEntities/Obsolete/ForceCombinationByFactorV1_0DTO.cs index c7c3ad6..ed9c753 100644 --- a/DataAccess/DTOs/DTOEntities/Obsolete/ForceCombinationByFactorV1_0DTO.cs +++ b/DataAccess/DTOs/DTOEntities/Obsolete/ForceCombinationByFactorV1_0DTO.cs @@ -35,7 +35,7 @@ namespace DataAccess.DTOs { get { - return new FactoredCombinationProperty() + return new FactoredCombinationProperty(Guid.NewGuid()) { CalcTerm = CalcTerm, LimitState = LimitState, diff --git a/StructureHelper/Infrastructure/UI/Resources/ButtonStyles.xaml b/StructureHelper/Infrastructure/UI/Resources/ButtonStyles.xaml index 0866ea8..c338420 100644 --- a/StructureHelper/Infrastructure/UI/Resources/ButtonStyles.xaml +++ b/StructureHelper/Infrastructure/UI/Resources/ButtonStyles.xaml @@ -615,6 +615,15 @@ + + + + + + + + + diff --git a/StructureHelper/StructureHelper.csproj.user b/StructureHelper/StructureHelper.csproj.user index 39209a9..24ec385 100644 --- a/StructureHelper/StructureHelper.csproj.user +++ b/StructureHelper/StructureHelper.csproj.user @@ -12,9 +12,18 @@ Code + + Code + Code + + Code + + + Code + Code @@ -140,9 +149,18 @@ Designer + + Designer + Designer + + Designer + + + Designer + Designer diff --git a/StructureHelper/Windows/BeamShears/BeamShearActionView.xaml b/StructureHelper/Windows/BeamShears/BeamShearActionView.xaml new file mode 100644 index 0000000..b183f1d --- /dev/null +++ b/StructureHelper/Windows/BeamShears/BeamShearActionView.xaml @@ -0,0 +1,13 @@ + + + + + diff --git a/StructureHelper/Windows/BeamShears/BeamShearActionView.xaml.cs b/StructureHelper/Windows/BeamShears/BeamShearActionView.xaml.cs new file mode 100644 index 0000000..802d29c --- /dev/null +++ b/StructureHelper/Windows/BeamShears/BeamShearActionView.xaml.cs @@ -0,0 +1,27 @@ +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 +{ + /// + /// Interaction logic for BeamShearActionView.xaml + /// + public partial class BeamShearActionView : Window + { + public BeamShearActionView() + { + InitializeComponent(); + } + } +} diff --git a/StructureHelper/Windows/BeamShears/BeamShearActionViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearActionViewModel.cs new file mode 100644 index 0000000..a162469 --- /dev/null +++ b/StructureHelper/Windows/BeamShears/BeamShearActionViewModel.cs @@ -0,0 +1,22 @@ +using StructureHelper.Windows.ViewModels; +using StructureHelperCommon.Models.Forces; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StructureHelper.Windows.BeamShears +{ + public class BeamShearActionViewModel : OkCancelViewModelBase + { + private readonly IBeamShearAction shearAction; + public BeamShearLoadsViewModel ShearLoads { get; private set; } + + public BeamShearActionViewModel(IBeamShearAction shearAction) + { + this.shearAction = shearAction; + ShearLoads = new(this.shearAction.YAxisShearAction.ShearLoads); + } + } +} diff --git a/StructureHelper/Windows/BeamShears/BeamShearCalculatorsViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearCalculatorsViewModel.cs index 53e5b48..c449294 100644 --- a/StructureHelper/Windows/BeamShears/BeamShearCalculatorsViewModel.cs +++ b/StructureHelper/Windows/BeamShears/BeamShearCalculatorsViewModel.cs @@ -1,5 +1,6 @@ using StructureHelper.Infrastructure; using StructureHelper.Infrastructure.Enums; +using StructureHelper.Windows.CalculationWindows.ProgressViews; using StructureHelper.Windows.ViewModels; using StructureHelper.Windows.ViewModels.Errors; using StructureHelperCommon.Infrastructures.Exceptions; @@ -31,7 +32,7 @@ namespace StructureHelper.Windows.BeamShears runCommand = new RelayCommand(param => { RunMethod(param); - } + }, o => SelectedItem != null )); } } @@ -86,6 +87,14 @@ namespace StructureHelper.Windows.BeamShears } private void RunCalculator() { + if (SelectedItem.TraceLogger is not null) + { + SelectedItem.TraceLogger.TraceLoggerEntries.Clear(); + } + else + { + SelectedItem.TraceLogger = new ShiftTraceLogger(); + } if (SelectedItem is IBeamShearCalculator beamShearCalculator) { beamShearCalculator.Run(); @@ -94,6 +103,7 @@ namespace StructureHelper.Windows.BeamShears { throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(SelectedItem)); } + TraceDocumentService.ShowDocument(SelectedItem.TraceLogger.TraceLoggerEntries); } } } diff --git a/StructureHelper/Windows/BeamShears/BeamShearLoadsViewModel.cs b/StructureHelper/Windows/BeamShears/BeamShearLoadsViewModel.cs new file mode 100644 index 0000000..a930bf4 --- /dev/null +++ b/StructureHelper/Windows/BeamShears/BeamShearLoadsViewModel.cs @@ -0,0 +1,31 @@ +using StructureHelper.Windows.ViewModels; +using StructureHelperCommon.Infrastructures.Exceptions; +using StructureHelperCommon.Models.Forces; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StructureHelper.Windows.BeamShears +{ + public class BeamShearLoadsViewModel : SelectItemVM + { + public BeamShearLoadsViewModel(List collection) : base(collection) + { + } + + public override void EditMethod(object parameter) + { + if (SelectedItem is IDistributedLoad distributedLoad) + { + + } + else + { + throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(SelectedItem)); + } + base.EditMethod(parameter); + } + } +} diff --git a/StructureHelper/Windows/BeamShears/BeamShearView.xaml b/StructureHelper/Windows/BeamShears/BeamShearView.xaml index b8274ea..acf97fe 100644 --- a/StructureHelper/Windows/BeamShears/BeamShearView.xaml +++ b/StructureHelper/Windows/BeamShears/BeamShearView.xaml @@ -17,7 +17,7 @@ + DescriptionText="Adds beam shear action"/> @@ -44,7 +44,7 @@ + DescriptionText="Adds uniformly distributed stirrups by value of density"/> @@ -54,25 +54,25 @@ Command="{Binding Add}" CommandParameter="{x:Static enums:StirrupTypes.UniformRebar}"> - + DescriptionText="Adds uniformly distributed stirrups by rebars (step, diameter, strength)"/> - + @@ -80,7 +80,7 @@