NikGapon/ISEbd-21_Gapon_N.I._Airbus_Base
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pre final work

Browse Source
This commit is contained in:
NikGapon 2022-11-07 21:37:24 +04:00
parent 9074f7f01c
commit b72751ca0d
4 changed files with 70 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Airbus/Airbus/FormMapWithSetAirplane.Designer.cs generated
View File

@ -120,6 +120,7 @@
this.buttonShowOnMap.TabIndex = 5; this.buttonShowOnMap.TabIndex = 5;
this.buttonShowOnMap.Text = "карта"; this.buttonShowOnMap.Text = "карта";
this.buttonShowOnMap.UseVisualStyleBackColor = true; this.buttonShowOnMap.UseVisualStyleBackColor = true;
this.buttonShowOnMap.Click += new System.EventHandler(this.buttonShowOnMap_Click);
// //
// buttonStorage // buttonStorage
// //
@ -129,6 +130,7 @@
this.buttonStorage.TabIndex = 4; this.buttonStorage.TabIndex = 4;
this.buttonStorage.Text = "Хранилище"; this.buttonStorage.Text = "Хранилище";
this.buttonStorage.UseVisualStyleBackColor = true; this.buttonStorage.UseVisualStyleBackColor = true;
this.buttonStorage.Click += new System.EventHandler(this.buttonStorage_Click);
// //
// buttonRemoveAirplane // buttonRemoveAirplane
// //
@ -138,6 +140,7 @@
this.buttonRemoveAirplane.TabIndex = 3; this.buttonRemoveAirplane.TabIndex = 3;
this.buttonRemoveAirplane.Text = "Удалить"; this.buttonRemoveAirplane.Text = "Удалить";
this.buttonRemoveAirplane.UseVisualStyleBackColor = true; this.buttonRemoveAirplane.UseVisualStyleBackColor = true;
this.buttonRemoveAirplane.Click += new System.EventHandler(this.buttonRemoveAirplane_Click);
// //
// maskedTextBoxPosition // maskedTextBoxPosition
// //
@ -160,12 +163,12 @@
// comboBoxSelectorMap // comboBoxSelectorMap
// //
this.comboBoxSelectorMap.FormattingEnabled = true; this.comboBoxSelectorMap.FormattingEnabled = true;
this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 22);
this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
this.comboBoxSelectorMap.Items.AddRange(new object[] { this.comboBoxSelectorMap.Items.AddRange(new object[] {
"Первая карта", "Первая карта",
"Вторая карта", "Вторая карта",
"Третья карта"}); "Третья карта"});
this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 22);
this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
this.comboBoxSelectorMap.Size = new System.Drawing.Size(182, 23); this.comboBoxSelectorMap.Size = new System.Drawing.Size(182, 23);
this.comboBoxSelectorMap.TabIndex = 0; this.comboBoxSelectorMap.TabIndex = 0;
this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);

36
Airbus/Airbus/FormMapWithSetAirplane.cs
View File

@ -14,8 +14,7 @@ namespace Airbus
public partial class FormMapWithSetAirplane : Form public partial class FormMapWithSetAirplane : Form
{ {
private AbstractMap _abstractMap; private AbstractMap _abstractMap;
private MapWithSetAirplaneGeneric<DrawningObjectAirplane, AbstractMap> private MapWithSetAirplaneGeneric<DrawningObjectAirplane, AbstractMap> _mapAirplanesCollectionGeneric;
_mapCarsCollectionGeneric;
/// <summary> /// <summary>
/// Конструктор /// Конструктор
/// </summary> /// </summary>
@ -46,13 +45,13 @@ namespace Airbus
} }
if (map != null) if (map != null)
{ {
_mapCarsCollectionGeneric = new _mapAirplanesCollectionGeneric = new
MapWithSetAirplaneGeneric<DrawningObjectAirplane, AbstractMap>( MapWithSetAirplaneGeneric<DrawningObjectAirplane, AbstractMap>(
pictureBox.Width, pictureBox.Height, map); pictureBox.Width, pictureBox.Height, map);
} }
else else
{ {
_mapCarsCollectionGeneric = null; _mapAirplanesCollectionGeneric = null;
} }
} }
/// <summary> /// <summary>
@ -62,7 +61,7 @@ namespace Airbus
/// <param name="e"></param> /// <param name="e"></param>
private void buttonAddAirplane_Click(object sender, EventArgs e) private void buttonAddAirplane_Click(object sender, EventArgs e)
{ {
if (_mapCarsCollectionGeneric == null) if (_mapAirplanesCollectionGeneric == null)
{ {
return; return;
} }
@ -70,10 +69,10 @@ namespace Airbus
if (form.ShowDialog() == DialogResult.OK) if (form.ShowDialog() == DialogResult.OK)
{ {
DrawningObjectAirplane airplane = new(form.SelectedAirplane); DrawningObjectAirplane airplane = new(form.SelectedAirplane);
if (_mapCarsCollectionGeneric + airplane) if (_mapAirplanesCollectionGeneric + airplane)
{ {
MessageBox.Show("Объект добавлен"); MessageBox.Show("Объект добавлен");
pictureBox.Image = _mapCarsCollectionGeneric.ShowSet(); pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet();
} }
else else
{ {
@ -86,7 +85,7 @@ namespace Airbus
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void ButtonRemoveCar_Click(object sender, EventArgs e) private void buttonRemoveAirplane_Click(object sender, EventArgs e)
{ {
if (string.IsNullOrEmpty(maskedTextBoxPosition.Text)) if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
{ {
@ -98,10 +97,10 @@ namespace Airbus
return; return;
} }
int pos = Convert.ToInt32(maskedTextBoxPosition.Text); int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
if (_mapCarsCollectionGeneric - pos) if (_mapAirplanesCollectionGeneric - pos)
{ {
MessageBox.Show("Объект удален"); MessageBox.Show("Объект удален");
pictureBox.Image = _mapCarsCollectionGeneric.ShowSet(); pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet();
} }
else else
{ {
@ -113,26 +112,27 @@ namespace Airbus
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void ButtonShowStorage_Click(object sender, EventArgs e) private void buttonStorage_Click(object sender, EventArgs e)
{ {
if (_mapCarsCollectionGeneric == null) if (_mapAirplanesCollectionGeneric == null)
{ {
return; return;
} }
pictureBox.Image = _mapCarsCollectionGeneric.ShowSet(); pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet();
} }
/// <summary> /// <summary>
/// Вывод карты /// Вывод карты
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void ButtonShowOnMap_Click(object sender, EventArgs e) private void buttonShowOnMap_Click(object sender, EventArgs e)
{ {
if (_mapCarsCollectionGeneric == null) if (_mapAirplanesCollectionGeneric == null)
{ {
return; return;
} }
pictureBox.Image = _mapCarsCollectionGeneric.ShowOnMap(); pictureBox.Image = _mapAirplanesCollectionGeneric.ShowOnMap();
} }
/// <summary> /// <summary>
/// Перемещение /// Перемещение
@ -141,7 +141,7 @@ namespace Airbus
/// <param name="e"></param> /// <param name="e"></param>
private void ButtonMove_Click(object sender, EventArgs e) private void ButtonMove_Click(object sender, EventArgs e)
{ {
if (_mapCarsCollectionGeneric == null) if (_mapAirplanesCollectionGeneric == null)
{ {
return; return;
} }
@ -163,7 +163,7 @@ namespace Airbus
dir = Direction.Right; dir = Direction.Right;
break; break;
} }
pictureBox.Image = _mapCarsCollectionGeneric.MoveObject(dir); pictureBox.Image = _mapAirplanesCollectionGeneric.MoveObject(dir);
} }
} }

30
Airbus/Airbus/MapWithSetAirplaneGeneric.cs
View File

@ -21,11 +21,11 @@ namespace Airbus
/// <summary> /// <summary>
/// Размер занимаемого объектом места (ширина) /// Размер занимаемого объектом места (ширина)
/// </summary> /// </summary>
private readonly int _placeSizeWidth = 210; private readonly int _placeSizeWidth = 250;
/// <summary> /// <summary>
/// Размер занимаемого объектом места (высота) /// Размер занимаемого объектом места (высота)
/// </summary> /// </summary>
private readonly int _placeSizeHeight = 90; private readonly int _placeSizeHeight = 70;
/// <summary> /// <summary>
/// Набор объектов /// Набор объектов
/// </summary> /// </summary>
@ -55,9 +55,9 @@ namespace Airbus
/// <param name="map"></param> /// <param name="map"></param>
/// <param name="car"></param> /// <param name="car"></param>
/// <returns></returns> /// <returns></returns>
public static bool operator +(MapWithSetAirplaneGeneric<T, U> map, T car) public static bool operator +(MapWithSetAirplaneGeneric<T, U> map, T airplane)
{ {
return map._setAirplane.Insert(car); return map._setAirplane.Insert(airplane);
} }
/// <summary> /// <summary>
/// Перегрузка оператора вычитания /// Перегрузка оператора вычитания
@ -79,7 +79,7 @@ namespace Airbus
Bitmap bmp = new(_pictureWidth, _pictureHeight); Bitmap bmp = new(_pictureWidth, _pictureHeight);
Graphics gr = Graphics.FromImage(bmp); Graphics gr = Graphics.FromImage(bmp);
DrawBackground(gr); DrawBackground(gr);
DrawCars(gr); DrawAirplanes(gr);
return bmp; return bmp;
} }
/// <summary> /// <summary>
@ -91,10 +91,10 @@ namespace Airbus
Shaking(); Shaking();
for (int i = 0; i < _setAirplane.Count; i++) for (int i = 0; i < _setAirplane.Count; i++)
{ {
var car = _setAirplane.Get(i); var airplane = _setAirplane.Get(i);
if (car != null) if (airplane != null)
{ {
return _map.CreateMap(_pictureWidth, _pictureHeight, car); return _map.CreateMap(_pictureWidth, _pictureHeight, airplane);
} }
} }
return new(_pictureWidth, _pictureHeight); return new(_pictureWidth, _pictureHeight);
@ -124,10 +124,10 @@ namespace Airbus
{ {
for (; j > i; j--) for (; j > i; j--)
{ {
var car = _setAirplane.Get(j); var airplane = _setAirplane.Get(j);
if (car != null) if (airplane != null)
{ {
_setAirplane.Insert(car, i); _setAirplane.Insert(airplane, i);
_setAirplane.Remove(j); _setAirplane.Remove(j);
break; break;
} }
@ -161,13 +161,15 @@ namespace Airbus
/// Метод прорисовки объектов /// Метод прорисовки объектов
/// </summary> /// </summary>
/// <param name="g"></param> /// <param name="g"></param>
private void DrawCars(Graphics g) private void DrawAirplanes(Graphics g)
{ {
int countInLine = _pictureWidth / _placeSizeWidth;
int maxLeft = (countInLine - 1) * _placeSizeWidth;
for (int i = 0; i < _setAirplane.Count; i++) for (int i = 0; i < _setAirplane.Count; i++)
{ {
// TODO установка позиции _setAirplane.Get(i)?.SetObject(maxLeft - i % countInLine * _placeSizeWidth, i / countInLine * _placeSizeHeight + 3, _pictureWidth, _pictureHeight);
_setAirplane.Get(i)?.DrawningObject(g); _setAirplane.Get(i)?.DrawningObject(g);
} }
} }
} }
} }

48
Airbus/Airbus/SetAirplaneGeneric.cs
View File

@ -15,27 +15,41 @@ namespace Airbus
{ {
_places = new T[count]; _places = new T[count];
} }
public bool Insert(T airplane)
{
return Insert(airplane, 0);
}
/// <summary> /// <summary>
/// Добавление объекта в набор на конкретную позицию /// Добавление объекта в набор на конкретную позицию
/// </summary> /// </summary>
/// <param name="car">Добавляемый автомобиль</param> /// <param name="car">Добавляемый автомобиль</param>
/// <param name="position">Позиция</param> /// <param name="position">Позиция</param>
/// <returns></returns> /// <returns></returns>
public bool Insert(T car, int position) private bool CanInsert(int position)
{ {
// TODO проверка позиции for (int i = position; i < _places.Length; i++)
// TODO проверка, что элемент массива по этой позиции пустой, if (_places[i] == null)
//если нет, то return true;
// проверка, что после вставляемого элемента в return false;
//массиве есть пустой элемент }
// сдвиг всех объектов, находящихся справа от
//позиции до первого пустого элемента public bool Insert(T airplane)
// TODO вставка по позиции {
_places[position] = car; return Insert(airplane, 0);
}
public bool Insert(T airplane, int position)
{
if (position < 0 || position > _places.Length) return false;
if (_places[position] != null && CanInsert(position))
{
for (int i = _places.Length - 1; i > position; --i)
{
if (_places[i] == null)
{
_places[i] = _places[i - 1];
_places[i - 1] = null;
}
}
}
_places[position] = airplane;
return true; return true;
} }
/// <summary> /// <summary>
@ -45,9 +59,7 @@ namespace Airbus
/// <returns></returns> /// <returns></returns>
public bool Remove(int position) public bool Remove(int position)
{ {
// TODO проверка позиции _places[position] = null;
// TODO удаление объекта из массива, присовив элементу массива
//значение null
return true; return true;
} }
/// <summary> /// <summary>
@ -57,7 +69,7 @@ namespace Airbus
/// <returns></returns> /// <returns></returns>
public T Get(int position) public T Get(int position)
{ {
// TODO проверка позиции if (position < 0 || position > _places.Length) return null;
return _places[position]; return _places[position];
} }
} }