diff --git a/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/AbstractCompany.cs b/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/AbstractCompany.cs index 001233b..54323ff 100644 --- a/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/AbstractCompany.cs +++ b/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/AbstractCompany.cs @@ -53,11 +53,11 @@ namespace WinFormsLabRad1.CollectionGenericObjects /// Перегрузка оператора сложения для класса /// /// Компания - /// Добавляемый объект + /// Добавляемый объект /// - public static bool operator +(AbstractCompany company, DrawningPlatforma car) + public static bool operator +(AbstractCompany company, DrawningPlatforma platforma) { - return company._collection?.Insert(car) ?? false; + return company._collection?.Insert(platforma) ?? false; } /// /// Перегрузка оператора удаления для класса diff --git a/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/Base.cs b/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/Base.cs index 62a9059..6db37de 100644 --- a/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/Base.cs +++ b/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/Base.cs @@ -63,6 +63,7 @@ namespace WinFormsLabRad1.CollectionGenericObjects } protected override void SetObjectsPosition(/*Graphics g*/) { + int arayposition = 0; _startPosX = 5; _startPosY = 5; for (int x = 0; x <= _pictureWidth; x = x + _placeSizeWidth) diff --git a/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/MassiveGenericObjects.cs b/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/MassiveGenericObjects.cs index efff760..06fecaf 100644 --- a/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/WinFormsLabRad1/WinFormsLabRad1/CollectionGenericObjects/MassiveGenericObjects.cs @@ -66,7 +66,7 @@ namespace WinFormsLabRad1.CollectionGenericObjects { if (_collection[i] == null) { - _collection[i] = default(T); + _collection[i] = obj; return true; } } @@ -81,7 +81,7 @@ namespace WinFormsLabRad1.CollectionGenericObjects // TODO вставка if (_collection[position] == null) { - _collection[position] = default(T); + _collection[position] = obj; return true; } if (_collection[position] != null) @@ -90,7 +90,7 @@ namespace WinFormsLabRad1.CollectionGenericObjects { if (_collection[i] == null) { - _collection[i] = default(T); + _collection[i] = obj; return true; } break; @@ -100,7 +100,7 @@ namespace WinFormsLabRad1.CollectionGenericObjects { if (_collection[i] == null) { - _collection[i] = default(T); + _collection[i] = obj; return true; } break; diff --git a/WinFormsLabRad1/WinFormsLabRad1/FormTanksCollection.cs b/WinFormsLabRad1/WinFormsLabRad1/FormTanksCollection.cs index 6a95cb5..2ed5f46 100644 --- a/WinFormsLabRad1/WinFormsLabRad1/FormTanksCollection.cs +++ b/WinFormsLabRad1/WinFormsLabRad1/FormTanksCollection.cs @@ -80,8 +80,8 @@ namespace WinFormsLabRad1 case nameof(DrawningTankZU): // TODO вызов диалогового окна для выбора цвета drawningPlatforma = new DrawningTankZU(random.Next(100, 300), random.Next(1000, 3000), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + GetColor(random), + GetColor(random), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); break; default: