From 62ba43a7f59d34ab9293efae2114bd657125febb Mon Sep 17 00:00:00 2001 From: BoiledMilk123 Date: Sat, 20 Apr 2024 16:48:13 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BB?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD=D1=83?= =?UTF-8?q?=D1=8E=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=83=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/EntityElectricLocomotive.cs | 7 +- .../Entities/EntityLocomotive.cs | 5 + .../FormCarConfig.Designer.cs | 358 ++++++++++++++++++ .../FormCarConfig.cs | 164 ++++++++ .../FormCarConfig.resx | 120 ++++++ .../FormLocomotiveCollection.Designer.cs | 14 - .../FormLocomotiveCollection.cs | 67 +--- .../LocomotiveDelegate.cs | 15 + 8 files changed, 688 insertions(+), 62 deletions(-) create mode 100644 ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.Designer.cs create mode 100644 ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.cs create mode 100644 ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.resx create mode 100644 ProjectElectricLocomotive/ProjectElectricLocomotive/LocomotiveDelegate.cs diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityElectricLocomotive.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityElectricLocomotive.cs index 9c0ac12..da17af0 100644 --- a/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityElectricLocomotive.cs +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityElectricLocomotive.cs @@ -12,7 +12,7 @@ public class EntityElectricLocomotive : EntityLocomotive public Color AdditionalColor { get; private set; } /// - /// Признак (опция) наличия "корпус" + /// Признак (опция) наличия "рогов" /// public bool ElectricHorns { get; private set; } @@ -37,4 +37,9 @@ public class EntityElectricLocomotive : EntityLocomotive ElectricHorns = electricHorns; BatteryPlacement = batteryPlacement; } + + public void SetAdditionalColor(Color color) + { + AdditionalColor = color; + } } diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityLocomotive.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityLocomotive.cs index 52007b7..a4fff9e 100644 --- a/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityLocomotive.cs +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/Entities/EntityLocomotive.cs @@ -42,4 +42,9 @@ public class EntityLocomotive Weight = weight; BodyColor = bodyColor; } + + public void SetBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } } diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.Designer.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.Designer.cs new file mode 100644 index 0000000..f08a87a --- /dev/null +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.Designer.cs @@ -0,0 +1,358 @@ +namespace ProjectElectricLocomotive +{ + partial class FormLocomotiveConfig + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + groupBoxConfig = new GroupBox(); + groupBoxColors = new GroupBox(); + panelPurple = new Panel(); + panelYellow = new Panel(); + panelBlack = new Panel(); + panelBlue = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxBattery = new CheckBox(); + checkBoxHorns = 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(); + labelBaseColor = 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(checkBoxBattery); + groupBoxConfig.Controls.Add(checkBoxHorns); + 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(544, 171); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(262, 12); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(254, 103); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(210, 68); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(38, 29); + panelPurple.TabIndex = 7; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(210, 22); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(38, 29); + panelYellow.TabIndex = 3; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(140, 68); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(38, 29); + panelBlack.TabIndex = 6; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(140, 22); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(38, 29); + panelBlue.TabIndex = 2; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(72, 68); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(38, 29); + panelGray.TabIndex = 5; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(6, 68); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(38, 29); + panelWhite.TabIndex = 4; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(72, 22); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(38, 29); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(6, 22); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(38, 29); + panelRed.TabIndex = 0; + panelRed.MouseDown += Panel_MouseDown; + // + // checkBoxBattery + // + checkBoxBattery.AutoSize = true; + checkBoxBattery.Location = new Point(6, 128); + checkBoxBattery.Name = "checkBoxBattery"; + checkBoxBattery.Size = new Size(231, 19); + checkBoxBattery.TabIndex = 7; + checkBoxBattery.Text = "Признак наличия места под батарею"; + checkBoxBattery.UseVisualStyleBackColor = true; + // + // checkBoxHorns + // + checkBoxHorns.AutoSize = true; + checkBoxHorns.Location = new Point(6, 103); + checkBoxHorns.Name = "checkBoxHorns"; + checkBoxHorns.Size = new Size(168, 19); + checkBoxHorns.TabIndex = 6; + checkBoxHorns.Text = "Признак наличия \"рогов\""; + checkBoxHorns.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(74, 63); + 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(120, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(6, 65); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(74, 30); + 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(120, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(6, 30); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(62, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(416, 118); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(100, 36); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(262, 118); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(100, 36); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(3, 34); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(148, 93); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(550, 136); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(75, 23); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(631, 136); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(75, 23); + buttonCancel.TabIndex = 3; + buttonCancel.Text = "Отменить"; + buttonCancel.UseVisualStyleBackColor = true; + // + // panelObject + // + panelObject.AllowDrop = true; + panelObject.Controls.Add(labelAdditionalColor); + panelObject.Controls.Add(labelBaseColor); + panelObject.Controls.Add(pictureBoxObject); + panelObject.Location = new Point(550, 0); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(156, 130); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(81, 9); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(70, 18); + labelAdditionalColor.TabIndex = 10; + labelAdditionalColor.Text = "Доп.цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += LabelColor_DragDrop; + labelAdditionalColor.DragEnter += LabelObject_DragEnter; + // + // labelBaseColor + // + labelBaseColor.AllowDrop = true; + labelBaseColor.BorderStyle = BorderStyle.FixedSingle; + labelBaseColor.Location = new Point(3, 9); + labelBaseColor.Name = "labelBaseColor"; + labelBaseColor.Size = new Size(62, 18); + labelBaseColor.TabIndex = 9; + labelBaseColor.Text = "Цвет"; + labelBaseColor.TextAlign = ContentAlignment.MiddleCenter; + labelBaseColor.DragDrop += LabelColor_DragDrop; + labelBaseColor.DragEnter += LabelObject_DragEnter; + // + // FormLocomotiveConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(713, 171); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormLocomotiveConfig"; + 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 CheckBox checkBoxHorns; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxBattery; + private GroupBox groupBoxColors; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelBaseColor; + private Label labelAdditionalColor; + } +} \ No newline at end of file diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.cs new file mode 100644 index 0000000..721ae99 --- /dev/null +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.cs @@ -0,0 +1,164 @@ +using ProjectElectricLocomotive.Drawnings; +using ProjectElectricLocomotive.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 ProjectElectricLocomotive; + +/// +/// Форма конфигурации объекта +/// +public partial class FormLocomotiveConfig : Form +{ + + /// + /// Объект - прорисовка объекта + /// + private DrawningLocomotive? _locomotive; + + /// + /// Событие для передачи объекта + /// + private event Action? _locomotiveDelegate; + + /// + /// Конструктор + /// + public FormLocomotiveConfig() + { + InitializeComponent(); + panelRed.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelGray.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + buttonCancel.Click += (e, sender) => Close(); + + + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action locomotiveDelegate) + { + _locomotiveDelegate += locomotiveDelegate; + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _locomotive?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _locomotive?.SetPosition(5, 5); + _locomotive?.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": + _locomotive = new DrawningLocomotive((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _locomotive = new DrawningElectricLocomotive((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxHorns.Checked, checkBoxBattery.Checked); + break; + } + DrawObject(); + } + + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.White, DragDropEffects.Move | DragDropEffects.Copy); + } + + private void LabelObject_DragEnter(object sender, DragEventArgs e) + { + if (!e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.None; + } + else + { + e.Effect = DragDropEffects.Copy; + } + } + + private void LabelColor_DragDrop(object sender, DragEventArgs e) + { + if (_locomotive == null) return; + switch ((sender as Label).Name) + { + case "labelBaseColor": + _locomotive.EntityLocomotive?.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + break; + case "labelAdditionalColor": + if (_locomotive is DrawningElectricLocomotive electricLocomotive) + { + ((EntityElectricLocomotive)electricLocomotive.EntityLocomotive)?.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + break; + } + + + DrawObject(); + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_locomotive != null) + { + _locomotiveDelegate?.Invoke(_locomotive); + Close(); + } + } +} diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.resx b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormCarConfig.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/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveCollection.Designer.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveCollection.Designer.cs index ee4e46f..d2b0584 100644 --- a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveCollection.Designer.cs +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveCollection.Designer.cs @@ -33,7 +33,6 @@ comboBoxSelectorCompany = new ComboBox(); panelCompanyTools = new Panel(); buttonAddLocomotive = new Button(); - buttonAddElectricLocomotiv = new Button(); buttonRefresh = new Button(); maskedTextBoxPosition = new MaskedTextBox(); buttonGoToCheck = new Button(); @@ -93,7 +92,6 @@ // panelCompanyTools // panelCompanyTools.Controls.Add(buttonAddLocomotive); - panelCompanyTools.Controls.Add(buttonAddElectricLocomotiv); panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(maskedTextBoxPosition); panelCompanyTools.Controls.Add(buttonGoToCheck); @@ -115,17 +113,6 @@ buttonAddLocomotive.UseVisualStyleBackColor = true; buttonAddLocomotive.Click += ButtonAddLocomotive_Click; // - // buttonAddElectricLocomotiv - // - buttonAddElectricLocomotiv.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddElectricLocomotiv.Location = new Point(3, 40); - buttonAddElectricLocomotiv.Name = "buttonAddElectricLocomotiv"; - buttonAddElectricLocomotiv.Size = new Size(188, 31); - buttonAddElectricLocomotiv.TabIndex = 2; - buttonAddElectricLocomotiv.Text = "Добавить электровоз"; - buttonAddElectricLocomotiv.UseVisualStyleBackColor = true; - buttonAddElectricLocomotiv.Click += ButtonAddElectricLocomotive_Click; - // // buttonRefresh // buttonRefresh.Location = new Point(3, 180); @@ -281,7 +268,6 @@ private Button buttonAddLocomotive; private Button buttonRemoveLocomotive; private MaskedTextBox maskedTextBoxPosition; - private Button buttonAddElectricLocomotiv; private PictureBox pictureBox; private Button buttonGoToCheck; private Button buttonRefresh; diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveCollection.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveCollection.cs index d3d093d..83ec660 100644 --- a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveCollection.cs +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveCollection.cs @@ -43,44 +43,31 @@ public partial class FormLocomotiveCollection : Form { panelCompanyTools.Enabled = false; } - /// - /// Добавление грузовика - /// - /// - /// - private void ButtonAddLocomotive_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningLocomotive)); - /// - /// Добавление бензовоза - /// - /// - /// - private void ButtonAddElectricLocomotive_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningElectricLocomotive)); /// - /// Создание объекта класса-перемещения + /// Добавление локомотива /// - /// Тип создаваемого объекта - private void CreateObject(string type) + /// + /// + private void ButtonAddLocomotive_Click(object sender, EventArgs e) { - if (_company == null) + FormLocomotiveConfig form = new(); + form.Show(); + form.AddEvent(SetLocomotive); + } + + /// + /// Добавление локомотива в коллекцию + /// + /// + private void SetLocomotive(DrawningLocomotive locomotive) + { + if(_company == null || locomotive == null) { return; } - Random random = new(); - DrawningLocomotive DrawningLocomotive; - switch (type) - { - case nameof(DrawningLocomotive): - DrawningLocomotive = new DrawningLocomotive(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningElectricLocomotive): - DrawningLocomotive = new DrawningElectricLocomotive(random.Next(100, 300), random.Next(1000, 5000), GetColor(random), GetColor(random), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - if (_company + DrawningLocomotive != -1) + + if (_company + locomotive != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -89,23 +76,9 @@ public partial class FormLocomotiveCollection : 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; - } + /// /// Удаление объекта /// diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/LocomotiveDelegate.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/LocomotiveDelegate.cs new file mode 100644 index 0000000..51f0154 --- /dev/null +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/LocomotiveDelegate.cs @@ -0,0 +1,15 @@ +using ProjectElectricLocomotive.Drawnings; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectElectricLocomotive; + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void LocomotiveDelegate(DrawningLocomotive locomotive); +