Создание классов

This commit is contained in:
KirillFirsof 2023-11-09 21:01:58 +04:00
parent bd7a35bdf7
commit b3a5559303
4 changed files with 206 additions and 47 deletions

View File

@ -20,14 +20,14 @@ namespace ProjectTractor
/// Набор объектов
/// </summary>
private readonly TractorsGenericCollection<DrawningTractor,
DrawningObjectTractor> _cars;
DrawningObjectTractor> _tractors;
/// <summary>
/// Конструктор
/// </summary>
public FormTractorCollection()
{
InitializeComponent();
_cars = new TractorsGenericCollection<DrawningTractor,
_tractors = new TractorsGenericCollection<DrawningTractor,
DrawningObjectTractor>(pictureBoxCollection.Width, pictureBoxCollection.Height);
}
@ -36,10 +36,10 @@ namespace ProjectTractor
FormTractor form = new();
if (form.ShowDialog() == DialogResult.OK)
{
if (_cars + form.SelectedTractor)
if (_tractors + form.SelectedTractor)
{
MessageBox.Show("Объект добавлен");
pictureBoxCollection.Image = _cars.ShowCars();
pictureBoxCollection.Image = _tractors.ShowTractors();
}
else
{
@ -61,10 +61,10 @@ namespace ProjectTractor
return;
}
int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
if (_cars - pos)
if (_tractors - pos)
{
MessageBox.Show("Объект удален");
pictureBoxCollection.Image = _cars.ShowCars();
pictureBoxCollection.Image = _tractors.ShowTractors();
}
else
{
@ -79,7 +79,7 @@ namespace ProjectTractor
private void ButtonRefreshCollection_Click(object sender, EventArgs
e)
{
pictureBoxCollection.Image = _cars.ShowCars();
pictureBoxCollection.Image = _tractors.ShowTractors();
}
private void InitializeComponent()
@ -90,8 +90,14 @@ namespace ProjectTractor
this.ButtonRemoveTractor = new System.Windows.Forms.Button();
this.ButtonAddTractor = new System.Windows.Forms.Button();
this.maskedTextBoxNumber = new System.Windows.Forms.MaskedTextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.maskedTextBox1 = new System.Windows.Forms.MaskedTextBox();
this.button1 = new System.Windows.Forms.Button();
this.listBoxStorages = new System.Windows.Forms.ListBox();
this.button2 = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).BeginInit();
this.groupBox.SuspendLayout();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// pictureBoxCollection
@ -99,28 +105,29 @@ namespace ProjectTractor
this.pictureBoxCollection.Dock = System.Windows.Forms.DockStyle.Left;
this.pictureBoxCollection.Location = new System.Drawing.Point(0, 0);
this.pictureBoxCollection.Name = "pictureBoxCollection";
this.pictureBoxCollection.Size = new System.Drawing.Size(620, 437);
this.pictureBoxCollection.Size = new System.Drawing.Size(620, 536);
this.pictureBoxCollection.TabIndex = 1;
this.pictureBoxCollection.TabStop = false;
//
// groupBox
//
this.groupBox.Controls.Add(this.groupBox1);
this.groupBox.Controls.Add(this.ButtonRefreshCollection);
this.groupBox.Controls.Add(this.ButtonRemoveTractor);
this.groupBox.Controls.Add(this.ButtonAddTractor);
this.groupBox.Controls.Add(this.maskedTextBoxNumber);
this.groupBox.Location = new System.Drawing.Point(626, 12);
this.groupBox.Name = "groupBox";
this.groupBox.Size = new System.Drawing.Size(255, 413);
this.groupBox.Size = new System.Drawing.Size(255, 522);
this.groupBox.TabIndex = 2;
this.groupBox.TabStop = false;
this.groupBox.Text = "Инструменты";
//
// ButtonRefreshCollection
//
this.ButtonRefreshCollection.Location = new System.Drawing.Point(20, 331);
this.ButtonRefreshCollection.Location = new System.Drawing.Point(28, 464);
this.ButtonRefreshCollection.Name = "ButtonRefreshCollection";
this.ButtonRefreshCollection.Size = new System.Drawing.Size(211, 35);
this.ButtonRefreshCollection.Size = new System.Drawing.Size(203, 35);
this.ButtonRefreshCollection.TabIndex = 8;
this.ButtonRefreshCollection.Text = "Обновить коллекцию";
this.ButtonRefreshCollection.UseVisualStyleBackColor = true;
@ -128,7 +135,7 @@ namespace ProjectTractor
//
// ButtonRemoveTractor
//
this.ButtonRemoveTractor.Location = new System.Drawing.Point(28, 156);
this.ButtonRemoveTractor.Location = new System.Drawing.Point(28, 390);
this.ButtonRemoveTractor.Name = "ButtonRemoveTractor";
this.ButtonRemoveTractor.Size = new System.Drawing.Size(203, 33);
this.ButtonRemoveTractor.TabIndex = 7;
@ -138,7 +145,7 @@ namespace ProjectTractor
//
// ButtonAddTractor
//
this.ButtonAddTractor.Location = new System.Drawing.Point(28, 46);
this.ButtonAddTractor.Location = new System.Drawing.Point(28, 317);
this.ButtonAddTractor.Name = "ButtonAddTractor";
this.ButtonAddTractor.Size = new System.Drawing.Size(203, 34);
this.ButtonAddTractor.TabIndex = 6;
@ -148,14 +155,61 @@ namespace ProjectTractor
//
// maskedTextBoxNumber
//
this.maskedTextBoxNumber.Location = new System.Drawing.Point(28, 113);
this.maskedTextBoxNumber.Location = new System.Drawing.Point(28, 357);
this.maskedTextBoxNumber.Name = "maskedTextBoxNumber";
this.maskedTextBoxNumber.Size = new System.Drawing.Size(203, 27);
this.maskedTextBoxNumber.TabIndex = 5;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.listBoxStorages);
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Controls.Add(this.maskedTextBox1);
this.groupBox1.Location = new System.Drawing.Point(16, 29);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(224, 279);
this.groupBox1.TabIndex = 9;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Наборы";
//
// maskedTextBox1
//
this.maskedTextBox1.Location = new System.Drawing.Point(12, 26);
this.maskedTextBox1.Name = "maskedTextBox1";
this.maskedTextBox1.Size = new System.Drawing.Size(203, 27);
this.maskedTextBox1.TabIndex = 0;
//
// button1
//
this.button1.Location = new System.Drawing.Point(12, 59);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(203, 29);
this.button1.TabIndex = 1;
this.button1.Text = "Добавить набор";
this.button1.UseVisualStyleBackColor = true;
//
// listBoxStorages
//
this.listBoxStorages.FormattingEnabled = true;
this.listBoxStorages.ItemHeight = 20;
this.listBoxStorages.Location = new System.Drawing.Point(12, 116);
this.listBoxStorages.Name = "listBoxStorages";
this.listBoxStorages.Size = new System.Drawing.Size(203, 84);
this.listBoxStorages.TabIndex = 2;
//
// button2
//
this.button2.Location = new System.Drawing.Point(12, 227);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(203, 35);
this.button2.TabIndex = 3;
this.button2.Text = "Удалить набор";
this.button2.UseVisualStyleBackColor = true;
//
// FormTractorCollection
//
this.ClientSize = new System.Drawing.Size(893, 437);
this.ClientSize = new System.Drawing.Size(893, 536);
this.Controls.Add(this.groupBox);
this.Controls.Add(this.pictureBoxCollection);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@ -166,6 +220,8 @@ namespace ProjectTractor
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).EndInit();
this.groupBox.ResumeLayout(false);
this.groupBox.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
@ -175,6 +231,11 @@ namespace ProjectTractor
private Button ButtonRemoveTractor;
private Button ButtonAddTractor;
private MaskedTextBox maskedTextBoxNumber;
private GroupBox groupBox1;
private Button button2;
private ListBox listBoxStorages;
private Button button1;
private MaskedTextBox maskedTextBox1;
private PictureBox pictureBoxCollection;
}

View File

@ -12,18 +12,23 @@ namespace ProjectTractor.Generics
/// <summary>
/// Массив объектов, которые храним
/// </summary>
private readonly T?[] _places;
private readonly List<T?> _places;
/// <summary>
/// Количество объектов в массиве
/// </summary>
public int Count => _places.Length;
public int Count => _places.Count;
/// <summary>
/// Максимальное количество объектов в списке
/// </summary>
private readonly int _maxCount;
/// <summary>
/// Конструктор
/// </summary>
/// <param name="count"></param>
public SetGeneric(int count)
{
_places = new T?[count];
_maxCount = count;
_places = new List<T?>(count);
}
/// <summary>
/// Добавление объекта в набор
@ -50,20 +55,9 @@ namespace ProjectTractor.Generics
/// <returns></returns>
public bool Insert(T tractor, int position)
{
if (!(position >= 0 && position < Count))
if (!(position >= 0 && position <= Count && _places.Count < _maxCount))
return false;
if (_places[position] != null)
{
int ind = position;
while (ind < Count && _places[ind] != null)
ind++;
if (ind == Count)
return false;
for (int i = ind - 1; i >= position; i--)
_places[i + 1] = _places[i];
}
_places[position] = tractor;
_places.Insert(position, tractor);
return true;
}
/// <summary>
@ -74,10 +68,8 @@ namespace ProjectTractor.Generics
public bool Remove(int position)
{
if (!(position >= 0 && position < Count))
{
return false;
}
_places[position] = null;
_places.RemoveAt(position);
return true;
}
/// <summary>
@ -85,13 +77,36 @@ namespace ProjectTractor.Generics
/// </summary>
/// <param name="position"></param>
/// <returns></returns>
public T? Get(int position)
public T? this[int position]
{
if (!(position >= 0 && position < Count))
get
{
return null;
if (!(position >= 0 && position <= Count))
return null;
return _places[position];
}
set
{
if (!(position >= 0 && position <= Count))
return;
_places.Insert(position, value);
}
return _places[position];
}
/// <summary>
/// Проход по списку
/// </summary>
/// <returns></returns>
public IEnumerable<T?> GetCars(int? maxTractors = null)
{
for (int i = 0; i < _places.Count; ++i)
{
yield return _places[i];
if (maxTractors.HasValue && i == maxTractors.Value)
{
yield break;
}
}
}
}
}

View File

@ -71,9 +71,10 @@ namespace ProjectTractor.Generics
/// <param name="collect"></param>
/// <param name="pos"></param>
/// <returns></returns>
public static bool operator -(TractorsGenericCollection<T, U> collect, int pos)
public static bool operator -(TractorsGenericCollection<T, U> collect, int
pos)
{
T? obj = collect._collection.Get(pos);
T? obj = collect._collection[pos];
if (obj != null)
{
collect._collection.Remove(pos);
@ -87,13 +88,13 @@ namespace ProjectTractor.Generics
/// <returns></returns>
public U? GetU(int pos)
{
return (U?)_collection.Get(pos)?.GetMoveableObject;
return (U?)_collection[pos]?.GetMoveableObject;
}
/// <summary>
/// Вывод всего набора объектов
/// </summary>
/// <returns></returns>
public Bitmap ShowCars()
public Bitmap ShowTractors()
{
Bitmap bmp = new(_pictureWidth, _pictureHeight);
Graphics gr = Graphics.FromImage(bmp);
@ -121,21 +122,22 @@ namespace ProjectTractor.Generics
_placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
}
}
/// <summary>
/// Метод прорисовки объектов
/// </summary>
/// <param name="g"></param>
private void DrawObjects(Graphics g)
{
for (int i = 0; i < _collection.Count; i++)
int i = 0;
foreach (var tractor in _collection.GetCars())
{
DrawningTractor? tractor = _collection.Get(i);
if (tractor != null)
{
int countRows = _pictureWidth / _placeSizeWidth;
tractor.SetPosition(_pictureWidth - _placeSizeWidth*2 - (i % countRows * _placeSizeWidth) + 20, _pictureHeight - i / countRows * _placeSizeHeight - 150);
int inRow = _pictureWidth / _placeSizeWidth;
tractor.SetPosition(_pictureWidth - _placeSizeWidth - (i % inRow * _placeSizeWidth) - _placeSizeHeight / 2 - 8, i / inRow * _placeSizeHeight + 20);
tractor.DrawTransport(g);
}
i++;
}
}
}

View File

@ -0,0 +1,81 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ProjectTractor.DrawningObjects;
using ProjectTractor.MovementStrategy;
using ProjectTractor.Generics;
namespace ProjectTractor
{
/// <summary>
/// Класс для хранения коллекции
/// </summary>
internal class TractorsGenericStorage
{
/// <summary>
/// Словарь (хранилище)
/// </summary>
readonly Dictionary<string, TractorsGenericCollection<DrawningTractor, DrawningObjectTractor>> _tractorStorages;
/// <summary>
/// Возвращение списка названий наборов
/// </summary>
public List<string> Keys => _tractorStorages.Keys.ToList();
/// <summary>
/// Ширина окна отрисовки
/// </summary>
private readonly int _pictureWidth;
/// <summary>
/// Высота окна отрисовки
/// </summary>
private readonly int _pictureHeight;
/// <summary>
/// Конструктор
/// </summary>
/// <param name="pictureWidth"></param>
/// <param name="pictureHeight"></param>
public TractorsGenericStorage(int pictureWidth, int pictureHeight)
{
_tractorStorages = new Dictionary<string,
TractorsGenericCollection<DrawningTractor, DrawningObjectTractor>>();
_pictureWidth = pictureWidth;
_pictureHeight = pictureHeight;
}
/// <summary>
/// Добавление набора
/// </summary>
/// <param name="name">Название набора</param>
public void AddSet(string name)
{
_tractorStorages.Add(name,
new TractorsGenericCollection<DrawningTractor,
DrawningObjectTractor>(_pictureWidth, _pictureHeight));
}
/// <summary>
/// Удаление набора
/// </summary>
/// <param name="name">Название набора</param>
public void DelSet(string name)
{
if (!_tractorStorages.ContainsKey(name))
return;
_tractorStorages.Remove(name);
}
/// <summary>
/// Доступ к набору
/// </summary>
/// <param name="ind"></param>
/// <returns></returns>
public TractorsGenericCollection<DrawningTractor, DrawningObjectTractor>?
this[string ind]
{
get
{
if (_tractorStorages.ContainsKey(ind))
return _tractorStorages[ind];
return null;
}
}
}
}