diff --git a/DataAccess/DTOs/Converters/BeamShears/HasStirrupsFromDTOUpdateStrategy.cs b/DataAccess/DTOs/Converters/BeamShears/HasStirrupsFromDTOUpdateStrategy.cs index c184f4a..32f2fe6 100644 --- a/DataAccess/DTOs/Converters/BeamShears/HasStirrupsFromDTOUpdateStrategy.cs +++ b/DataAccess/DTOs/Converters/BeamShears/HasStirrupsFromDTOUpdateStrategy.cs @@ -1,6 +1,7 @@ using StructureHelperCommon.Infrastructures.Exceptions; using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Models; +using StructureHelperCommon.Models.VisualProperties; using StructureHelperCommon.Services; using StructureHelperLogics.Models.BeamShears; @@ -10,6 +11,7 @@ namespace DataAccess.DTOs { private Dictionary<(Guid id, Type type), ISaveable> referenceDictionary; private IShiftTraceLogger traceLogger; + private IUpdateStrategy visualUpdateStrategy; public HasStirrupsFromDTOUpdateStrategy(Dictionary<(Guid id, Type type), ISaveable> referenceDictionary, IShiftTraceLogger traceLogger) { @@ -63,7 +65,8 @@ namespace DataAccess.DTOs { throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(stirrup)); } - + visualUpdateStrategy = new HasVisualPropertyFromDTOUpdateStrategy(referenceDictionary, traceLogger); + visualUpdateStrategy.Update(newItem, stirrup); return newItem; } diff --git a/DataAccess/DTOs/Converters/BeamShears/HasStirrupsToDTOUpdateStrategy.cs b/DataAccess/DTOs/Converters/BeamShears/HasStirrupsToDTOUpdateStrategy.cs index cdbc9d8..a6f10c5 100644 --- a/DataAccess/DTOs/Converters/BeamShears/HasStirrupsToDTOUpdateStrategy.cs +++ b/DataAccess/DTOs/Converters/BeamShears/HasStirrupsToDTOUpdateStrategy.cs @@ -1,6 +1,7 @@ using StructureHelperCommon.Infrastructures.Exceptions; using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Models; +using StructureHelperCommon.Models.VisualProperties; using StructureHelperCommon.Services; using StructureHelperLogics.Models.BeamShears; @@ -10,6 +11,7 @@ namespace DataAccess.DTOs { private Dictionary<(Guid id, Type type), ISaveable> referenceDictionary; private IShiftTraceLogger traceLogger; + private IUpdateStrategy visualUpdateStrategy; public HasStirrupsToDTOUpdateStrategy(Dictionary<(Guid id, Type type), ISaveable> referenceDictionary, IShiftTraceLogger traceLogger) { @@ -64,6 +66,8 @@ namespace DataAccess.DTOs { throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(stirrup)); } + visualUpdateStrategy = new HasVisualPropertyToDTOUpdateStrategy(referenceDictionary, traceLogger); + visualUpdateStrategy.Update(newItem, stirrup); return newItem; } diff --git a/DataAccess/DTOs/Converters/BeamShears/StirrupByInclinedRebarToDTOConvertStrategy.cs b/DataAccess/DTOs/Converters/BeamShears/StirrupByInclinedRebarToDTOConvertStrategy.cs index dfdf3b7..98570aa 100644 --- a/DataAccess/DTOs/Converters/BeamShears/StirrupByInclinedRebarToDTOConvertStrategy.cs +++ b/DataAccess/DTOs/Converters/BeamShears/StirrupByInclinedRebarToDTOConvertStrategy.cs @@ -1,5 +1,6 @@ using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Models; +using StructureHelperCommon.Models.VisualProperties; using StructureHelperLogics.Models.BeamShears; using StructureHelperLogics.Models.Materials; using System; @@ -14,6 +15,7 @@ namespace DataAccess.DTOs { private IUpdateStrategy updateStrategy; private IConvertStrategy rebarConvertStrategy; + public StirrupByInclinedRebarToDTOConvertStrategy(Dictionary<(Guid id, Type type), ISaveable> referenceDictionary, IShiftTraceLogger traceLogger) : base(referenceDictionary, traceLogger) { diff --git a/DataAccess/DTOs/Converters/BeamShears/StirrupGroupToDTOConvertStrategy.cs b/DataAccess/DTOs/Converters/BeamShears/StirrupGroupToDTOConvertStrategy.cs index 46ba207..e53c85a 100644 --- a/DataAccess/DTOs/Converters/BeamShears/StirrupGroupToDTOConvertStrategy.cs +++ b/DataAccess/DTOs/Converters/BeamShears/StirrupGroupToDTOConvertStrategy.cs @@ -1,5 +1,6 @@ using StructureHelperCommon.Infrastructures.Interfaces; using StructureHelperCommon.Models; +using StructureHelperCommon.Models.VisualProperties; using StructureHelperLogics.Models.BeamShears; using StructureHelperLogics.Models.BeamShears.Logics; using System; @@ -15,6 +16,7 @@ namespace DataAccess.DTOs private IUpdateStrategy updateStrategy; private IUpdateStrategy stirrupUpdateStrategy; + public StirrupGroupToDTOConvertStrategy( Dictionary<(Guid id, Type type), ISaveable> referenceDictionary, IShiftTraceLogger traceLogger) @@ -34,7 +36,7 @@ namespace DataAccess.DTOs private void InitializeStrategies() { - updateStrategy ??= new StirrupGroupUpdateStrategy(); + updateStrategy ??= new StirrupGroupUpdateStrategy() { UpdateChildren = false}; stirrupUpdateStrategy ??= new HasStirrupsToDTOUpdateStrategy(ReferenceDictionary, TraceLogger); } } diff --git a/DataAccess/DTOs/Converters/HasVisualPropertyFromDTOUpdateStrategy.cs b/DataAccess/DTOs/Converters/HasVisualPropertyFromDTOUpdateStrategy.cs new file mode 100644 index 0000000..37c180f --- /dev/null +++ b/DataAccess/DTOs/Converters/HasVisualPropertyFromDTOUpdateStrategy.cs @@ -0,0 +1,37 @@ +using StructureHelperCommon.Infrastructures.Exceptions; +using StructureHelperCommon.Infrastructures.Interfaces; +using StructureHelperCommon.Models; +using StructureHelperCommon.Models.VisualProperties; +using StructureHelperCommon.Services; + +namespace DataAccess.DTOs +{ + public class HasVisualPropertyFromDTOUpdateStrategy : IUpdateStrategy + { + private Dictionary<(Guid id, Type type), ISaveable> referenceDictionary; + private IShiftTraceLogger traceLogger; + private IConvertStrategy convertStrategy; + + public HasVisualPropertyFromDTOUpdateStrategy(Dictionary<(Guid id, Type type), ISaveable> referenceDictionary, IShiftTraceLogger traceLogger) + { + this.referenceDictionary = referenceDictionary; + this.traceLogger = traceLogger; + } + + public void Update(IHasVisualProperty targetObject, IHasVisualProperty sourceObject) + { + CheckObject.IsNull(targetObject); + CheckObject.IsNull(sourceObject); + if (ReferenceEquals(targetObject, sourceObject)) { return; } + convertStrategy = new DictionaryConvertStrategy( + referenceDictionary, + traceLogger, + new PrimitiveVisualPropertyFromDTOConvertStrategy(referenceDictionary, traceLogger)); + if (sourceObject.VisualProperty is not PrimitiveVisualPropertyDTO visualProperty) + { + throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(sourceObject.VisualProperty)); + } + targetObject.VisualProperty = convertStrategy.Convert(visualProperty); + } + } +} diff --git a/DataAccess/DTOs/Converters/HasVisualPropertyToDTOUpdateStrategy.cs b/DataAccess/DTOs/Converters/HasVisualPropertyToDTOUpdateStrategy.cs new file mode 100644 index 0000000..663d320 --- /dev/null +++ b/DataAccess/DTOs/Converters/HasVisualPropertyToDTOUpdateStrategy.cs @@ -0,0 +1,32 @@ +using StructureHelperCommon.Infrastructures.Interfaces; +using StructureHelperCommon.Models; +using StructureHelperCommon.Models.VisualProperties; +using StructureHelperCommon.Services; + +namespace DataAccess.DTOs +{ + public class HasVisualPropertyToDTOUpdateStrategy : IUpdateStrategy + { + private Dictionary<(Guid id, Type type), ISaveable> referenceDictionary; + private IShiftTraceLogger traceLogger; + private IConvertStrategy convertStrategy; + + public HasVisualPropertyToDTOUpdateStrategy(Dictionary<(Guid id, Type type), ISaveable> referenceDictionary, IShiftTraceLogger traceLogger) + { + this.referenceDictionary = referenceDictionary; + this.traceLogger = traceLogger; + } + + public void Update(IHasVisualProperty targetObject, IHasVisualProperty sourceObject) + { + CheckObject.IsNull(targetObject); + CheckObject.IsNull(sourceObject); + if (ReferenceEquals(targetObject, sourceObject)) { return; } + convertStrategy = new DictionaryConvertStrategy( + referenceDictionary, + traceLogger, + new PrimitiveVisualPropertyToDTOConvertStrategy(referenceDictionary, traceLogger)); + targetObject.VisualProperty = convertStrategy.Convert(sourceObject.VisualProperty); + } + } +} diff --git a/DataAccess/DTOs/Converters/PrimitiveVisualPropertyFromDTOConvertStrategy.cs b/DataAccess/DTOs/Converters/PrimitiveVisualPropertyFromDTOConvertStrategy.cs new file mode 100644 index 0000000..e97ad9f --- /dev/null +++ b/DataAccess/DTOs/Converters/PrimitiveVisualPropertyFromDTOConvertStrategy.cs @@ -0,0 +1,23 @@ +using StructureHelperCommon.Infrastructures.Interfaces; +using StructureHelperCommon.Models; +using StructureHelperCommon.Models.VisualProperties; + +namespace DataAccess.DTOs +{ + internal class PrimitiveVisualPropertyFromDTOConvertStrategy : ConvertStrategy + { + private IUpdateStrategy _updateStrategy; + + public PrimitiveVisualPropertyFromDTOConvertStrategy(Dictionary<(Guid id, Type type), ISaveable> referenceDictionary, IShiftTraceLogger traceLogger) : base(referenceDictionary, traceLogger) + { + } + + public override PrimitiveVisualProperty GetNewItem(PrimitiveVisualPropertyDTO source) + { + _updateStrategy ??= new PrimitiveVisualPropertyUpdateStrategy(); + ChildClass = this; + NewItem = new(source.Id); + return NewItem; + } + } +} diff --git a/DataAccess/DTOs/Converters/PrimitiveVisualPropertyToDTOConvertStrategy.cs b/DataAccess/DTOs/Converters/PrimitiveVisualPropertyToDTOConvertStrategy.cs new file mode 100644 index 0000000..3c912b1 --- /dev/null +++ b/DataAccess/DTOs/Converters/PrimitiveVisualPropertyToDTOConvertStrategy.cs @@ -0,0 +1,25 @@ +using StructureHelperCommon.Infrastructures.Interfaces; +using StructureHelperCommon.Models; +using StructureHelperCommon.Models.VisualProperties; + +namespace DataAccess.DTOs +{ + public class PrimitiveVisualPropertyToDTOConvertStrategy : ConvertStrategy + { + private IUpdateStrategy _updateStrategy; + + public PrimitiveVisualPropertyToDTOConvertStrategy( + Dictionary<(Guid id, Type type), ISaveable> referenceDictionary, + IShiftTraceLogger traceLogger) : base(referenceDictionary, traceLogger) + { + } + + public override PrimitiveVisualPropertyDTO GetNewItem(IPrimitiveVisualProperty source) + { + _updateStrategy ??= new PrimitiveVisualPropertyUpdateStrategy(); + ChildClass = this; + NewItem = new(source.Id); + return NewItem; + } + } +} diff --git a/DataAccess/DTOs/Converters/ShapeFromDTOConvertStrategy.cs b/DataAccess/DTOs/Converters/ShapeFromDTOConvertStrategy.cs index 3023148..df50109 100644 --- a/DataAccess/DTOs/Converters/ShapeFromDTOConvertStrategy.cs +++ b/DataAccess/DTOs/Converters/ShapeFromDTOConvertStrategy.cs @@ -22,7 +22,7 @@ namespace DataAccess.DTOs (this, new RectangleShapeFromDTOConvertStrategy(this)); NewItem = rectangleConvertStrategy.Convert(rectangleShapeDTO); } - if (source is CircleShapeDTO circleShapeDTO) + else if (source is CircleShapeDTO circleShapeDTO) { circleConvertStrategy ??= new DictionaryConvertStrategy (this, new CircleShapeFromDTOConvertStrategy(this)); diff --git a/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByDensityDTO.cs b/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByDensityDTO.cs index 18a4d36..22ad14a 100644 --- a/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByDensityDTO.cs +++ b/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByDensityDTO.cs @@ -1,5 +1,7 @@ using Newtonsoft.Json; +using StructureHelperCommon.Models.VisualProperties; using StructureHelperLogics.Models.BeamShears; +using System.Windows.Media; namespace DataAccess.DTOs { @@ -10,13 +12,23 @@ namespace DataAccess.DTOs [JsonProperty("Name")] public string? Name { get; set; } = string.Empty; [JsonProperty("StirrupDensity")] - public double StirrupDensity { get; set; } + public double StirrupDensity { get; set; } = 30000; [JsonProperty("CompressedGap")] - public double CompressedGap { get; set; } + public double CompressedGap { get; set; } = 0; + [JsonProperty("StartCoordinate")] + public double StartCoordinate { get; set; } = 0; + [JsonProperty("EndCoordinate")] + public double EndCoordinate { get; set; } = 100; + [JsonProperty("VisualProperty")] + public IPrimitiveVisualProperty VisualProperty { get; set; } public StirrupByDensityDTO(Guid id) { Id = id; + VisualProperty = new PrimitiveVisualPropertyDTO(Guid.NewGuid()) + { + Color = (Color)ColorConverter.ConvertFromString("Black") + }; } public object Clone() diff --git a/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByInclinedRebarDTO.cs b/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByInclinedRebarDTO.cs index aa846d0..9c5b320 100644 --- a/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByInclinedRebarDTO.cs +++ b/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByInclinedRebarDTO.cs @@ -1,6 +1,8 @@ using Newtonsoft.Json; +using StructureHelperCommon.Models.VisualProperties; using StructureHelperLogics.Models.BeamShears; using StructureHelperLogics.Models.Materials; +using System.Windows.Media; namespace DataAccess.DTOs { @@ -22,11 +24,16 @@ namespace DataAccess.DTOs public double LegCount { get; set; } [JsonProperty("RebarSection")] public IRebarSection RebarSection { get; set; } - + [JsonProperty("VisualProperty")] + public IPrimitiveVisualProperty VisualProperty { get; set; } public StirrupByInclinedRebarDTO(Guid id) { Id = id; + VisualProperty = new PrimitiveVisualPropertyDTO(Guid.NewGuid()) + { + Color = (Color)ColorConverter.ConvertFromString("Black") + }; } public object Clone() diff --git a/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByRebarDTO.cs b/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByRebarDTO.cs index cd80a0c..1501b39 100644 --- a/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByRebarDTO.cs +++ b/DataAccess/DTOs/DTOEntities/BeamShears/StirrupByRebarDTO.cs @@ -1,6 +1,8 @@ using Newtonsoft.Json; +using StructureHelperCommon.Models.VisualProperties; using StructureHelperLogics.Models.BeamShears; using StructureHelperLogics.Models.Materials; +using System.Windows.Media; namespace DataAccess.DTOs { @@ -9,23 +11,33 @@ namespace DataAccess.DTOs [JsonProperty("Id")] public Guid Id { get; } [JsonProperty("Name")] - public string? Name { get; set; } + public string? Name { get; set; } = string.Empty; [JsonProperty("LegCount")] - public double LegCount { get; set; } + public double LegCount { get; set; } = 2; [JsonProperty("Diameter")] - public double Diameter { get; set; } + public double Diameter { get; set; } = 0.008; [JsonProperty("Material")] public IReinforcementLibMaterial Material { get; set; } [JsonProperty("Spacing")] - public double Spacing { get; set; } + public double Spacing { get; set; } = 0.1; [JsonProperty("CompressedGap")] - public double CompressedGap { get; set; } + public double CompressedGap { get; set; } = 0; [JsonProperty("IsSpiral")] public bool IsSpiral { get; set; } = false; + [JsonProperty("StartCoordinate")] + public double StartCoordinate { get; set; } = 0; + [JsonProperty("EndCoordinate")] + public double EndCoordinate { get; set; } = 100; + [JsonProperty("VisualProperty")] + public IPrimitiveVisualProperty VisualProperty { get; set; } public StirrupByRebarDTO(Guid id) { Id = id; + VisualProperty = new PrimitiveVisualPropertyDTO(Guid.NewGuid()) + { + Color = (Color)ColorConverter.ConvertFromString("Black") + }; } public object Clone() diff --git a/DataAccess/DTOs/DTOEntities/BeamShears/StirrupGroupDTO.cs b/DataAccess/DTOs/DTOEntities/BeamShears/StirrupGroupDTO.cs index dba7c39..128b466 100644 --- a/DataAccess/DTOs/DTOEntities/BeamShears/StirrupGroupDTO.cs +++ b/DataAccess/DTOs/DTOEntities/BeamShears/StirrupGroupDTO.cs @@ -1,5 +1,8 @@ using Newtonsoft.Json; +using StructureHelperCommon.Models.VisualProperties; using StructureHelperLogics.Models.BeamShears; +using StructureHelperLogics.NdmCalculations.Primitives; +using System.Windows.Media; namespace DataAccess.DTOs { @@ -8,20 +11,27 @@ namespace DataAccess.DTOs [JsonProperty("Id")] public Guid Id { get; } [JsonProperty("Name")] - public string? Name { get; set; } + public string? Name { get; set; } = string.Empty; [JsonProperty("CompressedGap")] - public double CompressedGap { get; set; } + public double CompressedGap { get; set; } = 0; [JsonProperty("Stirrups")] public List Stirrups { get; } = new(); + [JsonProperty("VisualProperty")] + public IPrimitiveVisualProperty VisualProperty { get; set; } + public StirrupGroupDTO(Guid id) { Id = id; + VisualProperty = new PrimitiveVisualPropertyDTO(Guid.NewGuid()) + { + Color = (Color)ColorConverter.ConvertFromString("Black") + }; } public object Clone() { - throw new NotImplementedException(); + return this; } } } diff --git a/DataAccess/DTOs/DTOEntities/PrimitiveVisualPropertyDTO.cs b/DataAccess/DTOs/DTOEntities/PrimitiveVisualPropertyDTO.cs new file mode 100644 index 0000000..5acaf92 --- /dev/null +++ b/DataAccess/DTOs/DTOEntities/PrimitiveVisualPropertyDTO.cs @@ -0,0 +1,32 @@ +using Newtonsoft.Json; +using StructureHelperCommon.Models.VisualProperties; +using StructureHelperCommon.Services.ColorServices; +using System.Windows.Media; + +namespace DataAccess.DTOs +{ + public class PrimitiveVisualPropertyDTO : IPrimitiveVisualProperty + { + [JsonProperty("Id")] + public Guid Id { get; } + [JsonProperty("IsVisible")] + public bool IsVisible { get; set; } = true; + [JsonProperty("Color")] + public Color Color { get; set; } = ColorProcessor.GetRandomColor(); + [JsonProperty("Zindex")] + public int ZIndex { get; set; } = 0; + [JsonProperty("Opacity")] + public double Opacity { get; set; } = 1; + + + public PrimitiveVisualPropertyDTO(Guid id) + { + Id = id; + } + + public object Clone() + { + return this; + } + } +} diff --git a/DataAccess/DTOs/DTOEntities/TypeBinderListFactory.cs b/DataAccess/DTOs/DTOEntities/TypeBinderListFactory.cs index e7224ca..d93c2b8 100644 --- a/DataAccess/DTOs/DTOEntities/TypeBinderListFactory.cs +++ b/DataAccess/DTOs/DTOEntities/TypeBinderListFactory.cs @@ -74,6 +74,7 @@ namespace DataAccess.DTOs { (typeof(List), "ListOfIVisualAnalysis") }, { (typeof(Point2DDTO), "Point2D") }, { (typeof(PointNdmPrimitiveDTO), "PointNdmPrimitive") }, + { (typeof(PrimitiveVisualPropertyDTO), "PrimitiveVisualProperty") }, { (typeof(ProjectDTO), "Project") }, { (typeof(RebarNdmPrimitiveDTO), "RebarNdmPrimitive") }, { (typeof(RebarSectionDTO), "RebarSection") }, diff --git a/DataAccess/DTOs/DTOEntities/VisualPropertyDTO.cs b/DataAccess/DTOs/DTOEntities/VisualPropertyDTO.cs index 320fdad..77b91cd 100644 --- a/DataAccess/DTOs/DTOEntities/VisualPropertyDTO.cs +++ b/DataAccess/DTOs/DTOEntities/VisualPropertyDTO.cs @@ -1,10 +1,5 @@ using Newtonsoft.Json; using StructureHelperLogics.NdmCalculations.Primitives; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Media; namespace DataAccess.DTOs @@ -24,5 +19,9 @@ namespace DataAccess.DTOs [JsonProperty("Opacity")] public double Opacity { get; set; } + public object Clone() + { + throw new NotImplementedException(); + } } } diff --git a/StructureHelper/Documentation/Manuals/Руководство пользователя.docx b/StructureHelper/Documentation/Manuals/Руководство пользователя.docx index a5706e5..b148c7d 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 25e9474..8f94f98 100644 --- a/StructureHelper/Properties/AssemblyInfo.cs +++ b/StructureHelper/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows; // Можно задать все значения или принять номера сборки и редакции по умолчанию // используя "*", как показано ниже: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2025.06.23.01")] -[assembly: AssemblyFileVersion("2025.06.23.01")] +[assembly: AssemblyVersion("2025.07.23.01")] +[assembly: AssemblyFileVersion("2025.07.23.01")] diff --git a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user index 7ad803f..58d96ec 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-01-27T09:32:31.9770658Z||;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-07-21T06:22:35.9564230Z||;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 a976cd8..684d0cc 100644 --- a/StructureHelper/StructureHelper.csproj +++ b/StructureHelper/StructureHelper.csproj @@ -8,7 +8,7 @@ true disable 7.0 - false + False Infrastructure\UI\Icons\SH_лого_16.ico diff --git a/StructureHelper/StructureHelper.csproj.user b/StructureHelper/StructureHelper.csproj.user index 32ecc72..9769907 100644 --- a/StructureHelper/StructureHelper.csproj.user +++ b/StructureHelper/StructureHelper.csproj.user @@ -1,7 +1,7 @@  - <_LastSelectedProfileId>D:\Repos\StructureHelper\StructureHelper\Properties\PublishProfiles\FolderProfile.pubxml + <_LastSelectedProfileId>C:\Repos\StructureHelper\StructureHelper\Properties\PublishProfiles\FolderProfile.pubxml diff --git a/StructureHelper/Windows/BeamShears/BeamShearView.xaml b/StructureHelper/Windows/BeamShears/BeamShearView.xaml index 809838d..ac41fe5 100644 --- a/StructureHelper/Windows/BeamShears/BeamShearView.xaml +++ b/StructureHelper/Windows/BeamShears/BeamShearView.xaml @@ -51,9 +51,7 @@ -