From 53f11b8eaa817ff64703302876ac800df36226d7 Mon Sep 17 00:00:00 2001 From: NikGapon <45200250+NikGapon@users.noreply.github.com> Date: Sat, 19 Nov 2022 17:21:37 +0400 Subject: [PATCH] lab05 rewrite for fix again --- Airbus/Airbus/EntityAirbus.cs | 6 +- Airbus/Airbus/EntityAirplane.cs | 6 +- Airbus/Airbus/FormAirplaneConfig.Designer.cs | 395 +++++++++++++++++++ Airbus/Airbus/FormAirplaneConfig.cs | 177 +++++++++ Airbus/Airbus/FormAirplaneConfig.resx | 60 +++ Airbus/Airbus/FormMapWithSetAirplane.cs | 33 +- Airbus/Airbus/MapWithSetAirplaneGeneric.cs | 2 +- 7 files changed, 658 insertions(+), 21 deletions(-) create mode 100644 Airbus/Airbus/FormAirplaneConfig.Designer.cs create mode 100644 Airbus/Airbus/FormAirplaneConfig.cs create mode 100644 Airbus/Airbus/FormAirplaneConfig.resx diff --git a/Airbus/Airbus/EntityAirbus.cs b/Airbus/Airbus/EntityAirbus.cs index 6e390ef..20dfd14 100644 --- a/Airbus/Airbus/EntityAirbus.cs +++ b/Airbus/Airbus/EntityAirbus.cs @@ -8,9 +8,9 @@ namespace Airbus { internal class EntityAirbus : EntityAirplane { - public Color DopColor { get; private set; } - public bool Compartment { get; private set; } - public bool Engine { get; private set; } + public Color DopColor { get; set; } + public bool Compartment { get; set; } + public bool Engine { get; set; } public EntityAirbus(int speed, float weight, Color bodyColor, Color dopColor, bool compartment, bool engine) : base(speed, weight, bodyColor) diff --git a/Airbus/Airbus/EntityAirplane.cs b/Airbus/Airbus/EntityAirplane.cs index 30e4f41..c00139c 100644 --- a/Airbus/Airbus/EntityAirplane.cs +++ b/Airbus/Airbus/EntityAirplane.cs @@ -8,9 +8,9 @@ namespace Airbus { public class EntityAirplane { - public int Speed { get; private set; } //Скорость - public float Weight { get; private set; } //Вес - public Color BodyColor { get; private set; } //Цвет + public int Speed { get; set; } //Скорость + public float Weight { get; set; } //Вес + public Color BodyColor { get; set; } //Цвет public float Step => Speed * 100 / Weight; //Шаг при перемещении //Инициализация public EntityAirplane(int speed, float weight, Color bodyColor) diff --git a/Airbus/Airbus/FormAirplaneConfig.Designer.cs b/Airbus/Airbus/FormAirplaneConfig.Designer.cs new file mode 100644 index 0000000..09118e9 --- /dev/null +++ b/Airbus/Airbus/FormAirplaneConfig.Designer.cs @@ -0,0 +1,395 @@ +namespace Airbus +{ + partial class FormAirplaneConfig + { + /// + /// 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); + } + + // + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.groupBoxConfig = new System.Windows.Forms.GroupBox(); + this.labelModifiedObject = new System.Windows.Forms.Label(); + this.labelSimpleObject = new System.Windows.Forms.Label(); + this.groupBoxColors = new System.Windows.Forms.GroupBox(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.panelGray = new System.Windows.Forms.Panel(); + this.panelBlack = new System.Windows.Forms.Panel(); + this.panelPurple = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelRed = new System.Windows.Forms.Panel(); + this.checkBoxAddEngine = new System.Windows.Forms.CheckBox(); + this.checkBoxAddСompartment = new System.Windows.Forms.CheckBox(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.labelWeight = new System.Windows.Forms.Label(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.pictureBoxObject = new System.Windows.Forms.PictureBox(); + this.panelObject = new System.Windows.Forms.Panel(); + this.labelAddColor = new System.Windows.Forms.Label(); + this.labelBaseColor = new System.Windows.Forms.Label(); + this.buttonOk = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.groupBoxConfig.SuspendLayout(); + this.groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + this.panelObject.SuspendLayout(); + this.SuspendLayout(); + // + // groupBoxConfig + // + this.groupBoxConfig.Controls.Add(this.labelModifiedObject); + this.groupBoxConfig.Controls.Add(this.labelSimpleObject); + this.groupBoxConfig.Controls.Add(this.groupBoxColors); + this.groupBoxConfig.Controls.Add(this.checkBoxAddEngine); + this.groupBoxConfig.Controls.Add(this.checkBoxAddСompartment); + this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); + this.groupBoxConfig.Controls.Add(this.labelWeight); + this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed); + this.groupBoxConfig.Controls.Add(this.labelSpeed); + this.groupBoxConfig.Location = new System.Drawing.Point(10, 9); + this.groupBoxConfig.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupBoxConfig.Name = "groupBoxConfig"; + this.groupBoxConfig.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupBoxConfig.Size = new System.Drawing.Size(630, 184); + this.groupBoxConfig.TabIndex = 0; + this.groupBoxConfig.TabStop = false; + this.groupBoxConfig.Text = "Параметры"; + // + // labelModifiedObject + // + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Location = new System.Drawing.Point(521, 71); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(100, 44); + this.labelModifiedObject.TabIndex = 8; + this.labelModifiedObject.Text = "Продвитнутый"; + this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // labelSimpleObject + // + this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelSimpleObject.Location = new System.Drawing.Point(523, 18); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(98, 44); + this.labelSimpleObject.TabIndex = 7; + this.labelSimpleObject.Text = "Простой"; + this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // groupBoxColors + // + this.groupBoxColors.Controls.Add(this.panelWhite); + this.groupBoxColors.Controls.Add(this.panelGray); + this.groupBoxColors.Controls.Add(this.panelBlack); + this.groupBoxColors.Controls.Add(this.panelPurple); + this.groupBoxColors.Controls.Add(this.panelYellow); + this.groupBoxColors.Controls.Add(this.panelBlue); + this.groupBoxColors.Controls.Add(this.panelGreen); + this.groupBoxColors.Controls.Add(this.panelRed); + this.groupBoxColors.Location = new System.Drawing.Point(302, 12); + this.groupBoxColors.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupBoxColors.Size = new System.Drawing.Size(208, 94); + this.groupBoxColors.TabIndex = 6; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Цвета"; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(5, 59); + this.panelWhite.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(35, 30); + this.panelWhite.TabIndex = 7; + this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(59, 59); + this.panelGray.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(35, 30); + this.panelGray.TabIndex = 6; + this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(114, 59); + this.panelBlack.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(35, 30); + this.panelBlack.TabIndex = 5; + this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); + this.panelPurple.Location = new System.Drawing.Point(168, 59); + this.panelPurple.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(35, 30); + this.panelPurple.TabIndex = 4; + this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(168, 20); + this.panelYellow.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(35, 30); + this.panelYellow.TabIndex = 3; + this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(114, 20); + this.panelBlue.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(35, 30); + this.panelBlue.TabIndex = 2; + this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Lime; + this.panelGreen.Location = new System.Drawing.Point(59, 20); + this.panelGreen.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(35, 30); + this.panelGreen.TabIndex = 1; + this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(5, 20); + this.panelRed.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(35, 30); + this.panelRed.TabIndex = 0; + this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // checkBoxAddEngine + // + this.checkBoxAddEngine.AutoSize = true; + this.checkBoxAddEngine.Location = new System.Drawing.Point(17, 141); + this.checkBoxAddEngine.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.checkBoxAddEngine.Name = "checkBoxAddEngine"; + this.checkBoxAddEngine.Size = new System.Drawing.Size(284, 19); + this.checkBoxAddEngine.TabIndex = 5; + this.checkBoxAddEngine.Text = "Признак наличия дополнительных двигателей"; + this.checkBoxAddEngine.UseVisualStyleBackColor = true; + // + // checkBoxAddСompartment + // + this.checkBoxAddСompartment.AutoSize = true; + this.checkBoxAddСompartment.Location = new System.Drawing.Point(17, 110); + this.checkBoxAddСompartment.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.checkBoxAddСompartment.Name = "checkBoxAddСompartment"; + this.checkBoxAddСompartment.Size = new System.Drawing.Size(204, 19); + this.checkBoxAddСompartment.TabIndex = 4; + this.checkBoxAddСompartment.Text = "Признак наличия Отсека сверху"; + this.checkBoxAddСompartment.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(100, 73); + this.numericUpDownWeight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.numericUpDownWeight.Maximum = new decimal(new int[] { + 1500, + 0, + 0, + 0}); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(90, 23); + this.numericUpDownWeight.TabIndex = 3; + this.numericUpDownWeight.Value = new decimal(new int[] { + 750, + 0, + 0, + 0}); + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(17, 74); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(29, 15); + this.labelWeight.TabIndex = 2; + this.labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(100, 28); + this.numericUpDownSpeed.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.numericUpDownSpeed.Maximum = new decimal(new int[] { + 2000, + 0, + 0, + 0}); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(90, 23); + this.numericUpDownSpeed.TabIndex = 1; + this.numericUpDownSpeed.Value = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(17, 29); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(62, 15); + this.labelSpeed.TabIndex = 0; + this.labelSpeed.Text = "Скорость:"; + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(14, 38); + this.pictureBoxObject.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(312, 102); + this.pictureBoxObject.TabIndex = 1; + this.pictureBoxObject.TabStop = false; + // + // panelObject + // + this.panelObject.AllowDrop = true; + this.panelObject.Controls.Add(this.labelAddColor); + this.panelObject.Controls.Add(this.labelBaseColor); + this.panelObject.Controls.Add(this.pictureBoxObject); + this.panelObject.Location = new System.Drawing.Point(646, 17); + this.panelObject.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(335, 142); + this.panelObject.TabIndex = 2; + this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.panelObject_DragDrop); + this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.panelObject_DragEnter); + // + // labelAddColor + // + this.labelAddColor.AllowDrop = true; + this.labelAddColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelAddColor.Location = new System.Drawing.Point(226, 4); + this.labelAddColor.Name = "labelAddColor"; + this.labelAddColor.Size = new System.Drawing.Size(100, 32); + this.labelAddColor.TabIndex = 3; + this.labelAddColor.Text = "Доп. цвет"; + this.labelAddColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelAddColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.labelDopColor_DragDrop); + this.labelAddColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.labelBaseColor_DragEnter); + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(14, 4); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(104, 32); + this.labelBaseColor.TabIndex = 2; + this.labelBaseColor.Text = "Цвет"; + this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.labelBaseColor_DragDrop); + this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.labelBaseColor_DragEnter); + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(660, 165); + this.buttonOk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonOk.Name = "buttonAddObject"; + this.buttonOk.Size = new System.Drawing.Size(104, 28); + this.buttonOk.TabIndex = 3; + this.buttonOk.Text = "Добавить"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(872, 165); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(100, 28); + this.buttonCancel.TabIndex = 4; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // FormAirplaneConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(993, 202); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.groupBoxConfig); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "FormAirplaneConfig"; + this.Text = "Создание объекта"; + this.groupBoxConfig.ResumeLayout(false); + this.groupBoxConfig.PerformLayout(); + this.groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.panelObject.ResumeLayout(false); + this.ResumeLayout(false); + + } + private GroupBox groupBoxConfig; + private CheckBox checkBoxAddСompartment; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private CheckBox checkBoxAddEngine; + private Label labelModifiedObject; + private Label labelSimpleObject; + private GroupBox groupBoxColors; + private Panel panelWhite; + private Panel panelGray; + private Panel panelBlack; + private Panel panelPurple; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + private PictureBox pictureBoxObject; + private Panel panelObject; + private Label labelAddColor; + private Label labelBaseColor; + private Button buttonOk; + private Button buttonCancel; + } +} diff --git a/Airbus/Airbus/FormAirplaneConfig.cs b/Airbus/Airbus/FormAirplaneConfig.cs new file mode 100644 index 0000000..ce664c7 --- /dev/null +++ b/Airbus/Airbus/FormAirplaneConfig.cs @@ -0,0 +1,177 @@ +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; +using System.Windows.Forms.Design.Behavior; + +namespace Airbus +{ + public partial class FormAirplaneConfig : Form + { + /// + /// Переменная-выбранная машина + /// + DrawningAirplane _airplane = null; + /// + /// Событие + /// + private event Action EventAddAirplane; + /// + /// Конструктор + /// + public FormAirplaneConfig() + { + InitializeComponent(); + panelBlack.MouseDown += PanelColor_MouseDown; + panelPurple.MouseDown += PanelColor_MouseDown; + panelGray.MouseDown += PanelColor_MouseDown; + panelGreen.MouseDown += PanelColor_MouseDown; + panelRed.MouseDown += PanelColor_MouseDown; + panelWhite.MouseDown += PanelColor_MouseDown; + panelYellow.MouseDown += PanelColor_MouseDown; + panelBlue.MouseDown += PanelColor_MouseDown; + buttonCancel.Click += (object sender, EventArgs e) => Close(); + } + /// + /// Отрисовать машину + /// + private void DrawAirplane() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _airplane?.SetPosition(75, 15, pictureBoxObject.Width, pictureBoxObject.Height); + _airplane?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + /// + /// Добавление события + /// + /// + public void AddEvent(Action ev) + { + if (EventAddAirplane == null) + { + EventAddAirplane = new Action(ev); + } + else + { + EventAddAirplane += ev; + } + } + /// + /// Передаем информацию при нажатии на Label + /// + /// + /// + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label).DoDragDrop((sender as Label).Name, + DragDropEffects.Move | DragDropEffects.Copy); + } + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void panelObject_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(DataFormats.Text)) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + /// + /// Действия при приеме перетаскиваемой информации + /// + /// + /// + private void panelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data.GetData(DataFormats.Text).ToString()) + { + case "labelSimpleObject": + _airplane = new DrawningAirplane((int)numericUpDownSpeed.Value, + (int)numericUpDownWeight.Value, Color.Black); + break; + case "labelModifiedObject": + _airplane = new DrawingAirbus((int)numericUpDownSpeed.Value, + (int)numericUpDownWeight.Value, Color.White, Color.Black, + checkBoxAddСompartment.Checked, checkBoxAddEngine.Checked); + break; + } + DrawAirplane(); + } + /// + /// Отправляем цвет с панели + /// + /// + /// + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor, + DragDropEffects.Move | DragDropEffects.Copy); + } + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void labelBaseColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + /// + /// Принимаем основной цвет + /// + /// + /// + private void labelBaseColor_DragDrop(object sender, DragEventArgs e) + { + if (_airplane != null) + _airplane.airplane.BodyColor = (Color)e.Data.GetData(typeof(Color)); + DrawAirplane(); + + } + /// + /// Принимаем дополнительный цвет + /// + /// + /// + private void labelDopColor_DragDrop(object sender, DragEventArgs e) + { + if (_airplane == null|| _airplane.airplane is not EntityAirbus airbus) + { + return; + } + airbus.DopColor = (Color)e.Data.GetData(typeof(Color)); + DrawAirplane(); + } + /// + /// Добавление машины + /// + /// + /// + private void buttonOk_Click(object sender, EventArgs e) + { + EventAddAirplane?.Invoke(_airplane); + Close(); + } + } + +} diff --git a/Airbus/Airbus/FormAirplaneConfig.resx b/Airbus/Airbus/FormAirplaneConfig.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/Airbus/Airbus/FormAirplaneConfig.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 diff --git a/Airbus/Airbus/FormMapWithSetAirplane.cs b/Airbus/Airbus/FormMapWithSetAirplane.cs index 2598c0e..83be8ab 100644 --- a/Airbus/Airbus/FormMapWithSetAirplane.cs +++ b/Airbus/Airbus/FormMapWithSetAirplane.cs @@ -94,27 +94,33 @@ namespace Airbus } private void buttonAddAirplane_Click(object sender, EventArgs e) + { + if (listBoxMaps.SelectedIndex == -1) + { + return; + } + var formAirplaneConfig = new FormAirplaneConfig(); + formAirplaneConfig.AddEvent(AddAirplane); + formAirplaneConfig.Show(); + } + private void AddAirplane(DrawningAirplane airplane) { if (listBoxMaps.SelectedIndex == -1) { return; } - FormAirplane form = new(); - if (form.ShowDialog() == DialogResult.OK) + DrawningObjectAirplane objectAirplane = new(airplane); + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + objectAirplane != -1) { - DrawningObjectAirplane airplane = new(form.SelectedAirplane); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + airplane > -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = - _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить "); } } + private void buttonRemoveAirplane_Click(object sender, EventArgs e) { if (listBoxMaps.SelectedIndex == -1) @@ -166,7 +172,6 @@ namespace Airbus } pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap(); - } /// /// Перемещение diff --git a/Airbus/Airbus/MapWithSetAirplaneGeneric.cs b/Airbus/Airbus/MapWithSetAirplaneGeneric.cs index 57f75f9..739d385 100644 --- a/Airbus/Airbus/MapWithSetAirplaneGeneric.cs +++ b/Airbus/Airbus/MapWithSetAirplaneGeneric.cs @@ -182,4 +182,4 @@ namespace Airbus } } } -} + }