From f677a3d2441f6d3a7b76fe347ce0aa9ac4e9916c Mon Sep 17 00:00:00 2001 From: Garifullin-Farid <95081032+Garifullin-Farid@users.noreply.github.com> Date: Sun, 19 May 2024 22:08:11 +0400 Subject: [PATCH 1/6] 1 --- .../Drawning/DrawningBattleTank.cs.orig | 73 +++++++++++++++++++ .../ProjectTank/Entities/EntityTank.cs.orig | 56 ++++++++++++++ .../Entities/EntiyBattleTank.cs.orig | 52 +++++++++++++ .../MovementStrategy/MoveableTank.cs.orig | 64 ++++++++++++++++ 4 files changed, 245 insertions(+) create mode 100644 ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs.orig create mode 100644 ProjectTank/ProjectTank/Entities/EntityTank.cs.orig create mode 100644 ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs.orig create mode 100644 ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs.orig diff --git a/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs.orig b/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs.orig new file mode 100644 index 0000000..86f6e79 --- /dev/null +++ b/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs.orig @@ -0,0 +1,73 @@ +<<<<<<< HEAD +======= +using ProjectTank.Entities; +>>>>>>> 6b2dbf2 (LabWork_2) + +namespace ProjectTank.Drawning; +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningBattleTank :DrawningTank +{ + /// + /// Конструктор + /// + /// Скорость +<<<<<<< HEAD + /// Вес +======= + /// Вес автомобиля +>>>>>>> 6b2dbf2 (LabWork_2) + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия пушки + /// признак наличия пулемета + /// + 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); + } + + /// + /// Прорисовка объекта + /// + /// + 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; + + } + +} + + + diff --git a/ProjectTank/ProjectTank/Entities/EntityTank.cs.orig b/ProjectTank/ProjectTank/Entities/EntityTank.cs.orig new file mode 100644 index 0000000..9803d29 --- /dev/null +++ b/ProjectTank/ProjectTank/Entities/EntityTank.cs.orig @@ -0,0 +1,56 @@ +<<<<<<< HEAD +namespace ProjectTank.Entities +======= +namespace ProjectTank.Entities +>>>>>>> 6b2dbf2 (LabWork_2) +{ + public class EntityTank + { + + /// + /// Скорость + /// + public int Speed { get; private set; } + + /// + /// Вес + /// + public double Weight { get; private set; } + + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + + /// + /// Шаг перемещения танка + /// + public double Step => Speed * 100 / Weight; +<<<<<<< HEAD + public void SetBodyColor(Color color) + { + BodyColor = color; + } +======= +>>>>>>> 6b2dbf2 (LabWork_2) + + /// + /// Конструктор сущности + /// + /// Скорость +<<<<<<< HEAD + /// Веc +======= + /// Вес автомобиля +>>>>>>> 6b2dbf2 (LabWork_2) + /// Основной цвет + + public EntityTank(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + + } + } +} diff --git a/ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs.orig b/ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs.orig new file mode 100644 index 0000000..7aae8d2 --- /dev/null +++ b/ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs.orig @@ -0,0 +1,52 @@ +using ProjectTank.Entities; + +namespace ProjectTank +{ + /// + /// Класс-сущность танк + /// + public class EntityBattleTank : EntityTank + + { + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + + /// + /// Признак (опция) наличия пушки + /// + public bool Gun { get; private set; } + + + /// + /// Признак (опция) наличия Пулемета на башне + /// /// + public bool MachinGun { get; private set; } + +<<<<<<< HEAD + public void SetAdditionalColor(Color addColor) + { + AdditionalColor = addColor; + } + +======= +>>>>>>> 6b2dbf2 (LabWork_2) + /// + /// Конструктор объекта-класса Боевого Танка + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Пушка танка + /// Пклемет на башне + public EntityBattleTank(int speed, double weight, Color bodyColor, Color additionalColor, bool gun, bool machinGun) : base(speed, weight, bodyColor) + { + AdditionalColor = additionalColor; + MachinGun= machinGun; + Gun = gun; + } + + } +} diff --git a/ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs.orig b/ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs.orig new file mode 100644 index 0000000..a9b935d --- /dev/null +++ b/ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs.orig @@ -0,0 +1,64 @@ +using ProjectTank.Drawning; + +namespace ProjectTank.MovementStrategy +{ + public class MoveableTank : IMoveableObject + { + /// + /// Поле-объект класса или его DrawningTank наследника + /// + private readonly DrawningTank? _tank = null; + /// +<<<<<<< HEAD + /// конструктор + /// + /// Объект класса DrawningTank +======= + /// Конструктор + /// + /// Объект класса DrawningBoat +>>>>>>> 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)); + } + /// + /// Конвертация из MovementDirection в DirectionType + /// + /// MovementDirection + /// DirectionType + 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, + }; + } + } +} -- 2.25.1 From 3e86003a1a12e32e3775785a5e78dd0d53653329 Mon Sep 17 00:00:00 2001 From: Garifullin-Farid <95081032+Garifullin-Farid@users.noreply.github.com> Date: Sun, 19 May 2024 22:19:35 +0400 Subject: [PATCH 2/6] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=E2=84=964?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs # ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs # ProjectTank/ProjectTank/FormBattleTankCollection.Designer.cs # ProjectTank/ProjectTank/FormBattleTankCollection.cs --- ProjectTank/ProjectTank/FormBattleTankCollection.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ProjectTank/ProjectTank/FormBattleTankCollection.cs b/ProjectTank/ProjectTank/FormBattleTankCollection.cs index 265cbfe..51c762e 100644 --- a/ProjectTank/ProjectTank/FormBattleTankCollection.cs +++ b/ProjectTank/ProjectTank/FormBattleTankCollection.cs @@ -1,4 +1,4 @@ -using ProjectTank.CollectionGenericObjects; +using ProjectTank.CollectionGenericObjects; using ProjectTank.Drawning; namespace ProjectTank @@ -224,4 +224,4 @@ namespace ProjectTank RerfreshListBoxItems(); } } -} +} \ No newline at end of file -- 2.25.1 From 66ada06a40bc534ba07bcc04387b26517ddfac65 Mon Sep 17 00:00:00 2001 From: Garifullin-Farid <95081032+Garifullin-Farid@users.noreply.github.com> Date: Sun, 19 May 2024 22:23:08 +0400 Subject: [PATCH 3/6] =?UTF-8?q?labWork=5F5=20=D0=B3=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # ProjectTank/ProjectTank/FormBattleTankCollection.cs # ProjectTank/ProjectTank/FormTankConfig.cs --- .../ProjectTank/FormBattleTankCollection.cs | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/ProjectTank/ProjectTank/FormBattleTankCollection.cs b/ProjectTank/ProjectTank/FormBattleTankCollection.cs index 51c762e..d81e1d2 100644 --- a/ProjectTank/ProjectTank/FormBattleTankCollection.cs +++ b/ProjectTank/ProjectTank/FormBattleTankCollection.cs @@ -67,15 +67,20 @@ namespace ProjectTank { return; } - FormTankConfig form = new(); - form.AddEvent(SetTank); - form.Show(); + + return color; } - /// - /// Удаление танка - /// - /// - /// + + private void ButtonAddTank_Click(object sender, EventArgs e) + { + CreateObject(nameof(DrawningTank)); + } + + private void ButtonAddBattleTank_Click(object sender, EventArgs e) + { + CreateObject(nameof(DrawningBattleTank)); + } + private void buttonRemoveTank_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null) return; -- 2.25.1 From 85b4605bbbe27c19dc6129da7d44f8d9e6b4c342 Mon Sep 17 00:00:00 2001 From: Garifullin-Farid <95081032+Garifullin-Farid@users.noreply.github.com> Date: Sun, 19 May 2024 22:26:06 +0400 Subject: [PATCH 4/6] fixLabWork_6 # Conflicts: # ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs # ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs # ProjectTank/ProjectTank/FormBattleTankCollection.cs # ProjectTank/ProjectTank/FormTankConfig.cs --- .../AbstractCompany.cs | 2 +- .../CollectionType.cs | 6 +- .../ICollectionGenericObjects.cs | 12 +- .../ListGenericObjects.cs | 33 ++-- .../MassiveGenericObjects.cs | 30 ++++ .../StorageCollection.cs | 149 +++++++++++++++++- .../Drawning/DrawningBattleTank.cs | 8 + .../ProjectTank/Drawning/DrawningTank.cs | 9 ++ .../Drawning/ExtensionDrawningTank.cs | 58 +++++++ .../ProjectTank/Entities/EntityTank.cs | 19 +++ .../ProjectTank/Entities/EntiyBattleTank.cs | 24 +++ .../FormBattleTankCollection.Designer.cs | 74 ++++++++- .../ProjectTank/FormBattleTankCollection.resx | 9 ++ .../MovementStrategy/MoveableTank.cs | 2 +- 14 files changed, 415 insertions(+), 20 deletions(-) create mode 100644 ProjectTank/ProjectTank/Drawning/ExtensionDrawningTank.cs diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/AbstractCompany.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/AbstractCompany.cs index b8b8f2f..77e0f65 100644 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/AbstractCompany.cs @@ -47,7 +47,7 @@ public abstract class AbstractCompany _pictureWidth = picWidth; _pictureHeight = picHeight; _collection = collection; - _collection.SetMaxCount = GetMaxCount; + _collection.MaxCount = GetMaxCount; } /// diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs index 35061b2..62cbc3b 100644 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs @@ -1,15 +1,19 @@ namespace ProjectTank.CollectionGenericObjects; - +/// +/// Тип коллекции +/// public enum CollectionType { /// /// Неопределено /// None = 0, + /// /// Массив /// Massive = 1, + /// /// Список /// diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/ICollectionGenericObjects.cs index ec1ba1f..3a42d62 100644 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -15,7 +15,7 @@ /// /// Установка максимального количества элементов /// - int SetMaxCount { set; } + int MaxCount { get; set; } /// /// Добавление объекта в коллекцию @@ -46,5 +46,15 @@ /// Объект T? Get(int position); + /// + /// Получение типа коллекции + /// + CollectionType GetCollectionType { get; } + + /// + /// Получение объектов коллекции по одному + /// + /// Поэлементный вывод элементов коллекции + IEnumerable GetItems(); } } diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/ListGenericObjects.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/ListGenericObjects.cs index bc45ea5..f683a7d 100644 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/ListGenericObjects.cs @@ -17,7 +17,21 @@ public class ListGenericObjects : ICollectionGenericObjects /// private int _maxCount; public int Count => _collection.Count; - public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } } + public int MaxCount + { + get => _maxCount; + set + { + if (value > 0) + { + _maxCount = value; + } + } + } + + + public CollectionType GetCollectionType => CollectionType.List; + /// /// Конструктор /// @@ -27,7 +41,6 @@ public class ListGenericObjects : ICollectionGenericObjects } public T? Get(int position) { - // TODO проверка позиции if (position <= Count) { return _collection[position]; @@ -37,18 +50,15 @@ public class ListGenericObjects : ICollectionGenericObjects } public int Insert(T obj) { - // TODO проверка, что не превышено максимальное количество элементов - // TODO вставка в конец набора if (Count + 1 > _maxCount) + { return -1; + } _collection.Add(obj); return Count; } public int Insert(T obj, int position) { - // TODO проверка, что не превышено максимальное количество элементов - // TODO проверка позиции - // TODO вставка по позиции if (Count + 1 > _maxCount) return -1; if (position < 0 || position > Count) @@ -59,12 +69,17 @@ public class ListGenericObjects : ICollectionGenericObjects } public T? Remove(int position) { - // TODO проверка позиции - // TODO удаление объекта из списка if (position < 0 || position > Count) return null; T? temp = _collection[position]; _collection.RemoveAt(position); return temp; } + public IEnumerable GetItems() + { + for (int i = 0; i < Count; i++) + { + yield return _collection[i]; + } + } } \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/MassiveGenericObjects.cs index 022bd14..32ea0fd 100644 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/MassiveGenericObjects.cs @@ -12,6 +12,28 @@ public class MassiveGenericObjects : ICollectionGenericObjects private T?[] _collection; public int Count => _collection.Length; + public int MaxCount + { + get + { + return _collection.Length; + } + set + { + if (value > 0) + { + if (Count > 0) + { + Array.Resize(ref _collection, value); + } + else + { + _collection = new T?[value]; + } + } + } + } + public CollectionType GetCollectionType => CollectionType.Massive; public int SetMaxCount { set @@ -29,6 +51,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects } } } + //public CollectionType GetCollectionType => CollectionType.Massive; /// /// Конструктор @@ -116,4 +139,11 @@ public class MassiveGenericObjects : ICollectionGenericObjects _collection[position] = null; return temp; } + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Length; i++) + { + yield return _collection[i]; + } + } } \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs index e172f1b..360b6d3 100644 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs @@ -1,8 +1,12 @@ namespace ProjectTank.CollectionGenericObjects { + /// + /// Класс-хранилище коллекций + /// + /// public class StorageCollection - where T : class + where T : DrawningTank { /// /// Словарь (хранилище) с коллекциями @@ -12,6 +16,21 @@ namespace ProjectTank.CollectionGenericObjects /// Возвращение списка названий коллекций /// public List Keys => _storages.Keys.ToList(); + + /// + /// Ключевое слово, с которого должен начинаться файл + /// + private readonly string _collectionKey = "CollectionStorage"; + + /// + /// Разделитель для записи ключа и значения элемента словаря + /// + private readonly string _separatorForKeyValue = "|"; + + /// + /// Разделитель для записей коллекции данных в файл + /// + private readonly string _separatorItems = ";"; /// /// Конструктор /// @@ -68,6 +87,134 @@ namespace ProjectTank.CollectionGenericObjects return _storages[name]; } } + public bool SaveData(string filename) + { + if (_storages.Count == 0) + { + return false; + } + if (File.Exists(filename)) + { + File.Delete(filename); + } + + using (StreamWriter writer = new StreamWriter(filename)) + { + writer.Write(_collectionKey); + foreach (KeyValuePair> value in _storages) + { + StringBuilder sb = new(); + + sb.Append(Environment.NewLine); + // не сохраняем пустые коллекции + if (value.Value.Count == 0) + { + continue; + } + + sb.Append(value.Key); + sb.Append(_separatorForKeyValue); + sb.Append(value.Value.GetCollectionType); + sb.Append(_separatorForKeyValue); + sb.Append(value.Value.MaxCount); + sb.Append(_separatorForKeyValue); + + foreach (T? item in value.Value.GetItems()) + { + string data = item?.GetDataForSave() ?? string.Empty; + if (string.IsNullOrEmpty(data)) + { + continue; + } + + sb.Append(data); + sb.Append(_separatorItems); + } + + writer.Write(sb); + } + + } + + return true; + } + + /// + /// Загрузка информации по автомобилям в хранилище из файла + /// + /// Путь и имя файла + /// true - загрузка прошла успешно, false - ошибка при загрузке данных + public bool LoadData(string filename) + { + if (!File.Exists(filename)) + { + return false; + } + + using (StreamReader fs = File.OpenText(filename)) + { + string str = fs.ReadLine(); + + if (str == null || str.Length == 0) + { + return false; + } + + if (!str.StartsWith(_collectionKey)) + { + return false; + } + + _storages.Clear(); + string strs = ""; + while ((strs = fs.ReadLine()) != null) + { + string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries); + if (record.Length != 4) + { + continue; + } + + CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); + ICollectionGenericObjects? collection = StorageCollection.CreateCollection(collectionType); + if (collection == null) + { + return false; + } + + collection.MaxCount = Convert.ToInt32(record[2]); + + string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); + foreach (string elem in set) + { + if (elem?.CreateDrawningTank() is T airbus) + { + if (collection.Insert(airbus) == -1) + { + return false; + } + } + } + _storages.Add(record[0], collection); + } + return true; + } + } + + /// + /// Создание коллекции по типа + /// + /// + /// + private static ICollectionGenericObjects? CreateCollection(CollectionType collectionType) + { + return collectionType switch + { + CollectionType.Massive => new MassiveGenericObjects(), + CollectionType.List => new ListGenericObjects(), + _ => null + }; + } } } diff --git a/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs b/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs index b7525e7..38d6179 100644 --- a/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs +++ b/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs @@ -19,6 +19,14 @@ public class DrawningBattleTank :DrawningTank { EntityTank = new EntityBattleTank(speed, weight, bodyColor, additionalColor, gun, machinGun); } + /// + /// Конструктор + /// + /// Класс-сущность + public DrawningBattleTank(EntityBattleTank tank) : base(145, 60) + { + EntityTank = new EntityBattleTank(tank.Speed, tank.Weight, tank.BodyColor, tank.AdditionalColor, tank.Gun, tank.MachinGun); + } /// /// Прорисовка объекта diff --git a/ProjectTank/ProjectTank/Drawning/DrawningTank.cs b/ProjectTank/ProjectTank/Drawning/DrawningTank.cs index a497d50..12650e6 100644 --- a/ProjectTank/ProjectTank/Drawning/DrawningTank.cs +++ b/ProjectTank/ProjectTank/Drawning/DrawningTank.cs @@ -89,6 +89,15 @@ namespace ProjectTank.Drawning _drawningTankWidth = drawningTankWidth; _drawningTankHeight = drawningTankHeight; } + /// + /// Конструктор + /// + /// Класс-сущность + public DrawningTank(EntityTank tank) : this() + { + EntityTank = new EntityTank(tank.Speed, tank.Weight, tank.BodyColor); + } + /// /// Установка границ поля /// diff --git a/ProjectTank/ProjectTank/Drawning/ExtensionDrawningTank.cs b/ProjectTank/ProjectTank/Drawning/ExtensionDrawningTank.cs new file mode 100644 index 0000000..b6c9e2c --- /dev/null +++ b/ProjectTank/ProjectTank/Drawning/ExtensionDrawningTank.cs @@ -0,0 +1,58 @@ +using ProjectTank.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectTank.Drawning +{ + public static class ExtensionDrawningTank + { + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separatorForObject = ":"; + + /// + /// Создание объекта из строки + /// + /// Строка с данными для создания объекта + /// Объект + public static DrawningTank? CreateDrawningTank(this string info) + { + string[] strs = info.Split(_separatorForObject); + + EntityTank? tank = EntityBattleTank.CreateEntityBattleTank(strs); + if (tank != null) + { + return new DrawningBattleTank((EntityBattleTank)tank); + } + + tank = EntityTank.CreateEntityTank(strs); + if (tank != null) + { + return new DrawningTank(tank); + } + + return null; + } + + /// + /// Получение данных для сохранения в файл + /// + /// Сохраняемый объект + /// Строка с данными по объекту + public static string GetDataForSave(this DrawningTank drawningTank) + { + string[]? array = drawningTank?.EntityTank?.GetStringRepresentation(); + + if (array == null) + { + return string.Empty; + } + + return string.Join(_separatorForObject, array); + } + } +} diff --git a/ProjectTank/ProjectTank/Entities/EntityTank.cs b/ProjectTank/ProjectTank/Entities/EntityTank.cs index a1b9484..e2bb06f 100644 --- a/ProjectTank/ProjectTank/Entities/EntityTank.cs +++ b/ProjectTank/ProjectTank/Entities/EntityTank.cs @@ -41,5 +41,24 @@ namespace ProjectTank.Entities BodyColor = bodyColor; } + public virtual string[] GetStringRepresentation() + { + return new[] { nameof(EntityTank), Speed.ToString(), Weight.ToString(), BodyColor.Name }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityTank? CreateEntityTank(string[] strs) + { + if (strs.Length != 4 || strs[0] != nameof(EntityTank)) + { + return null; + } + + return new EntityTank(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3])); + } } } diff --git a/ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs b/ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs index 9b82b31..d5fbcce 100644 --- a/ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs +++ b/ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs @@ -44,6 +44,30 @@ namespace ProjectTank MachinGun= machinGun; Gun = gun; } + /// + /// Получение строк со значениями свойств объекта продвинутого класса-сущности + /// + /// + public override string[] GetStringRepresentation() + { + return new[] { nameof(EntityBattleTank), Speed.ToString(), Weight.ToString(), BodyColor.Name, + AdditionalColor.Name, Gun.ToString(), MachinGun.ToString() }; + } + /// + /// Создание продвинутого объекта из массива строк + /// + /// + /// + public static EntityTank? CreateEntityBattleTank(string[] strs) + { + if (strs.Length != 7 || strs[0] != nameof(EntityBattleTank)) + { + return null; + } + + return new EntityBattleTank(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), + Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6])); + } } } diff --git a/ProjectTank/ProjectTank/FormBattleTankCollection.Designer.cs b/ProjectTank/ProjectTank/FormBattleTankCollection.Designer.cs index 67ca06b..7e189c4 100644 --- a/ProjectTank/ProjectTank/FormBattleTankCollection.Designer.cs +++ b/ProjectTank/ProjectTank/FormBattleTankCollection.Designer.cs @@ -1,4 +1,6 @@ -namespace ProjectTank +using System.Windows.Forms; + +namespace ProjectTank { partial class FormBattleTankCollection { @@ -46,10 +48,17 @@ labelCollectionName = new Label(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); + menuStrip = new MenuStrip(); + файлToolStripMenuItem = new ToolStripMenuItem(); + SaveToolStripMenuItem = new ToolStripMenuItem(); + LoadToolStripMenuItem = new ToolStripMenuItem(); + saveFileDialog = new SaveFileDialog(); + openFileDialog = new OpenFileDialog(); groupBoxTools.SuspendLayout(); panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + menuStrip.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -59,9 +68,9 @@ groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(815, 0); + groupBoxTools.Location = new Point(798, 24); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(187, 610); + groupBoxTools.Size = new Size(187, 611); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "инструменты"; @@ -239,19 +248,61 @@ // pictureBox // pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 0); + pictureBox.Location = new Point(0, 24); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(815, 610); + pictureBox.Size = new Size(798, 611); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // + // menuStrip + // + menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(985, 24); + menuStrip.TabIndex = 8; + menuStrip.Text = "menuStrip"; + // + // файлToolStripMenuItem + // + файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem }); + файлToolStripMenuItem.Name = "файлToolStripMenuItem"; + файлToolStripMenuItem.Size = new Size(48, 20); + файлToolStripMenuItem.Text = "Файл"; + // + // SaveToolStripMenuItem + // + SaveToolStripMenuItem.Name = "SaveToolStripMenuItem"; + SaveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S; + SaveToolStripMenuItem.Size = new Size(181, 22); + SaveToolStripMenuItem.Text = "Сохранение"; + SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click; + // + // LoadToolStripMenuItem + // + LoadToolStripMenuItem.Name = "LoadToolStripMenuItem"; + LoadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L; + LoadToolStripMenuItem.Size = new Size(181, 22); + LoadToolStripMenuItem.Text = "Загрузка"; + LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click; + // + // saveFileDialog + // + saveFileDialog.Filter = "txt file | *.txt"; + // + // openFileDialog + // + openFileDialog.Filter = "txt file | *.txt"; + // // FormBattleTankCollection // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1002, 610); + ClientSize = new Size(985, 635); Controls.Add(pictureBox); Controls.Add(groupBoxTools); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; Name = "FormBattleTankCollection"; Text = "Коллекция танков"; groupBoxTools.ResumeLayout(false); @@ -260,9 +311,14 @@ panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } + + #endregion private GroupBox groupBoxTools; @@ -283,5 +339,11 @@ private ListBox listBoxСollection; private Button buttonCollectionAdd; private Panel panelCompanyTools; + private MenuStrip menuStrip; + private ToolStripMenuItem файлToolStripMenuItem; + private ToolStripMenuItem SaveToolStripMenuItem; + private ToolStripMenuItem LoadToolStripMenuItem; + private SaveFileDialog saveFileDialog; + private OpenFileDialog openFileDialog; } } \ No newline at end of file diff --git a/ProjectTank/ProjectTank/FormBattleTankCollection.resx b/ProjectTank/ProjectTank/FormBattleTankCollection.resx index af32865..7dc5378 100644 --- a/ProjectTank/ProjectTank/FormBattleTankCollection.resx +++ b/ProjectTank/ProjectTank/FormBattleTankCollection.resx @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 126, 17 + + + 255, 17 + \ No newline at end of file diff --git a/ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs b/ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs index e725302..40eeb71 100644 --- a/ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs +++ b/ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs @@ -51,7 +51,7 @@ namespace ProjectTank.MovementStrategy MovementDirection.Right => DirectionType.Right, MovementDirection.Up => DirectionType.Up, MovementDirection.Down => DirectionType.Down, - _ => DirectionType.Unknow, + _=> DirectionType.Unknow, }; } } -- 2.25.1 From 9373b38d7edd72bc84dc8e1df35586be17f47cea Mon Sep 17 00:00:00 2001 From: Garifullin-Farid <95081032+Garifullin-Farid@users.noreply.github.com> Date: Mon, 6 May 2024 22:46:50 +0400 Subject: [PATCH 5/6] fix --- .../.CollectionType.cs.swp | Bin 0 -> 12288 bytes .../.CollectionType_BASE_1418.cs.swp | Bin 0 -> 12288 bytes .../.CollectionType_LOCAL_1418.cs.swp | Bin 0 -> 12288 bytes .../.CollectionType_REMOTE_1418.cs.swp | Bin 0 -> 12288 bytes .../CollectionType_BACKUP_1418.cs | 25 ++++++ .../CollectionType_BASE_1418.cs | 17 ++++ .../CollectionType_LOCAL_1418.cs | 21 +++++ .../CollectionType_REMOTE_1418.cs | 17 ++++ .../StorageCollection_BACKUP_1588.cs | 83 ++++++++++++++++++ .../StorageCollection_BASE_1588.cs | 75 ++++++++++++++++ .../StorageCollection_LOCAL_1588.cs | 73 +++++++++++++++ .../StorageCollection_REMOTE_1588.cs | 79 +++++++++++++++++ 12 files changed, 390 insertions(+) create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType.cs.swp create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_BASE_1418.cs.swp create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_LOCAL_1418.cs.swp create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_REMOTE_1418.cs.swp create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BACKUP_1418.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs create mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType.cs.swp b/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType.cs.swp new file mode 100644 index 0000000000000000000000000000000000000000..a66b1897763edaddaf74816b6e5b50fc91419e3a GIT binary patch literal 12288 zcmeI2OK%cU6vuB}bXPUHa$&scR+$%%A*D^4wqm1wBqIBHT#`{32m>ah(Sjz%WnH<^ zh5ZD^NJ6NEg$ol`clP=T{0_$d0D?5Ft{cuFzg*_b;mp0i9hqaR`Hf9(#&m|b$XMg5 zR!Hv8GcnIt!K!+0l>bkxtv|Sz+upgI%4b(~J$-7m;wa$@c_cfstLQvz$+r9~+hHqw z9yS%(!>6w+JJs?d;nZ@L|9I;AYPncM-YffA;ft#0Y}-*?piFM$8Wj<9f>WPQH^{(j z8(3h5uBnlOn>ViW%afDDiUGC&5%02!Du1GUN=+ryd9jm~{#w9Xw{ zN0+pa0Wv@a$N(8217v^BX^ zAn=|Dw9;-(YEJ0&R(`|$q!gB^9lmq>Mn#p7dUhQaTyudFfODv6+CIfDN+NFSSQb9#7wk^Khz C2Ioc6tCW#?0tyAu08;AJwr?s)F7a+UAcQ|V}5Agec0#hjY|`D12i-uP;CC+y(G zUxFJDs6~MW>NJgHbn^DLR?*TtTZ;%dGXx+20SG_<0uX=z1Zq|wpR1z{KK+M^KvQL| zdooupF+l(V5P$##AOHafKmY;|fB*y_@E;0T{DOa}k?4{Wz5jps|9|t5=$f<7+2ibR z);Y_ZUz|}+7pINW#QDq5-*Ij^SDdKc1qTBH5P$##AOHafKmY;|fB*y_@SXzeBzTNF zL0do4QJv)Lb+)+`p1a?}O`Z=pC!8}~ex~LcD0_=*|ClR7UGjGuc(JVihEoBBrKb?6qvx39KfYkWIuWVx!bV`56H=aSzn53}>`yDu}(ZP~YwUcSDlW>c|B zcZ#X6(_*GYie4?alf?fsuFc=NkAs$r11rwTD;O7cSUZh74^3AGQ$>uUwvn$Sd zXExj?3Z({lTHpkbLylzdgS&5I^dCMfCgxQ255i=Xn+Q2U~&!At5fm> z$KN+laBMJ7ZJP&6PBcIRG(ZD1Km#;D12jMbG(ZD1Km&WwfQKLaCk}|b1j+yZKi~iM zpvY(N9=rw*!2?hP^S}kC!3;PIe&YQf;5+yRzJPVG23~=r{tLiC12jMbG(ZD1Km#;D z12jMbG(ZC)k40f*gQ%`9E4RPUTB|u7HOghL*1R$d*|)Z5+vp+h+RiXIH%#k?7QHA6 z?i-YH&Wv()sP)FKqYJ%-#`F)PyzyE$D`8S7{qI6+XlX|md%TMIBiIC6w!1^oM^bGR zN`bFT*eI*<9(LJw=45H#VRt=cJE*_euiJ^ABh>z#Jlt&Pl}%Lje53wqq)(0Nk2lX> Fl3%w%*7^Vd literal 0 HcmV?d00001 diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_REMOTE_1418.cs.swp b/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_REMOTE_1418.cs.swp new file mode 100644 index 0000000000000000000000000000000000000000..92fd60296ca27fc1cdb0569e728f9413df3f5d92 GIT binary patch literal 12288 zcmeI&&q^Cn6bA4U7w-JO7H+Le&CQGjEowJ0h}0OV(Pd>ay~4y~5;BQki)id?DCirA zD2Ud$RS~?i>^t}no++tu#OTJ2f;vw&Zlu?XYWZ6tnMx;?jZel{)b^VG z7Tkb9>j`wwh-t)v=l(eGLG<-5wjKeV7y=N000bZa0SG_<0xc|1E=FjRpTDhc&{N+d zPxksHHV8lf0uX=z1Rwwb2tWV=5P$##-l2fSFZi>aMAw|){r~^}|GJClmUF~8BHefs4QuDp0lR7lQGmNd8XBlKHvfN zD$leZHtIsH<_d1mC-!omT^@$#`FDSd_an|3=UmsG>G_L_l}ygDg>ox-5uSc0a;?1b Sik7X!qe1#;qbfW+KTh{Z%( +/// Тип коллекции +/// +======= + +>>>>>>> d84f98706403d56e8dae185838815e23bb91f4d7 +public enum CollectionType +{ + /// + /// Неопределено + /// + None = 0, + + /// + /// Массив + /// + Massive = 1, + + /// + /// Список + /// + List = 2 +} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs new file mode 100644 index 0000000..75d6067 --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs @@ -0,0 +1,17 @@ +namespace ProjectLinkor.CollectionGenericObjects; + +public enum CollectionType +{ + /// + /// Неопределено + /// + None = 0, + /// + /// Массив + /// + Massive = 1, + /// + /// Список + /// + List = 2 +} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs new file mode 100644 index 0000000..93d9dff --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs @@ -0,0 +1,21 @@ +namespace ProjectTank.CollectionGenericObjects; +/// +/// Тип коллекции +/// +public enum CollectionType +{ + /// + /// Неопределено + /// + None = 0, + + /// + /// Массив + /// + Massive = 1, + + /// + /// Список + /// + List = 2 +} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs new file mode 100644 index 0000000..f4bf31f --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs @@ -0,0 +1,17 @@ +namespace ProjectTank.CollectionGenericObjects; + +public enum CollectionType +{ + /// + /// Неопределено + /// + None = 0, + /// + /// Массив + /// + Massive = 1, + /// + /// Список + /// + List = 2 +} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs new file mode 100644 index 0000000..24dd440 --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs @@ -0,0 +1,83 @@ +<<<<<<< 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 + where T : class + { + /// + /// Словарь (хранилище) с коллекциями + /// + readonly Dictionary> _storages; + /// + /// Возвращение списка названий коллекций + /// + public List Keys => _storages.Keys.ToList(); + /// + /// Конструктор + /// + public StorageCollection() + { + _storages = new Dictionary>(); + } + /// + /// Добавление коллекции в хранилище + /// + /// Название коллекции + /// тип коллекции + 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(); + return; + case CollectionType.List: + _storages[name] = new ListGenericObjects(); + return; + } + + } + /// + /// Удаление коллекции + /// + /// Название коллекции + public void DelCollection(string name) + { + // TODO Прописать логику для удаления коллекции + if (_storages.ContainsKey(name)) + _storages.Remove(name); + } + /// + /// Доступ к коллекции + /// + /// Название коллекции + /// + public ICollectionGenericObjects? this[string name] + { + get + { + // TODO Продумать логику получения объекта + if (name == null || !_storages.ContainsKey(name)) + return null; + return _storages[name]; + } + } + + } +} diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs new file mode 100644 index 0000000..4345763 --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs @@ -0,0 +1,75 @@ +using ProjectLinkor.CollectionGenericObjects; + + +namespace ProjectTank.CollectionGenericObjects +{ + public class StorageCollection + where T : class + { + /// + /// Словарь (хранилище) с коллекциями + /// + readonly Dictionary> _storages; + /// + /// Возвращение списка названий коллекций + /// + public List Keys => _storages.Keys.ToList(); + /// + /// Конструктор + /// + public StorageCollection() + { + _storages = new Dictionary>(); + } + /// + /// Добавление коллекции в хранилище + /// + /// Название коллекции + /// тип коллекции + 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(); + return; + case CollectionType.List: + _storages[name] = new ListGenericObjects(); + return; + } + + } + /// + /// Удаление коллекции + /// + /// Название коллекции + public void DelCollection(string name) + { + // TODO Прописать логику для удаления коллекции + if (_storages.ContainsKey(name)) + _storages.Remove(name); + } + /// + /// Доступ к коллекции + /// + /// Название коллекции + /// + public ICollectionGenericObjects? this[string name] + { + get + { + // TODO Продумать логику получения объекта + if (name == null || !_storages.ContainsKey(name)) + return null; + return _storages[name]; + } + } + + } +} diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs new file mode 100644 index 0000000..6b0bc15 --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs @@ -0,0 +1,73 @@ + +namespace ProjectTank.CollectionGenericObjects +{ + public class StorageCollection + where T : class + { + /// + /// Словарь (хранилище) с коллекциями + /// + readonly Dictionary> _storages; + /// + /// Возвращение списка названий коллекций + /// + public List Keys => _storages.Keys.ToList(); + /// + /// Конструктор + /// + public StorageCollection() + { + _storages = new Dictionary>(); + } + /// + /// Добавление коллекции в хранилище + /// + /// Название коллекции + /// тип коллекции + 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(); + return; + case CollectionType.List: + _storages[name] = new ListGenericObjects(); + return; + } + + } + /// + /// Удаление коллекции + /// + /// Название коллекции + public void DelCollection(string name) + { + // TODO Прописать логику для удаления коллекции + if (_storages.ContainsKey(name)) + _storages.Remove(name); + } + /// + /// Доступ к коллекции + /// + /// Название коллекции + /// + public ICollectionGenericObjects? this[string name] + { + get + { + // TODO Продумать логику получения объекта + if (name == null || !_storages.ContainsKey(name)) + return null; + return _storages[name]; + } + } + + } +} diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs new file mode 100644 index 0000000..368bdcb --- /dev/null +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs @@ -0,0 +1,79 @@ +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 + where T : class + { + /// + /// Словарь (хранилище) с коллекциями + /// + readonly Dictionary> _storages; + /// + /// Возвращение списка названий коллекций + /// + public List Keys => _storages.Keys.ToList(); + /// + /// Конструктор + /// + public StorageCollection() + { + _storages = new Dictionary>(); + } + /// + /// Добавление коллекции в хранилище + /// + /// Название коллекции + /// тип коллекции + 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(); + return; + case CollectionType.List: + _storages[name] = new ListGenericObjects(); + return; + } + + } + /// + /// Удаление коллекции + /// + /// Название коллекции + public void DelCollection(string name) + { + // TODO Прописать логику для удаления коллекции + if (_storages.ContainsKey(name)) + _storages.Remove(name); + } + /// + /// Доступ к коллекции + /// + /// Название коллекции + /// + public ICollectionGenericObjects? this[string name] + { + get + { + // TODO Продумать логику получения объекта + if (name == null || !_storages.ContainsKey(name)) + return null; + return _storages[name]; + } + } + + } +} -- 2.25.1 From 53bc2289564c26737023dbfe65a5835b137e43bd Mon Sep 17 00:00:00 2001 From: Garifullin-Farid <95081032+Garifullin-Farid@users.noreply.github.com> Date: Mon, 6 May 2024 22:56:32 +0400 Subject: [PATCH 6/6] fix --- .../.CollectionType.cs.swp | Bin 12288 -> 0 bytes .../.CollectionType_BASE_1418.cs.swp | Bin 12288 -> 0 bytes .../.CollectionType_LOCAL_1418.cs.swp | Bin 12288 -> 0 bytes .../.CollectionType_REMOTE_1418.cs.swp | Bin 12288 -> 0 bytes .../CollectionType_BACKUP_1418.cs | 25 ------ .../CollectionType_BASE_1418.cs | 17 ---- .../CollectionType_LOCAL_1418.cs | 21 ----- .../CollectionType_REMOTE_1418.cs | 17 ---- .../StorageCollection.cs | 3 + .../StorageCollection_BACKUP_1588.cs | 83 ------------------ .../StorageCollection_BASE_1588.cs | 75 ---------------- .../StorageCollection_LOCAL_1588.cs | 73 --------------- .../StorageCollection_REMOTE_1588.cs | 79 ----------------- .../Drawning/DrawningBattleTank.cs.orig | 73 --------------- .../ProjectTank/Entities/EntityTank.cs.orig | 56 ------------ .../Entities/EntiyBattleTank.cs.orig | 52 ----------- .../ProjectTank/FormBattleTankCollection.cs | 51 ++++++++--- .../MovementStrategy/MoveableTank.cs.orig | 64 -------------- 18 files changed, 43 insertions(+), 646 deletions(-) delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType.cs.swp delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_BASE_1418.cs.swp delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_LOCAL_1418.cs.swp delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_REMOTE_1418.cs.swp delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BACKUP_1418.cs delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs delete mode 100644 ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs delete mode 100644 ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs.orig delete mode 100644 ProjectTank/ProjectTank/Entities/EntityTank.cs.orig delete mode 100644 ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs.orig delete mode 100644 ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs.orig diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType.cs.swp b/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType.cs.swp deleted file mode 100644 index a66b1897763edaddaf74816b6e5b50fc91419e3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2OK%cU6vuB}bXPUHa$&scR+$%%A*D^4wqm1wBqIBHT#`{32m>ah(Sjz%WnH<^ zh5ZD^NJ6NEg$ol`clP=T{0_$d0D?5Ft{cuFzg*_b;mp0i9hqaR`Hf9(#&m|b$XMg5 zR!Hv8GcnIt!K!+0l>bkxtv|Sz+upgI%4b(~J$-7m;wa$@c_cfstLQvz$+r9~+hHqw z9yS%(!>6w+JJs?d;nZ@L|9I;AYPncM-YffA;ft#0Y}-*?piFM$8Wj<9f>WPQH^{(j z8(3h5uBnlOn>ViW%afDDiUGC&5%02!Du1GUN=+ryd9jm~{#w9Xw{ zN0+pa0Wv@a$N(8217v^BX^ zAn=|Dw9;-(YEJ0&R(`|$q!gB^9lmq>Mn#p7dUhQaTyudFfODv6+CIfDN+NFSSQb9#7wk^Khz C2Ioc6tCW#?0tyAu08;AJwr?s)F7a+UAcQ|V}5Agec0#hjY|`D12i-uP;CC+y(G zUxFJDs6~MW>NJgHbn^DLR?*TtTZ;%dGXx+20SG_<0uX=z1Zq|wpR1z{KK+M^KvQL| zdooupF+l(V5P$##AOHafKmY;|fB*y_@E;0T{DOa}k?4{Wz5jps|9|t5=$f<7+2ibR z);Y_ZUz|}+7pINW#QDq5-*Ij^SDdKc1qTBH5P$##AOHafKmY;|fB*y_@SXzeBzTNF zL0do4QJv)Lb+)+`p1a?}O`Z=pC!8}~ex~LcD0_=*|ClR7UGjGuc(JVihEoBBrKb?6qvx39KfYkWIuWVx!bV`56H=aSzn53}>`yDu}(ZP~YwUcSDlW>c|B zcZ#X6(_*GYie4?alf?fsuFc=NkAs$r11rwTD;O7cSUZh74^3AGQ$>uUwvn$Sd zXExj?3Z({lTHpkbLylzdgS&5I^dCMfCgxQ255i=Xn+Q2U~&!At5fm> z$KN+laBMJ7ZJP&6PBcIRG(ZD1Km#;D12jMbG(ZD1Km&WwfQKLaCk}|b1j+yZKi~iM zpvY(N9=rw*!2?hP^S}kC!3;PIe&YQf;5+yRzJPVG23~=r{tLiC12jMbG(ZD1Km#;D z12jMbG(ZC)k40f*gQ%`9E4RPUTB|u7HOghL*1R$d*|)Z5+vp+h+RiXIH%#k?7QHA6 z?i-YH&Wv()sP)FKqYJ%-#`F)PyzyE$D`8S7{qI6+XlX|md%TMIBiIC6w!1^oM^bGR zN`bFT*eI*<9(LJw=45H#VRt=cJE*_euiJ^ABh>z#Jlt&Pl}%Lje53wqq)(0Nk2lX> Fl3%w%*7^Vd diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_REMOTE_1418.cs.swp b/ProjectTank/ProjectTank/CollectionGenericObjects/.CollectionType_REMOTE_1418.cs.swp deleted file mode 100644 index 92fd60296ca27fc1cdb0569e728f9413df3f5d92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&&q^Cn6bA4U7w-JO7H+Le&CQGjEowJ0h}0OV(Pd>ay~4y~5;BQki)id?DCirA zD2Ud$RS~?i>^t}no++tu#OTJ2f;vw&Zlu?XYWZ6tnMx;?jZel{)b^VG z7Tkb9>j`wwh-t)v=l(eGLG<-5wjKeV7y=N000bZa0SG_<0xc|1E=FjRpTDhc&{N+d zPxksHHV8lf0uX=z1Rwwb2tWV=5P$##-l2fSFZi>aMAw|){r~^}|GJClmUF~8BHefs4QuDp0lR7lQGmNd8XBlKHvfN zD$leZHtIsH<_d1mC-!omT^@$#`FDSd_an|3=UmsG>G_L_l}ygDg>ox-5uSc0a;?1b Sik7X!qe1#;qbfW+KTh{Z%( -/// Тип коллекции -/// -======= - ->>>>>>> d84f98706403d56e8dae185838815e23bb91f4d7 -public enum CollectionType -{ - /// - /// Неопределено - /// - None = 0, - - /// - /// Массив - /// - Massive = 1, - - /// - /// Список - /// - List = 2 -} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs deleted file mode 100644 index 75d6067..0000000 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_BASE_1418.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace ProjectLinkor.CollectionGenericObjects; - -public enum CollectionType -{ - /// - /// Неопределено - /// - None = 0, - /// - /// Массив - /// - Massive = 1, - /// - /// Список - /// - List = 2 -} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs deleted file mode 100644 index 93d9dff..0000000 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_LOCAL_1418.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace ProjectTank.CollectionGenericObjects; -/// -/// Тип коллекции -/// -public enum CollectionType -{ - /// - /// Неопределено - /// - None = 0, - - /// - /// Массив - /// - Massive = 1, - - /// - /// Список - /// - List = 2 -} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs deleted file mode 100644 index f4bf31f..0000000 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType_REMOTE_1418.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace ProjectTank.CollectionGenericObjects; - -public enum CollectionType -{ - /// - /// Неопределено - /// - None = 0, - /// - /// Массив - /// - Massive = 1, - /// - /// Список - /// - List = 2 -} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs index 360b6d3..983b5a6 100644 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs @@ -1,4 +1,7 @@ +using ProjectTank.Drawning; +using System.Text; + namespace ProjectTank.CollectionGenericObjects { /// diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs deleted file mode 100644 index 24dd440..0000000 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BACKUP_1588.cs +++ /dev/null @@ -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 - where T : class - { - /// - /// Словарь (хранилище) с коллекциями - /// - readonly Dictionary> _storages; - /// - /// Возвращение списка названий коллекций - /// - public List Keys => _storages.Keys.ToList(); - /// - /// Конструктор - /// - public StorageCollection() - { - _storages = new Dictionary>(); - } - /// - /// Добавление коллекции в хранилище - /// - /// Название коллекции - /// тип коллекции - 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(); - return; - case CollectionType.List: - _storages[name] = new ListGenericObjects(); - return; - } - - } - /// - /// Удаление коллекции - /// - /// Название коллекции - public void DelCollection(string name) - { - // TODO Прописать логику для удаления коллекции - if (_storages.ContainsKey(name)) - _storages.Remove(name); - } - /// - /// Доступ к коллекции - /// - /// Название коллекции - /// - public ICollectionGenericObjects? this[string name] - { - get - { - // TODO Продумать логику получения объекта - if (name == null || !_storages.ContainsKey(name)) - return null; - return _storages[name]; - } - } - - } -} diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs deleted file mode 100644 index 4345763..0000000 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_BASE_1588.cs +++ /dev/null @@ -1,75 +0,0 @@ -using ProjectLinkor.CollectionGenericObjects; - - -namespace ProjectTank.CollectionGenericObjects -{ - public class StorageCollection - where T : class - { - /// - /// Словарь (хранилище) с коллекциями - /// - readonly Dictionary> _storages; - /// - /// Возвращение списка названий коллекций - /// - public List Keys => _storages.Keys.ToList(); - /// - /// Конструктор - /// - public StorageCollection() - { - _storages = new Dictionary>(); - } - /// - /// Добавление коллекции в хранилище - /// - /// Название коллекции - /// тип коллекции - 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(); - return; - case CollectionType.List: - _storages[name] = new ListGenericObjects(); - return; - } - - } - /// - /// Удаление коллекции - /// - /// Название коллекции - public void DelCollection(string name) - { - // TODO Прописать логику для удаления коллекции - if (_storages.ContainsKey(name)) - _storages.Remove(name); - } - /// - /// Доступ к коллекции - /// - /// Название коллекции - /// - public ICollectionGenericObjects? this[string name] - { - get - { - // TODO Продумать логику получения объекта - if (name == null || !_storages.ContainsKey(name)) - return null; - return _storages[name]; - } - } - - } -} diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs deleted file mode 100644 index 6b0bc15..0000000 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_LOCAL_1588.cs +++ /dev/null @@ -1,73 +0,0 @@ - -namespace ProjectTank.CollectionGenericObjects -{ - public class StorageCollection - where T : class - { - /// - /// Словарь (хранилище) с коллекциями - /// - readonly Dictionary> _storages; - /// - /// Возвращение списка названий коллекций - /// - public List Keys => _storages.Keys.ToList(); - /// - /// Конструктор - /// - public StorageCollection() - { - _storages = new Dictionary>(); - } - /// - /// Добавление коллекции в хранилище - /// - /// Название коллекции - /// тип коллекции - 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(); - return; - case CollectionType.List: - _storages[name] = new ListGenericObjects(); - return; - } - - } - /// - /// Удаление коллекции - /// - /// Название коллекции - public void DelCollection(string name) - { - // TODO Прописать логику для удаления коллекции - if (_storages.ContainsKey(name)) - _storages.Remove(name); - } - /// - /// Доступ к коллекции - /// - /// Название коллекции - /// - public ICollectionGenericObjects? this[string name] - { - get - { - // TODO Продумать логику получения объекта - if (name == null || !_storages.ContainsKey(name)) - return null; - return _storages[name]; - } - } - - } -} diff --git a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs b/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs deleted file mode 100644 index 368bdcb..0000000 --- a/ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection_REMOTE_1588.cs +++ /dev/null @@ -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 - where T : class - { - /// - /// Словарь (хранилище) с коллекциями - /// - readonly Dictionary> _storages; - /// - /// Возвращение списка названий коллекций - /// - public List Keys => _storages.Keys.ToList(); - /// - /// Конструктор - /// - public StorageCollection() - { - _storages = new Dictionary>(); - } - /// - /// Добавление коллекции в хранилище - /// - /// Название коллекции - /// тип коллекции - 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(); - return; - case CollectionType.List: - _storages[name] = new ListGenericObjects(); - return; - } - - } - /// - /// Удаление коллекции - /// - /// Название коллекции - public void DelCollection(string name) - { - // TODO Прописать логику для удаления коллекции - if (_storages.ContainsKey(name)) - _storages.Remove(name); - } - /// - /// Доступ к коллекции - /// - /// Название коллекции - /// - public ICollectionGenericObjects? this[string name] - { - get - { - // TODO Продумать логику получения объекта - if (name == null || !_storages.ContainsKey(name)) - return null; - return _storages[name]; - } - } - - } -} diff --git a/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs.orig b/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs.orig deleted file mode 100644 index 86f6e79..0000000 --- a/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs.orig +++ /dev/null @@ -1,73 +0,0 @@ -<<<<<<< HEAD -======= -using ProjectTank.Entities; ->>>>>>> 6b2dbf2 (LabWork_2) - -namespace ProjectTank.Drawning; -/// -/// Класс, отвечающий за прорисовку и перемещение объекта-сущности -/// -public class DrawningBattleTank :DrawningTank -{ - /// - /// Конструктор - /// - /// Скорость -<<<<<<< HEAD - /// Вес -======= - /// Вес автомобиля ->>>>>>> 6b2dbf2 (LabWork_2) - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия пушки - /// признак наличия пулемета - /// - 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); - } - - /// - /// Прорисовка объекта - /// - /// - 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; - - } - -} - - - diff --git a/ProjectTank/ProjectTank/Entities/EntityTank.cs.orig b/ProjectTank/ProjectTank/Entities/EntityTank.cs.orig deleted file mode 100644 index 9803d29..0000000 --- a/ProjectTank/ProjectTank/Entities/EntityTank.cs.orig +++ /dev/null @@ -1,56 +0,0 @@ -<<<<<<< HEAD -namespace ProjectTank.Entities -======= -namespace ProjectTank.Entities ->>>>>>> 6b2dbf2 (LabWork_2) -{ - public class EntityTank - { - - /// - /// Скорость - /// - public int Speed { get; private set; } - - /// - /// Вес - /// - public double Weight { get; private set; } - - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } - - /// - /// Шаг перемещения танка - /// - public double Step => Speed * 100 / Weight; -<<<<<<< HEAD - public void SetBodyColor(Color color) - { - BodyColor = color; - } -======= ->>>>>>> 6b2dbf2 (LabWork_2) - - /// - /// Конструктор сущности - /// - /// Скорость -<<<<<<< HEAD - /// Веc -======= - /// Вес автомобиля ->>>>>>> 6b2dbf2 (LabWork_2) - /// Основной цвет - - public EntityTank(int speed, double weight, Color bodyColor) - { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; - - } - } -} diff --git a/ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs.orig b/ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs.orig deleted file mode 100644 index 7aae8d2..0000000 --- a/ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs.orig +++ /dev/null @@ -1,52 +0,0 @@ -using ProjectTank.Entities; - -namespace ProjectTank -{ - /// - /// Класс-сущность танк - /// - public class EntityBattleTank : EntityTank - - { - /// - /// Дополнительный цвет (для опциональных элементов) - /// - public Color AdditionalColor { get; private set; } - - /// - /// Признак (опция) наличия пушки - /// - public bool Gun { get; private set; } - - - /// - /// Признак (опция) наличия Пулемета на башне - /// /// - public bool MachinGun { get; private set; } - -<<<<<<< HEAD - public void SetAdditionalColor(Color addColor) - { - AdditionalColor = addColor; - } - -======= ->>>>>>> 6b2dbf2 (LabWork_2) - /// - /// Конструктор объекта-класса Боевого Танка - /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Пушка танка - /// Пклемет на башне - public EntityBattleTank(int speed, double weight, Color bodyColor, Color additionalColor, bool gun, bool machinGun) : base(speed, weight, bodyColor) - { - AdditionalColor = additionalColor; - MachinGun= machinGun; - Gun = gun; - } - - } -} diff --git a/ProjectTank/ProjectTank/FormBattleTankCollection.cs b/ProjectTank/ProjectTank/FormBattleTankCollection.cs index d81e1d2..689201b 100644 --- a/ProjectTank/ProjectTank/FormBattleTankCollection.cs +++ b/ProjectTank/ProjectTank/FormBattleTankCollection.cs @@ -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); + } + } + } + + /// + /// Обработка нажатия "Загрузка" + /// + /// + /// + 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); + + } + } + } } } \ No newline at end of file diff --git a/ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs.orig b/ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs.orig deleted file mode 100644 index a9b935d..0000000 --- a/ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs.orig +++ /dev/null @@ -1,64 +0,0 @@ -using ProjectTank.Drawning; - -namespace ProjectTank.MovementStrategy -{ - public class MoveableTank : IMoveableObject - { - /// - /// Поле-объект класса или его DrawningTank наследника - /// - private readonly DrawningTank? _tank = null; - /// -<<<<<<< HEAD - /// конструктор - /// - /// Объект класса DrawningTank -======= - /// Конструктор - /// - /// Объект класса DrawningBoat ->>>>>>> 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)); - } - /// - /// Конвертация из MovementDirection в DirectionType - /// - /// MovementDirection - /// DirectionType - 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, - }; - } - } -} -- 2.25.1