From 67273822b8b951f5332ed1436ecb03b77bb52b80 Mon Sep 17 00:00:00 2001 From: alhimek17 Date: Sun, 21 Apr 2024 16:45:41 +0400 Subject: [PATCH 1/4] =?UTF-8?q?5=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectAirPlane/Entites/EntityAirPlane.cs | 8 +- .../ProjectAirPlane/Entites/EntityPlane.cs | 2 + .../FormPlaneCollection.Designer.cs | 14 - .../ProjectAirPlane/FormPlaneCollection.cs | 30 +- .../FormPlaneConfig.Designer.cs | 377 ++++++++++++++++++ .../ProjectAirPlane/FormPlaneConfig.cs | 161 ++++++++ .../ProjectAirPlane/FormPlaneConfig.resx | 120 ++++++ .../ProjectAirPlane/PlaneDelegate.cs | 11 + 8 files changed, 702 insertions(+), 21 deletions(-) create mode 100644 ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs create mode 100644 ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs create mode 100644 ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.resx create mode 100644 ProjectAirPlane/ProjectAirPlane/PlaneDelegate.cs diff --git a/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs b/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs index c560690..7baca9f 100644 --- a/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs +++ b/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs @@ -10,18 +10,20 @@ public class EntityAirPlane : EntityPlane /// public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color color) => AdditionalColor = color; + /// - /// Признак (опция) наличия обвеса + /// Признак (опция) наличия радара /// public bool Radar { get; private set; } /// - /// Признак (опция) наличия антикрыла + /// Признак (опция) наличия допбака /// public bool DopBak { get; private set; } /// - /// Признак (опция) наличия гоночной полосы + /// Признак (опция) наличия шасси /// public bool Chassi { get; private set; } diff --git a/ProjectAirPlane/ProjectAirPlane/Entites/EntityPlane.cs b/ProjectAirPlane/ProjectAirPlane/Entites/EntityPlane.cs index 5b0f796..baf250e 100644 --- a/ProjectAirPlane/ProjectAirPlane/Entites/EntityPlane.cs +++ b/ProjectAirPlane/ProjectAirPlane/Entites/EntityPlane.cs @@ -20,6 +20,8 @@ public class EntityPlane /// public Color BodyColor { get; private set; } + public void SetBodyColor(Color color) => BodyColor = color; + /// /// Шаг перемещения автомобиля /// diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.Designer.cs b/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.Designer.cs index b13da08..136ed8b 100644 --- a/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.Designer.cs +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.Designer.cs @@ -31,7 +31,6 @@ groupBoxTools = new GroupBox(); panelCompanyTools = new Panel(); buttonAddPlane = new Button(); - buttonAddAirPlane = new Button(); maskedTextBox = new MaskedTextBox(); buttonRefresh = new Button(); buttonRemovePlane = new Button(); @@ -70,7 +69,6 @@ // panelCompanyTools // panelCompanyTools.Controls.Add(buttonAddPlane); - panelCompanyTools.Controls.Add(buttonAddAirPlane); panelCompanyTools.Controls.Add(maskedTextBox); panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(buttonRemovePlane); @@ -93,17 +91,6 @@ buttonAddPlane.UseVisualStyleBackColor = true; buttonAddPlane.Click += ButtonAddPlane_Click; // - // buttonAddAirPlane - // - buttonAddAirPlane.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddAirPlane.Location = new Point(3, 47); - buttonAddAirPlane.Name = "buttonAddAirPlane"; - buttonAddAirPlane.Size = new Size(166, 38); - buttonAddAirPlane.TabIndex = 2; - buttonAddAirPlane.Text = "Добавление самолёта с радаром"; - buttonAddAirPlane.UseVisualStyleBackColor = true; - buttonAddAirPlane.Click += ButtonAddAirPlane_Click; - // // maskedTextBox // maskedTextBox.Location = new Point(3, 91); @@ -283,7 +270,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; private Button buttonAddPlane; - private Button buttonAddAirPlane; private PictureBox pictureBox; private Button buttonRemovePlane; private MaskedTextBox maskedTextBox; diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs b/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs index f82c901..0fd97e2 100644 --- a/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs @@ -101,12 +101,34 @@ public partial class FormPlaneCollection : Form return color; } - private void ButtonAddPlane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningPlane)); + private void ButtonAddPlane_Click(object sender, EventArgs e) + { + FormPlaneConfig form = new(); + form.AddEvent(SetPlane); + form.Show(); + } + /// + /// Добавление самолёта в коллекцию + /// + /// + private void SetPlane(DrawningPlane plane) + { + if (_company == null || plane == null) + { + return; + } - - - private void ButtonAddAirPlane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirPlane)); + if (_company + plane != -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _company.Show(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } private void MaskedTextBox_MaskInputRejected(object sender, MaskInputRejectedEventArgs e) diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs new file mode 100644 index 0000000..7aa4b6c --- /dev/null +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs @@ -0,0 +1,377 @@ +namespace ProjectAirPlane +{ + partial class FormPlaneConfig + { + /// + /// 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(); + panelPurple = new Panel(); + panelYellow = new Panel(); + panelBlack = new Panel(); + panelGray = new Panel(); + panelBlue = new Panel(); + panelWhite = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxChassi = new CheckBox(); + checkBoxDopBak = new CheckBox(); + checkBoxRadar = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModifiedObject = new Label(); + labelSimpleObject = new Label(); + pictureBoxObject = new PictureBox(); + buttonAdd = new Button(); + buttonCancel = new Button(); + panelObjects = new Panel(); + labelAdditionalColor = new Label(); + labelBodyColor = new Label(); + pictureBoxObjects = new PictureBox(); + groupBoxConfig.SuspendLayout(); + groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + panelObjects.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObjects).BeginInit(); + SuspendLayout(); + // + // groupBoxConfig + // + groupBoxConfig.Controls.Add(groupBoxColors); + groupBoxConfig.Controls.Add(checkBoxChassi); + groupBoxConfig.Controls.Add(checkBoxDopBak); + groupBoxConfig.Controls.Add(checkBoxRadar); + groupBoxConfig.Controls.Add(numericUpDownWeight); + groupBoxConfig.Controls.Add(labelWeight); + groupBoxConfig.Controls.Add(numericUpDownSpeed); + groupBoxConfig.Controls.Add(labelSpeed); + groupBoxConfig.Controls.Add(labelModifiedObject); + groupBoxConfig.Controls.Add(labelSimpleObject); + groupBoxConfig.Dock = DockStyle.Left; + groupBoxConfig.Location = new Point(0, 0); + groupBoxConfig.Name = "groupBoxConfig"; + groupBoxConfig.Size = new Size(432, 261); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(189, 12); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(204, 115); + groupBoxColors.TabIndex = 9; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(164, 65); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(32, 33); + panelPurple.TabIndex = 3; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(164, 22); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(32, 33); + panelYellow.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(116, 65); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(32, 33); + panelBlack.TabIndex = 4; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(60, 65); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(32, 33); + panelGray.TabIndex = 5; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(116, 22); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(32, 33); + panelBlue.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(10, 65); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(32, 33); + panelWhite.TabIndex = 2; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(60, 22); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(32, 33); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(10, 22); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(32, 33); + panelRed.TabIndex = 0; + // + // checkBoxChassi + // + checkBoxChassi.AutoSize = true; + checkBoxChassi.Location = new Point(12, 141); + checkBoxChassi.Name = "checkBoxChassi"; + checkBoxChassi.Size = new Size(162, 19); + checkBoxChassi.TabIndex = 8; + checkBoxChassi.Text = "Признак наличия шасси"; + checkBoxChassi.UseVisualStyleBackColor = true; + // + // checkBoxDopBak + // + checkBoxDopBak.AutoSize = true; + checkBoxDopBak.Location = new Point(12, 116); + checkBoxDopBak.Name = "checkBoxDopBak"; + checkBoxDopBak.Size = new Size(171, 19); + checkBoxDopBak.TabIndex = 7; + checkBoxDopBak.Text = "Признак наличия допбака"; + checkBoxDopBak.UseVisualStyleBackColor = true; + // + // checkBoxRadar + // + checkBoxRadar.AutoSize = true; + checkBoxRadar.Location = new Point(12, 91); + checkBoxRadar.Name = "checkBoxRadar"; + checkBoxRadar.Size = new Size(164, 19); + checkBoxRadar.TabIndex = 6; + checkBoxRadar.Text = "Признак наличия радара"; + checkBoxRadar.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(77, 50); + 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(72, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(25, 52); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(26, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(77, 22); + 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(72, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 23); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(59, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(305, 130); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(100, 39); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(199, 130); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(100, 39); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(0, 0); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(100, 50); + pictureBoxObject.TabIndex = 0; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(455, 190); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(83, 23); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(594, 190); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(87, 23); + buttonCancel.TabIndex = 3; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // panelObjects + // + panelObjects.AllowDrop = true; + panelObjects.Controls.Add(labelAdditionalColor); + panelObjects.Controls.Add(labelBodyColor); + panelObjects.Controls.Add(pictureBoxObjects); + panelObjects.Location = new Point(441, 12); + panelObjects.Name = "panelObjects"; + panelObjects.Size = new Size(308, 182); + panelObjects.TabIndex = 4; + panelObjects.DragDrop += PanelObjects_DragDrop; + panelObjects.DragEnter += PanelObjects_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(141, 3); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(83, 23); + labelAdditionalColor.TabIndex = 11; + labelAdditionalColor.Text = "Доп цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + // + // labelBodyColor + // + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(20, 3); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(83, 23); + labelBodyColor.TabIndex = 10; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + // + // pictureBoxObjects + // + pictureBoxObjects.Location = new Point(20, 29); + pictureBoxObjects.Name = "pictureBoxObjects"; + pictureBoxObjects.Size = new Size(285, 143); + pictureBoxObjects.TabIndex = 0; + pictureBoxObjects.TabStop = false; + // + // FormPlaneConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(761, 261); + Controls.Add(panelObjects); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormPlaneConfig"; + Text = "Создание объекта"; + groupBoxConfig.ResumeLayout(false); + groupBoxConfig.PerformLayout(); + groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + panelObjects.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)pictureBoxObjects).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxConfig; + private Label labelSimpleObject; + private Label labelModifiedObject; + private Label labelSpeed; + private NumericUpDown numericUpDownSpeed; + private Label labelWeight; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxRadar; + private CheckBox checkBoxDopBak; + private CheckBox checkBoxChassi; + private GroupBox groupBoxColors; + private Panel panelRed; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + + private Panel panelObjects; + private PictureBox pictureBoxObjects; + private Label labelBodyColor; + private Label labelAdditionalColor; + } +} \ No newline at end of file diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs new file mode 100644 index 0000000..91bf69b --- /dev/null +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs @@ -0,0 +1,161 @@ +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 ProjectAirPlane.Drawnings; +using ProjectAirPlane.Entites; + +namespace ProjectAirPlane; + +/// +/// Форма конфигурации объекта +/// +public partial class FormPlaneConfig : Form +{ + + /// + /// Объект - прорисовка самолёта + /// + private DrawningPlane? _plane; + + /// + /// Событие для передачи объекта + /// + private event PlaneDelegate? PlaneDelegate; + + /// + /// Конструктор + /// + public FormPlaneConfig() + { + InitializeComponent(); + + panelRed.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelGray.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + + buttonCancel.Click += (sender, e) => Close(); + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(PlaneDelegate planeDelegate) + { + PlaneDelegate += planeDelegate; + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _plane?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _plane?.SetPosition(110, 75); + _plane?.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 PanelObjects_DragEnter(object sender, DragEventArgs e) + { + e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None; + } + + /// + /// Действия при приеме перетаскиваемой информации + /// + /// + /// + private void PanelObjects_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data?.GetData(DataFormats.Text)?.ToString()) + { + case "labelSimpleObject": + _plane = new DrawningPlane((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _plane = new DrawningAirPlane((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, + Color.White, Color.Black, checkBoxRadar.Checked, checkBoxDopBak.Checked, checkBoxChassi.Checked); + break; + } + DrawObject(); + } + + private void LabelColors_DragDrop(object? sender, DragEventArgs e) + { + if (_plane == null || sender == null || _plane.EntityPlane == null) + { + return; + } + + Label label = (Label)sender; + Color newColor = (Color)e.Data?.GetData(typeof(Color)); + + switch (label.Name) + { + case "labelBodyColor": + _plane.EntityPlane.SetBodyColor(newColor); + DrawObject(); + break; + case "labelAdditionalColor": + if (_plane is DrawningAirPlane) + { + (_plane.EntityPlane as EntityAirPlane)?.SetAdditionalColor(newColor); + DrawObject(); + } + break; + } + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_plane != null) + { + PlaneDelegate?.Invoke(_plane); + Close(); + } + } +} diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.resx b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.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 diff --git a/ProjectAirPlane/ProjectAirPlane/PlaneDelegate.cs b/ProjectAirPlane/ProjectAirPlane/PlaneDelegate.cs new file mode 100644 index 0000000..148fe17 --- /dev/null +++ b/ProjectAirPlane/ProjectAirPlane/PlaneDelegate.cs @@ -0,0 +1,11 @@ + +using ProjectAirPlane.Drawnings; + +namespace ProjectAirPlane; + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// + +public delegate void PlaneDelegate(DrawningPlane plane); -- 2.25.1 From 4a843f7eaf038b5c95dd4eeaf78d0188afad2aa5 Mon Sep 17 00:00:00 2001 From: alhimek17 Date: Sun, 21 Apr 2024 18:47:16 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=965=20=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=BD=D0=BD=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectAirPlane/Entites/EntityAirPlane.cs | 8 +- .../ProjectAirPlane/Entites/EntityPlane.cs | 8 +- .../ProjectAirPlane/FormPlaneCollection.cs | 56 +----- .../FormPlaneConfig.Designer.cs | 165 +++++++++--------- .../ProjectAirPlane/FormPlaneConfig.cs | 117 +++++++------ 5 files changed, 156 insertions(+), 198 deletions(-) diff --git a/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs b/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs index 7baca9f..3ad9848 100644 --- a/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs +++ b/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs @@ -10,7 +10,13 @@ public class EntityAirPlane : EntityPlane /// public Color AdditionalColor { get; private set; } - public void SetAdditionalColor(Color color) => AdditionalColor = color; + /// + /// Присваивание цвета + /// + public void SetAdditionalColor(Color color) + { + AdditionalColor = color; + } /// /// Признак (опция) наличия радара diff --git a/ProjectAirPlane/ProjectAirPlane/Entites/EntityPlane.cs b/ProjectAirPlane/ProjectAirPlane/Entites/EntityPlane.cs index baf250e..bf667d0 100644 --- a/ProjectAirPlane/ProjectAirPlane/Entites/EntityPlane.cs +++ b/ProjectAirPlane/ProjectAirPlane/Entites/EntityPlane.cs @@ -20,7 +20,13 @@ public class EntityPlane /// public Color BodyColor { get; private set; } - public void SetBodyColor(Color color) => BodyColor = color; + /// + /// Присваивание цвета + /// + public void SetBodyColor(Color color) + { + BodyColor = color; + } /// /// Шаг перемещения автомобиля diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs b/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs index 0fd97e2..be1b9e8 100644 --- a/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs @@ -46,61 +46,7 @@ public partial class FormPlaneCollection : Form panelCompanyTools.Enabled = false; } - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) - { - if (_company == null) - { - return; - } - - Random random = new(); - DrawningPlane drawningPlane; - switch (type) - { - case nameof(DrawningPlane): - drawningPlane = new DrawningPlane(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningAirPlane): - // TODO вызов диалогового окна для выбора цвета - drawningPlane = new DrawningAirPlane(random.Next(100, 300), random.Next(1000, 3000), - GetColor(random), GetColor(random), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - - if (_company + drawningPlane != -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _company.Show(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } - } - - /// - /// Получение цвета - /// - /// Генератор случайных чисел - /// - 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 ButtonAddPlane_Click(object sender, EventArgs e) { FormPlaneConfig form = new(); diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs index 7aa4b6c..44d6430 100644 --- a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs @@ -33,8 +33,8 @@ panelPurple = new Panel(); panelYellow = new Panel(); panelBlack = new Panel(); - panelGray = new Panel(); panelBlue = new Panel(); + panelGray = new Panel(); panelWhite = new Panel(); panelGreen = new Panel(); panelRed = new Panel(); @@ -50,17 +50,15 @@ pictureBoxObject = new PictureBox(); buttonAdd = new Button(); buttonCancel = new Button(); - panelObjects = new Panel(); + panelObject = new Panel(); labelAdditionalColor = new Label(); labelBodyColor = new Label(); - pictureBoxObjects = new PictureBox(); groupBoxConfig.SuspendLayout(); groupBoxColors.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); - panelObjects.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)pictureBoxObjects).BeginInit(); + panelObject.SuspendLayout(); SuspendLayout(); // // groupBoxConfig @@ -78,7 +76,7 @@ groupBoxConfig.Dock = DockStyle.Left; groupBoxConfig.Location = new Point(0, 0); groupBoxConfig.Name = "groupBoxConfig"; - groupBoxConfig.Size = new Size(432, 261); + groupBoxConfig.Size = new Size(491, 301); groupBoxConfig.TabIndex = 0; groupBoxConfig.TabStop = false; groupBoxConfig.Text = "Параметры"; @@ -88,14 +86,14 @@ groupBoxColors.Controls.Add(panelPurple); groupBoxColors.Controls.Add(panelYellow); groupBoxColors.Controls.Add(panelBlack); - groupBoxColors.Controls.Add(panelGray); groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGray); groupBoxColors.Controls.Add(panelWhite); groupBoxColors.Controls.Add(panelGreen); groupBoxColors.Controls.Add(panelRed); - groupBoxColors.Location = new Point(189, 12); + groupBoxColors.Location = new Point(224, 13); groupBoxColors.Name = "groupBoxColors"; - groupBoxColors.Size = new Size(204, 115); + groupBoxColors.Size = new Size(249, 127); groupBoxColors.TabIndex = 9; groupBoxColors.TabStop = false; groupBoxColors.Text = "Цвета"; @@ -103,71 +101,71 @@ // panelPurple // panelPurple.BackColor = Color.Purple; - panelPurple.Location = new Point(164, 65); + panelPurple.Location = new Point(194, 72); panelPurple.Name = "panelPurple"; - panelPurple.Size = new Size(32, 33); + panelPurple.Size = new Size(31, 30); panelPurple.TabIndex = 3; // // panelYellow // panelYellow.BackColor = Color.Yellow; - panelYellow.Location = new Point(164, 22); + panelYellow.Location = new Point(194, 22); panelYellow.Name = "panelYellow"; - panelYellow.Size = new Size(32, 33); + panelYellow.Size = new Size(31, 30); panelYellow.TabIndex = 1; // // panelBlack // panelBlack.BackColor = Color.Black; - panelBlack.Location = new Point(116, 65); + panelBlack.Location = new Point(136, 72); panelBlack.Name = "panelBlack"; - panelBlack.Size = new Size(32, 33); + panelBlack.Size = new Size(31, 30); panelBlack.TabIndex = 4; // - // panelGray - // - panelGray.BackColor = Color.Gray; - panelGray.Location = new Point(60, 65); - panelGray.Name = "panelGray"; - panelGray.Size = new Size(32, 33); - panelGray.TabIndex = 5; - // // panelBlue // panelBlue.BackColor = Color.Blue; - panelBlue.Location = new Point(116, 22); + panelBlue.Location = new Point(136, 22); panelBlue.Name = "panelBlue"; - panelBlue.Size = new Size(32, 33); + panelBlue.Size = new Size(31, 30); panelBlue.TabIndex = 1; // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(78, 72); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(31, 30); + panelGray.TabIndex = 5; + // // panelWhite // panelWhite.BackColor = Color.White; - panelWhite.Location = new Point(10, 65); + panelWhite.Location = new Point(18, 72); panelWhite.Name = "panelWhite"; - panelWhite.Size = new Size(32, 33); + panelWhite.Size = new Size(31, 30); panelWhite.TabIndex = 2; // // panelGreen // panelGreen.BackColor = Color.Green; - panelGreen.Location = new Point(60, 22); + panelGreen.Location = new Point(78, 22); panelGreen.Name = "panelGreen"; - panelGreen.Size = new Size(32, 33); + panelGreen.Size = new Size(31, 30); panelGreen.TabIndex = 1; // // panelRed // panelRed.BackColor = Color.Red; - panelRed.Location = new Point(10, 22); + panelRed.Location = new Point(18, 22); panelRed.Name = "panelRed"; - panelRed.Size = new Size(32, 33); + panelRed.Size = new Size(31, 30); panelRed.TabIndex = 0; // // checkBoxChassi // checkBoxChassi.AutoSize = true; - checkBoxChassi.Location = new Point(12, 141); + checkBoxChassi.Location = new Point(12, 146); checkBoxChassi.Name = "checkBoxChassi"; checkBoxChassi.Size = new Size(162, 19); checkBoxChassi.TabIndex = 8; @@ -177,17 +175,17 @@ // checkBoxDopBak // checkBoxDopBak.AutoSize = true; - checkBoxDopBak.Location = new Point(12, 116); + checkBoxDopBak.Location = new Point(12, 121); checkBoxDopBak.Name = "checkBoxDopBak"; - checkBoxDopBak.Size = new Size(171, 19); + checkBoxDopBak.Size = new Size(177, 19); checkBoxDopBak.TabIndex = 7; - checkBoxDopBak.Text = "Признак наличия допбака"; + checkBoxDopBak.Text = "Признак наличия доп. бака"; checkBoxDopBak.UseVisualStyleBackColor = true; // // checkBoxRadar // checkBoxRadar.AutoSize = true; - checkBoxRadar.Location = new Point(12, 91); + checkBoxRadar.Location = new Point(12, 96); checkBoxRadar.Name = "checkBoxRadar"; checkBoxRadar.Size = new Size(164, 19); checkBoxRadar.TabIndex = 6; @@ -196,18 +194,18 @@ // // numericUpDownWeight // - numericUpDownWeight.Location = new Point(77, 50); + numericUpDownWeight.Location = new Point(71, 50); 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(72, 23); + numericUpDownWeight.Size = new Size(98, 23); numericUpDownWeight.TabIndex = 5; numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); // // labelWeight // labelWeight.AutoSize = true; - labelWeight.Location = new Point(25, 52); + labelWeight.Location = new Point(12, 50); labelWeight.Name = "labelWeight"; labelWeight.Size = new Size(26, 15); labelWeight.TabIndex = 4; @@ -215,18 +213,18 @@ // // numericUpDownSpeed // - numericUpDownSpeed.Location = new Point(77, 22); + numericUpDownSpeed.Location = new Point(71, 17); 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(72, 23); + numericUpDownSpeed.Size = new Size(98, 23); numericUpDownSpeed.TabIndex = 3; numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); // // labelSpeed // labelSpeed.AutoSize = true; - labelSpeed.Location = new Point(12, 23); + labelSpeed.Location = new Point(6, 19); labelSpeed.Name = "labelSpeed"; labelSpeed.Size = new Size(59, 15); labelSpeed.TabIndex = 2; @@ -235,9 +233,9 @@ // labelModifiedObject // labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; - labelModifiedObject.Location = new Point(305, 130); + labelModifiedObject.Location = new Point(373, 146); labelModifiedObject.Name = "labelModifiedObject"; - labelModifiedObject.Size = new Size(100, 39); + labelModifiedObject.Size = new Size(100, 23); labelModifiedObject.TabIndex = 1; labelModifiedObject.Text = "Продвинутый"; labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; @@ -246,9 +244,9 @@ // labelSimpleObject // labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; - labelSimpleObject.Location = new Point(199, 130); + labelSimpleObject.Location = new Point(242, 146); labelSimpleObject.Name = "labelSimpleObject"; - labelSimpleObject.Size = new Size(100, 39); + labelSimpleObject.Size = new Size(100, 23); labelSimpleObject.TabIndex = 0; labelSimpleObject.Text = "Простой"; labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; @@ -256,17 +254,17 @@ // // pictureBoxObject // - pictureBoxObject.Location = new Point(0, 0); + pictureBoxObject.Location = new Point(20, 48); pictureBoxObject.Name = "pictureBoxObject"; - pictureBoxObject.Size = new Size(100, 50); - pictureBoxObject.TabIndex = 0; + pictureBoxObject.Size = new Size(306, 149); + pictureBoxObject.TabIndex = 1; pictureBoxObject.TabStop = false; // // buttonAdd // - buttonAdd.Location = new Point(455, 190); + buttonAdd.Location = new Point(554, 250); buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(83, 23); + buttonAdd.Size = new Size(75, 23); buttonAdd.TabIndex = 2; buttonAdd.Text = "Добавить"; buttonAdd.UseVisualStyleBackColor = true; @@ -274,73 +272,68 @@ // // buttonCancel // - buttonCancel.Location = new Point(594, 190); + buttonCancel.Location = new Point(721, 250); buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(87, 23); + buttonCancel.Size = new Size(75, 23); buttonCancel.TabIndex = 3; buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; // - // panelObjects + // panelObject // - panelObjects.AllowDrop = true; - panelObjects.Controls.Add(labelAdditionalColor); - panelObjects.Controls.Add(labelBodyColor); - panelObjects.Controls.Add(pictureBoxObjects); - panelObjects.Location = new Point(441, 12); - panelObjects.Name = "panelObjects"; - panelObjects.Size = new Size(308, 182); - panelObjects.TabIndex = 4; - panelObjects.DragDrop += PanelObjects_DragDrop; - panelObjects.DragEnter += PanelObjects_DragEnter; + panelObject.AllowDrop = true; + panelObject.Controls.Add(labelAdditionalColor); + panelObject.Controls.Add(labelBodyColor); + panelObject.Controls.Add(pictureBoxObject); + panelObject.Location = new Point(497, 17); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(344, 200); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; // // labelAdditionalColor // labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; - labelAdditionalColor.Location = new Point(141, 3); + labelAdditionalColor.Location = new Point(226, 18); labelAdditionalColor.Name = "labelAdditionalColor"; - labelAdditionalColor.Size = new Size(83, 23); + labelAdditionalColor.Size = new Size(100, 23); labelAdditionalColor.TabIndex = 11; - labelAdditionalColor.Text = "Доп цвет"; + labelAdditionalColor.Text = "Доп. цвет"; labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop; + labelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter; // // labelBodyColor // labelBodyColor.BorderStyle = BorderStyle.FixedSingle; - labelBodyColor.Location = new Point(20, 3); + labelBodyColor.Location = new Point(20, 18); labelBodyColor.Name = "labelBodyColor"; - labelBodyColor.Size = new Size(83, 23); + labelBodyColor.Size = new Size(100, 23); labelBodyColor.TabIndex = 10; labelBodyColor.Text = "Цвет"; labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; - // - // pictureBoxObjects - // - pictureBoxObjects.Location = new Point(20, 29); - pictureBoxObjects.Name = "pictureBoxObjects"; - pictureBoxObjects.Size = new Size(285, 143); - pictureBoxObjects.TabIndex = 0; - pictureBoxObjects.TabStop = false; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter; // // FormPlaneConfig // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(761, 261); - Controls.Add(panelObjects); + ClientSize = new Size(869, 301); + Controls.Add(panelObject); Controls.Add(buttonCancel); Controls.Add(buttonAdd); Controls.Add(groupBoxConfig); Name = "FormPlaneConfig"; - Text = "Создание объекта"; + Text = "FormPlaneConfig"; groupBoxConfig.ResumeLayout(false); groupBoxConfig.PerformLayout(); groupBoxColors.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); - panelObjects.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)pictureBoxObjects).EndInit(); + panelObject.ResumeLayout(false); ResumeLayout(false); } @@ -353,9 +346,9 @@ private NumericUpDown numericUpDownSpeed; private Label labelWeight; private NumericUpDown numericUpDownWeight; - private CheckBox checkBoxRadar; - private CheckBox checkBoxDopBak; private CheckBox checkBoxChassi; + private CheckBox checkBoxDopBak; + private CheckBox checkBoxRadar; private GroupBox groupBoxColors; private Panel panelRed; private Panel panelYellow; @@ -368,9 +361,7 @@ private PictureBox pictureBoxObject; private Button buttonAdd; private Button buttonCancel; - - private Panel panelObjects; - private PictureBox pictureBoxObjects; + private Panel panelObject; private Label labelBodyColor; private Label labelAdditionalColor; } diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs index 91bf69b..6f76240 100644 --- a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs @@ -1,12 +1,5 @@ -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 ProjectAirPlane.Drawnings; using ProjectAirPlane.Entites; @@ -17,7 +10,6 @@ namespace ProjectAirPlane; /// public partial class FormPlaneConfig : Form { - /// /// Объект - прорисовка самолёта /// @@ -33,24 +25,25 @@ public partial class FormPlaneConfig : Form /// public FormPlaneConfig() { - InitializeComponent(); - panelRed.MouseDown += Panel_MouseDown; panelGreen.MouseDown += Panel_MouseDown; panelBlue.MouseDown += Panel_MouseDown; - panelWhite.MouseDown += Panel_MouseDown; - panelBlack.MouseDown += Panel_MouseDown; - panelGray.MouseDown += Panel_MouseDown; - panelPurple.MouseDown += Panel_MouseDown; panelYellow.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelGray.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + // TODO buttonCancel.Click привязать анонимный метод через lambda с закрытием формы buttonCancel.Click += (sender, e) => Close(); + + InitializeComponent(); } /// /// Привязка внешнего метода к событию /// - /// + /// public void AddEvent(PlaneDelegate planeDelegate) { PlaneDelegate += planeDelegate; @@ -64,7 +57,7 @@ public partial class FormPlaneConfig : Form Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); Graphics gr = Graphics.FromImage(bmp); _plane?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); - _plane?.SetPosition(110, 75); + _plane?.SetPosition(15, 15); _plane?.DrawTransport(gr); pictureBoxObject.Image = bmp; } @@ -79,12 +72,13 @@ public partial class FormPlaneConfig : Form (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy); } + /// /// Проверка получаемой информации (ее типа на соответствие требуемому) /// /// /// - private void PanelObjects_DragEnter(object sender, DragEventArgs e) + private void PanelObject_DragEnter(object sender, DragEventArgs e) { e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None; } @@ -94,7 +88,7 @@ public partial class FormPlaneConfig : Form /// /// /// - private void PanelObjects_DragDrop(object sender, DragEventArgs e) + private void PanelObject_DragDrop(object sender, DragEventArgs e) { switch (e.Data?.GetData(DataFormats.Text)?.ToString()) { @@ -102,39 +96,13 @@ public partial class FormPlaneConfig : Form _plane = new DrawningPlane((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); break; case "labelModifiedObject": - _plane = new DrawningAirPlane((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, - Color.White, Color.Black, checkBoxRadar.Checked, checkBoxDopBak.Checked, checkBoxChassi.Checked); + _plane = new DrawningAirPlane((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxRadar.Checked, checkBoxDopBak.Checked, checkBoxChassi.Checked); break; } DrawObject(); } - private void LabelColors_DragDrop(object? sender, DragEventArgs e) - { - if (_plane == null || sender == null || _plane.EntityPlane == null) - { - return; - } - - Label label = (Label)sender; - Color newColor = (Color)e.Data?.GetData(typeof(Color)); - - switch (label.Name) - { - case "labelBodyColor": - _plane.EntityPlane.SetBodyColor(newColor); - DrawObject(); - break; - case "labelAdditionalColor": - if (_plane is DrawningAirPlane) - { - (_plane.EntityPlane as EntityAirPlane)?.SetAdditionalColor(newColor); - DrawObject(); - } - break; - } - } - /// /// Передаем информацию при нажатии на Panel /// @@ -142,14 +110,55 @@ public partial class FormPlaneConfig : Form /// private void Panel_MouseDown(object? sender, MouseEventArgs e) { - (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy); + // TODO отправка цвета в Drag&Drop + (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта) + private void LabelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_plane != null) + { + _plane.EntityPlane?.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + 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 LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_plane.EntityPlane is EntityAirPlane _airplane) + { + _airplane.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_plane is DrawningAirPlane) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } } - /// - /// Передача объекта - /// - /// - /// private void ButtonAdd_Click(object sender, EventArgs e) { if (_plane != null) -- 2.25.1 From 557d17ab8ac71e9b87b5319199bf4fcbe9e05d8d Mon Sep 17 00:00:00 2001 From: alhimek17 Date: Sun, 21 Apr 2024 20:30:42 +0400 Subject: [PATCH 3/4] =?UTF-8?q?5=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=20(1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Drawnings/DrawningAirPlane.cs | 4 +-- .../ProjectAirPlane/Entites/EntityAirPlane.cs | 4 +-- .../ProjectAirPlane/FormPlaneCollection.cs | 4 +-- .../FormPlaneConfig.Designer.cs | 15 ++------ .../ProjectAirPlane/FormPlaneConfig.cs | 36 ++++++++++--------- 5 files changed, 28 insertions(+), 35 deletions(-) diff --git a/ProjectAirPlane/ProjectAirPlane/Drawnings/DrawningAirPlane.cs b/ProjectAirPlane/ProjectAirPlane/Drawnings/DrawningAirPlane.cs index 5b24d56..75d8d13 100644 --- a/ProjectAirPlane/ProjectAirPlane/Drawnings/DrawningAirPlane.cs +++ b/ProjectAirPlane/ProjectAirPlane/Drawnings/DrawningAirPlane.cs @@ -18,9 +18,9 @@ public class DrawningAirPlane : DrawningPlane /// Признак наличия обвеса /// Признак наличия антикрыла /// Признак наличия гоночной полосы - public DrawningAirPlane(int speed, double weight, Color bodyColor, Color additionalColor, bool radar, bool dopBak, bool chassi) : base(195, 70) + public DrawningAirPlane(int speed, double weight, Color bodyColor, Color additionalColor, bool radar, bool dopBak) : base(195, 70) { - EntityPlane = new EntityAirPlane(speed, weight, bodyColor, additionalColor, radar, dopBak, chassi); + EntityPlane = new EntityAirPlane(speed, weight, bodyColor, additionalColor, radar, dopBak); } diff --git a/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs b/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs index 3ad9848..41c349d 100644 --- a/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs +++ b/ProjectAirPlane/ProjectAirPlane/Entites/EntityAirPlane.cs @@ -48,13 +48,13 @@ public class EntityAirPlane : EntityPlane /// Признак наличия обвеса /// Признак наличия антикрыла /// Признак наличия гоночной полосы - public EntityAirPlane(int speed, double weight, Color bodyColor, Color additionalColor, bool radar, bool dopBak, bool chassi) : base(speed, weight, bodyColor) + public EntityAirPlane(int speed, double weight, Color bodyColor, Color additionalColor, bool radar, bool dopBak) : base(speed, weight, bodyColor) { AdditionalColor = additionalColor; Radar = radar; DopBak = dopBak; - Chassi = chassi; + } } \ No newline at end of file diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs b/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs index be1b9e8..2263292 100644 --- a/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneCollection.cs @@ -46,7 +46,7 @@ public partial class FormPlaneCollection : Form panelCompanyTools.Enabled = false; } - + private void ButtonAddPlane_Click(object sender, EventArgs e) { FormPlaneConfig form = new(); @@ -147,7 +147,7 @@ public partial class FormPlaneCollection : Form pictureBox.Image = _company.Show(); } - + /// /// Добавление коллекции /// diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs index 44d6430..93813ff 100644 --- a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.Designer.cs @@ -38,7 +38,6 @@ panelWhite = new Panel(); panelGreen = new Panel(); panelRed = new Panel(); - checkBoxChassi = new CheckBox(); checkBoxDopBak = new CheckBox(); checkBoxRadar = new CheckBox(); numericUpDownWeight = new NumericUpDown(); @@ -64,7 +63,6 @@ // groupBoxConfig // groupBoxConfig.Controls.Add(groupBoxColors); - groupBoxConfig.Controls.Add(checkBoxChassi); groupBoxConfig.Controls.Add(checkBoxDopBak); groupBoxConfig.Controls.Add(checkBoxRadar); groupBoxConfig.Controls.Add(numericUpDownWeight); @@ -162,16 +160,6 @@ panelRed.Size = new Size(31, 30); panelRed.TabIndex = 0; // - // checkBoxChassi - // - checkBoxChassi.AutoSize = true; - checkBoxChassi.Location = new Point(12, 146); - checkBoxChassi.Name = "checkBoxChassi"; - checkBoxChassi.Size = new Size(162, 19); - checkBoxChassi.TabIndex = 8; - checkBoxChassi.Text = "Признак наличия шасси"; - checkBoxChassi.UseVisualStyleBackColor = true; - // // checkBoxDopBak // checkBoxDopBak.AutoSize = true; @@ -294,6 +282,7 @@ // // labelAdditionalColor // + labelAdditionalColor.AllowDrop = true; labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; labelAdditionalColor.Location = new Point(226, 18); labelAdditionalColor.Name = "labelAdditionalColor"; @@ -306,6 +295,7 @@ // // labelBodyColor // + labelBodyColor.AllowDrop = true; labelBodyColor.BorderStyle = BorderStyle.FixedSingle; labelBodyColor.Location = new Point(20, 18); labelBodyColor.Name = "labelBodyColor"; @@ -346,7 +336,6 @@ private NumericUpDown numericUpDownSpeed; private Label labelWeight; private NumericUpDown numericUpDownWeight; - private CheckBox checkBoxChassi; private CheckBox checkBoxDopBak; private CheckBox checkBoxRadar; private GroupBox groupBoxColors; diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs index 6f76240..7abcce1 100644 --- a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs @@ -25,6 +25,8 @@ public partial class FormPlaneConfig : Form /// public FormPlaneConfig() { + InitializeComponent(); + panelRed.MouseDown += Panel_MouseDown; panelGreen.MouseDown += Panel_MouseDown; panelBlue.MouseDown += Panel_MouseDown; @@ -37,7 +39,7 @@ public partial class FormPlaneConfig : Form // TODO buttonCancel.Click привязать анонимный метод через lambda с закрытием формы buttonCancel.Click += (sender, e) => Close(); - InitializeComponent(); + } /// @@ -57,7 +59,7 @@ public partial class FormPlaneConfig : Form Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); Graphics gr = Graphics.FromImage(bmp); _plane?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); - _plane?.SetPosition(15, 15); + _plane?.SetPosition(110, 75); _plane?.DrawTransport(gr); pictureBoxObject.Image = bmp; } @@ -97,7 +99,7 @@ public partial class FormPlaneConfig : Form break; case "labelModifiedObject": _plane = new DrawningAirPlane((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, - Color.Black, checkBoxRadar.Checked, checkBoxDopBak.Checked, checkBoxChassi.Checked); + Color.Black, checkBoxRadar.Checked, checkBoxDopBak.Checked); break; } DrawObject(); @@ -114,14 +116,6 @@ public partial class FormPlaneConfig : Form (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); } // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта) - private void LabelBodyColor_DragDrop(object sender, DragEventArgs e) - { - if (_plane != null) - { - _plane.EntityPlane?.SetBodyColor((Color)e.Data.GetData(typeof(Color))); - DrawObject(); - } - } private void LabelBodyColor_DragEnter(object sender, DragEventArgs e) { @@ -134,16 +128,16 @@ public partial class FormPlaneConfig : Form e.Effect = DragDropEffects.None; } } - - private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + private void LabelBodyColor_DragDrop(object sender, DragEventArgs e) { - if (_plane.EntityPlane is EntityAirPlane _airplane) + if (_plane != null) { - _airplane.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + _plane.EntityPlane?.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); } - DrawObject(); } + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) { if (_plane is DrawningAirPlane) @@ -158,6 +152,16 @@ public partial class FormPlaneConfig : Form } } } + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_plane.EntityPlane is EntityAirPlane _airplane) + { + _airplane.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + private void ButtonAdd_Click(object sender, EventArgs e) { -- 2.25.1 From 24e042d02d7085bfc7aa3edcbe96595f39cf5927 Mon Sep 17 00:00:00 2001 From: alhimek17 Date: Sun, 21 Apr 2024 20:36:55 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=965=20(1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirPlane/ProjectAirPlane/Drawnings/DrawningAirPlane.cs | 2 +- ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ProjectAirPlane/ProjectAirPlane/Drawnings/DrawningAirPlane.cs b/ProjectAirPlane/ProjectAirPlane/Drawnings/DrawningAirPlane.cs index 75d8d13..396042e 100644 --- a/ProjectAirPlane/ProjectAirPlane/Drawnings/DrawningAirPlane.cs +++ b/ProjectAirPlane/ProjectAirPlane/Drawnings/DrawningAirPlane.cs @@ -33,7 +33,7 @@ public class DrawningAirPlane : DrawningPlane return; } Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityPlane.BodyColor); + Brush additionalBrush = new SolidBrush(airPlane.AdditionalColor); if (airPlane.Chassi) { diff --git a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs index 7abcce1..44755ce 100644 --- a/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs +++ b/ProjectAirPlane/ProjectAirPlane/FormPlaneConfig.cs @@ -59,7 +59,7 @@ public partial class FormPlaneConfig : Form Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); Graphics gr = Graphics.FromImage(bmp); _plane?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); - _plane?.SetPosition(110, 75); + _plane?.SetPosition(80, 60); _plane?.DrawTransport(gr); pictureBoxObject.Image = bmp; } -- 2.25.1