diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 69e23bd..d85a223 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/KursiveWork/.vs/KursiveWork/DesignTimeBuild/.dtbcache.v2 b/KursiveWork/.vs/KursiveWork/DesignTimeBuild/.dtbcache.v2 index e1129d1..4e93fa9 100644 Binary files a/KursiveWork/.vs/KursiveWork/DesignTimeBuild/.dtbcache.v2 and b/KursiveWork/.vs/KursiveWork/DesignTimeBuild/.dtbcache.v2 differ diff --git a/KursiveWork/.vs/KursiveWork/FileContentIndex/87002207-cafc-47cf-92e2-4ee2be04e2b4.vsidx b/KursiveWork/.vs/KursiveWork/FileContentIndex/87002207-cafc-47cf-92e2-4ee2be04e2b4.vsidx deleted file mode 100644 index 475737c..0000000 Binary files a/KursiveWork/.vs/KursiveWork/FileContentIndex/87002207-cafc-47cf-92e2-4ee2be04e2b4.vsidx and /dev/null differ diff --git a/KursiveWork/.vs/KursiveWork/FileContentIndex/e30f50aa-a41c-4a74-81bb-0c68bfb5b09c.vsidx b/KursiveWork/.vs/KursiveWork/FileContentIndex/e30f50aa-a41c-4a74-81bb-0c68bfb5b09c.vsidx new file mode 100644 index 0000000..e0971c1 Binary files /dev/null and b/KursiveWork/.vs/KursiveWork/FileContentIndex/e30f50aa-a41c-4a74-81bb-0c68bfb5b09c.vsidx differ diff --git a/KursiveWork/.vs/KursiveWork/FileContentIndex/b5a28f5c-5b21-4c7a-95a8-6946fcb904ff.vsidx b/KursiveWork/.vs/KursiveWork/FileContentIndex/e707e435-8a87-4a9e-86a6-d7def1e35615.vsidx similarity index 100% rename from KursiveWork/.vs/KursiveWork/FileContentIndex/b5a28f5c-5b21-4c7a-95a8-6946fcb904ff.vsidx rename to KursiveWork/.vs/KursiveWork/FileContentIndex/e707e435-8a87-4a9e-86a6-d7def1e35615.vsidx diff --git a/KursiveWork/.vs/KursiveWork/v17/.futdcache.v2 b/KursiveWork/.vs/KursiveWork/v17/.futdcache.v2 index 501542e..38cf1ca 100644 Binary files a/KursiveWork/.vs/KursiveWork/v17/.futdcache.v2 and b/KursiveWork/.vs/KursiveWork/v17/.futdcache.v2 differ diff --git a/KursiveWork/.vs/KursiveWork/v17/.suo b/KursiveWork/.vs/KursiveWork/v17/.suo index 0caf877..fa9b1c1 100644 Binary files a/KursiveWork/.vs/KursiveWork/v17/.suo and b/KursiveWork/.vs/KursiveWork/v17/.suo differ diff --git a/KursiveWork/.vs/ProjectEvaluation/kursivework.metadata.v7.bin b/KursiveWork/.vs/ProjectEvaluation/kursivework.metadata.v7.bin index 4189303..0bf42db 100644 Binary files a/KursiveWork/.vs/ProjectEvaluation/kursivework.metadata.v7.bin and b/KursiveWork/.vs/ProjectEvaluation/kursivework.metadata.v7.bin differ diff --git a/KursiveWork/.vs/ProjectEvaluation/kursivework.projects.v7.bin b/KursiveWork/.vs/ProjectEvaluation/kursivework.projects.v7.bin index 913081e..2e3518f 100644 Binary files a/KursiveWork/.vs/ProjectEvaluation/kursivework.projects.v7.bin and b/KursiveWork/.vs/ProjectEvaluation/kursivework.projects.v7.bin differ diff --git a/KursiveWork/KursiveWork/LinkedListVisualizer.cs b/KursiveWork/KursiveWork/LinkedListVisualizer.cs index ae34fce..fb88969 100644 --- a/KursiveWork/KursiveWork/LinkedListVisualizer.cs +++ b/KursiveWork/KursiveWork/LinkedListVisualizer.cs @@ -2,6 +2,8 @@ using static LinkedList; using System; using System.Drawing; +using static System.Runtime.InteropServices.JavaScript.JSType; +using System.Windows.Forms; namespace KursiveWork; // Класс-визуализатор состояния списка @@ -16,7 +18,7 @@ public class LinkedListVisualizer { // Определение размера изображения int width = NodeWidth * 10 + NodeSpacing * 9; - int height = NodeHeight + 20; + int height = NodeHeight + 200; Bitmap bitmap = new Bitmap(width, height); using (Graphics g = Graphics.FromImage(bitmap)) { @@ -40,6 +42,12 @@ public class LinkedListVisualizer g.FillEllipse(Brushes.LightBlue, x, 10, NodeWidth, NodeHeight); g.DrawString(current.Data.ToString(), new Font("Arial", 12), Brushes.Black, new Point(x + NodeWidth / 2 - 5, 15)); + + VisualizeAdd(x); + + + + // Рисование стрелки if (current.Next != null) { @@ -65,15 +73,20 @@ public class LinkedListVisualizer } if (current == null) { - //g.DrawLine(Pens.Black, x + NodeWidth - 50, 25, x + NodeWidth + NodeSpacing - 50, 25); - //g.DrawPolygon(Pens.Black, new Point[] { - // new Point(x + NodeWidth + NodeSpacing - 50, 25), - // new Point(x + NodeWidth + NodeSpacing - 55, 20), - // new Point(x + NodeWidth + NodeSpacing - 55, 30) - // }); g.DrawString("NULL", new Font("Arial", 12), Brushes.Black, new Point(x + NodeWidth / 2 - 15, 15)); } } return bitmap; } + public void VisualizeAdd(int Number) + { + int width = NodeWidth * 10 + NodeSpacing * 9; + int height = NodeHeight + 200; + Bitmap bitmap = new Bitmap(width, height); + using (Graphics g = Graphics.FromImage(bitmap)) + { + g.FillEllipse(Brushes.LightBlue, 50, 50, 40, 30); + g.DrawString(Number.ToString(), new Font("Arial", 12), Brushes.Black, new Point(50, 55)); + } + } } diff --git a/KursiveWork/KursiveWork/MainForm.cs b/KursiveWork/KursiveWork/MainForm.cs index 983c1b2..c41c1f4 100644 --- a/KursiveWork/KursiveWork/MainForm.cs +++ b/KursiveWork/KursiveWork/MainForm.cs @@ -18,7 +18,6 @@ namespace KursiveWork private LinkedList list; private LinkedListVisualizer visualizer; private LinkedListManager manager; - private LinkedListParameters parameters; @@ -28,6 +27,7 @@ namespace KursiveWork list = new LinkedList(); visualizer = new LinkedListVisualizer(); + //MessageBox.Show("Настоятельно рекомендуется ознакомиться с информацией с помощью меню сверху"); manager = new LinkedListManager(parameters); Controls.Add(pictureBox); @@ -51,9 +51,9 @@ namespace KursiveWork list.InsertAtBeginning(Number); manager.storage.AddState(list.CreateState()); + pictureBox.Image = visualizer.Visualize(list.CreateState()); - } else { diff --git a/KursiveWork/KursiveWork/bin/Debug/net7.0-windows/KursiveWork.dll b/KursiveWork/KursiveWork/bin/Debug/net7.0-windows/KursiveWork.dll index c8e86fe..043b10f 100644 Binary files a/KursiveWork/KursiveWork/bin/Debug/net7.0-windows/KursiveWork.dll and b/KursiveWork/KursiveWork/bin/Debug/net7.0-windows/KursiveWork.dll differ diff --git a/KursiveWork/KursiveWork/bin/Debug/net7.0-windows/KursiveWork.pdb b/KursiveWork/KursiveWork/bin/Debug/net7.0-windows/KursiveWork.pdb index a923393..fa6bc8b 100644 Binary files a/KursiveWork/KursiveWork/bin/Debug/net7.0-windows/KursiveWork.pdb and b/KursiveWork/KursiveWork/bin/Debug/net7.0-windows/KursiveWork.pdb differ diff --git a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.GeneratedMSBuildEditorConfig.editorconfig b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.GeneratedMSBuildEditorConfig.editorconfig index 1a82c8c..9c20131 100644 --- a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.GeneratedMSBuildEditorConfig.editorconfig +++ b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.GeneratedMSBuildEditorConfig.editorconfig @@ -14,4 +14,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = KursiveWork -build_property.ProjectDir = C:\Users\ivans\Source\Repos\KurseWork\KursiveWork\KursiveWork\ +build_property.ProjectDir = C:\Users\ivans\source\repos\KurseWork\KursiveWork\KursiveWork\ diff --git a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.assets.cache b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.assets.cache index 6575205..d2cdb69 100644 Binary files a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.assets.cache and b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.assets.cache differ diff --git a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.dll b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.dll index c8e86fe..043b10f 100644 Binary files a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.dll and b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.dll differ diff --git a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.genruntimeconfig.cache b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.genruntimeconfig.cache index 9eb20f6..399b737 100644 --- a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.genruntimeconfig.cache +++ b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.genruntimeconfig.cache @@ -1 +1 @@ -d6f8afed7b6068eca92bf941c29c08f3033fcca7 +68c4ed4caff373776f07cd3dc9d81d8dee7411ca diff --git a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.pdb b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.pdb index a923393..fa6bc8b 100644 Binary files a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.pdb and b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/KursiveWork.pdb differ diff --git a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/ref/KursiveWork.dll b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/ref/KursiveWork.dll index 9e33997..7a500b9 100644 Binary files a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/ref/KursiveWork.dll and b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/ref/KursiveWork.dll differ diff --git a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/refint/KursiveWork.dll b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/refint/KursiveWork.dll index 9e33997..7a500b9 100644 Binary files a/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/refint/KursiveWork.dll and b/KursiveWork/KursiveWork/obj/Debug/net7.0-windows/refint/KursiveWork.dll differ diff --git a/KursiveWork/KursiveWork/obj/Release/net7.0-windows/KursiveWork.GeneratedMSBuildEditorConfig.editorconfig b/KursiveWork/KursiveWork/obj/Release/net7.0-windows/KursiveWork.GeneratedMSBuildEditorConfig.editorconfig index 1a82c8c..9c20131 100644 --- a/KursiveWork/KursiveWork/obj/Release/net7.0-windows/KursiveWork.GeneratedMSBuildEditorConfig.editorconfig +++ b/KursiveWork/KursiveWork/obj/Release/net7.0-windows/KursiveWork.GeneratedMSBuildEditorConfig.editorconfig @@ -14,4 +14,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = KursiveWork -build_property.ProjectDir = C:\Users\ivans\Source\Repos\KurseWork\KursiveWork\KursiveWork\ +build_property.ProjectDir = C:\Users\ivans\source\repos\KurseWork\KursiveWork\KursiveWork\ diff --git a/KursiveWork/KursiveWork/obj/Release/net7.0-windows/KursiveWork.assets.cache b/KursiveWork/KursiveWork/obj/Release/net7.0-windows/KursiveWork.assets.cache index c404574..4a0396c 100644 Binary files a/KursiveWork/KursiveWork/obj/Release/net7.0-windows/KursiveWork.assets.cache and b/KursiveWork/KursiveWork/obj/Release/net7.0-windows/KursiveWork.assets.cache differ