From 045caaadf9c6352f1dbe4fe60af3100c77386170 Mon Sep 17 00:00:00 2001 From: Daria Date: Sun, 5 May 2024 20:51:51 +0400 Subject: [PATCH] =?UTF-8?q?5=20=D0=BB=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Excavator/Entities/EntityExcavator.cs | 4 + .../Entities/EntityTrackedVehicle.cs | 15 +- .../FormTrackedVehicleCollection.Designer.cs | 166 ++++---- .../Excavator/FormTrackedVehicleCollection.cs | 56 +-- .../FormTrackedVehicleConfig.Designer.cs | 378 ++++++++++++++++++ .../Excavator/FormTrackedVehicleConfig.cs | 170 ++++++++ .../Excavator/FormTrackedVehicleConfig.resx | 120 ++++++ Excavator/Excavator/TrackedVehicleDelegate.cs | 8 + 8 files changed, 776 insertions(+), 141 deletions(-) create mode 100644 Excavator/Excavator/FormTrackedVehicleConfig.Designer.cs create mode 100644 Excavator/Excavator/FormTrackedVehicleConfig.cs create mode 100644 Excavator/Excavator/FormTrackedVehicleConfig.resx create mode 100644 Excavator/Excavator/TrackedVehicleDelegate.cs diff --git a/Excavator/Excavator/Entities/EntityExcavator.cs b/Excavator/Excavator/Entities/EntityExcavator.cs index 294e379..f233592 100644 --- a/Excavator/Excavator/Entities/EntityExcavator.cs +++ b/Excavator/Excavator/Entities/EntityExcavator.cs @@ -10,6 +10,10 @@ public class EntityExcavator : EntityTrackedVehicle /// Дополнительный цвет (для опциональных элементов) /// public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color additionalColor) + { + AdditionalColor = additionalColor; + } /// /// Признак (опция) наличия ковша diff --git a/Excavator/Excavator/Entities/EntityTrackedVehicle.cs b/Excavator/Excavator/Entities/EntityTrackedVehicle.cs index 3fb547f..72683d5 100644 --- a/Excavator/Excavator/Entities/EntityTrackedVehicle.cs +++ b/Excavator/Excavator/Entities/EntityTrackedVehicle.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Sockets; -using System.Text; -using System.Threading.Tasks; - -namespace Excavator.Entities; +namespace Excavator.Entities; /// /// Класс-сущность "Гусеничная машина" /// @@ -26,6 +19,10 @@ public class EntityTrackedVehicle /// Основной цвет /// public Color BodyColor { get; private set; } + public void SetBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } /// /// Шаг перемещения экскаватора @@ -47,4 +44,6 @@ public class EntityTrackedVehicle BodyColor = bodyColor; } + + } diff --git a/Excavator/Excavator/FormTrackedVehicleCollection.Designer.cs b/Excavator/Excavator/FormTrackedVehicleCollection.Designer.cs index 7701381..1275d20 100644 --- a/Excavator/Excavator/FormTrackedVehicleCollection.Designer.cs +++ b/Excavator/Excavator/FormTrackedVehicleCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBox1 = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddTrackedVehicle = new Button(); + buttonRefresh = new Button(); + buttonGoToCheck = new Button(); + maskedTextBox = new MaskedTextBox(); + buttonDelExcavator = new Button(); buttonCreateCompany = new Button(); panelStorage = new Panel(); buttonCollectionDel = new Button(); @@ -39,18 +45,11 @@ textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); comboBoxSelectorCompany = new ComboBox(); - buttonRefresh = new Button(); - buttonGoToCheck = new Button(); - buttonDelExcavator = new Button(); - maskedTextBox = new MaskedTextBox(); - buttonAddExcavator = new Button(); - buttonAddTrackedVehicle = new Button(); pictureBox = new PictureBox(); - panelCompanyTools = new Panel(); groupBox1.SuspendLayout(); + panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); - panelCompanyTools.SuspendLayout(); SuspendLayout(); // // groupBox1 @@ -67,6 +66,73 @@ groupBox1.TabStop = false; groupBox1.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddTrackedVehicle); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Controls.Add(maskedTextBox); + panelCompanyTools.Controls.Add(buttonDelExcavator); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 473); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(215, 330); + panelCompanyTools.TabIndex = 9; + // + // buttonAddTrackedVehicle + // + buttonAddTrackedVehicle.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddTrackedVehicle.Location = new Point(12, 3); + buttonAddTrackedVehicle.Name = "buttonAddTrackedVehicle"; + buttonAddTrackedVehicle.Size = new Size(177, 52); + buttonAddTrackedVehicle.TabIndex = 1; + buttonAddTrackedVehicle.Text = "Добавить гусеничную машину"; + buttonAddTrackedVehicle.UseVisualStyleBackColor = true; + buttonAddTrackedVehicle.Click += ButtonAddCar_Click; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(18, 273); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(176, 45); + 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(18, 222); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(171, 45); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // + // maskedTextBox + // + maskedTextBox.Location = new Point(13, 125); + maskedTextBox.Mask = "00"; + maskedTextBox.Name = "maskedTextBox"; + maskedTextBox.Size = new Size(191, 27); + maskedTextBox.TabIndex = 3; + maskedTextBox.ValidatingType = typeof(int); + // + // buttonDelExcavator + // + buttonDelExcavator.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonDelExcavator.Location = new Point(18, 171); + buttonDelExcavator.Name = "buttonDelExcavator"; + buttonDelExcavator.Size = new Size(171, 45); + buttonDelExcavator.TabIndex = 4; + buttonDelExcavator.Text = "Удалить машину"; + buttonDelExcavator.UseVisualStyleBackColor = true; + buttonDelExcavator.Click += ButtonDelExcavator_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(24, 441); @@ -170,70 +236,6 @@ comboBoxSelectorCompany.TabIndex = 0; comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(18, 273); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(176, 45); - 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(18, 222); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(171, 45); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonDelExcavator - // - buttonDelExcavator.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonDelExcavator.Location = new Point(18, 171); - buttonDelExcavator.Name = "buttonDelExcavator"; - buttonDelExcavator.Size = new Size(171, 45); - buttonDelExcavator.TabIndex = 4; - buttonDelExcavator.Text = "Удалить машину"; - buttonDelExcavator.UseVisualStyleBackColor = true; - buttonDelExcavator.Click += ButtonDelExcavator_Click; - // - // maskedTextBox - // - maskedTextBox.Location = new Point(13, 125); - maskedTextBox.Mask = "00"; - maskedTextBox.Name = "maskedTextBox"; - maskedTextBox.Size = new Size(191, 27); - maskedTextBox.TabIndex = 3; - maskedTextBox.ValidatingType = typeof(int); - // - // buttonAddExcavator - // - buttonAddExcavator.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddExcavator.Location = new Point(18, 72); - buttonAddExcavator.Name = "buttonAddExcavator"; - buttonAddExcavator.Size = new Size(166, 35); - buttonAddExcavator.TabIndex = 2; - buttonAddExcavator.Text = "Добавить экскаватор"; - buttonAddExcavator.UseVisualStyleBackColor = true; - buttonAddExcavator.Click += buttonAddExcavator_Click; - // - // buttonAddTrackedVehicle - // - buttonAddTrackedVehicle.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddTrackedVehicle.Location = new Point(12, 3); - buttonAddTrackedVehicle.Name = "buttonAddTrackedVehicle"; - buttonAddTrackedVehicle.Size = new Size(177, 52); - buttonAddTrackedVehicle.TabIndex = 1; - buttonAddTrackedVehicle.Text = "Добавить гусеничную машину"; - buttonAddTrackedVehicle.UseVisualStyleBackColor = true; - buttonAddTrackedVehicle.Click += ButtonAddCar_Click; - // // pictureBox // pictureBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -243,21 +245,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddTrackedVehicle); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonAddExcavator); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Controls.Add(maskedTextBox); - panelCompanyTools.Controls.Add(buttonDelExcavator); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 473); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(215, 330); - panelCompanyTools.TabIndex = 9; - // // FormTrackedVehicleCollection // AutoScaleDimensions = new SizeF(8F, 20F); @@ -268,11 +255,11 @@ Name = "FormTrackedVehicleCollection"; Text = "Коллекция экскаваторов"; groupBox1.ResumeLayout(false); + panelCompanyTools.ResumeLayout(false); + panelCompanyTools.PerformLayout(); panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); - panelCompanyTools.ResumeLayout(false); - panelCompanyTools.PerformLayout(); ResumeLayout(false); } @@ -283,7 +270,6 @@ private Button buttonAddTrackedVehicle; private Button buttonDelExcavator; private MaskedTextBox maskedTextBox; - private Button buttonAddExcavator; private Button buttonRefresh; private Button buttonGoToCheck; private Panel panelStorage; diff --git a/Excavator/Excavator/FormTrackedVehicleCollection.cs b/Excavator/Excavator/FormTrackedVehicleCollection.cs index a25cc47..77b0824 100644 --- a/Excavator/Excavator/FormTrackedVehicleCollection.cs +++ b/Excavator/Excavator/FormTrackedVehicleCollection.cs @@ -38,43 +38,30 @@ public partial class FormTrackedVehicleCollection : Form } /// - /// Добавление обычного автомобиля + /// Добавление автомобиля /// /// /// - private void ButtonAddCar_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTrackedVehicle)); - private void buttonAddExcavator_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningExcavator)); + private void ButtonAddCar_Click(object sender, EventArgs e) + { + FormTrackedVehicleConfig form = new(); + + form.Show(); + form.AddEvent(SetCar); + } /// - /// Создание объекта класса-перемещения + /// Добавление автомобиля в коллекцию /// - /// Тип создаваемого объекта - private void CreateObject(string type) + /// + private void SetCar(DrawningTrackedVehicle? car) { - if (_company == null) + if (_company == null || car == null) { return; } - Random random = new(); - DrawningTrackedVehicle drawningTrackedVehicle; - switch (type) - { - case nameof(DrawningTrackedVehicle): - drawningTrackedVehicle = new DrawningTrackedVehicle(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningExcavator): - drawningTrackedVehicle = new DrawningExcavator(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; - } - - int result = _company + drawningTrackedVehicle; - if (result != -2) + if (_company + car != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -85,23 +72,6 @@ public partial class FormTrackedVehicleCollection : Form } } - /// - /// Получение цвета - /// - /// Генератор случайных чисел - /// - private static Color GetColor(Random random) - { - Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)); - ColorDialog dialog = new(); - if (dialog.ShowDialog() == DialogResult.OK) - { - color = dialog.Color; - } - - return color; - } - /// /// Удаление объекта /// diff --git a/Excavator/Excavator/FormTrackedVehicleConfig.Designer.cs b/Excavator/Excavator/FormTrackedVehicleConfig.Designer.cs new file mode 100644 index 0000000..06dc0df --- /dev/null +++ b/Excavator/Excavator/FormTrackedVehicleConfig.Designer.cs @@ -0,0 +1,378 @@ +namespace Excavator +{ + partial class FormTrackedVehicleConfig + { + /// + /// 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(); + panelBlack = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxSupports = new CheckBox(); + checkBoxBucket = 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(checkBoxSupports); + groupBoxConfig.Controls.Add(checkBoxBucket); + 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.Margin = new Padding(3, 4, 3, 4); + groupBoxConfig.Name = "groupBoxConfig"; + groupBoxConfig.Padding = new Padding(3, 4, 3, 4); + groupBoxConfig.Size = new Size(675, 297); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(265, 29); + groupBoxColors.Margin = new Padding(3, 4, 3, 4); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Padding = new Padding(3, 4, 3, 4); + groupBoxColors.Size = new Size(354, 128); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(257, 80); + panelPurple.Margin = new Padding(3, 4, 3, 4); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(35, 40); + panelPurple.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(184, 80); + panelBlack.Margin = new Padding(3, 4, 3, 4); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(35, 40); + panelBlack.TabIndex = 1; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(114, 80); + panelGray.Margin = new Padding(3, 4, 3, 4); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(35, 40); + panelGray.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(43, 77); + panelWhite.Margin = new Padding(3, 4, 3, 4); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(35, 40); + panelWhite.TabIndex = 1; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(257, 29); + panelYellow.Margin = new Padding(3, 4, 3, 4); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(35, 40); + panelYellow.TabIndex = 1; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(184, 29); + panelBlue.Margin = new Padding(3, 4, 3, 4); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(35, 40); + panelBlue.TabIndex = 1; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(114, 29); + panelGreen.Margin = new Padding(3, 4, 3, 4); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(35, 40); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(43, 29); + panelRed.Margin = new Padding(3, 4, 3, 4); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(35, 40); + panelRed.TabIndex = 0; + // + // checkBoxSupports + // + checkBoxSupports.AutoSize = true; + checkBoxSupports.Location = new Point(14, 185); + checkBoxSupports.Margin = new Padding(3, 4, 3, 4); + checkBoxSupports.Name = "checkBoxSupports"; + checkBoxSupports.Size = new Size(194, 24); + checkBoxSupports.TabIndex = 7; + checkBoxSupports.Text = "Признак наличия опор"; + checkBoxSupports.UseVisualStyleBackColor = true; + // + // checkBoxBucket + // + checkBoxBucket.AutoSize = true; + checkBoxBucket.Location = new Point(14, 136); + checkBoxBucket.Margin = new Padding(3, 4, 3, 4); + checkBoxBucket.Name = "checkBoxBucket"; + checkBoxBucket.Size = new Size(202, 24); + checkBoxBucket.TabIndex = 6; + checkBoxBucket.Text = "Признак наличия ковша"; + checkBoxBucket.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(88, 76); + numericUpDownWeight.Margin = new Padding(3, 4, 3, 4); + 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(98, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(14, 79); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(33, 20); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(88, 37); + numericUpDownSpeed.Margin = new Padding(3, 4, 3, 4); + 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(98, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(14, 40); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(73, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(467, 172); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(122, 49); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(293, 172); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(122, 49); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(18, 76); + pictureBoxObject.Margin = new Padding(3, 4, 3, 4); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(296, 145); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(722, 251); + buttonAdd.Margin = new Padding(3, 4, 3, 4); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(95, 31); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(881, 251); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(96, 31); + buttonCancel.TabIndex = 3; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // panelObject + // + panelObject.AllowDrop = true; + panelObject.Controls.Add(pictureBoxObject); + panelObject.Controls.Add(labelAdditionalColor); + panelObject.Controls.Add(labelBodyColor); + panelObject.Location = new Point(682, 0); + panelObject.Margin = new Padding(3, 4, 3, 4); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(328, 243); + panelObject.TabIndex = 4; + panelObject.DragDrop += panelObject_DragDrop; + panelObject.DragEnter += panelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(186, 12); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(108, 49); + 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(40, 11); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(113, 49); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // FormTrackedVehicleConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1024, 297); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Margin = new Padding(3, 4, 3, 4); + Name = "FormTrackedVehicleConfig"; + 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 labelSimpleObject; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private Label labelModifiedObject; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxBucket; + private CheckBox checkBoxSupports; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + 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/Excavator/Excavator/FormTrackedVehicleConfig.cs b/Excavator/Excavator/FormTrackedVehicleConfig.cs new file mode 100644 index 0000000..35c898c --- /dev/null +++ b/Excavator/Excavator/FormTrackedVehicleConfig.cs @@ -0,0 +1,170 @@ +using Excavator.Drawnings; +using Excavator.Entities; + +namespace Excavator; + +/// +/// Форма конфигурации объекта +/// +public partial class FormTrackedVehicleConfig : Form +/// +/// Объект - прорисовка гусеничной машины +/// + +{ + private DrawningTrackedVehicle? _car; + private event Action? CarDelegate; + + /// + /// Событие для передачи объекта + /// + /// + public void AddEvent(Action carDelegate) + { + if (CarDelegate != null) + { + CarDelegate = carDelegate; + } + else + { + CarDelegate += carDelegate; + } + } + + /// + /// Конструктор + /// + public FormTrackedVehicleConfig() + { + InitializeComponent(); + panelRed.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelGray.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + + buttonCancel.Click += (sender, e) => Close(); + + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _car?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _car?.SetPosition(15, 15); + _car?.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": + _car = new DrawningTrackedVehicle((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _car = new DrawningExcavator((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxBucket.Checked, checkBoxSupports.Checked); + break; + } + + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + private void labelBodyColor_DragEnter(object? sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void labelBodyColor_DragDrop(object? sender, DragEventArgs e) + { + if (_car != null) + { + _car.EntityTrackedVehicle.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + private void labelAdditionalColor_DragEnter(object? sender, DragEventArgs e) + { + if (_car is DrawningExcavator) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void labelAdditionalColor_DragDrop(object? sender, DragEventArgs e) + { + if (_car.EntityTrackedVehicle is EntityExcavator excavator) + { + excavator.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_car != null) + { + CarDelegate?.Invoke(_car); + Close(); + } + } + +} diff --git a/Excavator/Excavator/FormTrackedVehicleConfig.resx b/Excavator/Excavator/FormTrackedVehicleConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Excavator/Excavator/FormTrackedVehicleConfig.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/Excavator/Excavator/TrackedVehicleDelegate.cs b/Excavator/Excavator/TrackedVehicleDelegate.cs new file mode 100644 index 0000000..67a7fbd --- /dev/null +++ b/Excavator/Excavator/TrackedVehicleDelegate.cs @@ -0,0 +1,8 @@ +using Excavator.Drawnings; + +namespace Excavator; +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void CarDelegate(DrawningTrackedVehicle car);