diff --git a/AirplaneWithRadar/AirplaneWithRadar/AirplaneDelegate.cs b/AirplaneWithRadar/AirplaneWithRadar/AirplaneDelegate.cs new file mode 100644 index 0000000..b0a7d46 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/AirplaneDelegate.cs @@ -0,0 +1,5 @@ +namespace AirplaneWithRadar +{ + //делегат для передачи объекта-самолёта + public delegate void AirplaneDelegate(DrawningAirplane airplane); +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs index be48f3b..1203e86 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs @@ -10,7 +10,7 @@ namespace AirplaneWithRadar { public int Speed { get; private set; } public float Weight { get; private set; } - public Color BodyColor { get; private set; } + public Color BodyColor { get; set; } public float Step => Speed * 100 / Weight; public EntityAirplane(int speed, float weight, Color bodyColor) { diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs index 5a2409d..d405d11 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs @@ -11,7 +11,7 @@ namespace AirplaneWithRadar /// /// Дополнительный цвет /// - public Color DopColor { get; private set; } + public Color DopColor { get; set; } /// /// Признак наличия радара /// diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.Designer.cs new file mode 100644 index 0000000..2ae1b90 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.Designer.cs @@ -0,0 +1,414 @@ +namespace AirplaneWithRadar +{ + 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); + } + + #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.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.checkBoxAddLadder = new System.Windows.Forms.CheckBox(); + this.checkBoxAddWindow = new System.Windows.Forms.CheckBox(); + this.checkBoxAddRadar = 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.pictureBox = new System.Windows.Forms.PictureBox(); + this.panelObject = new System.Windows.Forms.Panel(); + this.labelDopColor = new System.Windows.Forms.Label(); + this.labelBaseColor = new System.Windows.Forms.Label(); + this.buttonAddObject = 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.pictureBox)).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.checkBoxAddLadder); + this.groupBoxConfig.Controls.Add(this.checkBoxAddWindow); + this.groupBoxConfig.Controls.Add(this.checkBoxAddRadar); + 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, 116); + 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(412, 116); + 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(412, 13); + 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); + // + // checkBoxAddLadder + // + this.checkBoxAddLadder.AutoSize = true; + this.checkBoxAddLadder.Location = new System.Drawing.Point(17, 154); + this.checkBoxAddLadder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.checkBoxAddLadder.Name = "checkBoxAddLadder"; + this.checkBoxAddLadder.Size = new System.Drawing.Size(276, 19); + this.checkBoxAddLadder.TabIndex = 4; + this.checkBoxAddLadder.Text = "Признак наличия дополнительной лестницы"; + this.checkBoxAddLadder.UseVisualStyleBackColor = true; + // + // checkBoxAddWindow + // + this.checkBoxAddWindow.AutoSize = true; + this.checkBoxAddWindow.Location = new System.Drawing.Point(17, 132); + this.checkBoxAddWindow.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.checkBoxAddWindow.Name = "checkBoxAddWindow"; + this.checkBoxAddWindow.Size = new System.Drawing.Size(253, 19); + this.checkBoxAddWindow.TabIndex = 5; + this.checkBoxAddWindow.Text = "Признак наличия дополнительного окна"; + this.checkBoxAddWindow.UseVisualStyleBackColor = true; + // + // checkBoxAddRadar + // + this.checkBoxAddRadar.AutoSize = true; + this.checkBoxAddRadar.Location = new System.Drawing.Point(17, 110); + this.checkBoxAddRadar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.checkBoxAddRadar.Name = "checkBoxAddRadar"; + this.checkBoxAddRadar.Size = new System.Drawing.Size(265, 19); + this.checkBoxAddRadar.TabIndex = 4; + this.checkBoxAddRadar.Text = "Признак наличия дополнительного радара"; + this.checkBoxAddRadar.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 = "Скорость:"; + // + // pictureBox + // + this.pictureBox.Location = new System.Drawing.Point(14, 38); + this.pictureBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pictureBox.Name = "pictureBox"; + this.pictureBox.Size = new System.Drawing.Size(209, 102); + this.pictureBox.TabIndex = 1; + this.pictureBox.TabStop = false; + // + // panelObject + // + this.panelObject.AllowDrop = true; + this.panelObject.Controls.Add(this.labelDopColor); + this.panelObject.Controls.Add(this.labelBaseColor); + this.panelObject.Controls.Add(this.pictureBox); + 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(234, 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); + // + // labelDopColor + // + this.labelDopColor.AllowDrop = true; + this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelDopColor.Location = new System.Drawing.Point(123, 4); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(100, 32); + this.labelDopColor.TabIndex = 3; + this.labelDopColor.Text = "Доп. цвет"; + this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelAddColor_DragDrop); + this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_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.LabelColor_DragEnter); + // + // buttonAddObject + // + this.buttonAddObject.Location = new System.Drawing.Point(660, 164); + this.buttonAddObject.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonAddObject.Name = "buttonAddObject"; + this.buttonAddObject.Size = new System.Drawing.Size(104, 28); + this.buttonAddObject.TabIndex = 3; + this.buttonAddObject.Text = "Добавить"; + this.buttonAddObject.UseVisualStyleBackColor = true; + this.buttonAddObject.Click += new System.EventHandler(this.ButtonAddObject_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(769, 164); + 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(890, 205); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonAddObject); + 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.pictureBox)).EndInit(); + this.panelObject.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBoxConfig; + private CheckBox checkBoxAddRadar; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private CheckBox checkBoxAddWindow; + private CheckBox checkBoxAddLadder; + 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 pictureBox; + private Panel panelObject; + private Label labelDopColor; + private Label labelBaseColor; + private Button buttonAddObject; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs new file mode 100644 index 0000000..7c5a819 --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs @@ -0,0 +1,145 @@ +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 AirplaneWithRadar +{ + 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(pictureBox.Width, pictureBox.Height); + Graphics gr = Graphics.FromImage(bmp); + _airplane?.SetPosition(5, 5, pictureBox.Width, pictureBox.Height); + _airplane?.DrawTransport(gr); + pictureBox.Image = bmp; + } + + //добавление события + public void AddEvent(Action ev) + { + if (EventAddAirplane == null) + { + EventAddAirplane = new Action(ev); + } + else + { + EventAddAirplane += ev; + } + } + + 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, labelBaseColor.BackColor); + break; + case "labelModifiedObject": + _airplane = new DrawningAirplaneWithRadar((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, labelBaseColor.BackColor, labelDopColor.BackColor, + checkBoxAddRadar.Checked, checkBoxAddLadder.Checked, checkBoxAddWindow.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 LabelColor_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 LabelAddColor_DragDrop(object sender, DragEventArgs e) + { + //проверка на пустоту объекта и правильную сущноть + if (_airplane != null && _airplane.Airplane is EntityAirplaneWithRadar entityAirplane) + { + entityAirplane.DopColor = (Color)e.Data.GetData(typeof(Color)); + + DrawAirplane(); + } + } + + //добавление машины + private void ButtonAddObject_Click(object sender, EventArgs e) + { + EventAddAirplane?.Invoke(_airplane); + Close(); + } + } +} diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.resx b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/AirplaneWithRadar/AirplaneWithRadar/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/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplane.cs index 5256dda..ecd62b5 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplane.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplane.cs @@ -83,6 +83,23 @@ namespace AirplaneWithRadar _mapAirplaneCollectionGeneric = null; } } + private void AddAirplane(DrawningAirplane airplane) + { + if (ListBoxMaps.SelectedIndex == -1) + { + return; + } + if (_mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectAirplane(airplane) != -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + + } /// /// Добавление объекта /// @@ -90,24 +107,10 @@ namespace AirplaneWithRadar /// private void ButtonAddAirplane_Click(object sender, EventArgs e) { - if (ListBoxMaps.SelectedIndex == -1) - { - return; - } - FormAirplane form = new(); - if (form.ShowDialog() == DialogResult.OK) - { - 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("Не удалось добавить объект"); - } - } + var formAirplaneConfig = new FormAirplaneConfig(); + + formAirplaneConfig.AddEvent(AddAirplane); + formAirplaneConfig.Show(); } /// /// Удаление объекта @@ -116,23 +119,23 @@ namespace AirplaneWithRadar /// private void ButtonRemoveAirplane_Click(object sender, EventArgs e) { - if (ListBoxMaps.SelectedIndex == -1) - { - return; - } if (string.IsNullOrEmpty(maskedTextBoxPosition.Text)) { return; } - if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + + if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, + MessageBoxIcon.Question) == DialogResult.No) { return; } + int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - if (_mapAirplaneCollectionGeneric - pos != null) + + if (_mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? String.Empty] - pos != null) { - MessageBox.Show("Объект удален"); - pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + MessageBox.Show("Объект удалён"); + pictureBox.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? String.Empty].ShowSet(); } else { diff --git a/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplaneGeneric.cs b/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplaneGeneric.cs index 6916b7d..cfcc925 100644 --- a/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplaneGeneric.cs +++ b/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplaneGeneric.cs @@ -10,9 +10,9 @@ // Высота окна отрисовки private readonly int _pictureHeight; // Размер занимаемого объектом места (ширина) - private readonly int _placeSizeWidth = 180; + private readonly int _placeSizeWidth = 120; // Размер занимаемого объектом места (высота) - private readonly int _placeSizeHeight = 90; + private readonly int _placeSizeHeight = 80; // Набор объектов private readonly SetAirplaneGeneric _setAirplane; // Карта @@ -121,7 +121,7 @@ curHeight * _placeSizeHeight + 30, _pictureWidth, _pictureHeight); airplane?.DrawningObject(g); - if (curWidth < widthEl) + if (curWidth < widthEl - 1) curWidth++; else {