From 4e882f2f03614148b7a79c03a5b0180cf0c67ea0 Mon Sep 17 00:00:00 2001 From: BroPlasmaNinja Date: Wed, 24 Apr 2024 11:50:42 +0400 Subject: [PATCH] some fix --- .../ProjectLiner/DesignTimeBuild/.dtbcache.v2 | Bin 97435 -> 97436 bytes .../.vs/ProjectLiner/v17/DocumentLayout.json | 107 +++++++----------- ProjectLiner/ProjectLiner/DrawingLiner.cs | 6 +- 3 files changed, 46 insertions(+), 67 deletions(-) diff --git a/ProjectLiner/.vs/ProjectLiner/DesignTimeBuild/.dtbcache.v2 b/ProjectLiner/.vs/ProjectLiner/DesignTimeBuild/.dtbcache.v2 index b7b953026f9f13478fe05d78dcf294edf8782914..8e33a06f4830c6e783b8e92b3dd1506f40ccc89c 100644 GIT binary patch delta 87 zcmV~$yA^;S3;@8VK6Y@7Aml^m2(BO@EMesaSnCA#4rXcR-TAreb8VTE3KLHRLWpMM pvt;u?Q5mqH#Fcd-s|a3Fp(wr-P8_OH%BXs@ap(i=_j7me_5+W08rlE= delta 86 zcmV~$u@QhE3;@8>J9cmk1Brpo5nLgGxP+A(V67WaJD4S%|4(;!cXeA?h;ae2ERZl3 oL@>@GY`YO@M)NVEq@cwZefAVsifTllSplv(jYBxw+lKG>0lEPjmH+?% diff --git a/ProjectLiner/.vs/ProjectLiner/v17/DocumentLayout.json b/ProjectLiner/.vs/ProjectLiner/v17/DocumentLayout.json index 3e56bea..013a8a0 100644 --- a/ProjectLiner/.vs/ProjectLiner/v17/DocumentLayout.json +++ b/ProjectLiner/.vs/ProjectLiner/v17/DocumentLayout.json @@ -6,25 +6,21 @@ "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\drawingliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\drawingliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\formliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\formliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\entityliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\entityliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\formliner.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\formliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\formliner.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\projectliner\\formliner.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\formliner.designer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|c:\\somegitstuff\\isebd-11_khatypov_k.r_fundamental\\projectliner\\projectliner\\directiontype.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\directiontype.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\projectliner\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7FB62E78-175F-490A-B5F2-2FF676947033}|ProjectLiner\\ProjectLiner.csproj|solutionrelative:projectliner\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -34,58 +30,19 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 4, + "SelectedChildIndex": 1, "Children": [ { "$type": "Document", "DocumentIndex": 1, - "Title": "FormLiner.cs", - "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.cs", - "RelativeDocumentMoniker": "ProjectLiner\\FormLiner.cs", - "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.cs", - "RelativeToolTip": "ProjectLiner\\FormLiner.cs", - "ViewState": "AQIAAA8AAAAAAAAAAIA0wBcAAAAHAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-20T11:09:29.961Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 4, - "Title": "FormLiner.Designer.cs", - "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.Designer.cs", - "RelativeDocumentMoniker": "ProjectLiner\\FormLiner.Designer.cs", - "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.Designer.cs", - "RelativeToolTip": "ProjectLiner\\FormLiner.Designer.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-20T11:09:26.829Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 2, - "Title": "Program.cs", - "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\Program.cs", - "RelativeDocumentMoniker": "ProjectLiner\\Program.cs", - "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\Program.cs", - "RelativeToolTip": "ProjectLiner\\Program.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-20T11:09:23.139Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 3, "Title": "EntityLiner.cs", "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\EntityLiner.cs", "RelativeDocumentMoniker": "ProjectLiner\\EntityLiner.cs", "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\EntityLiner.cs", "RelativeToolTip": "ProjectLiner\\EntityLiner.cs", - "ViewState": "AQIAACEAAAAAAAAAAAAowAAAAAAAAAAA", + "ViewState": "AQIAAA0AAAAAAAAAAAAQwB8AAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-20T11:09:21.909Z", + "WhenOpened": "2024-04-24T07:40:21.618Z", "EditorCaption": "" }, { @@ -96,23 +53,47 @@ "RelativeDocumentMoniker": "ProjectLiner\\DrawingLiner.cs", "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\DrawingLiner.cs", "RelativeToolTip": "ProjectLiner\\DrawingLiner.cs", - "ViewState": "AQIAAG8AAAAAAAAAAAAqwHoAAAAKAAAA", + "ViewState": "AQIAAFAAAAAAAAAAAAAgwGEAAABpAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-20T11:09:20.684Z", + "WhenOpened": "2024-04-24T07:37:52.748Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, - "Title": "DirectionType.cs", - "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\DirectionType.cs", - "RelativeDocumentMoniker": "ProjectLiner\\DirectionType.cs", - "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\DirectionType.cs", - "RelativeToolTip": "ProjectLiner\\DirectionType.cs", + "DocumentIndex": 3, + "Title": "FormLiner.Designer.cs", + "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.Designer.cs", + "RelativeDocumentMoniker": "ProjectLiner\\FormLiner.Designer.cs", + "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.Designer.cs", + "RelativeToolTip": "ProjectLiner\\FormLiner.Designer.cs", + "ViewState": "AQIAACoAAAAAAAAAAAAewDMAAAAhAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-24T06:50:50.101Z" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "FormLiner.cs", + "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.cs", + "RelativeDocumentMoniker": "ProjectLiner\\FormLiner.cs", + "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\FormLiner.cs", + "RelativeToolTip": "ProjectLiner\\FormLiner.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAFwAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-24T06:44:12.266Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Program.cs", + "DocumentMoniker": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\Program.cs", + "RelativeDocumentMoniker": "ProjectLiner\\Program.cs", + "ToolTip": "C:\\SomeGitStuff\\ISEbd-11_Khatypov_K.R_fundamental\\ProjectLiner\\ProjectLiner\\Program.cs", + "RelativeToolTip": "ProjectLiner\\Program.cs", "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-20T11:09:18.889Z", - "EditorCaption": "" + "WhenOpened": "2024-04-23T15:50:13.098Z" } ] } diff --git a/ProjectLiner/ProjectLiner/DrawingLiner.cs b/ProjectLiner/ProjectLiner/DrawingLiner.cs index 8497562..00dee3f 100644 --- a/ProjectLiner/ProjectLiner/DrawingLiner.cs +++ b/ProjectLiner/ProjectLiner/DrawingLiner.cs @@ -95,8 +95,8 @@ public class DrawningLiner return; } - _startPosX = _pictureWidth - _drawingLinerWidth < x ? _pictureWidth - _drawingLinerWidth : x; - _startPosY = _pictureHeight - _drawingLinerHeight < y ? _pictureHeight - _drawingLinerHeight : y; + _startPosX = _pictureWidth - _drawingLinerWidth < x ? _pictureWidth - _drawingLinerWidth : x < 0 ?0:x ; + _startPosY = _pictureHeight - _drawingLinerHeight < y ? _pictureHeight - _drawingLinerHeight : y<0? 0: y; } /// @@ -175,8 +175,6 @@ public class DrawningLiner Brush mainBrush = new SolidBrush(EntityLiner.BodyColor); Brush additionalBrush = new SolidBrush(EntityLiner.AdditionalColor); - g.DrawRectangle(pen, new(_startPosX.Value, _startPosY.Value, 80, 60)); - //Рисуем тело g.FillPolygon(mainBrush, new Point[] { new(_startPosX.Value+0, _startPosY.Value + 30),