исправление ошибок
This commit is contained in:
parent
9c40d1a8e2
commit
d59414bed4
@ -2,7 +2,7 @@
|
|||||||
using ProjectTank.CollectionGenericObjects;
|
using ProjectTank.CollectionGenericObjects;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Абстракция компании, хранящий коллекцию автомобилей
|
/// Абстракция компании, хранящий Танковую базу
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public abstract class AbstractCompany
|
public abstract class AbstractCompany
|
||||||
{
|
{
|
||||||
@ -27,7 +27,7 @@ public abstract class AbstractCompany
|
|||||||
protected readonly int _pictureHeight;
|
protected readonly int _pictureHeight;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Коллекция автомобилей
|
/// Танковая база
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected ICollectionGenericObjects<DrawningTank>? _collection = null;
|
protected ICollectionGenericObjects<DrawningTank>? _collection = null;
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ public abstract class AbstractCompany
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="picWidth">Ширина окна</param>
|
/// <param name="picWidth">Ширина окна</param>
|
||||||
/// <param name="picHeight">Высота окна</param>
|
/// <param name="picHeight">Высота окна</param>
|
||||||
/// <param name="collection">Коллекция автомобилей</param>
|
/// <param name="collection">Танковая база</param>
|
||||||
public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTank> collection)
|
public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTank> collection)
|
||||||
{
|
{
|
||||||
_pictureWidth = picWidth;
|
_pictureWidth = picWidth;
|
||||||
|
@ -36,16 +36,7 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
|
|||||||
public int Insert(T obj)
|
public int Insert(T obj)
|
||||||
{
|
{
|
||||||
// вставка в свободное место набора
|
// вставка в свободное место набора
|
||||||
for (int i = 0; i < Count; i++)
|
return Insert(obj, 0);
|
||||||
{
|
|
||||||
if (_collection[i] == null)
|
|
||||||
{
|
|
||||||
_collection[i] = obj;
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int Insert(T obj, int position)
|
public int Insert(T obj, int position)
|
||||||
|
@ -13,7 +13,7 @@ namespace ProjectTank.CollectionGenericObjects
|
|||||||
int width = _pictureWidth / _placeSizeWidth;
|
int width = _pictureWidth / _placeSizeWidth;
|
||||||
int height = _pictureHeight / _placeSizeHeight;
|
int height = _pictureHeight / _placeSizeHeight;
|
||||||
Pen pen = new(Color.Black, 2);
|
Pen pen = new(Color.Black, 2);
|
||||||
for (int i = 0; i < width; i++)
|
for (int i = 0; i < width+1; i++)
|
||||||
{
|
{
|
||||||
for (int j = 0; j < height + 1; ++j)
|
for (int j = 0; j < height + 1; ++j)
|
||||||
{
|
{
|
||||||
@ -39,7 +39,7 @@ namespace ProjectTank.CollectionGenericObjects
|
|||||||
_collection.Get(i)?.SetPosition(_placeSizeWidth * TankWidth + 20, TankHeight * _placeSizeHeight + 5);
|
_collection.Get(i)?.SetPosition(_placeSizeWidth * TankWidth + 20, TankHeight * _placeSizeHeight + 5);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (TankWidth < width - 1)
|
if (TankWidth < width)
|
||||||
TankWidth++;
|
TankWidth++;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
namespace ProjectTank.Drawning;
|
namespace ProjectTank.Drawning;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
|
/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -4,12 +4,12 @@ using ProjectTank.Drawning;
|
|||||||
namespace ProjectTank
|
namespace ProjectTank
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
/// Форма работы с компанией и её коллекцией
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public partial class FormBattleTankCollection : Form
|
public partial class FormBattleTankCollection : Form
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
/// Компания
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private AbstractCompany? _company = null;
|
private AbstractCompany? _company = null;
|
||||||
|
|
||||||
@ -22,7 +22,7 @@ namespace ProjectTank
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
/// Выбор компании
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="sender"></param>
|
/// <param name="sender"></param>
|
||||||
/// <param name="e"></param>
|
/// <param name="e"></param>
|
||||||
@ -123,7 +123,7 @@ namespace ProjectTank
|
|||||||
if (_company == null) return;
|
if (_company == null) return;
|
||||||
|
|
||||||
DrawningTank? tank = null;
|
DrawningTank? tank = null;
|
||||||
int coutner = 1;
|
int coutner = 100;
|
||||||
|
|
||||||
while (tank == null)
|
while (tank == null)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user