diff --git a/Battleship/Battleship/Entities/EntityBattleship.cs b/Battleship/Battleship/Entities/EntityBattleship.cs index c961dc1..edeccf6 100644 --- a/Battleship/Battleship/Entities/EntityBattleship.cs +++ b/Battleship/Battleship/Entities/EntityBattleship.cs @@ -17,9 +17,6 @@ public class EntityBattleship : EntityWarship /// Основной цвет /// public Color BodyColor { get; private set; } - /// - /// Перемещение военного корабля - /// /// /// /// Признак (опция) отсека для ракет /// @@ -36,6 +33,10 @@ public class EntityBattleship : EntityWarship /// Дополнительный цвет (для опциональных элементов) /// public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color color) + { + AdditionalColor = color; + } /// /// Перемещение линкора /// diff --git a/Battleship/Battleship/Entities/EntityWarship.cs b/Battleship/Battleship/Entities/EntityWarship.cs index 8d20e4d..ec342a9 100644 --- a/Battleship/Battleship/Entities/EntityWarship.cs +++ b/Battleship/Battleship/Entities/EntityWarship.cs @@ -22,6 +22,11 @@ public class EntityWarship /// Основной цвет /// public Color BodyColor { get; private set; } + public void SetBodyColor(Color color) + { + BodyColor = color; + } + /// /// Перемещение военного корабля /// diff --git a/Battleship/Battleship/FormWarshipCollection.Designer.cs b/Battleship/Battleship/FormWarshipCollection.Designer.cs index 146784d..31efc86 100644 --- a/Battleship/Battleship/FormWarshipCollection.Designer.cs +++ b/Battleship/Battleship/FormWarshipCollection.Designer.cs @@ -35,7 +35,6 @@ buttonGoToCheck = new Button(); buttonAddWarship = new Button(); buttonRemoveWarship = new Button(); - buttonAddBattleship = new Button(); panelStorage = new Panel(); comboBoxSelectorCompany = new ComboBox(); buttonCollectionDel = new Button(); @@ -73,7 +72,6 @@ panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Controls.Add(buttonAddWarship); panelCompanyTools.Controls.Add(buttonRemoveWarship); - panelCompanyTools.Controls.Add(buttonAddBattleship); panelCompanyTools.Location = new Point(6, 374); panelCompanyTools.Name = "panelCompanyTools"; panelCompanyTools.Size = new Size(283, 276); @@ -132,17 +130,6 @@ buttonRemoveWarship.UseVisualStyleBackColor = true; buttonRemoveWarship.Click += ButtonRemoveWarship_Click_1; // - // buttonAddBattleship - // - buttonAddBattleship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddBattleship.Location = new Point(3, 51); - buttonAddBattleship.Name = "buttonAddBattleship"; - buttonAddBattleship.Size = new Size(277, 42); - buttonAddBattleship.TabIndex = 2; - buttonAddBattleship.Text = "Добавление линкора"; - buttonAddBattleship.UseVisualStyleBackColor = true; - buttonAddBattleship.Click += ButtonAddBattleship_Click; - // // panelStorage // panelStorage.Controls.Add(comboBoxSelectorCompany); @@ -284,7 +271,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; - private Button buttonAddBattleship; private Button buttonAddWarship; private Button buttonRemoveWarship; private PictureBox pictureBox; diff --git a/Battleship/Battleship/FormWarshipCollection.cs b/Battleship/Battleship/FormWarshipCollection.cs index c3518d4..e73f788 100644 --- a/Battleship/Battleship/FormWarshipCollection.cs +++ b/Battleship/Battleship/FormWarshipCollection.cs @@ -38,54 +38,30 @@ public partial class FormWarshipCollection : Form } /// - /// Добавление линкора - /// - /// - /// - private void ButtonAddBattleship_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawingBattleship)); - } - - /// - /// Добавление военного корабля + /// Добавление корабля /// /// /// private void ButtonAddWarship_Click(object sender, EventArgs e) { - CreateObject(nameof(DrawingWarship)); + FormWarshipConfig form = new(); + form.Show(); + form.AddEvent(SetWarship); } + /// - /// Создание объекта + /// Добавление корабля в коллекцию /// - /// - private void CreateObject(string type) + /// + private void SetWarship(DrawingWarship warship) { - if (_company == null) + if (_company == null || warship == null) { return; } - Random random = new(); - DrawingWarship drawingWarship; - switch (type) - { - case nameof(DrawingWarship): - drawingWarship = new DrawingWarship(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawingBattleship): - drawingWarship = new DrawingBattleship(random.Next(100, 300), random.Next(1000, 3000), - GetColor(random), - GetColor(random), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(1, 2)), Convert.ToBoolean(random.Next(1, 2))); - break; - default: - return; - } - - if (_company + drawingWarship != -1) + if (_company + warship != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -94,23 +70,8 @@ public partial class FormWarshipCollection : 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/Battleship/Battleship/FormWarshipConfig.Designer.cs b/Battleship/Battleship/FormWarshipConfig.Designer.cs new file mode 100644 index 0000000..d988cf0 --- /dev/null +++ b/Battleship/Battleship/FormWarshipConfig.Designer.cs @@ -0,0 +1,370 @@ +namespace Battleship +{ + partial class FormWarshipConfig + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + groupBoxConfig = new GroupBox(); + groupBoxColors = new GroupBox(); + panelPurple = new Panel(); + panelBlack = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxTower = new CheckBox(); + checkBoxCompartment = new CheckBox(); + checkBoxBodyDeck = 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(checkBoxTower); + groupBoxConfig.Controls.Add(checkBoxCompartment); + groupBoxConfig.Controls.Add(checkBoxBodyDeck); + 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(581, 274); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(259, 35); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(300, 155); + groupBoxColors.TabIndex = 9; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(230, 89); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(50, 46); + panelPurple.TabIndex = 7; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(163, 89); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(50, 46); + panelBlack.TabIndex = 6; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(97, 89); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(50, 46); + panelGray.TabIndex = 5; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(31, 89); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(50, 46); + panelWhite.TabIndex = 4; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(230, 26); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(50, 46); + panelYellow.TabIndex = 3; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(163, 26); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(50, 46); + panelBlue.TabIndex = 2; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(97, 26); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(50, 46); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(31, 26); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(50, 46); + panelRed.TabIndex = 0; + // + // checkBoxTower + // + checkBoxTower.AutoSize = true; + checkBoxTower.Location = new Point(12, 231); + checkBoxTower.Name = "checkBoxTower"; + checkBoxTower.Size = new Size(205, 24); + checkBoxTower.TabIndex = 8; + checkBoxTower.Text = "Признак наличия башни"; + checkBoxTower.UseVisualStyleBackColor = true; + // + // checkBoxCompartment + // + checkBoxCompartment.AutoSize = true; + checkBoxCompartment.Location = new Point(12, 179); + checkBoxCompartment.Name = "checkBoxCompartment"; + checkBoxCompartment.Size = new Size(210, 24); + checkBoxCompartment.TabIndex = 7; + checkBoxCompartment.Text = "Признак отсека для ракет"; + checkBoxCompartment.UseVisualStyleBackColor = true; + // + // checkBoxBodyDeck + // + checkBoxBodyDeck.AutoSize = true; + checkBoxBodyDeck.Location = new Point(12, 124); + checkBoxBodyDeck.Name = "checkBoxBodyDeck"; + checkBoxBodyDeck.Size = new Size(210, 24); + checkBoxBodyDeck.TabIndex = 6; + checkBoxBodyDeck.Text = "Признак наличия палубы"; + checkBoxBodyDeck.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(94, 76); + 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(90, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 78); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(36, 20); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(94, 35); + 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(128, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 37); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(422, 206); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(137, 49); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(259, 206); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(137, 49); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой "; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(14, 66); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(187, 125); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(601, 216); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(87, 29); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(706, 216); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(82, 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(587, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(209, 198); + panelObject.TabIndex = 4; + panelObject.DragDrop += panelObject_DragDrop; + panelObject.DragEnter += panelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(119, 16); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(82, 38); + 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(14, 16); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(73, 38); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет "; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter; + // + // FormWarshipConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 274); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormWarshipConfig"; + 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 Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private CheckBox checkBoxBodyDeck; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxCompartment; + private CheckBox checkBoxTower; + 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 labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/Battleship/Battleship/FormWarshipConfig.cs b/Battleship/Battleship/FormWarshipConfig.cs new file mode 100644 index 0000000..a83f1b0 --- /dev/null +++ b/Battleship/Battleship/FormWarshipConfig.cs @@ -0,0 +1,192 @@ +using Battleship.Drawings; +using Battleship.Entities; + +namespace Battleship; + +/// +/// Форма конфигурации объекта +/// +public partial class FormWarshipConfig : Form +{ + /// + /// Объект - прорисовка корабля + /// + private DrawingWarship? _warship; + + /// + /// Событие для передачи объекта + /// + private event Action? WarshipDelegate; + + /// + /// Конструктор + /// + public FormWarshipConfig() + { + 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 привязать анонимный метод через lambda с закрытием формы + buttonCancel.Click += (sender, e) => Close(); + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action warshipDelegate) + { + if (WarshipDelegate == null) + { + WarshipDelegate = warshipDelegate; + } + else + { + WarshipDelegate += warshipDelegate; + } + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _warship?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _warship?.SetPosition(5, 5); + _warship?.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) + { + 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": + _warship = new DrawingWarship((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _warship = new DrawingBattleship((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxBodyDeck.Checked, checkBoxCompartment.Checked, checkBoxTower.Checked); + break; + } + + DrawObject(); + } + + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + // TODO отправка цвета в Drag&Drop + (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 (_warship != null) + { + if (e.Data?.GetDataPresent(typeof(Color)) ?? false) + { + _warship.EntityWarship.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + + } + DrawObject(); + } + } + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_warship != null && _warship is DrawingBattleship) + { + 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 (_warship != null && _warship.EntityWarship is EntityBattleship _battleship) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + _battleship.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + + } + DrawObject(); + } + } + + /// + /// Передача объекта + /// + /// + /// + private void buttonAdd_Click(object sender, EventArgs e) + { + if (_warship != null) + { + WarshipDelegate?.Invoke(_warship); + Close(); + } + } +} \ No newline at end of file diff --git a/Battleship/Battleship/FormWarshipConfig.resx b/Battleship/Battleship/FormWarshipConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/Battleship/Battleship/FormWarshipConfig.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/Battleship/Battleship/WarshipDelegate.cs b/Battleship/Battleship/WarshipDelegate.cs new file mode 100644 index 0000000..029f7b5 --- /dev/null +++ b/Battleship/Battleship/WarshipDelegate.cs @@ -0,0 +1,8 @@ +using Battleship.Drawings; +namespace Battleship; + +/// +/// Делегат передачи объекта прорисовки +/// +/// +public delegate void WarshipDelegate(DrawingWarship warship); \ No newline at end of file