diff --git a/DataAccess/DTOs/DTOEntities/NdmCrossSections/ForceCalculatorInputDataDTO.cs b/DataAccess/DTOs/DTOEntities/NdmCrossSections/ForceCalculatorInputDataDTO.cs index 0448737..b99d81d 100644 --- a/DataAccess/DTOs/DTOEntities/NdmCrossSections/ForceCalculatorInputDataDTO.cs +++ b/DataAccess/DTOs/DTOEntities/NdmCrossSections/ForceCalculatorInputDataDTO.cs @@ -24,6 +24,8 @@ namespace DataAccess.DTOs public IAccuracy Accuracy { get; set; } [JsonProperty("CompressedMember")] public ICompressedMember CompressedMember { get; set; } = new CompressedMemberDTO(); + [JsonProperty("CheckStrainLimit")] + public bool CheckStrainLimit { get; set; } = true; public ForceCalculatorInputDataDTO(Guid id) { diff --git a/DataAccess/DataAccess.csproj b/DataAccess/DataAccess.csproj index 4aad7c0..2dd161f 100644 --- a/DataAccess/DataAccess.csproj +++ b/DataAccess/DataAccess.csproj @@ -7,7 +7,7 @@ - + diff --git a/StructureHelper/Documentation/Verification/Materials.shpj b/StructureHelper/Documentation/Verification/Materials.shpj index 56d1163..64de14e 100644 --- a/StructureHelper/Documentation/Verification/Materials.shpj +++ b/StructureHelper/Documentation/Verification/Materials.shpj @@ -2,7 +2,7 @@ "$id": "1", "$type": "RootObject", "FileVersion": { - "Id": "24d6a33c-a189-4b16-9d14-00e18b022698", + "Id": "0e4e721a-1df3-4693-999d-3670b14f7113", "VersionNumber": 1, "SubVersionNumber": 4 }, diff --git a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml index bafcfeb..f31a868 100644 --- a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml +++ b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml @@ -6,10 +6,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - bin\Release\net6.0-windows7.0\win-x64\publish\win-x64\ + bin\Release\publish\win-x64\ FileSystem <_TargetId>Folder - net6.0-windows7.0 + net9.0-windows7.0 win-x64 true false diff --git a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user index e8dd7a8..84cc092 100644 --- a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2025-09-01T13:13:26.2156933Z||;True|2025-09-01T10:22:19.7113160+05:00||;True|2025-07-21T11:22:35.9564230+05:00||;True|2025-01-27T14:32:31.9770658+05:00||;True|2024-12-29T20:48:11.7280613+05:00||;True|2024-12-27T13:24:44.0055462+05:00||;True|2024-11-13T09:16:22.8894163+05:00||;True|2024-08-13T14:00:35.8311260+05:00||;True|2024-08-12T12:59:16.1785759+05:00||;True|2024-03-11T20:33:14.1457807+05:00||;True|2024-03-10T19:11:27.6834663+05:00||;True|2024-02-02T12:22:50.1454015+05:00||;True|2023-02-25T13:37:39.2738786+05:00||;False|2023-02-25T13:37:24.0284261+05:00||;True|2023-02-25T13:34:01.6858860+05:00||;True|2023-02-25T13:31:18.8295711+05:00||;False|2023-02-25T13:25:21.5807199+05:00||;False|2023-02-25T13:24:41.7164398+05:00||; + True|2025-10-08T10:12:30.5384948Z||;False|2025-10-08T15:11:01.2672591+05:00||;True|2025-10-08T09:15:32.2315891+05:00||;False|2025-10-08T09:11:08.2259505+05:00||;False|2025-10-08T09:10:40.2008110+05:00||;False|2025-10-08T09:09:13.4947353+05:00||;True|2025-09-01T18:13:26.2156933+05:00||;True|2025-09-01T10:22:19.7113160+05:00||;True|2025-07-21T11:22:35.9564230+05:00||;True|2025-01-27T14:32:31.9770658+05:00||;True|2024-12-29T20:48:11.7280613+05:00||;True|2024-12-27T13:24:44.0055462+05:00||;True|2024-11-13T09:16:22.8894163+05:00||;True|2024-08-13T14:00:35.8311260+05:00||;True|2024-08-12T12:59:16.1785759+05:00||;True|2024-03-11T20:33:14.1457807+05:00||;True|2024-03-10T19:11:27.6834663+05:00||;True|2024-02-02T12:22:50.1454015+05:00||;True|2023-02-25T13:37:39.2738786+05:00||;False|2023-02-25T13:37:24.0284261+05:00||;True|2023-02-25T13:34:01.6858860+05:00||;True|2023-02-25T13:31:18.8295711+05:00||;False|2023-02-25T13:25:21.5807199+05:00||;False|2023-02-25T13:24:41.7164398+05:00||; \ No newline at end of file diff --git a/StructureHelper/StructureHelper.csproj b/StructureHelper/StructureHelper.csproj index c2a2331..3732ff2 100644 --- a/StructureHelper/StructureHelper.csproj +++ b/StructureHelper/StructureHelper.csproj @@ -68,7 +68,7 @@ - + diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorView.xaml b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorView.xaml index 8c2867c..070acf7 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorView.xaml +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceCalculatorView.xaml @@ -7,7 +7,7 @@ xmlns:vm="clr-namespace:StructureHelper.Windows.ViewModels.Calculations.Calculators" d:DataContext="{d:DesignInstance vm:ForceCalculatorViewModel}" mc:Ignorable="d" - Title="Analysis by forces" Height="300" Width="400" MinHeight="300" MinWidth="400" WindowStartupLocation="CenterScreen" Closing="Window_Closing"> + Title="Analysis by forces" Height="350" Width="400" MinHeight="350" MinWidth="400" WindowStartupLocation="CenterScreen" Closing="Window_Closing">