From fd828b12d0773fe2642b90b079343cc7475c9c42 Mon Sep 17 00:00:00 2001 From: ILYAkuznetsov73 <148066069+ILYAkuznetsov73@users.noreply.github.com> Date: Sat, 20 Apr 2024 00:21:39 +0400 Subject: [PATCH] =?UTF-8?q?5=20=D0=BB=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/EntityGasolineTanker.cs | 5 + .../Entities/EntityTanker.cs | 5 + .../FormTankerCollection.Designer.cs | 166 ++++---- .../FormTankerCollection.cs | 65 +--- .../FormTankerConfig.Designer.cs | 357 ++++++++++++++++++ .../ProjectGasolineTanker/FormTankerConfig.cs | 123 ++++++ .../FormTankerConfig.resx | 120 ++++++ .../ProjectGasolineTanker/TankerDelegate.cs | 11 + 8 files changed, 707 insertions(+), 145 deletions(-) create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.Designer.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.cs create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.resx create mode 100644 ProjectGasolineTanker/ProjectGasolineTanker/TankerDelegate.cs diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityGasolineTanker.cs b/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityGasolineTanker.cs index 62b4b51..970b01f 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityGasolineTanker.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityGasolineTanker.cs @@ -41,5 +41,10 @@ namespace ProjectGasolineTanker.Entities Tank = tank; OrnamentWheels = ornamentWheels; } + + public void SetAdditionalColor(Color additionalColor) + { + AdditionalColor = additionalColor; + } } } diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityTanker.cs b/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityTanker.cs index ffe5f13..f946206 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityTanker.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/Entities/EntityTanker.cs @@ -44,5 +44,10 @@ public class EntityTanker Weight = weight; BodyColor = bodyColor; } + + public void SetBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } } diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs index 1e4a423..40d1b67 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddTanker = new Button(); + buttonRefresh = new Button(); + maskedTextBox1 = new MaskedTextBox(); + buttonGoToCheck = new Button(); + buttonDelTanker = 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(); - buttonDelTanker = new Button(); - maskedTextBox1 = new MaskedTextBox(); - buttonAddGasolineTanker = new Button(); - buttonAddTanker = 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,73 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddTanker); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(maskedTextBox1); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Controls.Add(buttonDelTanker); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 456); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(252, 351); + panelCompanyTools.TabIndex = 2; + // + // buttonAddTanker + // + buttonAddTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddTanker.Location = new Point(13, 14); + buttonAddTanker.Name = "buttonAddTanker"; + buttonAddTanker.Size = new Size(230, 43); + buttonAddTanker.TabIndex = 1; + buttonAddTanker.Text = "Добавление грузовика"; + buttonAddTanker.UseVisualStyleBackColor = true; + buttonAddTanker.Click += buttonAddTanker_Click; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(13, 268); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(226, 55); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += buttonRefresh_Click; + // + // maskedTextBox1 + // + maskedTextBox1.Location = new Point(13, 109); + maskedTextBox1.Mask = "00"; + maskedTextBox1.Name = "maskedTextBox1"; + maskedTextBox1.Size = new Size(230, 31); + maskedTextBox1.TabIndex = 3; + maskedTextBox1.ValidatingType = typeof(int); + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(13, 207); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(230, 55); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += buttonGoToCheck_Click; + // + // buttonDelTanker + // + buttonDelTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonDelTanker.Location = new Point(13, 146); + buttonDelTanker.Name = "buttonDelTanker"; + buttonDelTanker.Size = new Size(230, 55); + buttonDelTanker.TabIndex = 4; + buttonDelTanker.Text = "Удаление грузовика"; + buttonDelTanker.UseVisualStyleBackColor = true; + buttonDelTanker.Click += buttonDelTanker_Click_1; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(16, 374); @@ -159,70 +225,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(13, 268); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(226, 55); - 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(13, 207); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(230, 55); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += buttonGoToCheck_Click; - // - // buttonDelTanker - // - buttonDelTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonDelTanker.Location = new Point(13, 146); - buttonDelTanker.Name = "buttonDelTanker"; - buttonDelTanker.Size = new Size(230, 55); - buttonDelTanker.TabIndex = 4; - buttonDelTanker.Text = "Удаление грузовика"; - buttonDelTanker.UseVisualStyleBackColor = true; - buttonDelTanker.Click += buttonDelTanker_Click_1; - // - // maskedTextBox1 - // - maskedTextBox1.Location = new Point(13, 109); - maskedTextBox1.Mask = "00"; - maskedTextBox1.Name = "maskedTextBox1"; - maskedTextBox1.Size = new Size(230, 31); - maskedTextBox1.TabIndex = 3; - maskedTextBox1.ValidatingType = typeof(int); - // - // buttonAddGasolineTanker - // - buttonAddGasolineTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddGasolineTanker.Location = new Point(13, 63); - buttonAddGasolineTanker.Name = "buttonAddGasolineTanker"; - buttonAddGasolineTanker.Size = new Size(230, 40); - buttonAddGasolineTanker.TabIndex = 2; - buttonAddGasolineTanker.Text = "Добавление Бензовоза"; - buttonAddGasolineTanker.UseVisualStyleBackColor = true; - buttonAddGasolineTanker.Click += buttonAddGasolineTanker_Click_1; - // - // buttonAddTanker - // - buttonAddTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddTanker.Location = new Point(13, 14); - buttonAddTanker.Name = "buttonAddTanker"; - buttonAddTanker.Size = new Size(230, 43); - buttonAddTanker.TabIndex = 1; - buttonAddTanker.Text = "Добавление грузовика"; - buttonAddTanker.UseVisualStyleBackColor = true; - buttonAddTanker.Click += buttonAddTanker_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -244,21 +246,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddTanker); - panelCompanyTools.Controls.Add(buttonAddGasolineTanker); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(maskedTextBox1); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Controls.Add(buttonDelTanker); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 456); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(252, 351); - panelCompanyTools.TabIndex = 2; - // // FormTankerCollection // AutoScaleDimensions = new SizeF(10F, 25F); @@ -269,11 +256,11 @@ Name = "FormTankerCollection"; 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); } @@ -281,7 +268,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; - private Button buttonAddGasolineTanker; private Button buttonAddTanker; private MaskedTextBox maskedTextBox1; private PictureBox pictureBox; diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs index d959b36..5d5c885 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs @@ -39,35 +39,21 @@ public partial class FormTankerCollection : Form panelCompanyTools.Enabled = false; } - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + private void buttonAddTanker_Click(object sender, EventArgs e) { - if (_company == null) + FormTankerConfig form = new(); + form.Show(); + form.AddEvent(SetTanker); + } + + private void SetTanker(DrawingTanker tanker) + { + if (_company == null || tanker == null) { return; } - Random random = new(); - DrawingTanker drawingTanker; - switch (type) - { - case nameof(DrawingTanker): - drawingTanker = new DrawingTanker(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawingGasolineTanker): - drawingTanker = new DrawingGasolineTanker(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 + drawingTanker != -1) + if (_company + tanker != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -78,37 +64,6 @@ public partial class FormTankerCollection : 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; - } - - /// - /// Добавление обычного самолета - /// - /// - /// - private void buttonAddTanker_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingTanker)); - - /// - /// Добавление самолета с радаром - /// - /// - /// - private void buttonAddGasolineTanker_Click_1(object sender, EventArgs e) => CreateObject(nameof(DrawingGasolineTanker)); - /// /// Удаление объекта /// diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.Designer.cs b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.Designer.cs new file mode 100644 index 0000000..79058fe --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.Designer.cs @@ -0,0 +1,357 @@ +namespace ProjectGasolineTanker +{ + partial class FormTankerConfig + { + /// + /// 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(); + checkBoxOrnamentWheels = new CheckBox(); + checkBoxTank = 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(checkBoxOrnamentWheels); + groupBoxConfig.Controls.Add(checkBoxTank); + 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(724, 257); + 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(371, 30); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(331, 171); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(253, 98); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(57, 52); + panelPurple.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(175, 98); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(57, 52); + panelBlack.TabIndex = 1; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(96, 98); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(57, 52); + panelGray.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(18, 98); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(57, 52); + panelWhite.TabIndex = 1; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(253, 32); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(57, 52); + panelYellow.TabIndex = 2; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(175, 32); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(57, 52); + panelBlue.TabIndex = 1; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(96, 32); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(57, 52); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(18, 32); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(57, 52); + panelRed.TabIndex = 1; + // + // checkBoxOrnamentWheels + // + checkBoxOrnamentWheels.AutoSize = true; + checkBoxOrnamentWheels.Location = new Point(12, 134); + checkBoxOrnamentWheels.Name = "checkBoxOrnamentWheels"; + checkBoxOrnamentWheels.Size = new Size(338, 29); + checkBoxOrnamentWheels.TabIndex = 7; + checkBoxOrnamentWheels.Text = "Признак наличия украшенных колес"; + checkBoxOrnamentWheels.UseVisualStyleBackColor = true; + // + // checkBoxTank + // + checkBoxTank.AutoSize = true; + checkBoxTank.Location = new Point(12, 99); + checkBoxTank.Name = "checkBoxTank"; + checkBoxTank.Size = new Size(264, 29); + checkBoxTank.TabIndex = 6; + checkBoxTank.Text = "Признак наличия цистерны"; + checkBoxTank.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(120, 62); + 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(94, 31); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(71, 52); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(43, 25); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(120, 25); + 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(94, 31); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(21, 27); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(93, 25); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(12, 166); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(165, 65); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(185, 166); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(165, 65); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(13, 50); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(190, 124); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(730, 207); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(103, 34); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(839, 207); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(103, 34); + 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(730, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(219, 189); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(113, 11); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(90, 36); + labelAdditionalColor.TabIndex = 10; + 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(13, 11); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(90, 36); + labelBodyColor.TabIndex = 9; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // FormTankerConfig + // + AutoScaleDimensions = new SizeF(10F, 25F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(961, 257); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormTankerConfig"; + 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 labelModifiedObject; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxTank; + private CheckBox checkBoxOrnamentWheels; + private GroupBox groupBoxColors; + private Panel panelRed; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + 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/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.cs b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.cs new file mode 100644 index 0000000..b9c4799 --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.cs @@ -0,0 +1,123 @@ +using ProjectGasolineTanker.Drawings; +using ProjectGasolineTanker.Entities; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ProjectGasolineTanker +{ + public partial class FormTankerConfig : Form + { + private DrawingTanker? _tanker; + + private event Action? TankerDelegate; + + public FormTankerConfig() + { + 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 tankerDelegate) + { + TankerDelegate += tankerDelegate; + } + + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _tanker?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _tanker?.SetPosition(5, 5); + _tanker?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + 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": + _tanker = new DrawingTanker((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _tanker = new DrawingGasolineTanker((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxTank.Checked, checkBoxOrnamentWheels.Checked); + break; + } + + DrawObject(); + } + + private void labelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_tanker == null) + return; + _tanker.EntityTanker?.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 (_tanker?.EntityTanker is EntityGasolineTanker _gasolinetanker) + _gasolinetanker?.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; + } + + 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 (_tanker != null) + { + TankerDelegate?.Invoke(_tanker); + Close(); + } + } + } +} diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.resx b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.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/ProjectGasolineTanker/ProjectGasolineTanker/TankerDelegate.cs b/ProjectGasolineTanker/ProjectGasolineTanker/TankerDelegate.cs new file mode 100644 index 0000000..4f1b8fd --- /dev/null +++ b/ProjectGasolineTanker/ProjectGasolineTanker/TankerDelegate.cs @@ -0,0 +1,11 @@ +using ProjectGasolineTanker.Drawings; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectGasolineTanker; + +public delegate void TankerDelegate(DrawingTanker tanker); +