Denis/Pibd21_Musoev._D.T._AirplaneWithRadar_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

8 лаба

Browse Source
This commit is contained in:
Denis 2022-12-06 01:47:14 +04:00
parent 5dd9b3f1cb
commit e82d5dd28a
12 changed files with 291 additions and 446 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace AirplaneWithRadar namespace AirplaneWithRadar
{ {
internal abstract class AbstractMap internal abstract class AbstractMap : IEquatable<AbstractMap>
{ {
private IDrawningObject _drawningObject = null; private IDrawningObject _drawningObject = null;
protected int[,] _map = null; protected int[,] _map = null;
@ -135,5 +135,44 @@ namespace AirplaneWithRadar
protected abstract void GenerateMap(); protected abstract void GenerateMap();
protected abstract void DrawRoadPart(Graphics g, int i, int j); protected abstract void DrawRoadPart(Graphics g, int i, int j);
protected abstract void DrawBarrierPart(Graphics g, int i, int j); protected abstract void DrawBarrierPart(Graphics g, int i, int j);
public bool Equals(AbstractMap? other)
{
if (other == null)
{
return false;
}
var otherMap = other as AbstractMap;
if (otherMap == null)
{
return false;
}
if (_width != otherMap._width)
{
return false;
}
if (_height != otherMap._height)
{
return false;
}
if (_size_x != otherMap._size_x)
{
return false;
}
if (_size_y != otherMap._size_y)
{
return false;
}
for (int i = 0; i < _map.GetLength(0); i++)
{
for (int j = 0; j < _map.GetLength(1); j++)
{
if (_map[i, j] != otherMap._map[i, j])
{
return false;
}
}
}
return true;
}
} }
} }

62
AirplaneWithRadar/AirplaneWithRadar/AirplaneCompareByColor.cs Normal file
View File

@ -0,0 +1,62 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AirplaneWithRadar
{
internal class AirplaneCompareByColor : IComparer<IDrawningObject>
{
public int Compare(IDrawningObject? x, IDrawningObject? y)
{
if (x == null && y == null)
{
return 0;
}
if (x == null && y != null)
{
return 1;
}
if (x != null && y == null)
{
return -1;
}
var xAirplane = x as DrawningObjectAirplane;
var yAirplane = y as DrawningObjectAirplane;
if (xAirplane == null && yAirplane == null)
{
return 0;
}
if (xAirplane == null && yAirplane != null)
{
return 1;
}
if (xAirplane != null && yAirplane == null)
{
return -1;
}
var xEntityAirplane = xAirplane._airplane.Airplane;
var yEntityAirplane = yAirplane._airplane.Airplane;
var baseColorCompare = xEntityAirplane.BodyColor.ToArgb().CompareTo(yEntityAirplane.BodyColor.ToArgb());
if (baseColorCompare != 0)
{
return baseColorCompare;
}
if (xEntityAirplane is EntityAirplaneWithRadar xAirplaneWithRadar && yEntityAirplane is EntityAirplaneWithRadar yAirplaneWithRadar)
{
var dopColorCompare = xAirplaneWithRadar.DopColor.ToArgb().CompareTo(yAirplaneWithRadar.DopColor.ToArgb());
if (dopColorCompare != 0)
{
return dopColorCompare;
}
}
var speedCompare = xAirplane._airplane.Airplane.Speed.CompareTo(yAirplane._airplane.Airplane.Speed);
if (speedCompare != 0)
{
return speedCompare;
}
return xAirplane._airplane.Airplane.Weight.CompareTo(yAirplane._airplane.Airplane.Weight);
}
}
}

55
AirplaneWithRadar/AirplaneWithRadar/AirplaneCompareByType.cs Normal file
View File

@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AirplaneWithRadar
{
internal class AirplaneCompareByType : IComparer<IDrawningObject>
{
public int Compare(IDrawningObject? x, IDrawningObject? y)
{
if (x == null && y == null)
{
return 0;
}
if (x == null && y != null)
{
return 1;
}
if (x != null && y == null)
{
return -1;
}
var xAirplane = x as DrawningObjectAirplane;
var yAirplane = y as DrawningObjectAirplane;
if (xAirplane == null && yAirplane == null)
{
return 0;
}
if (xAirplane == null && yAirplane != null)
{
return 1;
}
if (xAirplane != null && yAirplane == null)
{
return -1;
}
if (xAirplane.GetAirplane.GetType().Name != yAirplane.GetAirplane.GetType().Name)
{
if (xAirplane.GetAirplane.GetType().Name == "DrawningAirplane")
{
return -1;
}
return 1;
}
var speedCompare = xAirplane.GetAirplane.Airplane.Speed.CompareTo(yAirplane.GetAirplane.Airplane.Speed);
if (speedCompare != 0)
{
return speedCompare;
}
return xAirplane.GetAirplane.Airplane.Weight.CompareTo(yAirplane.GetAirplane.Airplane.Weight);
}
}
}

30
AirplaneWithRadar/AirplaneWithRadar/DrawningObjectAirplane.cs
View File

@ -8,7 +8,7 @@ namespace AirplaneWithRadar
{ {
internal class DrawningObjectAirplane : IDrawningObject internal class DrawningObjectAirplane : IDrawningObject
{ {
private DrawningAirplane _airplane = null; public DrawningAirplane _airplane { get; private set; }
public DrawningObjectAirplane(DrawningAirplane airplane) public DrawningObjectAirplane(DrawningAirplane airplane)
{ {
@ -36,7 +36,33 @@ namespace AirplaneWithRadar
{ {
_airplane.DrawTransport(g); _airplane.DrawTransport(g);
} }
public string GetInfo() => _airplane?.GetDataForSave(); public string GetInfo() => _airplane?.GetDataForSave() ?? string.Empty;
public static IDrawningObject Create(string data) => new DrawningObjectAirplane(data.CreateDrawningAirplane()); public static IDrawningObject Create(string data) => new DrawningObjectAirplane(data.CreateDrawningAirplane());
public bool Equals(IDrawningObject? other)
{
if (other is not DrawningObjectAirplane otherAirplane)
{
return false;
}
var entity = _airplane.Airplane;
var otherEntity = otherAirplane._airplane.Airplane;
if (entity.GetType() != otherEntity.GetType() ||
entity.Speed != otherEntity.Speed ||
entity.Weight != otherEntity.Weight ||
entity.BodyColor != otherEntity.BodyColor)
{
return false;
}
if (entity is EntityAirplaneWithRadar entityAirplaneWithRadar &&
otherEntity is EntityAirplaneWithRadar otherEntityAirplaneWithRadar && (
entityAirplaneWithRadar.Ladder != otherEntityAirplaneWithRadar.Ladder ||
entityAirplaneWithRadar.DopColor != otherEntityAirplaneWithRadar.DopColor ||
entityAirplaneWithRadar.Window != otherEntityAirplaneWithRadar.Window ||
entityAirplaneWithRadar.Radar != otherEntityAirplaneWithRadar.Radar))
{
return false;
}
return true;
}
} }
} }

209
AirplaneWithRadar/AirplaneWithRadar/FormMap.Designer.cs generated
View File

@ -1,209 +0,0 @@
namespace AirplaneWithRadar
{
partial class FormMap
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.pictureBoxAirplane = new System.Windows.Forms.PictureBox();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
this.buttonCreate = new System.Windows.Forms.Button();
this.buttonUp = new System.Windows.Forms.Button();
this.buttonLeft = new System.Windows.Forms.Button();
this.buttonDown = new System.Windows.Forms.Button();
this.buttonRight = new System.Windows.Forms.Button();
this.buttonCreateModify = new System.Windows.Forms.Button();
this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).BeginInit();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
//
// pictureBoxAirplane
//
this.pictureBoxAirplane.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBoxAirplane.Location = new System.Drawing.Point(0, 0);
this.pictureBoxAirplane.Name = "pictureBoxAirplane";
this.pictureBoxAirplane.Size = new System.Drawing.Size(800, 450);
this.pictureBoxAirplane.TabIndex = 0;
this.pictureBoxAirplane.TabStop = false;
//
// statusStrip1
//
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabelSpeed,
this.toolStripStatusLabelWeight,
this.toolStripStatusLabelBodyColor});
this.statusStrip1.Location = new System.Drawing.Point(0, 428);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(800, 22);
this.statusStrip1.TabIndex = 1;
this.statusStrip1.Text = "Скорость";
//
// toolStripStatusLabelSpeed
//
this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(59, 17);
this.toolStripStatusLabelSpeed.Text = "Скорость";
//
// toolStripStatusLabelWeight
//
this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(26, 17);
this.toolStripStatusLabelWeight.Text = "Вес";
//
// toolStripStatusLabelBodyColor
//
this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(33, 17);
this.toolStripStatusLabelBodyColor.Text = "Цвет";
//
// buttonCreate
//
this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.buttonCreate.Location = new System.Drawing.Point(12, 402);
this.buttonCreate.Name = "buttonCreate";
this.buttonCreate.Size = new System.Drawing.Size(75, 23);
this.buttonCreate.TabIndex = 2;
this.buttonCreate.Text = "Создать";
this.buttonCreate.UseVisualStyleBackColor = true;
this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
//
// buttonUp
//
this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonUp.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowUp;
this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonUp.Location = new System.Drawing.Point(687, 357);
this.buttonUp.Name = "buttonUp";
this.buttonUp.Size = new System.Drawing.Size(30, 30);
this.buttonUp.TabIndex = 3;
this.buttonUp.UseVisualStyleBackColor = true;
this.buttonUp.Click += new System.EventHandler(this.buttonMove_Click);
//
// buttonLeft
//
this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonLeft.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowLeft;
this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonLeft.Location = new System.Drawing.Point(651, 395);
this.buttonLeft.Name = "buttonLeft";
this.buttonLeft.Size = new System.Drawing.Size(30, 30);
this.buttonLeft.TabIndex = 4;
this.buttonLeft.UseVisualStyleBackColor = true;
this.buttonLeft.Click += new System.EventHandler(this.buttonMove_Click);
//
// buttonDown
//
this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonDown.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowDown;
this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonDown.Location = new System.Drawing.Point(687, 395);
this.buttonDown.Name = "buttonDown";
this.buttonDown.Size = new System.Drawing.Size(30, 30);
this.buttonDown.TabIndex = 5;
this.buttonDown.UseVisualStyleBackColor = true;
this.buttonDown.Click += new System.EventHandler(this.buttonMove_Click);
//
// buttonRight
//
this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonRight.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowRight;
this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonRight.Location = new System.Drawing.Point(723, 395);
this.buttonRight.Name = "buttonRight";
this.buttonRight.Size = new System.Drawing.Size(30, 30);
this.buttonRight.TabIndex = 6;
this.buttonRight.UseVisualStyleBackColor = true;
this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click);
//
// buttonCreateModify
//
this.buttonCreateModify.Location = new System.Drawing.Point(93, 402);
this.buttonCreateModify.Name = "buttonCreateModify";
this.buttonCreateModify.Size = new System.Drawing.Size(108, 23);
this.buttonCreateModify.TabIndex = 7;
this.buttonCreateModify.Text = "Модификация";
this.buttonCreateModify.UseVisualStyleBackColor = true;
this.buttonCreateModify.Click += new System.EventHandler(this.buttonCreateModify_Click);
//
// comboBoxSelectorMap
//
this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxSelectorMap.FormattingEnabled = true;
this.comboBoxSelectorMap.Items.AddRange(new object[] {
"Простая карта",
"Карта неба с облаками",
"Карта туманного неба с грозой"});
this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12);
this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23);
this.comboBoxSelectorMap.TabIndex = 8;
this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
//
// FormMap
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.comboBoxSelectorMap);
this.Controls.Add(this.buttonCreateModify);
this.Controls.Add(this.buttonRight);
this.Controls.Add(this.buttonDown);
this.Controls.Add(this.buttonLeft);
this.Controls.Add(this.buttonUp);
this.Controls.Add(this.buttonCreate);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.pictureBoxAirplane);
this.Name = "FormMap";
this.Text = "FormMap";
((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirplane)).EndInit();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private PictureBox pictureBoxAirplane;
private StatusStrip statusStrip1;
private ToolStripStatusLabel toolStripStatusLabelSpeed;
private ToolStripStatusLabel toolStripStatusLabelWeight;
private ToolStripStatusLabel toolStripStatusLabelBodyColor;
private Button buttonCreate;
private Button buttonUp;
private Button buttonLeft;
private Button buttonDown;
private Button buttonRight;
private Button buttonCreateModify;
private ComboBox comboBoxSelectorMap;
}
}

107
AirplaneWithRadar/AirplaneWithRadar/FormMap.cs
View File

@ -1,107 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Numerics;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace AirplaneWithRadar
{
public partial class FormMap : Form
{
private AbstractMap _abstractMap;
public FormMap()
{
InitializeComponent();
_abstractMap = new SimpleMap();
}
/// <summary>
/// Заполнение информации по объекту
/// </summary>
/// <param name="aiplane"></param>
private void SetData(DrawningAirplane airplane)
{
toolStripStatusLabelSpeed.Text = $"Скорость: {airplane.Airplane.Speed}";
toolStripStatusLabelWeight.Text = $"Вес: {airplane.Airplane.Weight}";
toolStripStatusLabelBodyColor.Text = $"Цвет: {airplane.Airplane.BodyColor.Name}";
pictureBoxAirplane.Image = _abstractMap.CreateMap(pictureBoxAirplane.Width, pictureBoxAirplane.Height,
new DrawningObjectAirplane(airplane));
}
/// <summary>
/// Обработка нажатия кнопки "Создать"
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void buttonCreate_Click(object sender, EventArgs e)
{
Random rnd = new();
var ship = new DrawningAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
SetData(ship);
}
/// <summary>
/// Изменение размеров формы
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void buttonMove_Click(object sender, EventArgs e)
{
//получаем имя кнопки
string name = ((Button)sender)?.Name ?? string.Empty;
Direction dir = Direction.None;
switch (name)
{
case "buttonUp":
dir = Direction.Up;
break;
case "buttonDown":
dir = Direction.Down;
break;
case "buttonLeft":
dir = Direction.Left;
break;
case "buttonRight":
dir = Direction.Right;
break;
}
pictureBoxAirplane.Image = _abstractMap?.MoveObject(dir);
}
/// <summary>
/// Обработка нажатия кнопки "Модификация"
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void buttonCreateModify_Click(object sender, EventArgs e)
{
Random rnd = new();
var ship = new DrawningAirplaneWithRadar(rnd.Next(100, 300), rnd.Next(1000, 2000),
Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
SetData(ship);
}
/// <summary>
/// Смена карты
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
{
switch (comboBoxSelectorMap.Text)
{
case "Простая карта":
_abstractMap = new SimpleMap();
break;
case "Карта неба с облаками":
_abstractMap = new SkyMap();
break;
case "Карта туманного неба с грозой":
_abstractMap = new FoggySkyMap();
break;
}
}
}
}

63
AirplaneWithRadar/AirplaneWithRadar/FormMap.resx
View File

@ -1,63 +0,0 @@
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

71
AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplane.Designer.cs generated
View File

@ -28,6 +28,8 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.buttonSortByColor = new System.Windows.Forms.Button();
this.buttonSortByType = new System.Windows.Forms.Button();
this.groupBox = new System.Windows.Forms.GroupBox(); this.groupBox = new System.Windows.Forms.GroupBox();
this.buttonDown = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button();
this.buttonRight = new System.Windows.Forms.Button(); this.buttonRight = new System.Windows.Forms.Button();
@ -57,8 +59,30 @@
this.menuStrip.SuspendLayout(); this.menuStrip.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// buttonSortByColor
//
this.buttonSortByColor.Location = new System.Drawing.Point(19, 279);
this.buttonSortByColor.Name = "buttonSortByColor";
this.buttonSortByColor.Size = new System.Drawing.Size(169, 30);
this.buttonSortByColor.TabIndex = 12;
this.buttonSortByColor.Text = "Сортировать по цвету";
this.buttonSortByColor.UseVisualStyleBackColor = true;
this.buttonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click);
//
// buttonSortByType
//
this.buttonSortByType.Location = new System.Drawing.Point(19, 243);
this.buttonSortByType.Name = "buttonSortByType";
this.buttonSortByType.Size = new System.Drawing.Size(169, 30);
this.buttonSortByType.TabIndex = 11;
this.buttonSortByType.Text = "Сортировать по типу";
this.buttonSortByType.UseVisualStyleBackColor = true;
this.buttonSortByType.Click += new System.EventHandler(this.ButtonSortByType_Click);
//
// groupBox // groupBox
// //
this.groupBox.Controls.Add(this.buttonSortByColor);
this.groupBox.Controls.Add(this.buttonSortByType);
this.groupBox.Controls.Add(this.buttonDown); this.groupBox.Controls.Add(this.buttonDown);
this.groupBox.Controls.Add(this.buttonRight); this.groupBox.Controls.Add(this.buttonRight);
this.groupBox.Controls.Add(this.buttonLeft); this.groupBox.Controls.Add(this.buttonLeft);
@ -72,7 +96,7 @@
this.groupBox.Dock = System.Windows.Forms.DockStyle.Right; this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
this.groupBox.Location = new System.Drawing.Point(600, 24); this.groupBox.Location = new System.Drawing.Point(600, 24);
this.groupBox.Name = "groupBox"; this.groupBox.Name = "groupBox";
this.groupBox.Size = new System.Drawing.Size(200, 492); this.groupBox.Size = new System.Drawing.Size(200, 590);
this.groupBox.TabIndex = 0; this.groupBox.TabIndex = 0;
this.groupBox.TabStop = false; this.groupBox.TabStop = false;
this.groupBox.Text = "Инструменты"; this.groupBox.Text = "Инструменты";
@ -82,7 +106,7 @@
this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonDown.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowDown; this.buttonDown.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowDown;
this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonDown.Location = new System.Drawing.Point(86, 456); this.buttonDown.Location = new System.Drawing.Point(86, 554);
this.buttonDown.Name = "buttonDown"; this.buttonDown.Name = "buttonDown";
this.buttonDown.Size = new System.Drawing.Size(30, 30); this.buttonDown.Size = new System.Drawing.Size(30, 30);
this.buttonDown.TabIndex = 9; this.buttonDown.TabIndex = 9;
@ -94,7 +118,7 @@
this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonRight.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowRight; this.buttonRight.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowRight;
this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonRight.Location = new System.Drawing.Point(122, 456); this.buttonRight.Location = new System.Drawing.Point(122, 554);
this.buttonRight.Name = "buttonRight"; this.buttonRight.Name = "buttonRight";
this.buttonRight.Size = new System.Drawing.Size(30, 30); this.buttonRight.Size = new System.Drawing.Size(30, 30);
this.buttonRight.TabIndex = 8; this.buttonRight.TabIndex = 8;
@ -106,7 +130,7 @@
this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonLeft.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowLeft; this.buttonLeft.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowLeft;
this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonLeft.Location = new System.Drawing.Point(50, 456); this.buttonLeft.Location = new System.Drawing.Point(50, 554);
this.buttonLeft.Name = "buttonLeft"; this.buttonLeft.Name = "buttonLeft";
this.buttonLeft.Size = new System.Drawing.Size(30, 30); this.buttonLeft.Size = new System.Drawing.Size(30, 30);
this.buttonLeft.TabIndex = 7; this.buttonLeft.TabIndex = 7;
@ -118,7 +142,7 @@
this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonUp.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowUp; this.buttonUp.BackgroundImage = global::AirplaneWithRadar.Properties.Resources.arrowUp;
this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonUp.Location = new System.Drawing.Point(86, 420); this.buttonUp.Location = new System.Drawing.Point(86, 518);
this.buttonUp.Name = "buttonUp"; this.buttonUp.Name = "buttonUp";
this.buttonUp.Size = new System.Drawing.Size(30, 30); this.buttonUp.Size = new System.Drawing.Size(30, 30);
this.buttonUp.TabIndex = 6; this.buttonUp.TabIndex = 6;
@ -128,7 +152,7 @@
// buttonShowOnMap // buttonShowOnMap
// //
this.buttonShowOnMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonShowOnMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonShowOnMap.Location = new System.Drawing.Point(19, 384); this.buttonShowOnMap.Location = new System.Drawing.Point(19, 482);
this.buttonShowOnMap.Name = "buttonShowOnMap"; this.buttonShowOnMap.Name = "buttonShowOnMap";
this.buttonShowOnMap.Size = new System.Drawing.Size(169, 30); this.buttonShowOnMap.Size = new System.Drawing.Size(169, 30);
this.buttonShowOnMap.TabIndex = 5; this.buttonShowOnMap.TabIndex = 5;
@ -139,7 +163,7 @@
// buttonShowStorage // buttonShowStorage
// //
this.buttonShowStorage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonShowStorage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonShowStorage.Location = new System.Drawing.Point(19, 348); this.buttonShowStorage.Location = new System.Drawing.Point(19, 446);
this.buttonShowStorage.Name = "buttonShowStorage"; this.buttonShowStorage.Name = "buttonShowStorage";
this.buttonShowStorage.Size = new System.Drawing.Size(169, 30); this.buttonShowStorage.Size = new System.Drawing.Size(169, 30);
this.buttonShowStorage.TabIndex = 4; this.buttonShowStorage.TabIndex = 4;
@ -150,7 +174,7 @@
// buttonRemoveAirplane // buttonRemoveAirplane
// //
this.buttonRemoveAirplane.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRemoveAirplane.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonRemoveAirplane.Location = new System.Drawing.Point(19, 312); this.buttonRemoveAirplane.Location = new System.Drawing.Point(19, 410);
this.buttonRemoveAirplane.Name = "buttonRemoveAirplane"; this.buttonRemoveAirplane.Name = "buttonRemoveAirplane";
this.buttonRemoveAirplane.Size = new System.Drawing.Size(169, 30); this.buttonRemoveAirplane.Size = new System.Drawing.Size(169, 30);
this.buttonRemoveAirplane.TabIndex = 3; this.buttonRemoveAirplane.TabIndex = 3;
@ -161,7 +185,7 @@
// maskedTextBoxPosition // maskedTextBoxPosition
// //
this.maskedTextBoxPosition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.maskedTextBoxPosition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.maskedTextBoxPosition.Location = new System.Drawing.Point(19, 286); this.maskedTextBoxPosition.Location = new System.Drawing.Point(19, 384);
this.maskedTextBoxPosition.Mask = "00"; this.maskedTextBoxPosition.Mask = "00";
this.maskedTextBoxPosition.Name = "maskedTextBoxPosition"; this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
this.maskedTextBoxPosition.Size = new System.Drawing.Size(169, 23); this.maskedTextBoxPosition.Size = new System.Drawing.Size(169, 23);
@ -170,7 +194,7 @@
// buttonAddAirplane // buttonAddAirplane
// //
this.buttonAddAirplane.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonAddAirplane.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonAddAirplane.Location = new System.Drawing.Point(19, 250); this.buttonAddAirplane.Location = new System.Drawing.Point(19, 348);
this.buttonAddAirplane.Name = "buttonAddAirplane"; this.buttonAddAirplane.Name = "buttonAddAirplane";
this.buttonAddAirplane.Size = new System.Drawing.Size(169, 30); this.buttonAddAirplane.Size = new System.Drawing.Size(169, 30);
this.buttonAddAirplane.TabIndex = 1; this.buttonAddAirplane.TabIndex = 1;
@ -185,21 +209,21 @@
this.groupBox1.Controls.Add(this.ButtonAddMap); this.groupBox1.Controls.Add(this.ButtonAddMap);
this.groupBox1.Controls.Add(this.textBoxNewMapName); this.groupBox1.Controls.Add(this.textBoxNewMapName);
this.groupBox1.Controls.Add(this.comboBoxSelectorMap); this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
this.groupBox1.Location = new System.Drawing.Point(5, 20); this.groupBox1.Location = new System.Drawing.Point(6, 21);
this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.groupBox1.Size = new System.Drawing.Size(219, 225); this.groupBox1.Size = new System.Drawing.Size(194, 204);
this.groupBox1.TabIndex = 18; this.groupBox1.TabIndex = 18;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "Карты"; this.groupBox1.Text = "Карты";
// //
// ButtonDeleteMap // ButtonDeleteMap
// //
this.ButtonDeleteMap.Location = new System.Drawing.Point(9, 191); this.ButtonDeleteMap.Location = new System.Drawing.Point(6, 182);
this.ButtonDeleteMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ButtonDeleteMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ButtonDeleteMap.Name = "ButtonDeleteMap"; this.ButtonDeleteMap.Name = "ButtonDeleteMap";
this.ButtonDeleteMap.Size = new System.Drawing.Size(181, 22); this.ButtonDeleteMap.Size = new System.Drawing.Size(182, 22);
this.ButtonDeleteMap.TabIndex = 13; this.ButtonDeleteMap.TabIndex = 13;
this.ButtonDeleteMap.Text = "Удалить карту"; this.ButtonDeleteMap.Text = "Удалить карту";
this.ButtonDeleteMap.UseVisualStyleBackColor = true; this.ButtonDeleteMap.UseVisualStyleBackColor = true;
@ -209,7 +233,7 @@
// //
this.ListBoxMaps.FormattingEnabled = true; this.ListBoxMaps.FormattingEnabled = true;
this.ListBoxMaps.ItemHeight = 15; this.ListBoxMaps.ItemHeight = 15;
this.ListBoxMaps.Location = new System.Drawing.Point(9, 102); this.ListBoxMaps.Location = new System.Drawing.Point(6, 102);
this.ListBoxMaps.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ListBoxMaps.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ListBoxMaps.Name = "ListBoxMaps"; this.ListBoxMaps.Name = "ListBoxMaps";
this.ListBoxMaps.Size = new System.Drawing.Size(182, 79); this.ListBoxMaps.Size = new System.Drawing.Size(182, 79);
@ -218,7 +242,7 @@
// //
// ButtonAddMap // ButtonAddMap
// //
this.ButtonAddMap.Location = new System.Drawing.Point(9, 76); this.ButtonAddMap.Location = new System.Drawing.Point(6, 76);
this.ButtonAddMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ButtonAddMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.ButtonAddMap.Name = "ButtonAddMap"; this.ButtonAddMap.Name = "ButtonAddMap";
this.ButtonAddMap.Size = new System.Drawing.Size(181, 22); this.ButtonAddMap.Size = new System.Drawing.Size(181, 22);
@ -229,7 +253,7 @@
// //
// textBoxNewMapName // textBoxNewMapName
// //
this.textBoxNewMapName.Location = new System.Drawing.Point(9, 26); this.textBoxNewMapName.Location = new System.Drawing.Point(6, 20);
this.textBoxNewMapName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxNewMapName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.textBoxNewMapName.Name = "textBoxNewMapName"; this.textBoxNewMapName.Name = "textBoxNewMapName";
this.textBoxNewMapName.Size = new System.Drawing.Size(182, 23); this.textBoxNewMapName.Size = new System.Drawing.Size(182, 23);
@ -243,19 +267,18 @@
"Простая карта", "Простая карта",
"Карта неба с облаками", "Карта неба с облаками",
"Карта туманного неба с грозой"}); "Карта туманного неба с грозой"});
this.comboBoxSelectorMap.Location = new System.Drawing.Point(9, 50); this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 49);
this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; 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 = 9; this.comboBoxSelectorMap.TabIndex = 9;
this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
// //
// pictureBox // pictureBox
// //
this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox.Location = new System.Drawing.Point(0, 24); this.pictureBox.Location = new System.Drawing.Point(0, 24);
this.pictureBox.Name = "pictureBox"; this.pictureBox.Name = "pictureBox";
this.pictureBox.Size = new System.Drawing.Size(600, 492); this.pictureBox.Size = new System.Drawing.Size(600, 590);
this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pictureBox.TabIndex = 1; this.pictureBox.TabIndex = 1;
this.pictureBox.TabStop = false; this.pictureBox.TabStop = false;
@ -282,14 +305,14 @@
// SaveToolStripMenuItem // SaveToolStripMenuItem
// //
this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem"; this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
this.SaveToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.SaveToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
this.SaveToolStripMenuItem.Text = "Сохранение"; this.SaveToolStripMenuItem.Text = "Сохранение";
this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click); this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
// //
// LoadToolStripMenuItem // LoadToolStripMenuItem
// //
this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem"; this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
this.LoadToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.LoadToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
this.LoadToolStripMenuItem.Text = "Загрузка"; this.LoadToolStripMenuItem.Text = "Загрузка";
this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click); this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
// //
@ -306,7 +329,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 516); this.ClientSize = new System.Drawing.Size(800, 614);
this.Controls.Add(this.pictureBox); this.Controls.Add(this.pictureBox);
this.Controls.Add(this.groupBox); this.Controls.Add(this.groupBox);
this.Controls.Add(this.menuStrip); this.Controls.Add(this.menuStrip);
@ -327,6 +350,8 @@
#endregion #endregion
private Button buttonSortByColor;
private Button buttonSortByType;
private GroupBox groupBox; private GroupBox groupBox;
private Button buttonDown; private Button buttonDown;
private Button buttonRight; private Button buttonRight;

62
AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplane.cs
View File

@ -14,10 +14,6 @@ namespace AirplaneWithRadar
{ {
public partial class FormMapWithSetAirplane : Form public partial class FormMapWithSetAirplane : Form
{ {
/// <summary>
/// Объект от класса карты с набором объектов
/// </summary>
private MapWithSetAirplaneGeneric<DrawningObjectAirplane, AbstractMap> _mapAirplaneCollectionGeneric;
private readonly Dictionary<string, AbstractMap> _mapDict = new() private readonly Dictionary<string, AbstractMap> _mapDict = new()
{ {
{"Простая карта", new SimpleMap() }, {"Простая карта", new SimpleMap() },
@ -56,36 +52,6 @@ namespace AirplaneWithRadar
ListBoxMaps.SelectedIndex = index; ListBoxMaps.SelectedIndex = index;
} }
} }
/// <summary>
/// Выбор карты
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
{
AbstractMap map = null;
switch (comboBoxSelectorMap.Text)
{
case "Простая карта":
map = new SimpleMap();
break;
case "Карта неба с облаками":
map = new SkyMap();
break;
case "Карта туманного неба с грозой":
map = new FoggySkyMap();
break;
}
if (map != null)
{
_mapAirplaneCollectionGeneric = new MapWithSetAirplaneGeneric<DrawningObjectAirplane, AbstractMap>(
pictureBox.Width, pictureBox.Height, map);
}
else
{
_mapAirplaneCollectionGeneric = null;
}
}
private void AddAirplane(DrawningAirplane airplane) private void AddAirplane(DrawningAirplane airplane)
{ {
try try
@ -320,5 +286,33 @@ namespace AirplaneWithRadar
} }
} }
} }
/// <summary>
/// Сортировка по типу
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonSortByType_Click(object sender, EventArgs e)
{
if (ListBoxMaps.SelectedIndex == -1)
{
return;
}
_mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new AirplaneCompareByType());
pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
/// <summary>
/// Сортировка по цвету
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonSortByColor_Click(object sender, EventArgs e)
{
if (ListBoxMaps.SelectedIndex == -1)
{
return;
}
_mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new AirplaneCompareByColor());
pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
} }
} }

2
AirplaneWithRadar/AirplaneWithRadar/IDrawningObject.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace AirplaneWithRadar namespace AirplaneWithRadar
{ {
internal interface IDrawningObject internal interface IDrawningObject : IEquatable<IDrawningObject>
{ {
/// <summary> /// <summary>
/// Шаг перемещения объекта /// Шаг перемещения объекта

12
AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplaneGeneric.cs
View File

@ -2,7 +2,7 @@
{ {
// Карта с набром объектов под нее // Карта с набром объектов под нее
internal class MapWithSetAirplaneGeneric<T, U> internal class MapWithSetAirplaneGeneric<T, U>
where T : class, IDrawningObject where T : class, IDrawningObject, IEquatable<T>
where U : AbstractMap where U : AbstractMap
{ {
// Ширина окна отрисовки // Ширина окна отрисовки
@ -90,6 +90,14 @@
_setAirplane.Insert(DrawningObjectAirplane.Create(rec) as T); _setAirplane.Insert(DrawningObjectAirplane.Create(rec) as T);
} }
} }
/// <summary>
/// Сортировка
/// </summary>
/// <param name="comparer"></param>
public void Sort(IComparer<T> comparer)
{
_setAirplane.SortSet(comparer);
}
// "Взбалтываем" набор, чтобы все элементы оказались в начале // "Взбалтываем" набор, чтобы все элементы оказались в начале
private void Shaking() private void Shaking()
{ {
@ -123,7 +131,7 @@
g.FillRectangle(brush, 0, 0, _pictureWidth, _pictureHeight); g.FillRectangle(brush, 0, 0, _pictureWidth, _pictureHeight);
for (int i = 0; i <= _pictureWidth / _placeSizeWidth; i++) for (int i = 0; i <= _pictureWidth / _placeSizeWidth; i++)
{ {
for (int j = 0; j <= _pictureHeight / _placeSizeHeight + 1; ++j) for (int j = 0; j <= (_pictureHeight / _placeSizeHeight); ++j)
{//линия разметки места {//линия разметки места
g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth, j * _placeSizeHeight); g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth, j * _placeSizeHeight);
g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight + 10, i * _placeSizeWidth + _placeSizeWidth, j * _placeSizeHeight + 10); g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight + 10, i * _placeSizeWidth + _placeSizeWidth, j * _placeSizeHeight + 10);

21
AirplaneWithRadar/AirplaneWithRadar/SetAirplaneGeneric.cs
View File

@ -2,7 +2,7 @@
{ {
// Параметризованный набор объектов // Параметризованный набор объектов
internal class SetAirplaneGeneric<T> internal class SetAirplaneGeneric<T>
where T : class where T : class, IEquatable<T>
{ {
private readonly List<T> _places; private readonly List<T> _places;
public int Count => _places.Count; public int Count => _places.Count;
@ -26,11 +26,14 @@
// Добавление объекта в набор на конкретную позицию // Добавление объекта в набор на конкретную позицию
public int Insert(T airplane, int position) public int Insert(T airplane, int position)
{ {
if (Count == _maxCount) if (_places.Contains(airplane))
{
throw new ArgumentException($"Объект {airplane} уже присутствует в наборе");
}
if (position < 0 || position > Count || _maxCount == Count)
{ {
throw new StorageOverflowException(_maxCount); throw new StorageOverflowException(_maxCount);
} }
if (position < 0 || position > _maxCount) return -1;
_places.Insert(position, airplane); _places.Insert(position, airplane);
return position; return position;
} }
@ -81,5 +84,17 @@
} }
} }
} }
/// <summary>
/// Сортировка набора объектов
/// </summary>
/// <param name="comparer"></param>
public void SortSet(IComparer<T> comparer)
{
if (comparer == null)
{
return;
}
_places.Sort(comparer);
}
} }
} }