From 7ecb2de05667cd65a56b004b6676d0f4db35ec29 Mon Sep 17 00:00:00 2001 From: zolotovart Date: Sun, 21 Apr 2024 17:01:20 +0300 Subject: [PATCH 1/2] =?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 --- .../ProjectAirbus/Entities/EntityLinkor.cs | 4 + .../ProjectAirbus/Entities/EntityShip.cs | 5 +- .../FormShipCollection.Designer.cs | 162 ++++---- .../ProjectAirbus/FormShipCollection.cs | 55 +-- .../ProjectAirbus/FormShipConfig.Designer.cs | 365 ++++++++++++++++++ ProjectAirbus/ProjectAirbus/FormShipConfig.cs | 156 ++++++++ .../ProjectAirbus/FormShipConfig.resx | 120 ++++++ ProjectAirbus/ProjectAirbus/ShipDelegate.cs | 9 + 8 files changed, 747 insertions(+), 129 deletions(-) create mode 100644 ProjectAirbus/ProjectAirbus/FormShipConfig.Designer.cs create mode 100644 ProjectAirbus/ProjectAirbus/FormShipConfig.cs create mode 100644 ProjectAirbus/ProjectAirbus/FormShipConfig.resx create mode 100644 ProjectAirbus/ProjectAirbus/ShipDelegate.cs diff --git a/ProjectAirbus/ProjectAirbus/Entities/EntityLinkor.cs b/ProjectAirbus/ProjectAirbus/Entities/EntityLinkor.cs index 5fa3fe8..04ec4d6 100644 --- a/ProjectAirbus/ProjectAirbus/Entities/EntityLinkor.cs +++ b/ProjectAirbus/ProjectAirbus/Entities/EntityLinkor.cs @@ -12,6 +12,10 @@ namespace ProjectLinkor.Entities public class EntityLinkor : EntityShip { public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color additionalColor) + { + AdditionalColor = additionalColor; + } /// /// Признак (опция) наличия ракеты /// diff --git a/ProjectAirbus/ProjectAirbus/Entities/EntityShip.cs b/ProjectAirbus/ProjectAirbus/Entities/EntityShip.cs index 7da6fd6..41778c8 100644 --- a/ProjectAirbus/ProjectAirbus/Entities/EntityShip.cs +++ b/ProjectAirbus/ProjectAirbus/Entities/EntityShip.cs @@ -23,7 +23,10 @@ public class EntityShip /// Основной цвет /// public Color BodyColor { get; private set; } - + public void SetBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } /// /// Шаг перемещения корабля /// diff --git a/ProjectAirbus/ProjectAirbus/FormShipCollection.Designer.cs b/ProjectAirbus/ProjectAirbus/FormShipCollection.Designer.cs index 8b8589a..877b8ea 100644 --- a/ProjectAirbus/ProjectAirbus/FormShipCollection.Designer.cs +++ b/ProjectAirbus/ProjectAirbus/FormShipCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddShip = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonRemoveShip = new Button(); + buttonGoToCheck = new Button(); buttonCreateCompany = new Button(); panelStorage = new Panel(); buttonCollectionDel = new Button(); @@ -38,19 +44,12 @@ radioButtonMassive = new RadioButton(); textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); - buttonRefresh = new Button(); - buttonGoToCheck = new Button(); - buttonRemoveShip = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddLinkor = new Button(); - buttonAddShip = new Button(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); - panelCompanyTools = new Panel(); groupBoxTools.SuspendLayout(); + panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); - panelCompanyTools.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -67,6 +66,71 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddShip); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonRemoveShip); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Location = new Point(3, 486); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(294, 398); + panelCompanyTools.TabIndex = 8; + // + // buttonAddShip + // + buttonAddShip.Location = new Point(17, 13); + buttonAddShip.Name = "buttonAddShip"; + buttonAddShip.Size = new Size(264, 60); + buttonAddShip.TabIndex = 1; + buttonAddShip.Text = "Добавление корабля"; + buttonAddShip.UseVisualStyleBackColor = true; + buttonAddShip.Click += ButtonAddShip_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(17, 155); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(264, 31); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(17, 333); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(264, 60); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonRemoveShip + // + buttonRemoveShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveShip.Location = new Point(17, 201); + buttonRemoveShip.Name = "buttonRemoveShip"; + buttonRemoveShip.Size = new Size(264, 60); + buttonRemoveShip.TabIndex = 4; + buttonRemoveShip.Text = "Удалить корабль"; + buttonRemoveShip.UseVisualStyleBackColor = true; + buttonRemoveShip.Click += ButtonRemoveShip_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(17, 267); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(264, 60); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(21, 441); @@ -159,69 +223,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(17, 333); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(264, 60); - buttonRefresh.TabIndex = 6; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += ButtonRefresh_Click; - // - // buttonGoToCheck - // - buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(17, 267); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(264, 60); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveShip - // - buttonRemoveShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveShip.Location = new Point(17, 201); - buttonRemoveShip.Name = "buttonRemoveShip"; - buttonRemoveShip.Size = new Size(264, 60); - buttonRemoveShip.TabIndex = 4; - buttonRemoveShip.Text = "Удалить корабль"; - buttonRemoveShip.UseVisualStyleBackColor = true; - buttonRemoveShip.Click += ButtonRemoveShip_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(17, 155); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(264, 31); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddLinkor - // - buttonAddLinkor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddLinkor.Location = new Point(17, 79); - buttonAddLinkor.Name = "buttonAddLinkor"; - buttonAddLinkor.Size = new Size(264, 60); - buttonAddLinkor.TabIndex = 2; - buttonAddLinkor.Text = "Добавление линкора"; - buttonAddLinkor.UseVisualStyleBackColor = true; - buttonAddLinkor.Click += ButtonAddLinkor_Click; - // - // buttonAddShip - // - buttonAddShip.Location = new Point(17, 13); - buttonAddShip.Name = "buttonAddShip"; - buttonAddShip.Size = new Size(264, 60); - buttonAddShip.TabIndex = 1; - buttonAddShip.Text = "Добавление корабля"; - buttonAddShip.UseVisualStyleBackColor = true; - buttonAddShip.Click += ButtonAddShip_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -243,20 +244,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddShip); - panelCompanyTools.Controls.Add(buttonAddLinkor); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonRemoveShip); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Location = new Point(3, 486); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(294, 398); - panelCompanyTools.TabIndex = 8; - // // FormShipCollection // AutoScaleDimensions = new SizeF(10F, 25F); @@ -267,11 +254,11 @@ Name = "FormShipCollection"; Text = "Коллекция кораблей"; groupBoxTools.ResumeLayout(false); + panelCompanyTools.ResumeLayout(false); + panelCompanyTools.PerformLayout(); panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); - panelCompanyTools.ResumeLayout(false); - panelCompanyTools.PerformLayout(); ResumeLayout(false); } @@ -280,7 +267,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; private Button buttonAddShip; - private Button buttonAddLinkor; private PictureBox pictureBox; private Button buttonRemoveShip; private MaskedTextBox maskedTextBoxPosition; diff --git a/ProjectAirbus/ProjectAirbus/FormShipCollection.cs b/ProjectAirbus/ProjectAirbus/FormShipCollection.cs index 74662ac..544c266 100644 --- a/ProjectAirbus/ProjectAirbus/FormShipCollection.cs +++ b/ProjectAirbus/ProjectAirbus/FormShipCollection.cs @@ -39,29 +39,24 @@ public partial class FormShipCollection : Form { panelCompanyTools.Enabled = false; } - private void CreateObject(string type) + private void ButtonAddShip_Click(object sender, EventArgs e) { - if (_company == null) + FormShipConfig form = new FormShipConfig(); + form.Show(); + form.AddEvent(SetShip); + } + + /// + /// Добавление корабля в коллекцию + /// + /// + private void SetShip(DrawingShip ship) + { + if (_company == null || ship == null) { return; } - Random random = new(); - DrawingShip drawingShip; - switch (type) - { - case nameof(DrawingShip): - drawingShip = new DrawingShip(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawingLinkor): - drawingShip = new DrawingLinkor(random.Next(100, 300), random.Next(1000, 3000), - GetColor(random), GetColor(random), - Convert.ToBoolean(random.Next(0, 2)), - Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - if (_company + drawingShip >= 0) + if (_company + ship != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -70,27 +65,7 @@ public partial class FormShipCollection : Form { 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 ButtonAddShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingShip)); - private void ButtonAddLinkor_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingLinkor)); + } private void ButtonRemoveShip_Click(object sender, EventArgs e) { diff --git a/ProjectAirbus/ProjectAirbus/FormShipConfig.Designer.cs b/ProjectAirbus/ProjectAirbus/FormShipConfig.Designer.cs new file mode 100644 index 0000000..3cdbaa1 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/FormShipConfig.Designer.cs @@ -0,0 +1,365 @@ +namespace ProjectLinkor +{ + partial class FormShipConfig + { + /// + /// 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(); + panelGrey = new Panel(); + panelBlue = new Panel(); + panelWhite = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxGun = new CheckBox(); + checkBoxRocket = 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(); + panelObject = new Panel(); + labelAdditionalColor = new Label(); + labelBodyColor = new Label(); + groupBoxConfig.SuspendLayout(); + groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + panelObject.SuspendLayout(); + SuspendLayout(); + // + // groupBoxConfig + // + groupBoxConfig.Controls.Add(groupBoxColors); + groupBoxConfig.Controls.Add(checkBoxGun); + groupBoxConfig.Controls.Add(checkBoxRocket); + 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(631, 336); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelGrey); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(326, 45); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(300, 150); + groupBoxColors.TabIndex = 7; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(220, 94); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(40, 41); + panelPurple.TabIndex = 3; + panelPurple.MouseDown += Panel_MouseDown; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(220, 30); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(40, 41); + panelYellow.TabIndex = 1; + panelYellow.MouseDown += Panel_MouseDown; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(154, 94); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(40, 41); + panelBlack.TabIndex = 4; + panelBlack.MouseDown += Panel_MouseDown; + // + // panelGrey + // + panelGrey.BackColor = Color.Gray; + panelGrey.Location = new Point(88, 94); + panelGrey.Name = "panelGrey"; + panelGrey.Size = new Size(40, 41); + panelGrey.TabIndex = 5; + panelGrey.MouseDown += Panel_MouseDown; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(154, 30); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(40, 41); + panelBlue.TabIndex = 1; + panelBlue.MouseDown += Panel_MouseDown; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(16, 94); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(40, 41); + panelWhite.TabIndex = 2; + panelWhite.MouseDown += Panel_MouseDown; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(88, 30); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(40, 41); + panelGreen.TabIndex = 1; + panelGreen.MouseDown += Panel_MouseDown; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(16, 30); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(40, 41); + panelRed.TabIndex = 0; + panelRed.MouseDown += Panel_MouseDown; + // + // checkBoxGun + // + checkBoxGun.AutoSize = true; + checkBoxGun.Location = new Point(33, 183); + checkBoxGun.Name = "checkBoxGun"; + checkBoxGun.Size = new Size(248, 29); + checkBoxGun.TabIndex = 6; + checkBoxGun.Text = "Признак наличия оружия"; + checkBoxGun.UseVisualStyleBackColor = true; + // + // checkBoxRocket + // + checkBoxRocket.AutoSize = true; + checkBoxRocket.Location = new Point(33, 139); + checkBoxRocket.Name = "checkBoxRocket"; + checkBoxRocket.Size = new Size(243, 29); + checkBoxRocket.TabIndex = 5; + checkBoxRocket.Text = "Признак наличия ракеты"; + checkBoxRocket.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(132, 91); + 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(104, 31); + numericUpDownWeight.TabIndex = 0; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(33, 91); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(43, 25); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(132, 46); + 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(104, 31); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(33, 46); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(93, 25); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(464, 226); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(144, 49); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(305, 226); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(134, 49); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(10, 59); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(246, 179); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(668, 277); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(99, 47); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(792, 278); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(90, 46); + buttonCancel.TabIndex = 3; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // panelObject + // + panelObject.AllowDrop = true; + panelObject.Controls.Add(labelAdditionalColor); + panelObject.Controls.Add(labelBodyColor); + panelObject.Controls.Add(pictureBoxObject); + panelObject.Location = new Point(644, 21); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(263, 249); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(148, 7); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(99, 43); + labelAdditionalColor.TabIndex = 3; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop; + labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(5, 7); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(99, 43); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // FormShipConfig + // + AutoScaleDimensions = new SizeF(10F, 25F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(912, 336); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormShipConfig"; + Text = "Создание объекта"; + groupBoxConfig.ResumeLayout(false); + groupBoxConfig.PerformLayout(); + groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + panelObject.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxConfig; + private Label labelModifiedObject; + private Label labelSimpleObject; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private CheckBox checkBoxRocket; + private CheckBox checkBoxGun; + private GroupBox groupBoxColors; + private Panel panelGreen; + private Panel panelRed; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGrey; + private Panel panelWhite; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelBodyColor; + private Label labelAdditionalColor; + } +} \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/FormShipConfig.cs b/ProjectAirbus/ProjectAirbus/FormShipConfig.cs new file mode 100644 index 0000000..14a0701 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/FormShipConfig.cs @@ -0,0 +1,156 @@ +using ProjectLinkor.Drawnings; +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 static System.Windows.Forms.VisualStyles.VisualStyleElement.TrackBar; +using ProjectLinkor.Entities; + +namespace ProjectLinkor; + +/// +/// Форма конфигурации объекта +/// +public partial class FormShipConfig : Form +{ + /// + /// Объект - прорисовка автомобиля + /// + private DrawingShip? _ship; + + /// + /// Событие для передачи объекта + /// + private event ShipDelegate? ShipDelegate; + /// + /// Конструктор + /// + public FormShipConfig() + { + InitializeComponent(); + panelRed.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelGrey.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + //TODO + buttonCancel.Click += (sender, e) => Close(); + } + /// + /// Привязка внешнего метода и событие + /// + /// + public void AddEvent(ShipDelegate shipDelegate) + { + ShipDelegate += shipDelegate; + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _ship?.SetPictureSize(pictureBoxObject.Width, + pictureBoxObject.Height); + _ship?.SetPosition(50, 40); + _ship?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + /// + /// Передаем информацию при нажатии на Label + /// + /// + /// + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy); + } + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None; + } + /// + /// Действия при приеме перетаскиваемой информации + /// + /// + /// + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data?.GetData(DataFormats.Text)?.ToString()) + { + case "labelSimpleObject": + _ship = new DrawingShip((int)numericUpDownSpeed.Value, + (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _ship = new DrawingLinkor((int)numericUpDownSpeed.Value, + (double)numericUpDownWeight.Value, + Color.White, Color.Black, checkBoxRocket.Checked, checkBoxGun.Checked); + break; + } + DrawObject(); + } + /// + /// Передача информации при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Control)?.DoDragDrop((sender as Control)?.BackColor!, DragDropEffects.Move | DragDropEffects.Copy); + } + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_ship != null) + { + ShipDelegate?.Invoke(_ship); + Close(); + } + } + private void labelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_ship == null) return; + _ship.EntityShip?.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 (_ship?.EntityShip is EntityLinkor _linkor) + _linkor?.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + + private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) e.Effect = DragDropEffects.Copy; + else e.Effect = DragDropEffects.None; + } + +} diff --git a/ProjectAirbus/ProjectAirbus/FormShipConfig.resx b/ProjectAirbus/ProjectAirbus/FormShipConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/FormShipConfig.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/ProjectAirbus/ProjectAirbus/ShipDelegate.cs b/ProjectAirbus/ProjectAirbus/ShipDelegate.cs new file mode 100644 index 0000000..15452a2 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/ShipDelegate.cs @@ -0,0 +1,9 @@ +using ProjectLinkor.Drawnings; + +namespace ProjectLinkor; +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void ShipDelegate (DrawingShip ship); + -- 2.25.1 From e482bb84d25d6f73a705e01737800714bc03f7e4 Mon Sep 17 00:00:00 2001 From: zolotovart Date: Tue, 23 Apr 2024 10:56:17 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=9F=D1=80=D0=B8=D0=B2=D1=8F=D0=B7?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B2=D0=BD=D0=B5=D1=88=D0=BD=D0=B5=D0=B3=D0=BE?= =?UTF-8?q?=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20=D0=BA=20=D1=81=D0=BE?= =?UTF-8?q?=D0=B1=D1=8B=D1=82=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirbus/ProjectAirbus/FormShipConfig.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ProjectAirbus/ProjectAirbus/FormShipConfig.cs b/ProjectAirbus/ProjectAirbus/FormShipConfig.cs index 14a0701..6040b58 100644 --- a/ProjectAirbus/ProjectAirbus/FormShipConfig.cs +++ b/ProjectAirbus/ProjectAirbus/FormShipConfig.cs @@ -26,7 +26,7 @@ public partial class FormShipConfig : Form /// /// Событие для передачи объекта /// - private event ShipDelegate? ShipDelegate; + public event Action? _shipDelegate; /// /// Конструктор /// @@ -45,12 +45,12 @@ public partial class FormShipConfig : Form buttonCancel.Click += (sender, e) => Close(); } /// - /// Привязка внешнего метода и событие + /// Привязка внешнего метода к событию /// /// - public void AddEvent(ShipDelegate shipDelegate) + public void AddEvent(Action? shipDelegate) { - ShipDelegate += shipDelegate; + _shipDelegate += shipDelegate; } /// @@ -123,7 +123,7 @@ public partial class FormShipConfig : Form { if (_ship != null) { - ShipDelegate?.Invoke(_ship); + _shipDelegate?.Invoke(_ship); Close(); } } -- 2.25.1