diff --git a/ProjectDumpTruck/ProjectDumpTruck/Entities/EntityDumpTruck.cs b/ProjectDumpTruck/ProjectDumpTruck/Entities/EntityDumpTruck.cs index 0e3cdae..0495b91 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/Entities/EntityDumpTruck.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/Entities/EntityDumpTruck.cs @@ -15,6 +15,9 @@ public class EntityDumpTruck : EntityTruck /// Дополнительный цвет (для опциональных элементов) /// public Color AdditionalColor { get; private set; } + + public void SetAdditionalColor(Color color) { AdditionalColor = color; } + /// /// Наличие кузова /// diff --git a/ProjectDumpTruck/ProjectDumpTruck/Entities/EntityTruck.cs b/ProjectDumpTruck/ProjectDumpTruck/Entities/EntityTruck.cs index 1fa467b..4532346 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/Entities/EntityTruck.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/Entities/EntityTruck.cs @@ -23,6 +23,8 @@ public class EntityTruck /// Основной цвет /// public Color BodyColor { get; private set; } + + public void SetBodyColor(Color color) { BodyColor = color; } /// /// Шаг перемещения самосвала /// diff --git a/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.Designer.cs b/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.Designer.cs index f29301a..e02b76b 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.Designer.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.Designer.cs @@ -31,7 +31,6 @@ groupBoxTools = new GroupBox(); panelCompanyTools = new Panel(); buttonAddTruck = new Button(); - buttonAddDumpTruck = new Button(); buttonRefresh = new Button(); maskedTextBoxPosition = new MaskedTextBox(); buttonGoToChek = new Button(); @@ -70,7 +69,6 @@ // panelCompanyTools // panelCompanyTools.Controls.Add(buttonAddTruck); - panelCompanyTools.Controls.Add(buttonAddDumpTruck); panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(maskedTextBoxPosition); panelCompanyTools.Controls.Add(buttonGoToChek); @@ -92,16 +90,6 @@ buttonAddTruck.UseVisualStyleBackColor = true; buttonAddTruck.Click += ButtonAddTruck_Click; // - // buttonAddDumpTruck - // - buttonAddDumpTruck.Location = new Point(15, 76); - buttonAddDumpTruck.Name = "buttonAddDumpTruck"; - buttonAddDumpTruck.Size = new Size(220, 57); - buttonAddDumpTruck.TabIndex = 2; - buttonAddDumpTruck.Text = "Добавление самосвала"; - buttonAddDumpTruck.UseVisualStyleBackColor = true; - buttonAddDumpTruck.Click += ButtonAddDumpTruck_Click; - // // buttonRefresh // buttonRefresh.Location = new Point(15, 300); @@ -275,7 +263,6 @@ #endregion private GroupBox groupBoxTools; - private Button buttonAddDumpTruck; private Button buttonAddTruck; private ComboBox comboBoxSelectorCompany; private Button buttonRemoveTruck; diff --git a/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.cs b/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.cs index 954e18f..17b50fc 100644 --- a/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.cs +++ b/ProjectDumpTruck/ProjectDumpTruck/FormTruckCollection.cs @@ -6,6 +6,7 @@ using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; +using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; @@ -46,40 +47,24 @@ public partial class FormTruckCollection : Form /// /// /// - private void ButtonAddTruck_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTruck)); - /// - /// Добавление спортивного автомобиля - /// - /// CreateObject(nameof(DrawningDumpTruck)); + private void ButtonAddTruck_Click(object sender, EventArgs e) + { + FormTruckConfig form = new(); + form.AddEvent(SetTruck); + form.Show(); + } /// - /// Создание объекта класса-перемещения + /// Добавление автомобиля в коллекцию /// - /// Тип создаваемого объекта - private void CreateObject(string type) + /// + private void SetTruck(DrawningTruck? truck) { - if (_company == null) + if (_company == null || truck == null) { return; } - Random random = new(); - DrawningTruck drawningTruck; - switch (type) - { - case nameof(DrawningTruck): - drawningTruck = new DrawningTruck(random.Next(100, 300), random.Next(1000, 3000), - GetColor(random)); - break; - case nameof(DrawningDumpTruck): - drawningTruck = new DrawningDumpTruck(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 + drawningTruck >= 0) + if (_company + truck >= 0) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -90,22 +75,6 @@ public partial class FormTruckCollection : 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; - } - /// /// Удаление объекта /// @@ -224,10 +193,6 @@ public partial class FormTruckCollection : Form private void ButtonCollectionDel_Click(object sender, EventArgs e) { - // TODO прописать логику удаления элемента из коллекции - // нужно убедиться, что есть выбранная коллекция - // спросить у пользователя через MessageBox, что он подтверждает, что хочет удалить запись - // удалить и обновить ListBox if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItems == null) { MessageBox.Show("Коллекция не выбрана"); diff --git a/ProjectDumpTruck/ProjectDumpTruck/FormTruckConfig.Designer.cs b/ProjectDumpTruck/ProjectDumpTruck/FormTruckConfig.Designer.cs new file mode 100644 index 0000000..1dfdaf1 --- /dev/null +++ b/ProjectDumpTruck/ProjectDumpTruck/FormTruckConfig.Designer.cs @@ -0,0 +1,357 @@ +namespace ProjectDumpTruck +{ + partial class FormTruckConfig + { + /// + /// 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(); + checkBoxTent = new CheckBox(); + checkBoxBody = 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(); + panelObject = new Panel(); + labelAdditionalColor = new Label(); + labelBodyColor = new Label(); + buttonCancel = new Button(); + 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(checkBoxTent); + groupBoxConfig.Controls.Add(checkBoxBody); + 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(615, 305); + 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(280, 23); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(292, 167); + groupBoxColors.TabIndex = 1; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(219, 94); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(45, 43); + panelPurple.TabIndex = 11; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(219, 26); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(45, 43); + panelYellow.TabIndex = 9; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(155, 94); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(45, 43); + panelBlack.TabIndex = 12; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(155, 26); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(45, 43); + panelBlue.TabIndex = 9; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(88, 94); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(45, 43); + panelGray.TabIndex = 13; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(17, 94); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(45, 43); + panelWhite.TabIndex = 10; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(88, 26); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(45, 43); + panelGreen.TabIndex = 9; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(17, 26); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(45, 43); + panelRed.TabIndex = 8; + // + // checkBoxTent + // + checkBoxTent.AutoSize = true; + checkBoxTent.Location = new Point(12, 245); + checkBoxTent.Name = "checkBoxTent"; + checkBoxTent.Size = new Size(195, 24); + checkBoxTent.TabIndex = 7; + checkBoxTent.Text = "Признак наличия тента"; + checkBoxTent.UseVisualStyleBackColor = true; + // + // checkBoxBody + // + checkBoxBody.AutoSize = true; + checkBoxBody.Location = new Point(12, 206); + checkBoxBody.Name = "checkBoxBody"; + checkBoxBody.Size = new Size(204, 24); + checkBoxBody.TabIndex = 6; + checkBoxBody.Text = "Признак наличия кузова"; + checkBoxBody.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(94, 69); + 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(97, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 76); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(36, 20); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(94, 23); + 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(97, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 23); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(431, 226); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(141, 44); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(275, 226); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(141, 44); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(26, 56); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(206, 124); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(621, 264); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(94, 29); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // panelObject + // + panelObject.AllowDrop = true; + panelObject.Controls.Add(labelAdditionalColor); + panelObject.Controls.Add(pictureBoxObject); + panelObject.Controls.Add(labelBodyColor); + panelObject.Location = new Point(621, 39); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(260, 217); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(132, 10); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(101, 32); + labelAdditionalColor.TabIndex = 9; + 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(26, 10); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(100, 32); + labelBodyColor.TabIndex = 8; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter; + // + // buttonCancel + // + buttonCancel.Location = new Point(787, 264); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 5; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // FormTruckConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(908, 305); + Controls.Add(buttonCancel); + Controls.Add(panelObject); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormTruckConfig"; + 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 Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxBody; + private CheckBox checkBoxTent; + private GroupBox groupBoxColors; + private Panel panelRed; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Panel panelObject; + private Label labelBodyColor; + private Label labelAdditionalColor; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/ProjectDumpTruck/ProjectDumpTruck/FormTruckConfig.cs b/ProjectDumpTruck/ProjectDumpTruck/FormTruckConfig.cs new file mode 100644 index 0000000..8b24e71 --- /dev/null +++ b/ProjectDumpTruck/ProjectDumpTruck/FormTruckConfig.cs @@ -0,0 +1,170 @@ +using ProjectDumpTruck.Drawnings; +using ProjectDumpTruck.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 ProjectDumpTruck +{ + /// + /// Форма конфигурации самосвала + /// + public partial class FormTruckConfig : Form + { + private event Action DrawningTruckEvent; + + /// + /// Объект - прорисовка грузовика + /// + private DrawningTruck _truck; + + public FormTruckConfig() + { + InitializeComponent(); + + panelRed.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + + buttonCancel.Click += (object sender, EventArgs e) => Close(); + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action truckDelegate) + { + DrawningTruckEvent += truckDelegate; + } + + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _truck?.SetPictureSize(pictureBoxObject.Width, + pictureBoxObject.Height); + _truck?.SetPosition(15, 15); + _truck?.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": + _truck = new DrawningTruck((int)numericUpDownSpeed.Value, + (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _truck = new + DrawningDumpTruck((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, + Color.White, + Color.Black, checkBoxBody.Checked, + checkBoxTent.Checked); + break; + } + DrawObject(); + } + + + 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) + { + _truck?.EntityTruck.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + + DrawObject(); + } + + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_truck is DrawningDumpTruck) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_truck.EntityTruck is EntityDumpTruck _dumpTruck) + { + _dumpTruck.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_truck != null) + { + DrawningTruckEvent?.Invoke(_truck); + Close(); + } + } + + + } +} diff --git a/ProjectDumpTruck/ProjectDumpTruck/FormTruckConfig.resx b/ProjectDumpTruck/ProjectDumpTruck/FormTruckConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectDumpTruck/ProjectDumpTruck/FormTruckConfig.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