diff --git a/Project_airbus/Project_airbus/AirplanDelegate.cs b/Project_airbus/Project_airbus/AirplanDelegate.cs
new file mode 100644
index 0000000..2d89356
--- /dev/null
+++ b/Project_airbus/Project_airbus/AirplanDelegate.cs
@@ -0,0 +1,9 @@
+using Project_airbus.Drawings;
+
+namespace Project_airbus;
+
+///
+/// Делегат передачи объекта класса-прорисовки
+///
+///
+public delegate void AirplanDelegate(DrawingAirplan airplan);
diff --git a/Project_airbus/Project_airbus/Drawings/DrawingAirbus.cs b/Project_airbus/Project_airbus/Drawings/DrawingAirbus.cs
index 6360bf2..2b08264 100644
--- a/Project_airbus/Project_airbus/Drawings/DrawingAirbus.cs
+++ b/Project_airbus/Project_airbus/Drawings/DrawingAirbus.cs
@@ -30,14 +30,15 @@ public class DrawingAirbus : DrawingAirplan
Pen pen = new(Color.Black);
Brush additionalBrush = new SolidBrush(airbus.AdditionalColor);
+ Pen addpen = new (airbus.AdditionalColor);
base.DrawTransport(g);
//Дополнительный отсек сверху
if (airbus.BodySection)
{
- g.DrawLine(pen, _startPosX.Value + 25, _startPosY.Value + 20, _startPosX.Value + 50, _startPosY.Value + 12);
- g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 12, _startPosX.Value + 70, _startPosY.Value + 12);
- g.DrawLine(pen, _startPosX.Value + 70, _startPosY.Value + 12, _startPosX.Value + 80, _startPosY.Value + 20);
+ g.DrawLine(addpen, _startPosX.Value + 25, _startPosY.Value + 20, _startPosX.Value + 50, _startPosY.Value + 12);
+ g.DrawLine(addpen, _startPosX.Value + 50, _startPosY.Value + 12, _startPosX.Value + 70, _startPosY.Value + 12);
+ g.DrawLine(addpen, _startPosX.Value + 70, _startPosY.Value + 12, _startPosX.Value + 80, _startPosY.Value + 20);
}
// Двигатели под крылом
diff --git a/Project_airbus/Project_airbus/Entities/EntityAirbus.cs b/Project_airbus/Project_airbus/Entities/EntityAirbus.cs
index 9b5057a..27bbaa2 100644
--- a/Project_airbus/Project_airbus/Entities/EntityAirbus.cs
+++ b/Project_airbus/Project_airbus/Entities/EntityAirbus.cs
@@ -10,13 +10,22 @@ public class EntityAirbus : EntityAirplan
///
public Color AdditionalColor { get; private set; }
+ ///
+ /// Метод передачи дополнительного цвета
+ ///
+ ///
+ public void setAdditionalColor(Color color)
+ {
+ AdditionalColor = color;
+ }
+
///
/// Признак(опция) наличия отсека
///
public bool BodySection { get; private set; }
///
- /// ПРизнак(опция) наличия дополнительных двигателей
+ /// Признак(опция) наличия дополнительных двигателей
///
public bool Motor { get; private set; }
diff --git a/Project_airbus/Project_airbus/Entities/EntityAirplan.cs b/Project_airbus/Project_airbus/Entities/EntityAirplan.cs
index 548cd6d..1bce00d 100644
--- a/Project_airbus/Project_airbus/Entities/EntityAirplan.cs
+++ b/Project_airbus/Project_airbus/Entities/EntityAirplan.cs
@@ -20,6 +20,15 @@ public class EntityAirplan
///
public Color BodyAirbus { get; private set; }
+ ///
+ /// Метод передачи цвета
+ ///
+ ///
+ public void setBodyColor(Color color)
+ {
+ BodyAirbus = color;
+ }
+
///
/// Шаг перемещения самолета(аэробуса)
///
diff --git a/Project_airbus/Project_airbus/FormAirplanCollection.Designer.cs b/Project_airbus/Project_airbus/FormAirplanCollection.Designer.cs
index 9b79560..3905d00 100644
--- a/Project_airbus/Project_airbus/FormAirplanCollection.Designer.cs
+++ b/Project_airbus/Project_airbus/FormAirplanCollection.Designer.cs
@@ -29,6 +29,12 @@
private void InitializeComponent()
{
groupBoxTools = new GroupBox();
+ panelCompanyTools = new Panel();
+ buttonAddAirplan = new Button();
+ maskedTextBox = new MaskedTextBox();
+ buttonRefresh = new Button();
+ ButtonDelAirplan = new Button();
+ buttonGoToCheck = new Button();
buttonCreateToCompany = new Button();
panelStorage = new Panel();
buttonCollectionDel = new Button();
@@ -38,19 +44,12 @@
radioButtonMassive = new RadioButton();
textBoxCollectionName = new TextBox();
labelCollectionName = new Label();
- buttonRefresh = new Button();
- buttonGoToCheck = new Button();
- ButtonDelAirplan = new Button();
- maskedTextBox = new MaskedTextBox();
- buttonAddAirbus = new Button();
- buttonAddAirplan = new Button();
comboBoxSelectorCompany = new ComboBox();
pictureBox = new PictureBox();
- panelCompanyTools = new Panel();
groupBoxTools.SuspendLayout();
+ panelCompanyTools.SuspendLayout();
panelStorage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
- panelCompanyTools.SuspendLayout();
SuspendLayout();
//
// groupBoxTools
@@ -67,6 +66,68 @@
groupBoxTools.TabStop = false;
groupBoxTools.Text = "Инструменты";
//
+ // panelCompanyTools
+ //
+ panelCompanyTools.Controls.Add(buttonAddAirplan);
+ panelCompanyTools.Controls.Add(maskedTextBox);
+ panelCompanyTools.Controls.Add(buttonRefresh);
+ panelCompanyTools.Controls.Add(ButtonDelAirplan);
+ panelCompanyTools.Controls.Add(buttonGoToCheck);
+ panelCompanyTools.Enabled = false;
+ panelCompanyTools.Location = new Point(3, 400);
+ panelCompanyTools.Name = "panelCompanyTools";
+ panelCompanyTools.Size = new Size(207, 307);
+ panelCompanyTools.TabIndex = 9;
+ //
+ // buttonAddAirplan
+ //
+ buttonAddAirplan.Location = new Point(3, 6);
+ buttonAddAirplan.Name = "buttonAddAirplan";
+ buttonAddAirplan.Size = new Size(192, 51);
+ buttonAddAirplan.TabIndex = 1;
+ buttonAddAirplan.Text = "Добавление самолёта";
+ buttonAddAirplan.UseVisualStyleBackColor = true;
+ buttonAddAirplan.Click += buttonAddAirplan_Click;
+ //
+ // maskedTextBox
+ //
+ maskedTextBox.Location = new Point(3, 116);
+ maskedTextBox.Mask = "00";
+ maskedTextBox.Name = "maskedTextBox";
+ maskedTextBox.Size = new Size(192, 27);
+ maskedTextBox.TabIndex = 3;
+ maskedTextBox.ValidatingType = typeof(int);
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Location = new Point(3, 253);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(195, 46);
+ buttonRefresh.TabIndex = 6;
+ buttonRefresh.Text = "Обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ buttonRefresh.Click += buttonRefresh_Click;
+ //
+ // ButtonDelAirplan
+ //
+ ButtonDelAirplan.Location = new Point(3, 149);
+ ButtonDelAirplan.Name = "ButtonDelAirplan";
+ ButtonDelAirplan.Size = new Size(195, 46);
+ ButtonDelAirplan.TabIndex = 4;
+ ButtonDelAirplan.Text = "Удалить самолёт";
+ ButtonDelAirplan.UseVisualStyleBackColor = true;
+ ButtonDelAirplan.Click += ButtonDelAirplan_Click;
+ //
+ // buttonGoToCheck
+ //
+ buttonGoToCheck.Location = new Point(3, 201);
+ buttonGoToCheck.Name = "buttonGoToCheck";
+ buttonGoToCheck.Size = new Size(195, 46);
+ buttonGoToCheck.TabIndex = 5;
+ buttonGoToCheck.Text = "Передать на тесты";
+ buttonGoToCheck.UseVisualStyleBackColor = true;
+ buttonGoToCheck.Click += buttonGoToCheck_Click;
+ //
// buttonCreateToCompany
//
buttonCreateToCompany.Location = new Point(6, 368);
@@ -159,65 +220,6 @@
labelCollectionName.TabIndex = 0;
labelCollectionName.Text = "Название коллекции";
//
- // buttonRefresh
- //
- buttonRefresh.Location = new Point(3, 253);
- buttonRefresh.Name = "buttonRefresh";
- buttonRefresh.Size = new Size(195, 46);
- buttonRefresh.TabIndex = 6;
- buttonRefresh.Text = "Обновить";
- buttonRefresh.UseVisualStyleBackColor = true;
- buttonRefresh.Click += buttonRefresh_Click;
- //
- // buttonGoToCheck
- //
- buttonGoToCheck.Location = new Point(3, 201);
- buttonGoToCheck.Name = "buttonGoToCheck";
- buttonGoToCheck.Size = new Size(195, 46);
- buttonGoToCheck.TabIndex = 5;
- buttonGoToCheck.Text = "Передать на тесты";
- buttonGoToCheck.UseVisualStyleBackColor = true;
- buttonGoToCheck.Click += buttonGoToCheck_Click;
- //
- // ButtonDelAirplan
- //
- ButtonDelAirplan.Location = new Point(3, 149);
- ButtonDelAirplan.Name = "ButtonDelAirplan";
- ButtonDelAirplan.Size = new Size(195, 46);
- ButtonDelAirplan.TabIndex = 4;
- ButtonDelAirplan.Text = "Удалить самолёт";
- ButtonDelAirplan.UseVisualStyleBackColor = true;
- ButtonDelAirplan.Click += buttonDelAirplan_Click;
- //
- // maskedTextBox
- //
- maskedTextBox.Location = new Point(3, 116);
- maskedTextBox.Mask = "00";
- maskedTextBox.Name = "maskedTextBox";
- maskedTextBox.Size = new Size(192, 27);
- maskedTextBox.TabIndex = 3;
- maskedTextBox.ValidatingType = typeof(int);
- //
- // buttonAddAirbus
- //
- buttonAddAirbus.Location = new Point(3, 63);
- buttonAddAirbus.Name = "buttonAddAirbus";
- buttonAddAirbus.Size = new Size(192, 47);
- buttonAddAirbus.TabIndex = 2;
- buttonAddAirbus.Text = "Добавление аэробаса";
- buttonAddAirbus.UseVisualStyleBackColor = true;
- buttonAddAirbus.Click += buttonAddAirbus_Click;
- //
- // buttonAddAirplan
- //
- buttonAddAirplan.Location = new Point(3, 6);
- buttonAddAirplan.Name = "buttonAddAirplan";
- buttonAddAirplan.Size = new Size(192, 51);
- buttonAddAirplan.TabIndex = 1;
- buttonAddAirplan.Text = "Добавление самолёта";
- buttonAddAirplan.UseVisualStyleBackColor = true;
- buttonAddAirplan.Click += buttonAddAirplan_Click;
- //
// comboBoxSelectorCompany
//
comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
@@ -239,20 +241,6 @@
pictureBox.TabIndex = 1;
pictureBox.TabStop = false;
//
- // panelCompanyTools
- //
- panelCompanyTools.Controls.Add(buttonAddAirplan);
- panelCompanyTools.Controls.Add(buttonAddAirbus);
- panelCompanyTools.Controls.Add(maskedTextBox);
- panelCompanyTools.Controls.Add(buttonRefresh);
- panelCompanyTools.Controls.Add(ButtonDelAirplan);
- panelCompanyTools.Controls.Add(buttonGoToCheck);
- panelCompanyTools.Enabled = false;
- panelCompanyTools.Location = new Point(3, 400);
- panelCompanyTools.Name = "panelCompanyTools";
- panelCompanyTools.Size = new Size(207, 307);
- panelCompanyTools.TabIndex = 9;
- //
// FormAirplanCollection
//
AutoScaleDimensions = new SizeF(8F, 20F);
@@ -263,18 +251,17 @@
Name = "FormAirplanCollection";
Text = "Коллекция самолётов";
groupBoxTools.ResumeLayout(false);
+ panelCompanyTools.ResumeLayout(false);
+ panelCompanyTools.PerformLayout();
panelStorage.ResumeLayout(false);
panelStorage.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
- panelCompanyTools.ResumeLayout(false);
- panelCompanyTools.PerformLayout();
ResumeLayout(false);
}
#endregion
private GroupBox groupBoxTools;
- private Button buttonAddAirbus;
private Button buttonAddAirplan;
private ComboBox comboBoxSelectorCompany;
private Button ButtonDelAirplan;
diff --git a/Project_airbus/Project_airbus/FormAirplanCollection.cs b/Project_airbus/Project_airbus/FormAirplanCollection.cs
index 9f03aec..c937a74 100644
--- a/Project_airbus/Project_airbus/FormAirplanCollection.cs
+++ b/Project_airbus/Project_airbus/FormAirplanCollection.cs
@@ -38,46 +38,24 @@ public partial class FormAirplanCollection : Form
}
///
- /// Добавление обычного самолёта
+ /// Добавление самолёта
///
///
///
- private void buttonAddAirplan_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingAirplan));
-
- ///
- /// Добавление аэробаса
- ///
- ///
- ///
- private void buttonAddAirbus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingAirbus));
-
- ///
- /// Создание объекта класса-перемещения
- ///
- /// Тип создаваемого объекта
- private void CreateObject(string type)
+ private void buttonAddAirplan_Click(object sender, EventArgs e)
{
- if (_company == null)
+ FormAirplanConfig form = new();
+ form.Show();
+ form.AddEvent(SetAirplan);
+ }
+
+ private void SetAirplan(DrawingAirplan? airplan)
+ {
+ if (_company == null || airplan == null)
{
return;
}
-
- Random random = new();
- DrawingAirplan drawingAirplan;
- switch (type)
- {
- case nameof(DrawingAirplan):
- drawingAirplan = new DrawingAirplan(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
- break;
- case nameof(DrawingAirbus):
- drawingAirplan = new DrawingAirbus(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), GetColor(random),
- Convert.ToBoolean(random.Next(1, 2)), Convert.ToBoolean(random.Next(1, 2)));
- break;
- default:
- return;
- }
-
- if (_company + drawingAirplan != -1)
+ if (_company + airplan != -1)
{
MessageBox.Show("Объект добавлен");
pictureBox.Image = _company.Show();
@@ -88,29 +66,12 @@ public partial class FormAirplanCollection : Form
}
}
- ///
- /// Получение цвета
- ///
- /// Генератор случайных чисел
- ///
- private static Color GetColor(Random random)
- {
- Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
- ColorDialog dialog = new();
- if (dialog.ShowDialog() == DialogResult.OK)
- {
- color = dialog.Color;
- }
-
- return color;
- }
-
///
/// Удаление объекта
///
///
///
- private void buttonDelAirplan_Click(object sender, EventArgs e)
+ private void ButtonDelAirplan_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
{
@@ -168,6 +129,24 @@ public partial class FormAirplanCollection : Form
SetAirplan = airplan
};
form.ShowDialog();
+
+ }
+
+ ///
+ /// Обновление списка в listBoxCollection
+ ///
+ private void RerfreshListBoxItems()
+ {
+ listBoxCollection.Items.Clear();
+ for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+ {
+ string? colName = _storageCollection.Keys?[i];
+ if (!string.IsNullOrEmpty(colName))
+ {
+ listBoxCollection.Items.Add(colName);
+ }
+ }
+
}
///
@@ -210,29 +189,11 @@ public partial class FormAirplanCollection : Form
_storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
RerfreshListBoxItems();
-
}
///
- /// Обновление списка в listBoxCollection
- ///
- private void RerfreshListBoxItems()
- {
- listBoxCollection.Items.Clear();
- for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
- {
- string? colName = _storageCollection.Keys?[i];
- if (!string.IsNullOrEmpty(colName))
- {
- listBoxCollection.Items.Add(colName);
- }
- }
-
- }
-
- ///
- /// Удаление коллекции
- ///
+ /// Удаление коллекции
+ ///
private void buttonCollectionDel_Click(object sender, EventArgs e)
{
if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
diff --git a/Project_airbus/Project_airbus/FormAirplanConfig.Designer.cs b/Project_airbus/Project_airbus/FormAirplanConfig.Designer.cs
new file mode 100644
index 0000000..43dcd72
--- /dev/null
+++ b/Project_airbus/Project_airbus/FormAirplanConfig.Designer.cs
@@ -0,0 +1,357 @@
+namespace Project_airbus
+{
+ partial class FormAirplanConfig
+ {
+ ///
+ /// 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()
+ {
+ groupBoxConfig = new GroupBox();
+ groupBoxColors = new GroupBox();
+ panelBlack = new Panel();
+ panelPurple = new Panel();
+ panelGray = new Panel();
+ panelWhite = new Panel();
+ panelYellow = new Panel();
+ panelBlue = new Panel();
+ panelGreen = new Panel();
+ panelRed = new Panel();
+ checkBoxMotor = new CheckBox();
+ checkBoxBodySection = new CheckBox();
+ numericUpDownWeight = new NumericUpDown();
+ labelWeight = new Label();
+ numericUpDownSpeed = new NumericUpDown();
+ labelSpeed = new Label();
+ labelModifieldObject = new Label();
+ labelSimpleObject = new Label();
+ pictureBoxObject = new PictureBox();
+ buttonAdd = new Button();
+ buttonCancel = new Button();
+ panelObject = new Panel();
+ labelAdditionalColor = new Label();
+ labelBodyColor = new Label();
+ groupBoxConfig.SuspendLayout();
+ groupBoxColors.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+ panelObject.SuspendLayout();
+ SuspendLayout();
+ //
+ // groupBoxConfig
+ //
+ groupBoxConfig.Controls.Add(groupBoxColors);
+ groupBoxConfig.Controls.Add(checkBoxMotor);
+ groupBoxConfig.Controls.Add(checkBoxBodySection);
+ groupBoxConfig.Controls.Add(numericUpDownWeight);
+ groupBoxConfig.Controls.Add(labelWeight);
+ groupBoxConfig.Controls.Add(numericUpDownSpeed);
+ groupBoxConfig.Controls.Add(labelSpeed);
+ groupBoxConfig.Controls.Add(labelModifieldObject);
+ groupBoxConfig.Controls.Add(labelSimpleObject);
+ groupBoxConfig.Dock = DockStyle.Left;
+ groupBoxConfig.Location = new Point(0, 0);
+ groupBoxConfig.Name = "groupBoxConfig";
+ groupBoxConfig.Size = new Size(507, 195);
+ groupBoxConfig.TabIndex = 0;
+ groupBoxConfig.TabStop = false;
+ groupBoxConfig.Text = "Параметры";
+ //
+ // groupBoxColors
+ //
+ groupBoxColors.Controls.Add(panelBlack);
+ groupBoxColors.Controls.Add(panelPurple);
+ groupBoxColors.Controls.Add(panelGray);
+ groupBoxColors.Controls.Add(panelWhite);
+ groupBoxColors.Controls.Add(panelYellow);
+ groupBoxColors.Controls.Add(panelBlue);
+ groupBoxColors.Controls.Add(panelGreen);
+ groupBoxColors.Controls.Add(panelRed);
+ groupBoxColors.Location = new Point(258, 12);
+ groupBoxColors.Name = "groupBoxColors";
+ groupBoxColors.Size = new Size(245, 117);
+ groupBoxColors.TabIndex = 8;
+ groupBoxColors.TabStop = false;
+ groupBoxColors.Text = "Цвета";
+ //
+ // panelBlack
+ //
+ panelBlack.BackColor = Color.Black;
+ panelBlack.Location = new Point(196, 75);
+ panelBlack.Name = "panelBlack";
+ panelBlack.Size = new Size(44, 36);
+ panelBlack.TabIndex = 7;
+ //
+ // panelPurple
+ //
+ panelPurple.BackColor = Color.Purple;
+ panelPurple.Location = new Point(132, 75);
+ panelPurple.Name = "panelPurple";
+ panelPurple.Size = new Size(44, 36);
+ panelPurple.TabIndex = 6;
+ //
+ // panelGray
+ //
+ panelGray.BackColor = Color.Gray;
+ panelGray.Location = new Point(67, 75);
+ panelGray.Name = "panelGray";
+ panelGray.Size = new Size(44, 36);
+ panelGray.TabIndex = 5;
+ //
+ // panelWhite
+ //
+ panelWhite.BackColor = Color.White;
+ panelWhite.Location = new Point(6, 75);
+ panelWhite.Name = "panelWhite";
+ panelWhite.Size = new Size(44, 36);
+ panelWhite.TabIndex = 4;
+ //
+ // panelYellow
+ //
+ panelYellow.BackColor = Color.Yellow;
+ panelYellow.Location = new Point(196, 22);
+ panelYellow.Name = "panelYellow";
+ panelYellow.Size = new Size(44, 36);
+ panelYellow.TabIndex = 3;
+ //
+ // panelBlue
+ //
+ panelBlue.BackColor = Color.Blue;
+ panelBlue.Location = new Point(132, 22);
+ panelBlue.Name = "panelBlue";
+ panelBlue.Size = new Size(44, 36);
+ panelBlue.TabIndex = 2;
+ //
+ // panelGreen
+ //
+ panelGreen.BackColor = Color.Green;
+ panelGreen.Location = new Point(67, 22);
+ panelGreen.Name = "panelGreen";
+ panelGreen.Size = new Size(44, 36);
+ panelGreen.TabIndex = 1;
+ //
+ // panelRed
+ //
+ panelRed.BackColor = Color.Red;
+ panelRed.Location = new Point(6, 22);
+ panelRed.Name = "panelRed";
+ panelRed.Size = new Size(44, 36);
+ panelRed.TabIndex = 0;
+ //
+ // checkBoxMotor
+ //
+ checkBoxMotor.AutoSize = true;
+ checkBoxMotor.Location = new Point(12, 152);
+ checkBoxMotor.Name = "checkBoxMotor";
+ checkBoxMotor.Size = new Size(236, 24);
+ checkBoxMotor.TabIndex = 7;
+ checkBoxMotor.Text = "Признак наличия двигателей";
+ checkBoxMotor.UseVisualStyleBackColor = true;
+ //
+ // checkBoxBodySection
+ //
+ checkBoxBodySection.AutoSize = true;
+ checkBoxBodySection.Location = new Point(12, 122);
+ checkBoxBodySection.Name = "checkBoxBodySection";
+ checkBoxBodySection.Size = new Size(203, 24);
+ checkBoxBodySection.TabIndex = 6;
+ checkBoxBodySection.Text = "Признак наличия отсека";
+ checkBoxBodySection.UseVisualStyleBackColor = true;
+ //
+ // numericUpDownWeight
+ //
+ numericUpDownWeight.Location = new Point(94, 70);
+ numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+ numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+ numericUpDownWeight.Name = "numericUpDownWeight";
+ numericUpDownWeight.Size = new Size(80, 27);
+ numericUpDownWeight.TabIndex = 5;
+ numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+ //
+ // labelWeight
+ //
+ labelWeight.AutoSize = true;
+ labelWeight.Location = new Point(12, 72);
+ labelWeight.Name = "labelWeight";
+ labelWeight.Size = new Size(36, 20);
+ labelWeight.TabIndex = 4;
+ labelWeight.Text = "Вес:";
+ //
+ // numericUpDownSpeed
+ //
+ numericUpDownSpeed.Location = new Point(94, 34);
+ numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+ numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+ numericUpDownSpeed.Name = "numericUpDownSpeed";
+ numericUpDownSpeed.Size = new Size(80, 27);
+ numericUpDownSpeed.TabIndex = 3;
+ numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+ //
+ // labelSpeed
+ //
+ labelSpeed.AutoSize = true;
+ labelSpeed.Location = new Point(12, 36);
+ labelSpeed.Name = "labelSpeed";
+ labelSpeed.Size = new Size(76, 20);
+ labelSpeed.TabIndex = 2;
+ labelSpeed.Text = "Скорость:";
+ //
+ // labelModifieldObject
+ //
+ labelModifieldObject.BorderStyle = BorderStyle.FixedSingle;
+ labelModifieldObject.Location = new Point(390, 141);
+ labelModifieldObject.Name = "labelModifieldObject";
+ labelModifieldObject.Size = new Size(113, 44);
+ labelModifieldObject.TabIndex = 1;
+ labelModifieldObject.Text = "Продвинутый";
+ labelModifieldObject.TextAlign = ContentAlignment.MiddleCenter;
+ labelModifieldObject.MouseDown += LabelObject_MouseDown;
+ //
+ // labelSimpleObject
+ //
+ labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+ labelSimpleObject.Location = new Point(271, 141);
+ labelSimpleObject.Name = "labelSimpleObject";
+ labelSimpleObject.Size = new Size(106, 44);
+ labelSimpleObject.TabIndex = 0;
+ labelSimpleObject.Text = "Простой";
+ labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+ labelSimpleObject.MouseDown += LabelObject_MouseDown;
+ //
+ // pictureBoxObject
+ //
+ pictureBoxObject.Location = new Point(5, 44);
+ pictureBoxObject.Name = "pictureBoxObject";
+ pictureBoxObject.Size = new Size(218, 102);
+ pictureBoxObject.TabIndex = 1;
+ pictureBoxObject.TabStop = false;
+ //
+ // buttonAdd
+ //
+ buttonAdd.Location = new Point(539, 152);
+ buttonAdd.Name = "buttonAdd";
+ buttonAdd.Size = new Size(107, 36);
+ buttonAdd.TabIndex = 2;
+ buttonAdd.Text = "Добавить";
+ buttonAdd.UseVisualStyleBackColor = true;
+ buttonAdd.Click += buttonAdd_Click_1;
+ //
+ // buttonCancel
+ //
+ buttonCancel.Location = new Point(653, 152);
+ buttonCancel.Name = "buttonCancel";
+ buttonCancel.Size = new Size(107, 36);
+ buttonCancel.TabIndex = 3;
+ buttonCancel.Text = "Отмена";
+ buttonCancel.UseVisualStyleBackColor = true;
+ //
+ // panelObject
+ //
+ panelObject.AllowDrop = true;
+ panelObject.Controls.Add(labelAdditionalColor);
+ panelObject.Controls.Add(labelBodyColor);
+ panelObject.Controls.Add(pictureBoxObject);
+ panelObject.Location = new Point(534, 0);
+ panelObject.Name = "panelObject";
+ panelObject.Size = new Size(226, 146);
+ panelObject.TabIndex = 4;
+ panelObject.DragDrop += PanelObject_DragDrop;
+ panelObject.DragEnter += PanelObject_DragEnter;
+ //
+ // labelAdditionalColor
+ //
+ labelAdditionalColor.AllowDrop = true;
+ labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+ labelAdditionalColor.Location = new Point(124, 9);
+ labelAdditionalColor.Name = "labelAdditionalColor";
+ labelAdditionalColor.Size = new Size(92, 32);
+ labelAdditionalColor.TabIndex = 10;
+ labelAdditionalColor.Text = "Доп.цвет";
+ labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+ labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
+ labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter;
+ //
+ // labelBodyColor
+ //
+ labelBodyColor.AllowDrop = true;
+ labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+ labelBodyColor.Location = new Point(20, 9);
+ labelBodyColor.Name = "labelBodyColor";
+ labelBodyColor.Size = new Size(92, 32);
+ labelBodyColor.TabIndex = 9;
+ labelBodyColor.Text = "Цвет";
+ labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+ labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+ labelBodyColor.DragEnter += labelBodyColor_DragEnter;
+ //
+ // FormAirplanConfig
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(762, 195);
+ Controls.Add(panelObject);
+ Controls.Add(buttonCancel);
+ Controls.Add(buttonAdd);
+ Controls.Add(groupBoxConfig);
+ Name = "FormAirplanConfig";
+ Text = "Создание объекта";
+ groupBoxConfig.ResumeLayout(false);
+ groupBoxConfig.PerformLayout();
+ groupBoxColors.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+ ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+ panelObject.ResumeLayout(false);
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private GroupBox groupBoxConfig;
+ private Label labelSpeed;
+ private Label labelModifieldObject;
+ private Label labelSimpleObject;
+ private NumericUpDown numericUpDownWeight;
+ private Label labelWeight;
+ private NumericUpDown numericUpDownSpeed;
+ private CheckBox checkBoxBodySection;
+ private CheckBox checkBoxMotor;
+ private GroupBox groupBoxColors;
+ private Panel panelRed;
+ private Panel panelBlack;
+ private Panel panelPurple;
+ private Panel panelGray;
+ private Panel panelWhite;
+ private Panel panelYellow;
+ private Panel panelBlue;
+ private Panel panelGreen;
+ private PictureBox pictureBoxObject;
+ private Button buttonAdd;
+ private Button buttonCancel;
+ private Panel panelObject;
+ private Label labelAdditionalColor;
+ private Label labelBodyColor;
+ }
+}
\ No newline at end of file
diff --git a/Project_airbus/Project_airbus/FormAirplanConfig.cs b/Project_airbus/Project_airbus/FormAirplanConfig.cs
new file mode 100644
index 0000000..9e80d4e
--- /dev/null
+++ b/Project_airbus/Project_airbus/FormAirplanConfig.cs
@@ -0,0 +1,190 @@
+using Project_airbus.Drawings;
+using Project_airbus.Entities;
+
+namespace Project_airbus;
+
+///
+/// Форма конфигурации объекта
+///
+public partial class FormAirplanConfig : Form
+{
+ ///
+ /// Объект - прорисовка самолёта
+ ///
+ private DrawingAirplan? _airplan;
+
+ ///
+ /// Событие для передачи объекта
+ ///
+ private event Action _airplanDelegate;
+
+ ///
+ /// Конструктор
+ ///
+ public FormAirplanConfig()
+ {
+ InitializeComponent();
+ panelRed.MouseDown += Panel_MouseDown;
+ panelGreen.MouseDown += Panel_MouseDown;
+ panelBlue.MouseDown += Panel_MouseDown;
+ panelYellow.MouseDown += Panel_MouseDown;
+ panelWhite.MouseDown += Panel_MouseDown;
+ panelGray.MouseDown += Panel_MouseDown;
+ panelPurple.MouseDown += Panel_MouseDown;
+ panelBlack.MouseDown += Panel_MouseDown;
+
+ buttonCancel.Click += (sender, e) => Close();
+ }
+
+ ///
+ /// Привязка внешнего метода к событию
+ ///
+ ///
+ public void AddEvent(Action airplanDelegate)
+ {
+ _airplanDelegate += airplanDelegate;
+ }
+
+ ///
+ /// Прорисовка объекта
+ ///
+ private void DrawObject()
+ {
+ Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+ Graphics gr = Graphics.FromImage(bmp);
+ _airplan?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+ _airplan?.SetPosition(15, 15);
+ _airplan?.DrawTransport(gr);
+ pictureBoxObject.Image = bmp;
+ }
+
+ ///
+ /// Передаем информацию при нажатии на Label
+ ///
+ ///
+ ///
+ private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+ {
+ (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+ }
+
+ ///
+ /// Проверка получаемой информации (ее типа на соответствие требуемому)
+ ///
+ ///
+ ///
+ private void PanelObject_DragEnter(object sender, DragEventArgs e)
+ {
+ e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+ }
+
+ ///
+ /// Действия при приеме перетаскиваемой информации
+ ///
+ ///
+ ///
+ private void PanelObject_DragDrop(object sender, DragEventArgs e)
+ {
+ switch (e.Data?.GetData(DataFormats.Text)?.ToString())
+ {
+ case "labelSimpleObject":
+ _airplan = new DrawingAirplan((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+ break;
+ case "labelModifieldObject":
+ _airplan = new DrawingAirbus((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.Black,
+ Color.Black, checkBoxBodySection.Checked, checkBoxMotor.Checked);
+ break;
+ }
+
+ DrawObject();
+ }
+
+ ///
+ /// Передаем информацию при нажатии на Panel
+ ///
+ ///
+ ///
+ private void Panel_MouseDown(object? sender, MouseEventArgs e)
+ {
+ (sender as Control)?.DoDragDrop((sender as Control)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+ }
+
+ ///
+ /// Передача основного цвета
+ ///
+ ///
+ ///
+ private void labelBodyColor_DragEnter(object sender, DragEventArgs e)
+ {
+ if (e.Data.GetDataPresent(typeof(Color)))
+ {
+ e.Effect = DragDropEffects.Copy;
+ }
+ else
+ {
+ e.Effect = DragDropEffects.None;
+ }
+ }
+
+ ///
+ /// Прорисовка с основным цветом
+ ///
+ ///
+ ///
+ private void labelBodyColor_DragDrop(object sender, DragEventArgs e)
+ {
+ if (_airplan != null)
+ {
+ _airplan.EntityAirplan?.setBodyColor((Color)e.Data.GetData(typeof(Color)));
+ DrawObject();
+ }
+ }
+
+ ///
+ /// Передача дополнительного цвета
+ ///
+ ///
+ ///
+ private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e)
+ {
+ if (_airplan is DrawingAirbus)
+ {
+ if (e.Data.GetDataPresent(typeof(Color)))
+ {
+ e.Effect = DragDropEffects.Copy;
+ }
+ else
+ {
+ e.Effect = DragDropEffects.None;
+ }
+ }
+ }
+
+ ///
+ /// Прорисовка с дополнительным цветом
+ ///
+ ///
+ ///
+ private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+ {
+ if (_airplan?.EntityAirplan is EntityAirbus _airbus)
+ {
+ _airbus.setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+ }
+ DrawObject();
+ }
+
+ ///
+ /// Передача объекта
+ ///
+ ///
+ ///
+ private void buttonAdd_Click_1(object sender, EventArgs e)
+ {
+ if (_airplan != null)
+ {
+ _airplanDelegate?.Invoke(_airplan);
+ Close();
+ }
+ }
+}
diff --git a/Project_airbus/Project_airbus/FormAirplanConfig.resx b/Project_airbus/Project_airbus/FormAirplanConfig.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/Project_airbus/Project_airbus/FormAirplanConfig.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
\ No newline at end of file