diff --git a/ProjectTank/ProjectTank/Drawnings/DrawningTank.cs b/ProjectTank/ProjectTank/Drawnings/DrawningTank.cs index 7df44b9..cc06063 100644 --- a/ProjectTank/ProjectTank/Drawnings/DrawningTank.cs +++ b/ProjectTank/ProjectTank/Drawnings/DrawningTank.cs @@ -33,10 +33,8 @@ public class DrawningTank : DrawningTank2 _startPosX += 37; - _startPosY += 0; base.DrawTransport(g); _startPosX -= 37; - _startPosY -= 0; if (tank.GunTurret) { diff --git a/ProjectTank/ProjectTank/Entities/EntityTank.cs b/ProjectTank/ProjectTank/Entities/EntityTank.cs index 313b17d..484b36a 100644 --- a/ProjectTank/ProjectTank/Entities/EntityTank.cs +++ b/ProjectTank/ProjectTank/Entities/EntityTank.cs @@ -15,6 +15,10 @@ public class EntityTank : EntityTank2 /// Дополнительный цвет (для опциональных элементов) /// public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color additionalColor) + { + AdditionalColor = additionalColor; + } /// /// Признак (опция) наличия башни с орудием /// @@ -41,14 +45,3 @@ public class EntityTank : EntityTank2 MachineGun = machineGun; } } -public class MyClass -{ - private int PrivateField; - - public int PublicProperty { private get; set; } - - public void PublicMethod() - { - // Код метода - } -} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/Entities/EntityTank2.cs b/ProjectTank/ProjectTank/Entities/EntityTank2.cs index b56e9b8..164645f 100644 --- a/ProjectTank/ProjectTank/Entities/EntityTank2.cs +++ b/ProjectTank/ProjectTank/Entities/EntityTank2.cs @@ -20,6 +20,11 @@ public class EntityTank2 /// public Color BodyColor { get; private set; } + public void SetBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } + /// /// Шаг перемещения автомобиля /// diff --git a/ProjectTank/ProjectTank/FormTankCollection.Designer.cs b/ProjectTank/ProjectTank/FormTankCollection.Designer.cs index 2fecb7a..4a7a954 100644 --- a/ProjectTank/ProjectTank/FormTankCollection.Designer.cs +++ b/ProjectTank/ProjectTank/FormTankCollection.Designer.cs @@ -43,7 +43,6 @@ buttonDelTank = new Button(); maskedTextBox = new MaskedTextBox(); buttonAddTank = new Button(); - buttonAddTank2 = new Button(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); panelCompanyTools = new Panel(); @@ -201,29 +200,20 @@ maskedTextBox.Size = new Size(202, 27); maskedTextBox.TabIndex = 3; maskedTextBox.ValidatingType = typeof(int); + // + // // buttonAddTank // buttonAddTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddTank.Location = new Point(4, 55); + buttonAddTank.Location = new Point(4, 0); buttonAddTank.Name = "buttonAddTank"; buttonAddTank.Size = new Size(202, 49); - buttonAddTank.TabIndex = 2; - buttonAddTank.Text = "Добавление танка "; + buttonAddTank.TabIndex = 1; + buttonAddTank.Text = "Добавление бронированной машины"; buttonAddTank.UseVisualStyleBackColor = true; buttonAddTank.Click += ButtonAddTank_Click; // - // buttonAddTank2 - // - buttonAddTank2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddTank2.Location = new Point(4, 0); - buttonAddTank2.Name = "buttonAddTank2"; - buttonAddTank2.Size = new Size(202, 49); - buttonAddTank2.TabIndex = 1; - buttonAddTank2.Text = "Добавление бронированной машины"; - buttonAddTank2.UseVisualStyleBackColor = true; - buttonAddTank2.Click += ButtonAddTank2_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -250,9 +240,8 @@ panelCompanyTools.Controls.Add(buttonDelTank); panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(maskedTextBox); - panelCompanyTools.Controls.Add(buttonAddTank2); - panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Controls.Add(buttonAddTank); + panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Enabled = false; panelCompanyTools.Location = new Point(3, 382); @@ -281,9 +270,8 @@ #endregion private GroupBox groupBoxTools; - private Button buttonAddTank2; - private ComboBox comboBoxSelectorCompany; private Button buttonAddTank; + private ComboBox comboBoxSelectorCompany; private Button buttonDelTank; private MaskedTextBox maskedTextBox; private PictureBox pictureBox; diff --git a/ProjectTank/ProjectTank/FormTankCollection.cs b/ProjectTank/ProjectTank/FormTankCollection.cs index bac09ae..01c59c6 100644 --- a/ProjectTank/ProjectTank/FormTankCollection.cs +++ b/ProjectTank/ProjectTank/FormTankCollection.cs @@ -39,74 +39,39 @@ public partial class FormTankCollection : Form } /// - /// Добавление обычного автомобиля + /// Добавление танка /// /// /// - private void ButtonAddTank2_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTank2)); - - /// - /// Добавление спортивного автомобиля - /// - /// - /// - private void ButtonAddTank_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTank)); - - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + public void ButtonAddTank_Click(object sender, EventArgs e) { - if (_company == null) + + FormTankConfig form = new(); + form.AddEvent(SetMachine); + form.Show(); + } + + /// + /// Добавление машины в коллекцию + /// + /// + public void SetMachine(DrawningTank2 tank2) + { + if (_company == null || tank2 == null) { return; } - - Random random = new(); - DrawningTank2 drawningTank2; - switch (type) - { - case nameof(DrawningTank2): - drawningTank2 = new DrawningTank2(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningTank): - // вызов диалогового окна для выбора цвета - drawningTank2 = new DrawningTank(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 + drawningTank2 != -1) + if (_company + tank2 != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); } else { - _ = MessageBox.Show(drawningTank2.ToString()); - } - } - - /// - /// Получение цвета - /// - /// Генератор случайных чисел - /// - 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; + MessageBox.Show("Не удалось добавить объект"); } - return color; + } /// diff --git a/ProjectTank/ProjectTank/FormTankConfig.Designer.cs b/ProjectTank/ProjectTank/FormTankConfig.Designer.cs new file mode 100644 index 0000000..1c64504 --- /dev/null +++ b/ProjectTank/ProjectTank/FormTankConfig.Designer.cs @@ -0,0 +1,361 @@ +using static System.Net.Mime.MediaTypeNames; +using System.Windows.Forms; +using System.Xml.Linq; + +namespace ProjectTank +{ + 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(); + panelGray = new Panel(); + panelBlack = new Panel(); + panelPurple = new Panel(); + panelWhite = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxGunTurret = new CheckBox(); + checkBoxMachineGun = 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(checkBoxGunTurret); + groupBoxConfig.Controls.Add(checkBoxMachineGun); + groupBoxConfig.Controls.Add(numericUpDownWeight); + groupBoxConfig.Controls.Add(labelWeight); + groupBoxConfig.Controls.Add(numericUpDownSpeed); + groupBoxConfig.Controls.Add(labelSpeed); + groupBoxConfig.Controls.Add(labelModifiedObject); + groupBoxConfig.Controls.Add(labelSimpleObject); + groupBoxConfig.Dock = DockStyle.Left; + groupBoxConfig.Location = new Point(0, 0); + groupBoxConfig.Name = "groupBoxConfig"; + groupBoxConfig.Size = new Size(630, 274); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(308, 12); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(293, 143); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(85, 81); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(49, 45); + panelGray.TabIndex = 7; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(151, 81); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(49, 45); + panelBlack.TabIndex = 6; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(220, 81); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(49, 45); + panelPurple.TabIndex = 5; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(16, 81); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(49, 45); + panelWhite.TabIndex = 4; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(220, 26); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(49, 45); + panelYellow.TabIndex = 3; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(151, 26); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(49, 45); + panelBlue.TabIndex = 2; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(85, 26); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(49, 45); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(16, 26); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(49, 45); + panelRed.TabIndex = 0; + // + // checkBoxGunTurret + // + checkBoxGunTurret.AutoSize = true; + checkBoxGunTurret.Location = new Point(6, 114); + checkBoxGunTurret.Name = "checkBoxGunTurret"; + checkBoxGunTurret.Size = new Size(299, 24); + checkBoxGunTurret.TabIndex = 9; + checkBoxGunTurret.Text = "Признак наличия зенитного пулемёта"; + checkBoxGunTurret.UseVisualStyleBackColor = true; + // + // checkBoxMachineGun + // + checkBoxMachineGun.AutoSize = true; + checkBoxMachineGun.Location = new Point(6, 144); + checkBoxMachineGun.Name = "checkBoxMachineGun"; + checkBoxMachineGun.Size = new Size(281, 24); + checkBoxMachineGun.TabIndex = 8; + checkBoxMachineGun.Text = "Признак наличия башни с орудием"; + checkBoxMachineGun.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(94, 70); + numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownWeight.Name = "numericUpDownWeight"; + numericUpDownWeight.Size = new Size(119, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 72); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(36, 20); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(94, 32); + numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownSpeed.Name = "numericUpDownSpeed"; + numericUpDownSpeed.Size = new Size(119, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 34); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(457, 161); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(144, 39); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(308, 161); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(138, 39); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(19, 65); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(222, 152); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(655, 233); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(94, 29); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(784, 233); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 3; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // panelObject + // + panelObject.AllowDrop = true; + panelObject.Controls.Add(labelAdditionalColor); + panelObject.Controls.Add(labelBodyColor); + panelObject.Controls.Add(pictureBoxObject); + panelObject.Location = new Point(636, 7); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(258, 220); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(148, 13); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(93, 39); + labelAdditionalColor.TabIndex = 12; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop; + labelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(19, 13); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(93, 39); + labelBodyColor.TabIndex = 11; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter; + // + // FormTankConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(900, 274); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormTankConfig"; + Text = "Создание объекта"; + groupBoxConfig.ResumeLayout(false); + groupBoxConfig.PerformLayout(); + groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + panelObject.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxConfig; + private Label labelSimpleObject; + private Label labelSpeed; + private Label labelModifiedObject; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private CheckBox checkBoxMachineGun; + private CheckBox checkBoxGunTurret; + private GroupBox groupBoxColors; + private Panel panelGray; + private Panel panelBlack; + private Panel panelPurple; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/ProjectTank/ProjectTank/FormTankConfig.cs b/ProjectTank/ProjectTank/FormTankConfig.cs new file mode 100644 index 0000000..c65e604 --- /dev/null +++ b/ProjectTank/ProjectTank/FormTankConfig.cs @@ -0,0 +1,207 @@ +using ProjectTank.Drawnings; +using ProjectTank.Entities; +using System.Reflection.PortableExecutable; + + +namespace ProjectTank; + +/// +/// форма конфигурации объекта +/// +public partial class FormTankConfig : Form +{ + + private DrawningTank2? _tank2; + + /// + /// событие для передачи объекта + /// + private event Action? Tank2Delegate; + + /// + /// Конструктор + /// + 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 tank2Delegate) + { + Tank2Delegate += tank2Delegate; + } + + /// + /// Отрисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _tank2?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _tank2?.SetPosition(25, 25); + _tank2?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + + /// + /// Передаем информацию при нажатии на Labe + /// + /// + /// + + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy); + } + + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + if (e.Data?.GetDataPresent(DataFormats.Text) ?? false) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + /// + /// действия при приеме перетаскиваемой информации + /// + /// + /// + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data?.GetData(DataFormats.Text)?.ToString()) + { + case "labelSimpleObject": + _tank2 = new DrawningTank2((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _tank2 = new DrawningTank((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, + Color.White, + Color.Black, checkBoxGunTurret.Checked, + checkBoxMachineGun.Checked); + break; + } + labelBodyColor.BackColor = Color.Empty; + labelAdditionalColor.BackColor = Color.Empty; + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Control)?.DoDragDrop((sender as Control)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + + /// + /// Проверка получаемой информации по основному цвету + /// + /// + /// + private void LabelBodyColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + /// + /// действия при приеме перетаскиваемого основного цвета + /// + /// + /// + private void LabelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_tank2 != null) + { + _tank2.EntityTank2.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + /// + /// проверка получаемой информации по доп. цвету + /// + /// + /// + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_tank2 is DrawningTank) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + /// + /// действия при перетаскивании доп. цвета + /// + /// + /// + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_tank2.EntityTank2 is EntityTank _tank) + { + _tank.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_tank2 != null) + { + Tank2Delegate?.Invoke(_tank2); + Close(); + } + } +} diff --git a/ProjectTank/ProjectTank/FormTankConfig.resx b/ProjectTank/ProjectTank/FormTankConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectTank/ProjectTank/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/ProjectTank/ProjectTank/TankDelegate.cs b/ProjectTank/ProjectTank/TankDelegate.cs new file mode 100644 index 0000000..d87e986 --- /dev/null +++ b/ProjectTank/ProjectTank/TankDelegate.cs @@ -0,0 +1,12 @@ +using ProjectTank.Drawnings; + +namespace ProjectTank; + + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void TankDelegate(DrawningTank2 _tank2); + +