From 043cea423f5a08c6bc22c316b04c739143f700e5 Mon Sep 17 00:00:00 2001 From: mara-1 <147929076+mara-1@users.noreply.github.com> Date: Mon, 22 Apr 2024 23:17:42 +0400 Subject: [PATCH] =?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=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Drawnings/DrawingBulldozer.cs | 16 +- ...erProstoy.cs => DrawningTrackedMachine.cs} | 0 .../Entities/EntityBulldozer.cs | 4 + .../Entities/EntityTrackedMachine.cs | 5 + .../FormMachineCollectoin.Designer.cs | 166 ++++---- .../ProjectBulldozer/FormMachineCollectoin.cs | 76 +--- .../FormMachineConfig.Designer.cs | 357 ++++++++++++++++++ .../ProjectBulldozer/FormMachineConfig.cs | 209 ++++++++++ .../ProjectBulldozer/FormMachineConfig.resx | 120 ++++++ .../ProjectBulldozer/MachineDelegate.cs | 17 + 10 files changed, 819 insertions(+), 151 deletions(-) rename ProjectBulldozer/ProjectBulldozer/Drawnings/{DrawningBulldozerProstoy.cs => DrawningTrackedMachine.cs} (100%) create mode 100644 ProjectBulldozer/ProjectBulldozer/FormMachineConfig.Designer.cs create mode 100644 ProjectBulldozer/ProjectBulldozer/FormMachineConfig.cs create mode 100644 ProjectBulldozer/ProjectBulldozer/FormMachineConfig.resx create mode 100644 ProjectBulldozer/ProjectBulldozer/MachineDelegate.cs diff --git a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawingBulldozer.cs b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawingBulldozer.cs index bbb04b3..da13427 100644 --- a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawingBulldozer.cs +++ b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawingBulldozer.cs @@ -20,7 +20,7 @@ public class DrawningBulldozer : DrawningTrackedMachine /// Признак наличия рыхлителя сзади public DrawningBulldozer(int speed, double weight, Color bodyColor, Color - additionalColor, bool additionalOtval, bool additionalRihl, bool v) : base(180, 140) + additionalColor, bool additionalOtval, bool additionalRihl) : base(180, 140) { EntityTrackedMachine = new EntityBulldozer(speed, weight, bodyColor, additionalColor, additionalOtval, additionalRihl); @@ -48,8 +48,8 @@ public class DrawningBulldozer : DrawningTrackedMachine Brush bodyBrush2 = new SolidBrush(Bulldozer.AdditionalColor); /////////отвал - /// - + if (Bulldozer.AdditionalOtval) + { Point[] Otval = { new Point(_startPosX.Value + 142, _startPosY.Value + 70), @@ -58,7 +58,13 @@ public class DrawningBulldozer : DrawningTrackedMachine }; + g.FillPolygon(bodyBrush2, Otval); + g.DrawPolygon(pen, Otval); + } + + if (Bulldozer.AdditionalRihl) + { Brush black = new SolidBrush(Color.Black); Point[] Rihl = { @@ -80,9 +86,9 @@ public class DrawningBulldozer : DrawningTrackedMachine }; g.FillPolygon(black, Ttt); g.DrawPolygon(pen, Ttt); + } - g.FillPolygon(bodyBrush2, Otval); - g.DrawPolygon(pen, Otval); + } } diff --git a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningBulldozerProstoy.cs b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningTrackedMachine.cs similarity index 100% rename from ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningBulldozerProstoy.cs rename to ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningTrackedMachine.cs diff --git a/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs b/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs index a7f7505..4dbe3ce 100644 --- a/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs +++ b/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs @@ -10,6 +10,10 @@ public class EntityBulldozer : EntityTrackedMachine /// Дополнительный цвет (для опциональных элементов) /// public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color additionalColor) + { + AdditionalColor = additionalColor; + } /// /// Признак (опция) наличия отвала спереди /// diff --git a/ProjectBulldozer/ProjectBulldozer/Entities/EntityTrackedMachine.cs b/ProjectBulldozer/ProjectBulldozer/Entities/EntityTrackedMachine.cs index 22281c1..bb8602e 100644 --- a/ProjectBulldozer/ProjectBulldozer/Entities/EntityTrackedMachine.cs +++ b/ProjectBulldozer/ProjectBulldozer/Entities/EntityTrackedMachine.cs @@ -18,6 +18,11 @@ public class EntityTrackedMachine /// public Color BodyColor { get; private set; } + public void SetBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } + /// /// Шаг перемещения автомобиля /// diff --git a/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.Designer.cs b/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.Designer.cs index 52bbc33..d8d6ca0 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.Designer.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddMachine = new Button(); + maskedTextBox = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonRemoveMachine = new Button(); + buttonGoToCheck = new Button(); buttonCreateCompany = new Button(); panelStorage = new Panel(); buttonCollectinDel = new Button(); @@ -38,19 +44,12 @@ radioButtonMassive = new RadioButton(); textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); - buttonRefresh = new Button(); - maskedTextBox = new MaskedTextBox(); comboBoxSelectorCompany = new ComboBox(); - buttonGoToCheck = new Button(); - buttonRemoveMachine = new Button(); - buttonAddBulldozer = new Button(); - buttonAddMachine = new Button(); pictureBox = new PictureBox(); - panelCompanyTools = new Panel(); groupBoxTools.SuspendLayout(); + panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); - panelCompanyTools.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -67,6 +66,73 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddMachine); + panelCompanyTools.Controls.Add(maskedTextBox); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonRemoveMachine); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 377); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(225, 288); + panelCompanyTools.TabIndex = 9; + // + // buttonAddMachine + // + buttonAddMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddMachine.Location = new Point(3, 28); + buttonAddMachine.Name = "buttonAddMachine"; + buttonAddMachine.Size = new Size(219, 49); + buttonAddMachine.TabIndex = 0; + buttonAddMachine.Text = "Добавление гусеничной машины"; + buttonAddMachine.UseVisualStyleBackColor = true; + buttonAddMachine.Click += ButtonAddMachine_Click; + // + // maskedTextBox + // + maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + maskedTextBox.Location = new Point(3, 114); + maskedTextBox.Mask = "00"; + maskedTextBox.Name = "maskedTextBox"; + maskedTextBox.Size = new Size(219, 27); + maskedTextBox.TabIndex = 5; + maskedTextBox.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(3, 241); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(219, 41); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonRemoveMachine + // + buttonRemoveMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveMachine.Location = new Point(3, 147); + buttonRemoveMachine.Name = "buttonRemoveMachine"; + buttonRemoveMachine.Size = new Size(219, 41); + buttonRemoveMachine.TabIndex = 2; + buttonRemoveMachine.Text = "Удалить машину"; + buttonRemoveMachine.UseVisualStyleBackColor = true; + buttonRemoveMachine.Click += ButtonRemoveMachine_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(3, 194); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(219, 41); + buttonGoToCheck.TabIndex = 3; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(6, 341); @@ -158,27 +224,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 241); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(219, 41); - buttonRefresh.TabIndex = 6; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += ButtonRefresh_Click; - // - // maskedTextBox - // - maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - maskedTextBox.Location = new Point(3, 114); - maskedTextBox.Mask = "00"; - maskedTextBox.Name = "maskedTextBox"; - maskedTextBox.Size = new Size(219, 27); - maskedTextBox.TabIndex = 5; - maskedTextBox.ValidatingType = typeof(int); - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -191,50 +236,6 @@ comboBoxSelectorCompany.TabIndex = 4; comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged; // - // buttonGoToCheck - // - buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(3, 194); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(219, 41); - buttonGoToCheck.TabIndex = 3; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveMachine - // - buttonRemoveMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveMachine.Location = new Point(3, 147); - buttonRemoveMachine.Name = "buttonRemoveMachine"; - buttonRemoveMachine.Size = new Size(219, 41); - buttonRemoveMachine.TabIndex = 2; - buttonRemoveMachine.Text = "Удалить машину"; - buttonRemoveMachine.UseVisualStyleBackColor = true; - buttonRemoveMachine.Click += ButtonRemoveMachine_Click; - // - // buttonAddBulldozer - // - buttonAddBulldozer.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddBulldozer.Location = new Point(3, 59); - buttonAddBulldozer.Name = "buttonAddBulldozer"; - buttonAddBulldozer.Size = new Size(219, 49); - buttonAddBulldozer.TabIndex = 1; - buttonAddBulldozer.Text = "Добавление бульдозера"; - buttonAddBulldozer.UseVisualStyleBackColor = true; - buttonAddBulldozer.Click += ButtonAddBulldozer_Click; - // - // buttonAddMachine - // - buttonAddMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddMachine.Location = new Point(3, 4); - buttonAddMachine.Name = "buttonAddMachine"; - buttonAddMachine.Size = new Size(219, 49); - buttonAddMachine.TabIndex = 0; - buttonAddMachine.Text = "Добавление гусеничной машины"; - buttonAddMachine.UseVisualStyleBackColor = true; - buttonAddMachine.Click += ButtonAddMachine_Click; - // // pictureBox // pictureBox.Dock = DockStyle.Fill; @@ -244,20 +245,6 @@ pictureBox.TabIndex = 5; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddMachine); - panelCompanyTools.Controls.Add(buttonAddBulldozer); - panelCompanyTools.Controls.Add(maskedTextBox); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonRemoveMachine); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 377); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(225, 288); - panelCompanyTools.TabIndex = 9; - // // FormMachineCollectoin // AutoScaleDimensions = new SizeF(8F, 20F); @@ -268,11 +255,11 @@ Name = "FormMachineCollectoin"; 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); } @@ -282,7 +269,6 @@ private ComboBox comboBoxSelectorCompany; private Button buttonGoToCheck; private Button buttonRemoveMachine; - private Button buttonAddBulldozer; private Button buttonAddMachine; private MaskedTextBox maskedTextBox; private PictureBox pictureBox; diff --git a/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.cs b/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.cs index 6134e06..17bad6e 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.cs @@ -47,35 +47,29 @@ public partial class FormMachineCollectoin : Form } /// - /// создеание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + /// Добавление машины + /// + /// + /// + public void ButtonAddMachine_Click(object sender, EventArgs e) { - if (_company == null) + + FormMachineConfig form = new(); + form.AddEvent(SetMachine); + form.Show(); + } + + /// + /// Добавление машины в коллекцию + /// + /// + public void SetMachine(DrawningTrackedMachine trackedMachine) + { + if (_company == null || trackedMachine == null) { return; } - - Random random = new(); - DrawningTrackedMachine drawningTrackedMachine; - - switch (type) - { - case nameof(DrawningTrackedMachine): - drawningTrackedMachine = new DrawningTrackedMachine(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningBulldozer): - drawningTrackedMachine = new DrawningBulldozer(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 + drawningTrackedMachine >= 0) + if (_company + trackedMachine != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -85,39 +79,9 @@ public partial class FormMachineCollectoin : 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 ButtonAddMachine_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTrackedMachine)); - - - /// - /// Добавление бульдозера - /// - /// - /// - private void ButtonAddBulldozer_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBulldozer)); - /// /// Удаление объекта /// diff --git a/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.Designer.cs b/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.Designer.cs new file mode 100644 index 0000000..c64b10d --- /dev/null +++ b/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.Designer.cs @@ -0,0 +1,357 @@ +namespace ProjectBulldozer +{ + partial class FormMachineConfig + { + /// + /// 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(); + panelGray = new Panel(); + panelBlack = new Panel(); + panelPurple = new Panel(); + panelWhite = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxAdditionalRihl = new CheckBox(); + checkBoxAdditionalOtval = 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(checkBoxAdditionalRihl); + groupBoxConfig.Controls.Add(checkBoxAdditionalOtval); + 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(630, 274); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(308, 12); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(293, 143); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(85, 81); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(49, 45); + panelGray.TabIndex = 7; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(151, 81); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(49, 45); + panelBlack.TabIndex = 6; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(220, 81); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(49, 45); + panelPurple.TabIndex = 5; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(16, 81); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(49, 45); + panelWhite.TabIndex = 4; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(220, 26); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(49, 45); + panelYellow.TabIndex = 3; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(151, 26); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(49, 45); + panelBlue.TabIndex = 2; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(85, 26); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(49, 45); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(16, 26); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(49, 45); + panelRed.TabIndex = 0; + // + // checkBoxAdditionalRihl + // + checkBoxAdditionalRihl.AutoSize = true; + checkBoxAdditionalRihl.Location = new Point(12, 161); + checkBoxAdditionalRihl.Name = "checkBoxAdditionalRihl"; + checkBoxAdditionalRihl.Size = new Size(275, 24); + checkBoxAdditionalRihl.TabIndex = 9; + checkBoxAdditionalRihl.Text = "Признак наличия рыхлителя сзади"; + checkBoxAdditionalRihl.UseVisualStyleBackColor = true; + // + // checkBoxAdditionalOtval + // + checkBoxAdditionalOtval.AutoSize = true; + checkBoxAdditionalOtval.Location = new Point(12, 114); + checkBoxAdditionalOtval.Name = "checkBoxAdditionalOtval"; + checkBoxAdditionalOtval.Size = new Size(267, 24); + checkBoxAdditionalOtval.TabIndex = 8; + checkBoxAdditionalOtval.Text = "Признак наличия отвала спереди"; + checkBoxAdditionalOtval.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(94, 70); + 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(119, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 72); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(36, 20); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(94, 32); + 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(119, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 34); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(457, 161); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(144, 39); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(308, 161); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(138, 39); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(19, 63); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(222, 154); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(655, 233); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(94, 29); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(784, 233); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + 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(636, 7); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(258, 220); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(148, 13); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(93, 39); + labelAdditionalColor.TabIndex = 12; + 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(19, 13); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(93, 39); + labelBodyColor.TabIndex = 11; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter; + // + // FormMachineConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(900, 274); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormMachineConfig"; + 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 labelSpeed; + private Label labelModifiedObject; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private CheckBox checkBoxAdditionalOtval; + private CheckBox checkBoxAdditionalRihl; + private GroupBox groupBoxColors; + private Panel panelGray; + private Panel panelBlack; + private Panel panelPurple; + 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 labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.cs b/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.cs new file mode 100644 index 0000000..36d8244 --- /dev/null +++ b/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.cs @@ -0,0 +1,209 @@ +using ProjectBulldozer.Drawnings; +using ProjectBulldozer.Entities; +using System.Reflection.PortableExecutable; + + +namespace ProjectBulldozer +{ + /// + /// форма конфигурации объекта + /// + public partial class FormMachineConfig : Form + { + + private DrawningTrackedMachine? _machine; + + /// + /// событие для передачи объекта + /// + private event Action? MachineDelegate; + + /// + /// Конструктор + /// + public FormMachineConfig() + { + 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(); + + } + + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action machineDelegate) + { + MachineDelegate += machineDelegate; + } + + /// + /// Отрисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _machine?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _machine?.SetPosition(5, 5); + _machine?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + + /// + /// Передаем информацию при нажатии на Labe + /// + /// + /// + + 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) + { + if (e.Data?.GetDataPresent(DataFormats.Text) ?? false) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + /// + /// действия при приеме перетаскиваемой информации + /// + /// + /// + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data?.GetData(DataFormats.Text)?.ToString()) + { + case "labelSimpleObject": + _machine = new DrawningTrackedMachine((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _machine = new DrawningBulldozer((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, + Color.White, + Color.Black, checkBoxAdditionalOtval.Checked, + checkBoxAdditionalRihl.Checked); + break; + } + labelBodyColor.BackColor = Color.Empty; + labelAdditionalColor.BackColor = Color.Empty; + 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 (_machine != null) + { + _machine.EntityTrackedMachine.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + /// + /// проверка получаемой информации по доп. цвету + /// + /// + /// + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_machine is DrawningBulldozer) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + /// + /// действия при перетаскивании доп. цвета + /// + /// + /// + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_machine.EntityTrackedMachine is EntityBulldozer _bulldozer) + { + _bulldozer.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_machine != null) + { + MachineDelegate?.Invoke(_machine); + Close(); + } + } + } + +} diff --git a/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.resx b/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.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/ProjectBulldozer/ProjectBulldozer/MachineDelegate.cs b/ProjectBulldozer/ProjectBulldozer/MachineDelegate.cs new file mode 100644 index 0000000..bfbde9f --- /dev/null +++ b/ProjectBulldozer/ProjectBulldozer/MachineDelegate.cs @@ -0,0 +1,17 @@ +using ProjectBulldozer.Drawnings; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectBulldozer; + + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void MachineDelegate(DrawningTrackedMachine _trackedMachine); + +