Garifullin_Farid/Pibd-13_Garifullin_F.M_Tank_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Garifullin-Farid 2024-05-06 22:56:32 +04:00
parent 9373b38d7e
commit 53bc228956
18 changed files with 43 additions and 646 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType.cs.swp
View File

Binary file not shown.

BIN
ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_BASE_1418.cs.swp
View File

Binary file not shown.

BIN
ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_LOCAL_1418.cs.swp
View File

Binary file not shown.

BIN
ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_REMOTE_1418.cs.swp
View File

Binary file not shown.

25
ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BACKUP_1418.cs
View File

@ -1,25 +0,0 @@
namespace ProjectTank.CollectionGenericObjects;
<<<<<<< HEAD
/// <summary>
/// Тип коллекции
/// </summary>
=======
>>>>>>> d84f98706403d56e8dae185838815e23bb91f4d7
public enum CollectionType
{
/// <summary>
/// Неопределено
/// </summary>
None = 0,
/// <summary>
/// Массив
/// </summary>
Massive = 1,
/// <summary>
/// Список
/// </summary>
List = 2
}

17
ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs
View File

@ -1,17 +0,0 @@
namespace ProjectLinkor.CollectionGenericObjects;
public enum CollectionType
{
/// <summary>
/// Неопределено
/// </summary>
None = 0,
/// <summary>
/// Массив
/// </summary>
Massive = 1,
/// <summary>
/// Список
/// </summary>
List = 2
}

21
ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs
View File

@ -1,21 +0,0 @@
namespace ProjectTank.CollectionGenericObjects;
/// <summary>
/// Тип коллекции
/// </summary>
public enum CollectionType
{
/// <summary>
/// Неопределено
/// </summary>
None = 0,
/// <summary>
/// Массив
/// </summary>
Massive = 1,
/// <summary>
/// Список
/// </summary>
List = 2
}

17
ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs
View File

@ -1,17 +0,0 @@
namespace ProjectTank.CollectionGenericObjects;
public enum CollectionType
{
/// <summary>
/// Неопределено
/// </summary>
None = 0,
/// <summary>
/// Массив
/// </summary>
Massive = 1,
/// <summary>
/// Список
/// </summary>
List = 2
}

3
ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs
View File

@ -1,4 +1,7 @@
using ProjectTank.Drawning;
using System.Text;
namespace ProjectTank.CollectionGenericObjects
{
/// <summary>

83
ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs
View File

@ -1,83 +0,0 @@
<<<<<<< HEAD

=======
using ProjectLinkor.CollectionGenericObjects;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
>>>>>>> parent of 5665ee3 (fix)
namespace ProjectTank.CollectionGenericObjects
{
public class StorageCollection<T>
where T : class
{
/// <summary>
/// Словарь (хранилище) с коллекциями
/// </summary>
readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
/// <summary>
/// Возвращение списка названий коллекций
/// </summary>
public List<string> Keys => _storages.Keys.ToList();
/// <summary>
/// Конструктор
/// </summary>
public StorageCollection()
{
_storages = new Dictionary<string, ICollectionGenericObjects<T>>();
}
/// <summary>
/// Добавление коллекции в хранилище
/// </summary>
/// <param name="name">Название коллекции</param>
/// <param name="collectionType">тип коллекции</param>
public void AddCollection(string name, CollectionType collectionType)
{
// TODO проверка, что name не пустой и нет в словаре записи с таким ключом
// TODO Прописать логику для добавления
if (name == null || _storages.ContainsKey(name))
return;
switch (collectionType)
{
case CollectionType.None:
return;
case CollectionType.Massive:
_storages[name] = new MassiveGenericObjects<T>();
return;
case CollectionType.List:
_storages[name] = new ListGenericObjects<T>();
return;
}
}
/// <summary>
/// Удаление коллекции
/// </summary>
/// <param name="name">Название коллекции</param>
public void DelCollection(string name)
{
// TODO Прописать логику для удаления коллекции
if (_storages.ContainsKey(name))
_storages.Remove(name);
}
/// <summary>
/// Доступ к коллекции
/// </summary>
/// <param name="name">Название коллекции</param>
/// <returns></returns>
public ICollectionGenericObjects<T>? this[string name]
{
get
{
// TODO Продумать логику получения объекта
if (name == null || !_storages.ContainsKey(name))
return null;
return _storages[name];
}
}
}
}

75
ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs
View File

@ -1,75 +0,0 @@
using ProjectLinkor.CollectionGenericObjects;
namespace ProjectTank.CollectionGenericObjects
{
public class StorageCollection<T>
where T : class
{
/// <summary>
/// Словарь (хранилище) с коллекциями
/// </summary>
readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
/// <summary>
/// Возвращение списка названий коллекций
/// </summary>
public List<string> Keys => _storages.Keys.ToList();
/// <summary>
/// Конструктор
/// </summary>
public StorageCollection()
{
_storages = new Dictionary<string, ICollectionGenericObjects<T>>();
}
/// <summary>
/// Добавление коллекции в хранилище
/// </summary>
/// <param name="name">Название коллекции</param>
/// <param name="collectionType">тип коллекции</param>
public void AddCollection(string name, CollectionType collectionType)
{
// TODO проверка, что name не пустой и нет в словаре записи с таким ключом
// TODO Прописать логику для добавления
if (name == null || _storages.ContainsKey(name))
return;
switch (collectionType)
{
case CollectionType.None:
return;
case CollectionType.Massive:
_storages[name] = new MassiveGenericObjects<T>();
return;
case CollectionType.List:
_storages[name] = new ListGenericObjects<T>();
return;
}
}
/// <summary>
/// Удаление коллекции
/// </summary>
/// <param name="name">Название коллекции</param>
public void DelCollection(string name)
{
// TODO Прописать логику для удаления коллекции
if (_storages.ContainsKey(name))
_storages.Remove(name);
}
/// <summary>
/// Доступ к коллекции
/// </summary>
/// <param name="name">Название коллекции</param>
/// <returns></returns>
public ICollectionGenericObjects<T>? this[string name]
{
get
{
// TODO Продумать логику получения объекта
if (name == null || !_storages.ContainsKey(name))
return null;
return _storages[name];
}
}
}
}

73
ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs
View File

@ -1,73 +0,0 @@

namespace ProjectTank.CollectionGenericObjects
{
public class StorageCollection<T>
where T : class
{
/// <summary>
/// Словарь (хранилище) с коллекциями
/// </summary>
readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
/// <summary>
/// Возвращение списка названий коллекций
/// </summary>
public List<string> Keys => _storages.Keys.ToList();
/// <summary>
/// Конструктор
/// </summary>
public StorageCollection()
{
_storages = new Dictionary<string, ICollectionGenericObjects<T>>();
}
/// <summary>
/// Добавление коллекции в хранилище
/// </summary>
/// <param name="name">Название коллекции</param>
/// <param name="collectionType">тип коллекции</param>
public void AddCollection(string name, CollectionType collectionType)
{
// TODO проверка, что name не пустой и нет в словаре записи с таким ключом
// TODO Прописать логику для добавления
if (name == null || _storages.ContainsKey(name))
return;
switch (collectionType)
{
case CollectionType.None:
return;
case CollectionType.Massive:
_storages[name] = new MassiveGenericObjects<T>();
return;
case CollectionType.List:
_storages[name] = new ListGenericObjects<T>();
return;
}
}
/// <summary>
/// Удаление коллекции
/// </summary>
/// <param name="name">Название коллекции</param>
public void DelCollection(string name)
{
// TODO Прописать логику для удаления коллекции
if (_storages.ContainsKey(name))
_storages.Remove(name);
}
/// <summary>
/// Доступ к коллекции
/// </summary>
/// <param name="name">Название коллекции</param>
/// <returns></returns>
public ICollectionGenericObjects<T>? this[string name]
{
get
{
// TODO Продумать логику получения объекта
if (name == null || !_storages.ContainsKey(name))
return null;
return _storages[name];
}
}
}
}

79
ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs
View File

@ -1,79 +0,0 @@
using ProjectLinkor.CollectionGenericObjects;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectTank.CollectionGenericObjects
{
public class StorageCollection<T>
where T : class
{
/// <summary>
/// Словарь (хранилище) с коллекциями
/// </summary>
readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
/// <summary>
/// Возвращение списка названий коллекций
/// </summary>
public List<string> Keys => _storages.Keys.ToList();
/// <summary>
/// Конструктор
/// </summary>
public StorageCollection()
{
_storages = new Dictionary<string, ICollectionGenericObjects<T>>();
}
/// <summary>
/// Добавление коллекции в хранилище
/// </summary>
/// <param name="name">Название коллекции</param>
/// <param name="collectionType">тип коллекции</param>
public void AddCollection(string name, CollectionType collectionType)
{
// TODO проверка, что name не пустой и нет в словаре записи с таким ключом
// TODO Прописать логику для добавления
if (name == null || _storages.ContainsKey(name))
return;
switch (collectionType)
{
case CollectionType.None:
return;
case CollectionType.Massive:
_storages[name] = new MassiveGenericObjects<T>();
return;
case CollectionType.List:
_storages[name] = new ListGenericObjects<T>();
return;
}
}
/// <summary>
/// Удаление коллекции
/// </summary>
/// <param name="name">Название коллекции</param>
public void DelCollection(string name)
{
// TODO Прописать логику для удаления коллекции
if (_storages.ContainsKey(name))
_storages.Remove(name);
}
/// <summary>
/// Доступ к коллекции
/// </summary>
/// <param name="name">Название коллекции</param>
/// <returns></returns>
public ICollectionGenericObjects<T>? this[string name]
{
get
{
// TODO Продумать логику получения объекта
if (name == null || !_storages.ContainsKey(name))
return null;
return _storages[name];
}
}
}
}

73
ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs.orig
View File

@ -1,73 +0,0 @@
<<<<<<< HEAD
=======
using ProjectTank.Entities;
>>>>>>> 6b2dbf2 (LabWork_2)
namespace ProjectTank.Drawning;
/// <summary>
/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
/// </summary>
public class DrawningBattleTank :DrawningTank
{
/// <summary>
/// Конструктор
/// <summary>
/// <param name="speed">Скорость</param>
<<<<<<< HEAD
/// <param name="weight">Вес</param>
=======
/// <param name="weight">Вес автомобиля</param>
>>>>>>> 6b2dbf2 (LabWork_2)
/// <param name="bodyColor">Основной цвет</param>
/// <param name="additionalColor">Дополнительный цвет</param>
/// <param name="gun">Признак наличия пушки</param>
/// <param name="machinGun">признак наличия пулемета</param>
///
public DrawningBattleTank(int speed, double weight, Color bodyColor, Color additionalColor, bool gun, bool machinGun) : base(150, 87)
{
EntityTank = new EntityBattleTank(speed, weight, bodyColor, additionalColor, gun, machinGun);
}
/// <summary>
/// Прорисовка объекта
/// </summary>
/// <param name="g"></param>
public override void DrawTransport(Graphics g)
{
if (EntityTank == null || EntityTank is not EntityBattleTank battleTank || !_startPosX.HasValue || !_startPosY.HasValue)
{
return;
}
Pen pen = new(Color.Black);
Brush additionalBrush = new SolidBrush(battleTank.AdditionalColor);
if (battleTank.Gun)
{
g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 30, 45, 5);
g.FillRectangle(additionalBrush, _startPosX.Value, _startPosY.Value + 30, 45, 5);
}
//пулемет
if (battleTank.MachinGun)
{
g.DrawRectangle(pen, _startPosX.Value + 65, _startPosY.Value + 15, 16, 5);
g.DrawRectangle(pen, _startPosX.Value + 72, _startPosY.Value + 10, 5, 5);
g.DrawRectangle(pen, _startPosX.Value + 71, _startPosY.Value + 3, 7, 7);
g.DrawRectangle(pen, _startPosX.Value + 55, _startPosY.Value + 5, 15, 3);
g.FillRectangle(additionalBrush, _startPosX.Value + 65, _startPosY.Value + 15, 16, 5);
g.FillRectangle(additionalBrush, _startPosX.Value + 72, _startPosY.Value + 10, 5, 5);
g.FillRectangle(additionalBrush, _startPosX.Value + 71, _startPosY.Value + 3, 7, 7);
g.FillRectangle(additionalBrush, _startPosX.Value + 55, _startPosY.Value + 5, 15, 3);
}
_startPosY += 20;
base.DrawTransport(g);
_startPosY -= 20;
}
}

56
ProjectTank/ProjectTank/Entities/EntityTank.cs.orig
View File

@ -1,56 +0,0 @@
<<<<<<< HEAD
namespace ProjectTank.Entities
=======
namespace ProjectTank.Entities
>>>>>>> 6b2dbf2 (LabWork_2)
{
public class EntityTank
{
/// <summary>
/// Скорость
/// </summary>
public int Speed { get; private set; }
/// <summary>
/// Вес
/// </summary>
public double Weight { get; private set; }
/// <summary>
/// Основной цвет
/// </summary>
public Color BodyColor { get; private set; }
/// <summary>
/// Шаг перемещения танка
/// </summary>
public double Step => Speed * 100 / Weight;
<<<<<<< HEAD
public void SetBodyColor(Color color)
{
BodyColor = color;
}
=======
>>>>>>> 6b2dbf2 (LabWork_2)
/// <summary>
/// Конструктор сущности
/// </summary>
/// <param name="speed">Скорость</param>
<<<<<<< HEAD
/// <param name="weight">Веc</param>
=======
/// <param name="weight">Вес автомобиля</param>
>>>>>>> 6b2dbf2 (LabWork_2)
/// <param name="bodyColor">Основной цвет</param>
public EntityTank(int speed, double weight, Color bodyColor)
{
Speed = speed;
Weight = weight;
BodyColor = bodyColor;
}
}
}

52
ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs.orig
View File

@ -1,52 +0,0 @@
using ProjectTank.Entities;
namespace ProjectTank
{
/// <summary>
/// Класс-сущность танк
/// </summary>
public class EntityBattleTank : EntityTank
{
/// <summary>
/// Дополнительный цвет (для опциональных элементов)
/// </summary>
public Color AdditionalColor { get; private set; }
/// <summary>
/// Признак (опция) наличия пушки
/// </summary>
public bool Gun { get; private set; }
/// <summary>
/// Признак (опция) наличия Пулемета на башне
/// /// </summary>
public bool MachinGun { get; private set; }
<<<<<<< HEAD
public void SetAdditionalColor(Color addColor)
{
AdditionalColor = addColor;
}
=======
>>>>>>> 6b2dbf2 (LabWork_2)
/// <summary>
/// Конструктор объекта-класса Боевого Танка
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес</param>
/// <param name="bodyColor">Основной цвет</param>
/// <param name="additionalColor">Дополнительный цвет</param>
/// <param name="gun">Пушка танка</param>
/// <param name="machinGun">Пклемет на башне</param>
public EntityBattleTank(int speed, double weight, Color bodyColor, Color additionalColor, bool gun, bool machinGun) : base(speed, weight, bodyColor)
{
AdditionalColor = additionalColor;
MachinGun= machinGun;
Gun = gun;
}
}
}

51
ProjectTank/ProjectTank/FormBattleTankCollection.cs
View File

@ -68,19 +68,12 @@ namespace ProjectTank
return;
}
return color;
}
private void ButtonAddTank_Click(object sender, EventArgs e)
{
CreateObject(nameof(DrawningTank));
}
private void ButtonAddBattleTank_Click(object sender, EventArgs e)
{
CreateObject(nameof(DrawningBattleTank));
FormTankConfig form = new();
form.AddEvent(SetTank);
form.Show();
}
private void buttonRemoveTank_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null) return;
@ -228,5 +221,41 @@ namespace ProjectTank
panelCompanyTools.Enabled = true;
RerfreshListBoxItems();
}
private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
{
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
if (_storageCollection.SaveData(saveFileDialog.FileName))
{
MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
/// <summary>
/// Обработка нажатия "Загрузка"
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
{
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
if (_storageCollection.LoadData(openFileDialog.FileName))
{
MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
RerfreshListBoxItems();
}
else
{
MessageBox.Show("не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}
}

64
ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs.orig
View File

@ -1,64 +0,0 @@
using ProjectTank.Drawning;
namespace ProjectTank.MovementStrategy
{
public class MoveableTank : IMoveableObject
{
/// <summary>
/// Поле-объект класса или его DrawningTank наследника
/// </summary>
private readonly DrawningTank? _tank = null;
/// <summary>
<<<<<<< HEAD
/// конструктор
/// </summary>
/// <param name="tank">Объект класса DrawningTank</param>
=======
/// Конструктор
/// </summary>
/// <param name="car">Объект класса DrawningBoat</param>
>>>>>>> 6b2dbf2 (LabWork_2)
public MoveableTank(DrawningTank tank)
{
_tank = tank;
}
public ObjectParameters? GetObjectPosition
{
get
{
if (_tank == null || _tank.EntityTank == null ||
!_tank.GetPosX.HasValue || !_tank.GetPosY.HasValue)
{
return null;
}
return new ObjectParameters(_tank.GetPosX.Value,
_tank.GetPosY.Value, _tank.GetWidth, _tank.GetHeight);
}
}
public int GetStep => (int)(_tank?.EntityTank?.Step ?? 0);
public bool TryMoveObject(MovementDirection direction)
{
if (_tank == null || _tank.EntityTank == null)
{
return false;
}
return _tank.MoveTransport(GetDirectionType(direction));
}
/// <summary>
/// Конвертация из MovementDirection в DirectionType
/// </summary>
/// <param name="direction">MovementDirection</param>
/// <re turns>DirectionType</returns>
private static DirectionType GetDirectionType(MovementDirection direction)
{
return direction switch
{
MovementDirection.Left => DirectionType.Left,
MovementDirection.Right => DirectionType.Right,
MovementDirection.Up => DirectionType.Up,
MovementDirection.Down => DirectionType.Down,
_ => DirectionType.Unknow,
};
}
}
}