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

fixLabWork_6

Browse Source 
# Conflicts:
#	ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs
#	ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs
#	ProjectTank/ProjectTank/FormBattleTankCollection.cs
#	ProjectTank/ProjectTank/FormTankConfig.cs
This commit is contained in:
Garifullin-Farid 2024-05-19 22:26:06 +04:00
parent 66ada06a40
commit 85b4605bbb
14 changed files with 415 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProjectTank/ProjectTank/CollectionGenericObjects/AbstractCompany.cs
View File

@ -47,7 +47,7 @@ public abstract class AbstractCompany
_pictureWidth = picWidth;
_pictureHeight = picHeight;
_collection = collection;
_collection.SetMaxCount = GetMaxCount;
_collection.MaxCount = GetMaxCount;
}
/// <summary>

6
ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs
View File

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

12
ProjectTank/ProjectTank/CollectionGenericObjects/ICollectionGenericObjects.cs
View File

@ -15,7 +15,7 @@
/// <summary>
/// Установка максимального количества элементов
/// </summary>
int SetMaxCount { set; }
int MaxCount { get; set; }
/// <summary>
/// Добавление объекта в коллекцию
@ -46,5 +46,15 @@
/// <returns>Объект</returns>
T? Get(int position);
/// <summary>
/// Получение типа коллекции
/// </summary>
CollectionType GetCollectionType { get; }
/// <summary>
/// Получение объектов коллекции по одному
/// </summary>
/// <returns>Поэлементный вывод элементов коллекции</returns>
IEnumerable<T?> GetItems();
}
}

33
ProjectTank/ProjectTank/CollectionGenericObjects/ListGenericObjects.cs
View File

@ -17,7 +17,21 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
/// </summary>
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;
/// <summary>
/// Конструктор
/// </summary>
@ -27,7 +41,6 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
}
public T? Get(int position)
{
// TODO проверка позиции
if (position <= Count)
{
return _collection[position];
@ -37,18 +50,15 @@ public class ListGenericObjects<T> : ICollectionGenericObjects<T>
}
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<T> : ICollectionGenericObjects<T>
}
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<T?> GetItems()
{
for (int i = 0; i < Count; i++)
{
yield return _collection[i];
}
}
}

30
ProjectTank/ProjectTank/CollectionGenericObjects/MassiveGenericObjects.cs
View File

@ -12,6 +12,28 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
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<T> : ICollectionGenericObjects<T>
}
}
}
//public CollectionType GetCollectionType => CollectionType.Massive;
/// <summary>
/// Конструктор
@ -116,4 +139,11 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
_collection[position] = null;
return temp;
}
public IEnumerable<T?> GetItems()
{
for (int i = 0; i < _collection.Length; i++)
{
yield return _collection[i];
}
}
}

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

@ -1,8 +1,12 @@
namespace ProjectTank.CollectionGenericObjects
{
/// <summary>
/// Класс-хранилище коллекций
/// </summary>
/// <typeparam name="T"></typeparam>
public class StorageCollection<T>
where T : class
where T : DrawningTank
{
/// <summary>
/// Словарь (хранилище) с коллекциями
@ -12,6 +16,21 @@ namespace ProjectTank.CollectionGenericObjects
/// Возвращение списка названий коллекций
/// </summary>
public List<string> Keys => _storages.Keys.ToList();
/// <summary>
/// Ключевое слово, с которого должен начинаться файл
/// </summary>
private readonly string _collectionKey = "CollectionStorage";
/// <summary>
/// Разделитель для записи ключа и значения элемента словаря
/// </summary>
private readonly string _separatorForKeyValue = "|";
/// <summary>
/// Разделитель для записей коллекции данных в файл
/// </summary>
private readonly string _separatorItems = ";";
/// <summary>
/// Конструктор
/// </summary>
@ -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<string, ICollectionGenericObjects<T>> 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;
}
/// <summary>
/// Загрузка информации по автомобилям в хранилище из файла
/// </summary>
/// <param name="filename">Путь и имя файла</param>
/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
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<T>? collection = StorageCollection<T>.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;
}
}
/// <summary>
/// Создание коллекции по типа
/// </summary>
/// <param name="collectionType"></param>
/// <returns></returns>
private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
{
return collectionType switch
{
CollectionType.Massive => new MassiveGenericObjects<T>(),
CollectionType.List => new ListGenericObjects<T>(),
_ => null
};
}
}
}

8
ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs
View File

@ -19,6 +19,14 @@ public class DrawningBattleTank :DrawningTank
{
EntityTank = new EntityBattleTank(speed, weight, bodyColor, additionalColor, gun, machinGun);
}
/// <summary>
/// Конструктор
/// </summary>
/// <param name="tank">Класс-сущность</param>
public DrawningBattleTank(EntityBattleTank tank) : base(145, 60)
{
EntityTank = new EntityBattleTank(tank.Speed, tank.Weight, tank.BodyColor, tank.AdditionalColor, tank.Gun, tank.MachinGun);
}
/// <summary>
/// Прорисовка объекта

9
ProjectTank/ProjectTank/Drawning/DrawningTank.cs
View File

@ -89,6 +89,15 @@ namespace ProjectTank.Drawning
_drawningTankWidth = drawningTankWidth;
_drawningTankHeight = drawningTankHeight;
}
/// <summary>
/// Конструктор
/// </summary>
/// <param name="airbus">Класс-сущность</param>
public DrawningTank(EntityTank tank) : this()
{
EntityTank = new EntityTank(tank.Speed, tank.Weight, tank.BodyColor);
}
/// <summary>
/// Установка границ поля
/// </summary>

58
ProjectTank/ProjectTank/Drawning/ExtensionDrawningTank.cs Normal file
View File

@ -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
{
/// <summary>
/// Разделитель для записи информации по объекту в файл
/// </summary>
private static readonly string _separatorForObject = ":";
/// <summary>
/// Создание объекта из строки
/// </summary>
/// <param name="info">Строка с данными для создания объекта</param>
/// <returns>Объект</returns>
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;
}
/// <summary>
/// Получение данных для сохранения в файл
/// </summary>
/// <param name="drawningAirbus">Сохраняемый объект</param>
/// <returns>Строка с данными по объекту</returns>
public static string GetDataForSave(this DrawningTank drawningTank)
{
string[]? array = drawningTank?.EntityTank?.GetStringRepresentation();
if (array == null)
{
return string.Empty;
}
return string.Join(_separatorForObject, array);
}
}
}

19
ProjectTank/ProjectTank/Entities/EntityTank.cs
View File

@ -41,5 +41,24 @@ namespace ProjectTank.Entities
BodyColor = bodyColor;
}
public virtual string[] GetStringRepresentation()
{
return new[] { nameof(EntityTank), Speed.ToString(), Weight.ToString(), BodyColor.Name };
}
/// <summary>
/// Создание объекта из массива строк
/// </summary>
/// <param name="strs"></param>
/// <returns></returns>
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]));
}
}
}

24
ProjectTank/ProjectTank/Entities/EntiyBattleTank.cs
View File

@ -44,6 +44,30 @@ namespace ProjectTank
MachinGun= machinGun;
Gun = gun;
}
/// <summary>
/// Получение строк со значениями свойств объекта продвинутого класса-сущности
/// </summary>
/// <returns></returns>
public override string[] GetStringRepresentation()
{
return new[] { nameof(EntityBattleTank), Speed.ToString(), Weight.ToString(), BodyColor.Name,
AdditionalColor.Name, Gun.ToString(), MachinGun.ToString() };
}
/// <summary>
/// Создание продвинутого объекта из массива строк
/// </summary>
/// <param name="strs"></param>
/// <returns></returns>
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]));
}
}
}

74
ProjectTank/ProjectTank/FormBattleTankCollection.Designer.cs generated
View File

@ -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;
}
}

9
ProjectTank/ProjectTank/FormBattleTankCollection.resx
View File

@ -117,4 +117,13 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>126, 17</value>
</metadata>
<metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>255, 17</value>
</metadata>
</root>

2
ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs
View File

@ -51,7 +51,7 @@ namespace ProjectTank.MovementStrategy
MovementDirection.Right => DirectionType.Right,
MovementDirection.Up => DirectionType.Up,
MovementDirection.Down => DirectionType.Down,
_ => DirectionType.Unknow,
_=> DirectionType.Unknow,
};
}
}