From 00d54fe26cfa1f66a2ee03deb8901152396e8f4c Mon Sep 17 00:00:00 2001 From: 1SooNoo1 Date: Sat, 4 Nov 2023 13:43:40 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectExcavator/ExcavatorGenericCollection.cs | 6 +++--- .../ProjectExcavator/FormExcavatorCollection.cs | 4 ++-- ProjectExcavator/ProjectExcavator/SetGeneric.cs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ProjectExcavator/ProjectExcavator/ExcavatorGenericCollection.cs b/ProjectExcavator/ProjectExcavator/ExcavatorGenericCollection.cs index a3b73e4..6da714a 100644 --- a/ProjectExcavator/ProjectExcavator/ExcavatorGenericCollection.cs +++ b/ProjectExcavator/ProjectExcavator/ExcavatorGenericCollection.cs @@ -26,13 +26,13 @@ namespace ProjectExcavator.Generic _pictureHeight = picHeight; _collection = new SetGeneric(width * height); } - public static bool operator +(ExcavatorGenericCollection collect, T? obj) + public static int operator +(ExcavatorGenericCollection collect, T? obj) { if (obj == null) { - return false; + return -1; } - return collect?._collection.Insert(obj) ?? false; + return collect?._collection.Insert(obj) ?? -1; } public static T? operator -(ExcavatorGenericCollection collect, int pos) { diff --git a/ProjectExcavator/ProjectExcavator/FormExcavatorCollection.cs b/ProjectExcavator/ProjectExcavator/FormExcavatorCollection.cs index 2680200..843874b 100644 --- a/ProjectExcavator/ProjectExcavator/FormExcavatorCollection.cs +++ b/ProjectExcavator/ProjectExcavator/FormExcavatorCollection.cs @@ -97,10 +97,10 @@ pictureBoxCollection.Height); { return; } - ExcavatorForm form = new(); + ExcavatorForm form = new ExcavatorForm(); if (form.ShowDialog() == DialogResult.OK) { - if (obj + form.SelectedExcavator) + if ((obj + form.SelectedExcavator) != -1) { MessageBox.Show("Объект добавлен"); pictureBoxCollection.Image = obj.ShowExcavator(); diff --git a/ProjectExcavator/ProjectExcavator/SetGeneric.cs b/ProjectExcavator/ProjectExcavator/SetGeneric.cs index 82813df..cb6d22e 100644 --- a/ProjectExcavator/ProjectExcavator/SetGeneric.cs +++ b/ProjectExcavator/ProjectExcavator/SetGeneric.cs @@ -17,14 +17,14 @@ namespace ProjectExcavator.Generic _maxCount = count; _places = new List(_maxCount); } - public bool Insert(T excavator) + public int Insert(T excavator) { if(_places.Count >= _maxCount) { - return false; + return -1; } _places.Insert(0, excavator); - return true; + return 0; } public bool Insert(T excavator, int position) {