diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityArtillery.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityArtillery.cs
index 5e43a67..c2ace0b 100644
--- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityArtillery.cs
+++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityArtillery.cs
@@ -9,6 +9,10 @@ public class EntityArtillery : EntityTank
/// Дополнительный цвет (для опциональных элементов)
///
public Color AdditionalColor { get; private set; }
+ public void SetAdditionalColor(Color color)
+ {
+ AdditionalColor = color;
+ }
///
/// Признак (опция) наличия пушки
///
@@ -18,18 +22,18 @@ public class EntityArtillery : EntityTank
///
public bool Rocket { get; private set; }
-
+
///
/// Инициализация полей объекта-класса спортивного автомобиля
///
-
+
/// Дополнительный цвет
/// Признак наличия пушки
/// Признак наличия залповой установки
public EntityArtillery(int speed, double weight, Color bodyColor, Color additionalColor, bool cannon, bool rocket) : base(speed, weight, bodyColor)
{
-
+
AdditionalColor = additionalColor;
Cannon = cannon;
Rocket = rocket;
diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityTank.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityTank.cs
index 6bc0ef7..5419804 100644
--- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityTank.cs
+++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Entities/EntityTank.cs
@@ -4,20 +4,23 @@
///
public class EntityTank
{
-
+
///
/// Скорость
///
- public int Speed { get; set; }
+ public int Speed { get; set; }
///
/// Вес
///
- public double Weight { get; set; }
+ public double Weight { get; set; }
///
/// Основной цвет
///
- public Color BodyColor { get; set; }
-
+ public Color BodyColor { get; set; }
+ public void SetBodyColor(Color color)
+ {
+ BodyColor = color;
+ }
///
/// Шаг перемещения автомобиля
///
@@ -25,7 +28,7 @@ public class EntityTank
///
/// Конструктор сущности
///
- public EntityTank(int speed, double weight, Color bodyColor)
+ public EntityTank(int speed, double weight, Color bodyColor)
{
Speed = speed;
Weight = weight;
diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankCollection.Designer.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankCollection.Designer.cs
index 8fd3f7e..3f48002 100644
--- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankCollection.Designer.cs
+++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankCollection.Designer.cs
@@ -221,7 +221,6 @@
buttonAddArtillery.TabIndex = 1;
buttonAddArtillery.Text = "Добавление сау";
buttonAddArtillery.UseVisualStyleBackColor = true;
- buttonAddArtillery.Click += ButtonAddArtillery_Click;
//
// comboBoxSelectorCompany
//
diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankCollection.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankCollection.cs
index fbe4577..18fa67d 100644
--- a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankCollection.cs
+++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankCollection.cs
@@ -33,29 +33,25 @@ public partial class FormTankCollection : Form
panelCompanyTools.Enabled = false;
}
- private void CreateObject(string type)
+ private void ButtonAddTank_Click(object sender, EventArgs e)
{
- if (_company == null)
+ FormTankConfig form = new();
+ form.AddEvent(SetTank);
+ form.Show();
+ }
+
+ ///
+ /// Добавление танка в коллекцию
+ ///
+ ///
+ private void SetTank(DrawningTank? tank)
+ {
+ if (_company == null || tank == null)
{
return;
}
- Random random = new();
- DrawningTank drawningTank;
- switch (type)
- {
- case nameof(DrawningTank):
- drawningTank = new DrawningTank(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
- break;
- case nameof(DrawningArtillery):
- drawningTank = new DrawningArtillery(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 + drawningTank != -1)
+ if (_company + tank != -1)
{
MessageBox.Show("Объект добавлен");
pictureBox.Image = _company.Show();
@@ -67,27 +63,10 @@ public partial class FormTankCollection : 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 ButtonAddTank_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTank));
-
- private void ButtonAddArtillery_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningArtillery));
-
-
-
+ ///
+ ///
private void ButtonRemoveTank_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
@@ -144,8 +123,6 @@ public partial class FormTankCollection : Form
};
form.ShowDialog();
-
-
}
private void ButtonRefresh_Click(object sender, EventArgs e)
diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankConfig.Designer.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankConfig.Designer.cs
new file mode 100644
index 0000000..3ba6231
--- /dev/null
+++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankConfig.Designer.cs
@@ -0,0 +1,357 @@
+namespace SelfPropelledArtilleryUnit
+{
+ partial class FormTankConfig
+ {
+ ///
+ /// 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();
+ panelGreen = new Panel();
+ panelWhite = new Panel();
+ panelRed = new Panel();
+ checkBoxRocket = new CheckBox();
+ checkBoxCannon = 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(checkBoxRocket);
+ groupBoxConfig.Controls.Add(checkBoxCannon);
+ 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(575, 450);
+ 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(panelGreen);
+ groupBoxColors.Controls.Add(panelWhite);
+ groupBoxColors.Controls.Add(panelRed);
+ groupBoxColors.Location = new Point(246, 12);
+ groupBoxColors.Name = "groupBoxColors";
+ groupBoxColors.Size = new Size(217, 113);
+ groupBoxColors.TabIndex = 8;
+ groupBoxColors.TabStop = false;
+ groupBoxColors.Text = "Цвета";
+ //
+ // panelPurple
+ //
+ panelPurple.BackColor = Color.Purple;
+ panelPurple.Location = new Point(129, 65);
+ panelPurple.Name = "panelPurple";
+ panelPurple.Size = new Size(26, 25);
+ panelPurple.TabIndex = 4;
+ //
+ // panelYellow
+ //
+ panelYellow.BackColor = Color.Yellow;
+ panelYellow.Location = new Point(129, 22);
+ panelYellow.Name = "panelYellow";
+ panelYellow.Size = new Size(26, 25);
+ panelYellow.TabIndex = 1;
+ //
+ // panelBlack
+ //
+ panelBlack.BackColor = Color.Black;
+ panelBlack.Location = new Point(88, 65);
+ panelBlack.Name = "panelBlack";
+ panelBlack.Size = new Size(26, 25);
+ panelBlack.TabIndex = 6;
+ //
+ // panelBlue
+ //
+ panelBlue.BackColor = Color.Blue;
+ panelBlue.Location = new Point(88, 22);
+ panelBlue.Name = "panelBlue";
+ panelBlue.Size = new Size(26, 25);
+ panelBlue.TabIndex = 2;
+ //
+ // panelGray
+ //
+ panelGray.BackColor = Color.Gray;
+ panelGray.Location = new Point(47, 65);
+ panelGray.Name = "panelGray";
+ panelGray.Size = new Size(26, 25);
+ panelGray.TabIndex = 5;
+ //
+ // panelGreen
+ //
+ panelGreen.BackColor = Color.Green;
+ panelGreen.Location = new Point(47, 22);
+ panelGreen.Name = "panelGreen";
+ panelGreen.Size = new Size(26, 25);
+ panelGreen.TabIndex = 1;
+ //
+ // panelWhite
+ //
+ panelWhite.BackColor = Color.White;
+ panelWhite.Location = new Point(6, 65);
+ panelWhite.Name = "panelWhite";
+ panelWhite.Size = new Size(26, 25);
+ panelWhite.TabIndex = 3;
+ //
+ // panelRed
+ //
+ panelRed.BackColor = Color.Red;
+ panelRed.Location = new Point(6, 22);
+ panelRed.Name = "panelRed";
+ panelRed.Size = new Size(26, 25);
+ panelRed.TabIndex = 0;
+ //
+ // checkBoxRocket
+ //
+ checkBoxRocket.AutoSize = true;
+ checkBoxRocket.Location = new Point(19, 122);
+ checkBoxRocket.Name = "checkBoxRocket";
+ checkBoxRocket.Size = new Size(231, 19);
+ checkBoxRocket.TabIndex = 7;
+ checkBoxRocket.Text = "Признак наличия залповой устаноки";
+ checkBoxRocket.UseVisualStyleBackColor = true;
+ //
+ // checkBoxCannon
+ //
+ checkBoxCannon.AutoSize = true;
+ checkBoxCannon.Location = new Point(20, 93);
+ checkBoxCannon.Name = "checkBoxCannon";
+ checkBoxCannon.Size = new Size(163, 19);
+ checkBoxCannon.TabIndex = 6;
+ checkBoxCannon.Text = "Признак наличия пушки";
+ checkBoxCannon.UseVisualStyleBackColor = true;
+ //
+ // numericUpDownWeight
+ //
+ numericUpDownWeight.Location = new Point(77, 48);
+ 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(99, 23);
+ numericUpDownWeight.TabIndex = 5;
+ numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+ //
+ // labelWeight
+ //
+ labelWeight.AutoSize = true;
+ labelWeight.Location = new Point(12, 48);
+ labelWeight.Name = "labelWeight";
+ labelWeight.Size = new Size(26, 15);
+ labelWeight.TabIndex = 4;
+ labelWeight.Text = "Вес";
+ //
+ // numericUpDownSpeed
+ //
+ numericUpDownSpeed.Location = new Point(77, 19);
+ 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(99, 23);
+ numericUpDownSpeed.TabIndex = 3;
+ numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+ //
+ // labelSpeed
+ //
+ labelSpeed.AutoSize = true;
+ labelSpeed.Location = new Point(12, 19);
+ labelSpeed.Name = "labelSpeed";
+ labelSpeed.Size = new Size(59, 15);
+ labelSpeed.TabIndex = 2;
+ labelSpeed.Text = "Скорость";
+ //
+ // labelModifiedObject
+ //
+ labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+ labelModifiedObject.Location = new Point(363, 156);
+ labelModifiedObject.Name = "labelModifiedObject";
+ labelModifiedObject.Size = new Size(100, 23);
+ labelModifiedObject.TabIndex = 1;
+ labelModifiedObject.Text = "Продвинутый";
+ labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+ labelModifiedObject.MouseDown += LabelObject_MouseDown;
+ //
+ // labelSimpleObject
+ //
+ labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+ labelSimpleObject.Location = new Point(246, 156);
+ labelSimpleObject.Name = "labelSimpleObject";
+ labelSimpleObject.Size = new Size(100, 23);
+ labelSimpleObject.TabIndex = 0;
+ labelSimpleObject.Text = "Простой";
+ labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+ labelSimpleObject.MouseDown += LabelObject_MouseDown;
+ //
+ // pictureBoxObject
+ //
+ pictureBoxObject.Location = new Point(16, 77);
+ pictureBoxObject.Name = "pictureBoxObject";
+ pictureBoxObject.Size = new Size(193, 91);
+ pictureBoxObject.TabIndex = 1;
+ pictureBoxObject.TabStop = false;
+ //
+ // buttonAdd
+ //
+ buttonAdd.Location = new Point(597, 181);
+ 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(715, 181);
+ 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(labelBodyColor);
+ panelObject.Controls.Add(pictureBoxObject);
+ panelObject.Location = new Point(581, 0);
+ panelObject.Name = "panelObject";
+ panelObject.Size = new Size(225, 179);
+ panelObject.TabIndex = 4;
+ panelObject.DragDrop += PanelObject_DragDrop;
+ panelObject.DragEnter += PanelObject_DragEnter;
+ //
+ // labelAdditionalColor
+ //
+ labelAdditionalColor.AllowDrop = true;
+ labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+ labelAdditionalColor.Location = new Point(134, 19);
+ labelAdditionalColor.Name = "labelAdditionalColor";
+ labelAdditionalColor.Size = new Size(75, 23);
+ labelAdditionalColor.TabIndex = 3;
+ labelAdditionalColor.Text = "Доп. цвет";
+ labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+ labelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop;
+ labelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter;
+ //
+ // labelBodyColor
+ //
+ labelBodyColor.AllowDrop = true;
+ labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+ labelBodyColor.Location = new Point(16, 19);
+ labelBodyColor.Name = "labelBodyColor";
+ labelBodyColor.Size = new Size(75, 23);
+ labelBodyColor.TabIndex = 2;
+ labelBodyColor.Text = "Цвет";
+ labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+ labelBodyColor.DragDrop += LabelBodyColor_DragDrop;
+ labelBodyColor.DragEnter += LabelBodyColor_DragEnter;
+ //
+ // FormLocomotiveConfig
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(818, 450);
+ 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 labelModifiedObject;
+ private Label labelSimpleObject;
+ private NumericUpDown numericUpDownSpeed;
+ private Label labelSpeed;
+ private Label labelWeight;
+ private NumericUpDown numericUpDownWeight;
+ private CheckBox checkBoxRocket;
+ private CheckBox checkBoxCannon;
+ private GroupBox groupBoxColors;
+ private Panel panelRed;
+ private Panel panelPurple;
+ private Panel panelYellow;
+ private Panel panelBlack;
+ private Panel panelBlue;
+ private Panel panelGray;
+ private Panel panelGreen;
+ private Panel panelWhite;
+ 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/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankConfig.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankConfig.cs
new file mode 100644
index 0000000..80dd800
--- /dev/null
+++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankConfig.cs
@@ -0,0 +1,137 @@
+using SelfPropelledArtilleryUnit.Drawnings;
+using SelfPropelledArtilleryUnit.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 SelfPropelledArtilleryUnit;
+
+public partial class FormTankConfig : Form
+{
+ private DrawningTank? _tank;
+
+ private event Action? TankDelegate;
+
+ public FormTankConfig()
+ {
+ 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 tankDelegate)
+ {
+ TankDelegate += tankDelegate;
+ }
+ private void DrawObject()
+ {
+ Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+ Graphics gr = Graphics.FromImage(bmp);
+ _tank?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+ _tank?.SetPosition(5, 5);
+ _tank?.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":
+ _tank = new DrawningTank((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+ break;
+ case "labelModifiedObject":
+ _tank = new DrawningArtillery((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+ Color.Black, checkBoxCannon.Checked, checkBoxRocket.Checked);
+ break;
+ }
+ labelBodyColor.BackColor = Color.Empty;
+ labelAdditionalColor.BackColor = Color.Empty;
+ 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)) ?? false)
+ {
+ e.Effect = DragDropEffects.Copy;
+ }
+ else
+ {
+ e.Effect = DragDropEffects.None;
+ }
+ }
+ private void LabelBodyColor_DragDrop(object sender, DragEventArgs e)
+ {
+ if (_tank != null)
+ {
+ _tank.EntityTank.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+ DrawObject();
+ }
+ }
+ private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e)
+ {
+ if (_tank != null && _tank is DrawningArtillery)
+ {
+ if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
+ {
+ e.Effect = DragDropEffects.Copy;
+ }
+ else
+ {
+ e.Effect = DragDropEffects.None;
+ }
+ }
+ }
+ private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e)
+ {
+ if (_tank != null && _tank.EntityTank is EntityArtillery _artillery)
+ {
+ if (e.Data.GetDataPresent(typeof(Color)))
+ {
+ _artillery.SetAdditionalColor((Color)e.Data.GetData(typeof(Color)));
+
+ }
+ DrawObject();
+ }
+ }
+ private void ButtonAdd_Click(object sender, EventArgs e)
+ {
+
+ if (_tank != null)
+ {
+ TankDelegate?.Invoke(_tank);
+ Close();
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankConfig.resx b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankConfig.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormTankConfig.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/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/TankDelegate.cs b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/TankDelegate.cs
new file mode 100644
index 0000000..94eace6
--- /dev/null
+++ b/SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/TankDelegate.cs
@@ -0,0 +1,13 @@
+using SelfPropelledArtilleryUnit.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SelfPropelledArtilleryUnit;
+///
+/// Делегат передачи объекта класса-прорисовки
+///
+///
+public delegate void TankDelegate(DrawningTank tank);