qkrlnt/PIbd-12_Ulybin_A.A._Monorail_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Переделал методы из требования №5

Browse Source
This commit is contained in:
qkrlnt 2024-03-27 18:41:43 +04:00
parent a22085ac83
commit 578ac2e424
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProjectMonorail/CollectionGenericObjects/AbstractCompany.cs
View File

@ -67,7 +67,7 @@ public abstract class AbstractCompany
{ {
if(company._collection == null) if(company._collection == null)
{ {
return 0; return -1;
} }
return company._collection.Insert(train); return company._collection.Insert(train);
} }

2
ProjectMonorail/CollectionGenericObjects/ICollectionGenericObjects.cs
View File

@ -36,7 +36,7 @@ public interface ICollectionGenericObjects<T>
/// <param name="obj">Добавляемый объект</param> /// <param name="obj">Добавляемый объект</param>
/// <param name="position">Позиция</param> /// <param name="position">Позиция</param>
/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns> /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
bool Insert(T obj, int position); int Insert(T obj, int position);
/// <summary> /// <summary>
/// Удаление объекта из коллекции с конкретной позиции /// Удаление объекта из коллекции с конкретной позиции

12
ProjectMonorail/CollectionGenericObjects/MassiveGenericObjects.cs
View File

@ -49,21 +49,21 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
return i; return i;
} }
} }
return 0; return -1;
} }
public bool Insert(T obj, int position) public int Insert(T obj, int position)
{ {
if (position < 0 || position >= Count) if (position < 0 || position >= Count)
{ {
return false; return -1;
} }
for (int i = position; i < Count; i++) for (int i = position; i < Count; i++)
{ {
if (_collection[i] == null) if (_collection[i] == null)
{ {
_collection[i] = obj; _collection[i] = obj;
return true; return i;
} }
} }
for (int i = position - 1; i >= 0; i--) for (int i = position - 1; i >= 0; i--)
@ -71,10 +71,10 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
if (_collection[i] == null) if (_collection[i] == null)
{ {
_collection[i] = obj; _collection[i] = obj;
return true; return i;
} }
} }
return false; return -1;
} }
public T Remove(int position) public T Remove(int position)

4
ProjectMonorail/CollectionGenericObjects/TrainSharingService.cs
View File

@ -41,9 +41,9 @@ public class TrainSharingService : AbstractCompany
{ {
int counter = 0; int counter = 0;
int valPlaceY = _pictureHeight / _placeSizeHeight; int valPlaceY = _pictureHeight / _placeSizeHeight;
for (int y = (valPlaceY - 1) * _placeSizeHeight; y >= 0; y -= _placeSizeHeight) for (int y = ((valPlaceY - 1) * _placeSizeHeight) + 30; y >= 0; y -= _placeSizeHeight)
{ {
for (int x = 5; x + _placeSizeWidth < _pictureWidth; x += _placeSizeWidth) for (int x = 10; x + _placeSizeWidth < _pictureWidth; x += _placeSizeWidth)
{ {
_collection?.Get(counter)?.SetPictureSize(_pictureWidth, _pictureHeight); _collection?.Get(counter)?.SetPictureSize(_pictureWidth, _pictureHeight);
_collection?.Get(counter)?.SetPosition(x, y); _collection?.Get(counter)?.SetPosition(x, y);

2
ProjectMonorail/FormTrainCollection.cs
View File

@ -86,7 +86,7 @@ public partial class FormTrainCollection : Form
default: return; default: return;
} }
if (_company + drawingTrain != 0) if (_company + drawingTrain != -1)
{ {
MessageBox.Show("Объект добавлен"); MessageBox.Show("Объект добавлен");
pictureBox.Image = _company.Show(); pictureBox.Image = _company.Show();