diff --git a/Airbus/Airbus/FormMap.Designer.cs b/Airbus/Airbus/FormMap.Designer.cs
deleted file mode 100644
index 7e671eb..0000000
--- a/Airbus/Airbus/FormMap.Designer.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-namespace Airbus
-{
- partial class FormMap
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
- #region Windows Form Designer generated code
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.statusStrip1 = new System.Windows.Forms.StatusStrip();
- this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
- this.toolStripStatusLabelWight = new System.Windows.Forms.ToolStripStatusLabel();
- this.toolStripStatusLabelColor = new System.Windows.Forms.ToolStripStatusLabel();
- this.pictureBox = new System.Windows.Forms.PictureBox();
- this.buttonCreate = new System.Windows.Forms.Button();
- this.buttonUp = new System.Windows.Forms.Button();
- this.buttonRight = new System.Windows.Forms.Button();
- this.buttonLeft = new System.Windows.Forms.Button();
- this.buttonDown = new System.Windows.Forms.Button();
- this.buttonModCreate = new System.Windows.Forms.Button();
- this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
- this.comboBoxPortholeSer = new System.Windows.Forms.ComboBox();
- this.comboBoxFormPorthole = new System.Windows.Forms.ComboBox();
- this.statusStrip1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
- this.SuspendLayout();
- //
- // statusStrip1
- //
- this.statusStrip1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.statusStrip1.Dock = System.Windows.Forms.DockStyle.None;
- this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripStatusLabelSpeed,
- this.toolStripStatusLabelWight,
- this.toolStripStatusLabelColor});
- this.statusStrip1.Location = new System.Drawing.Point(0, 428);
- this.statusStrip1.Name = "statusStrip1";
- this.statusStrip1.Size = new System.Drawing.Size(135, 22);
- this.statusStrip1.TabIndex = 0;
- this.statusStrip1.Text = "statusStrip1";
- //
- // toolStripStatusLabelSpeed
- //
- this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
- this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(59, 17);
- this.toolStripStatusLabelSpeed.Text = "Скорость";
- //
- // toolStripStatusLabelWight
- //
- this.toolStripStatusLabelWight.Name = "toolStripStatusLabelWight";
- this.toolStripStatusLabelWight.Size = new System.Drawing.Size(26, 17);
- this.toolStripStatusLabelWight.Text = "Вес";
- //
- // toolStripStatusLabelColor
- //
- this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor";
- this.toolStripStatusLabelColor.Size = new System.Drawing.Size(33, 17);
- this.toolStripStatusLabelColor.Text = "Цвет";
- //
- // pictureBox
- //
- this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBox.Location = new System.Drawing.Point(0, 0);
- this.pictureBox.Name = "pictureBox";
- this.pictureBox.Size = new System.Drawing.Size(800, 450);
- this.pictureBox.TabIndex = 1;
- this.pictureBox.TabStop = false;
- //
- // 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(0, 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::Airbus.Properties.Resources.v2;
- this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonUp.Location = new System.Drawing.Point(719, 326);
- this.buttonUp.Name = "buttonUp";
- this.buttonUp.Size = new System.Drawing.Size(35, 35);
- this.buttonUp.TabIndex = 3;
- this.buttonUp.UseVisualStyleBackColor = true;
- this.buttonUp.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::Airbus.Properties.Resources.v3;
- this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonRight.Location = new System.Drawing.Point(753, 358);
- this.buttonRight.Name = "buttonRight";
- this.buttonRight.Size = new System.Drawing.Size(35, 35);
- this.buttonRight.TabIndex = 4;
- this.buttonRight.UseVisualStyleBackColor = true;
- this.buttonRight.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::Airbus.Properties.Resources.v1;
- this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonLeft.Location = new System.Drawing.Point(686, 358);
- this.buttonLeft.Name = "buttonLeft";
- this.buttonLeft.Size = new System.Drawing.Size(35, 35);
- this.buttonLeft.TabIndex = 5;
- 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::Airbus.Properties.Resources.v4;
- this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.buttonDown.Location = new System.Drawing.Point(719, 390);
- this.buttonDown.Name = "buttonDown";
- this.buttonDown.Size = new System.Drawing.Size(35, 35);
- this.buttonDown.TabIndex = 6;
- this.buttonDown.UseVisualStyleBackColor = true;
- this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
- //
- // buttonModCreate
- //
- this.buttonModCreate.Location = new System.Drawing.Point(81, 402);
- this.buttonModCreate.Name = "buttonModCreate";
- this.buttonModCreate.Size = new System.Drawing.Size(75, 23);
- this.buttonModCreate.TabIndex = 7;
- this.buttonModCreate.Text = "Модификация";
- this.buttonModCreate.UseVisualStyleBackColor = true;
- this.buttonModCreate.Click += new System.EventHandler(this.buttonModCreate_Click);
- //
- // comboBoxSelectorMap
- //
- 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);
- //
- // comboBoxPortholeSer
- //
- this.comboBoxPortholeSer.FormattingEnabled = true;
- this.comboBoxPortholeSer.Items.AddRange(new object[] {
- "10",
- "20",
- "30"});
- this.comboBoxPortholeSer.Location = new System.Drawing.Point(139, 12);
- this.comboBoxPortholeSer.Name = "comboBoxPortholeSer";
- this.comboBoxPortholeSer.Size = new System.Drawing.Size(121, 23);
- this.comboBoxPortholeSer.TabIndex = 9;
- //
- // comboBoxFormPorthole
- //
- this.comboBoxFormPorthole.FormattingEnabled = true;
- this.comboBoxFormPorthole.Items.AddRange(new object[] {
- "Обычные",
- "Крадратные",
- "Ромбом"});
- this.comboBoxFormPorthole.Location = new System.Drawing.Point(139, 41);
- this.comboBoxFormPorthole.Name = "comboBoxFormPorthole";
- this.comboBoxFormPorthole.Size = new System.Drawing.Size(121, 23);
- this.comboBoxFormPorthole.TabIndex = 10;
- //
- // 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.comboBoxFormPorthole);
- this.Controls.Add(this.comboBoxPortholeSer);
- this.Controls.Add(this.comboBoxSelectorMap);
- this.Controls.Add(this.buttonModCreate);
- this.Controls.Add(this.buttonDown);
- this.Controls.Add(this.buttonLeft);
- this.Controls.Add(this.buttonRight);
- this.Controls.Add(this.buttonUp);
- this.Controls.Add(this.buttonCreate);
- this.Controls.Add(this.statusStrip1);
- this.Controls.Add(this.pictureBox);
- this.Name = "FormMap";
- this.Text = "Airbus";
- this.statusStrip1.ResumeLayout(false);
- this.statusStrip1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
- #endregion
- private StatusStrip statusStrip1;
- private ToolStripStatusLabel toolStripStatusLabelSpeed;
- private ToolStripStatusLabel toolStripStatusLabelWight;
- private ToolStripStatusLabel toolStripStatusLabelColor;
- private PictureBox pictureBox;
- private Button buttonCreate;
- private Button buttonUp;
- private Button buttonRight;
- private Button buttonLeft;
- private Button buttonDown;
- private Button buttonModCreate;
- private ComboBox comboBoxSelectorMap;
- private ComboBox comboBoxPortholeSer;
- private ComboBox comboBoxFormPorthole;
- }
-}
diff --git a/Airbus/Airbus/FormMap.cs b/Airbus/Airbus/FormMap.cs
deleted file mode 100644
index dcbc4b0..0000000
--- a/Airbus/Airbus/FormMap.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Airbus
-{
- public partial class FormMap : Form
- {
-
- private AbstractMap _abstractMap;
- public FormMap()
- {
- InitializeComponent();
- _abstractMap = new SimpleMap();
- }
- private void SetData(DrawningAirplane airplane)
- {
- toolStripStatusLabelSpeed.Text = $"Скорость: {airplane.airplane?.Speed}";
- toolStripStatusLabelWight.Text = $"Вес: {airplane.airplane?.Weight}";
- toolStripStatusLabelColor.Text = $" : {airplane.airplane?.BodyColor}";
- pictureBox.Image = _abstractMap.CreateMap(pictureBox.Width, pictureBox.Height, new DrawningObjectAirplane(airplane));
- }
- private void buttonCreate_Click(object sender, EventArgs e)
- {
- IPorthole formPorthole = new DrawningPorthole();
- switch (comboBoxFormPorthole.Text)
- {
- case "Обычные":
- formPorthole = new DrawningPorthole();
- break;
- case "Крадратные":
- formPorthole = new DrawingSquarePorthole();
-
- break;
- case "Ромбом":
- formPorthole = new DrawingRhombPorthole();
- break;
- }
- Random random = new Random();
- var airbus = new DrawningAirplane(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), formPorthole);
- CountPorthole count_porthole = CountPorthole.Ten;
- switch (comboBoxPortholeSer.Text)
- {
- case "10":
- count_porthole = CountPorthole.Ten;
- break;
- case "20":
- count_porthole = CountPorthole.Twenty;
- break;
- case "30":
- count_porthole = CountPorthole.Thirty;
- break;
-
- }
- airbus.Upd_count_Porthole(count_porthole);
- SetData(airbus);
- }
-
- private void ButtonMove_Click(object sender, EventArgs e)
- {
- string name = ((Button)sender)?.Name ?? string.Empty;
- Direction direction = Direction.None;
- switch (name)
- {
- case "buttonLeft":
- direction = Direction.Left;
- break;
- case "buttonUp":
- direction = Direction.Up;
- break;
- case "buttonRight":
- direction = Direction.Right;
- break;
- case "buttonDown":
- direction = Direction.Down;
- break;
- }
- pictureBox.Image = _abstractMap?.MoveObject(direction);
- }
-
- private void buttonModCreate_Click(object sender, EventArgs e)
- {
- IPorthole formPorthole = new DrawningPorthole();
- switch (comboBoxFormPorthole.Text)
- {
- case "Обычные":
- formPorthole = new DrawningPorthole();
- break;
- case "Крадратные":
- formPorthole = new DrawingSquarePorthole();
-
- break;
- case "Ромбом":
- formPorthole = new DrawingRhombPorthole();
- break;
- }
- Random random = new Random();
- var airbus = new DrawingAirbus(random.Next(100, 300), random.Next(1000, 3000),
- Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
- Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
- true, true, formPorthole);
- CountPorthole count_porthole = CountPorthole.Ten;
- switch (comboBoxPortholeSer.Text)
- {
- case "10":
- count_porthole = CountPorthole.Ten;
- toolStripStatusLabelSpeed.Text = Convert.ToString((int)count_porthole);
- break;
- case "20":
- count_porthole = CountPorthole.Twenty;
- break;
- case "30":
- count_porthole = CountPorthole.Thirty;
- break;
-
- }
- airbus.Upd_count_Porthole(count_porthole);
- SetData(airbus);
-
- }
-
- private void comboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
- {
- switch (comboBoxSelectorMap.Text)
- {
- case "Первая карта":
- _abstractMap = new SimpleMap();
- break;
- case "Вторая карта":
- _abstractMap = new SecondMap();
- break;
- case "Третья карта":
- _abstractMap = new ThirdMap();
- break;
- }
- }
- }
-}
diff --git a/Airbus/Airbus/FormMap.resx b/Airbus/Airbus/FormMap.resx
deleted file mode 100644
index 5cb320f..0000000
--- a/Airbus/Airbus/FormMap.resx
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 17, 17
-
-
\ No newline at end of file