From b690a648546bbaa9423908caffacfb230e896fed Mon Sep 17 00:00:00 2001 From: ilyaryabovv Date: Sun, 31 Mar 2024 13:39:20 +0400 Subject: [PATCH 1/2] =?UTF-8?q?5=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/EntityBaseStormtrooper.cs | 6 +- .../Entities/EntityStormtrooper.cs | 4 + .../FormStormtrooperCollection.Designer.cs | 15 +- .../FormStormtrooperCollection.cs | 59 +-- .../FormStormtrooperConfig.Designer.cs | 357 ++++++++++++++++++ .../FormStormtrooperConfig.cs | 182 +++++++++ .../FormStormtrooperConfig.resx | 120 ++++++ .../StormtooperDelegate.cs | 8 + 8 files changed, 692 insertions(+), 59 deletions(-) create mode 100644 ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.Designer.cs create mode 100644 ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.cs create mode 100644 ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.resx create mode 100644 ProjectStormtrooper/ProjectStormtrooper/StormtooperDelegate.cs diff --git a/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityBaseStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityBaseStormtrooper.cs index 9f67ba4..b2bc6e9 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityBaseStormtrooper.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityBaseStormtrooper.cs @@ -19,7 +19,11 @@ public class EntityBaseStormtrooper /// /// public Color BodyColor { get; private set; } - + + public void SetBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } /// /// Шаг перемещения бомбардировщика /// diff --git a/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityStormtrooper.cs index 1a52a13..bb0f400 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityStormtrooper.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityStormtrooper.cs @@ -10,6 +10,10 @@ public class EntityStormtrooper : EntityBaseStormtrooper /// Дополнительный цвет (для опциональных элементов) /// public Color AdditionalColor { get; protected set; } + public void SetAdditionalColor(Color additionalColor) + { + AdditionalColor = additionalColor; + } /// /// Признак (опция) наличия ракет diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs index 9dbb7dc..8288043 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs @@ -31,7 +31,6 @@ groupBoxTools = new GroupBox(); panelCompanyTools = new Panel(); buttonCreateCompany = new Button(); - buttonAddBaseStormtrooper = new Button(); buttonAddStormtrooper = new Button(); buttonRefresh = new Button(); maskedTextBoxPosition = new MaskedTextBox(); @@ -69,7 +68,6 @@ // panelCompanyTools // panelCompanyTools.Controls.Add(buttonCreateCompany); - panelCompanyTools.Controls.Add(buttonAddBaseStormtrooper); panelCompanyTools.Controls.Add(buttonAddStormtrooper); panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(maskedTextBoxPosition); @@ -92,16 +90,6 @@ buttonCreateCompany.UseVisualStyleBackColor = true; buttonCreateCompany.Click += buttonCreateCompany_Click; // - // buttonAddBaseStormtrooper - // - buttonAddBaseStormtrooper.Location = new Point(3, 90); - buttonAddBaseStormtrooper.Name = "buttonAddBaseStormtrooper"; - buttonAddBaseStormtrooper.Size = new Size(213, 52); - buttonAddBaseStormtrooper.TabIndex = 1; - buttonAddBaseStormtrooper.Text = "Добавление базового бомбардировщика"; - buttonAddBaseStormtrooper.UseVisualStyleBackColor = true; - buttonAddBaseStormtrooper.Click += buttonAddBaseStormtrooper_Click; - // // buttonAddStormtrooper // buttonAddStormtrooper.Location = new Point(3, 32); @@ -110,7 +98,7 @@ buttonAddStormtrooper.TabIndex = 2; buttonAddStormtrooper.Text = "Добавление бомбардировщика"; buttonAddStormtrooper.UseVisualStyleBackColor = true; - buttonAddStormtrooper.Click += buttonAddStormtrooper_Click; + buttonAddStormtrooper.Click += buttonAddBaseStormtrooper_Click; // // buttonRefresh // @@ -279,7 +267,6 @@ private Button buttonRemoveStormtrooper; private MaskedTextBox maskedTextBoxPosition; private Button buttonAddStormtrooper; - private Button buttonAddBaseStormtrooper; private PictureBox pictureBox; private Button buttonRefresh; private Button buttonGoToCheck; diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.cs index d4eaaed..bd14a40 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.cs @@ -33,32 +33,17 @@ public partial class FormStormtrooperCollection : Form { panelCompanyTools.Enabled = true; } - /// - /// Создание объекта класса-перемещения - /// - /// - private void CreateObject(string type) + /// + /// Добавление бомбардировщика в коллекцию + /// + /// + private void SetStormtrooper(DrawningBaseStormtrooper stormtrooper) { - if (_company == null) + if (_company == null || stormtrooper == null) { return; } - Random random = new(); - DrawningBaseStormtrooper drawningBaseStormtrooper; - switch (type) - { - case nameof(DrawningBaseStormtrooper): - drawningBaseStormtrooper = new DrawningBaseStormtrooper(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawingStormtrooper): - drawningBaseStormtrooper = new DrawingStormtrooper(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; - } - int tempSize = StormtrooperSharingService.getAmountOfObjects(); - if (_company + drawningBaseStormtrooper != -1) + if (_company + stormtrooper !=-1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -67,34 +52,20 @@ public partial class FormStormtrooperCollection : 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; + } /// /// Добавление бомбардировщика /// /// /// - private void buttonAddStormtrooper_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingStormtrooper)); - /// - /// Добавление базового бомбардировщика - /// - /// - /// - private void buttonAddBaseStormtrooper_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBaseStormtrooper)); + private void buttonAddBaseStormtrooper_Click(object sender, EventArgs e) { + + FormStormtrooperConfig form = new(); + form.Show(); + // TODO передать метод + form.AddEvent(SetStormtrooper); + } /// /// Удаление объекта /// diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.Designer.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.Designer.cs new file mode 100644 index 0000000..daf1c02 --- /dev/null +++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.Designer.cs @@ -0,0 +1,357 @@ +namespace ProjectStormtrooper +{ + partial class FormStormtrooperConfig + { + /// + /// 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(); + panelGrey = new Panel(); + panelWhite = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxBombs = new CheckBox(); + checkBoxRockets = 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(checkBoxBombs); + groupBoxConfig.Controls.Add(checkBoxRockets); + 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(515, 264); + 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(panelGrey); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(220, 30); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(277, 156); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(212, 90); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(46, 47); + panelPurple.TabIndex = 4; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(212, 22); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(46, 47); + panelYellow.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(144, 90); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(46, 47); + panelBlack.TabIndex = 6; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(144, 22); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(46, 47); + panelBlue.TabIndex = 2; + // + // panelGrey + // + panelGrey.BackColor = Color.Gray; + panelGrey.Location = new Point(79, 90); + panelGrey.Name = "panelGrey"; + panelGrey.Size = new Size(46, 47); + panelGrey.TabIndex = 5; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(16, 90); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(46, 47); + panelWhite.TabIndex = 3; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(79, 22); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(46, 47); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(16, 22); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(46, 47); + panelRed.TabIndex = 0; + // + // checkBoxBombs + // + checkBoxBombs.AutoSize = true; + checkBoxBombs.Location = new Point(27, 179); + checkBoxBombs.Name = "checkBoxBombs"; + checkBoxBombs.Size = new Size(156, 19); + checkBoxBombs.TabIndex = 7; + checkBoxBombs.Text = "Признак наличия бомб"; + checkBoxBombs.UseVisualStyleBackColor = true; + // + // checkBoxRockets + // + checkBoxRockets.AutoSize = true; + checkBoxRockets.Location = new Point(27, 132); + checkBoxRockets.Name = "checkBoxRockets"; + checkBoxRockets.Size = new Size(156, 19); + checkBoxRockets.TabIndex = 6; + checkBoxRockets.Text = "Признак наличия ракет"; + checkBoxRockets.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(74, 60); + 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(27, 62); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(74, 28); + 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(378, 217); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(100, 38); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(245, 217); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(100, 38); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(14, 51); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(171, 144); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(521, 214); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(93, 40); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(636, 216); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(92, 40); + 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(527, 0); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(200, 198); + panelObject.TabIndex = 4; + panelObject.DragDrop += panelObject_DragDrop; + panelObject.DragEnter += panelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(113, 1); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(87, 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(0, 1); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(87, 38); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // FormStormtrooperConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(735, 264); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormStormtrooperConfig"; + 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 numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private CheckBox checkBoxRockets; + private CheckBox checkBoxBombs; + private GroupBox groupBoxColors; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGrey; + 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/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.cs new file mode 100644 index 0000000..8150ddc --- /dev/null +++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.cs @@ -0,0 +1,182 @@ +using ProjectStormtrooper.Drawnings; +using ProjectStormtrooper.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 ProjectStormtrooper; +/// +/// Форма конфигурации объекта +/// +public partial class FormStormtrooperConfig : Form +{ + /// + /// Объект - прорисовка бомбардировщика + /// + private DrawningBaseStormtrooper? _drawningBaseStormtrooper; + private event Action? _stormtrooperDelegate; + /// + /// Событие для передачи объекта + /// + + //private event StormtooperDelegate? _stormtooperDelegate; + + public void AddEvent(Action stormtrooperDelegate) + { + if (_stormtrooperDelegate == null) + { + _stormtrooperDelegate = stormtrooperDelegate; + } + else + { + _stormtrooperDelegate += stormtrooperDelegate; + } + } + + /// + /// Конструктор + /// + public FormStormtrooperConfig() + { + InitializeComponent(); + panelRed.MouseDown += panel_MouseDown; + panelGreen.MouseDown += panel_MouseDown; + panelBlue.MouseDown += panel_MouseDown; + panelYellow.MouseDown += panel_MouseDown; + panelBlack.MouseDown += panel_MouseDown; + panelPurple.MouseDown += panel_MouseDown; + panelWhite.MouseDown += panel_MouseDown; + panelGrey.MouseDown += panel_MouseDown; + //TODO buttonCancel.Click with lambda с закрытием формы + buttonCancel.Click += (sender, e) => Close(); + + } + /// + /// Привязка внешнего метода к событию + /// + /// + //public void AddEvent(StormtooperDelegate stormtooperDelegate) + //{ + // _stormtooperDelegate += stormtooperDelegate; + //} + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningBaseStormtrooper?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _drawningBaseStormtrooper?.SetPosition(5, 5); + _drawningBaseStormtrooper?.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": + _drawningBaseStormtrooper = new DrawningBaseStormtrooper((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _drawningBaseStormtrooper = new DrawingStormtrooper((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxBombs.Checked, checkBoxRockets.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); + } + + + + //TODO реализовать логику смены цветов: основного и дополнительного ( для продвинутого объекта) + 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 (_drawningBaseStormtrooper != null) + { + _drawningBaseStormtrooper.EntityBaseStormtrooper.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + private void labelAdditionalColor_DragEnter(object? sender, DragEventArgs e) + { + if (_drawningBaseStormtrooper is DrawingStormtrooper) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void labelAdditionalColor_DragDrop(object? sender, DragEventArgs e) + { + if (_drawningBaseStormtrooper.EntityBaseStormtrooper is EntityStormtrooper stormtrooper) + { + stormtrooper.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + /// + /// Передача объекта + /// + /// + /// + private void buttonAdd_Click(object sender, EventArgs e) + { + if (_drawningBaseStormtrooper != null) + { + _stormtrooperDelegate?.Invoke(_drawningBaseStormtrooper); + Close(); + } + } +} diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.resx b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.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/ProjectStormtrooper/ProjectStormtrooper/StormtooperDelegate.cs b/ProjectStormtrooper/ProjectStormtrooper/StormtooperDelegate.cs new file mode 100644 index 0000000..1dbebcf --- /dev/null +++ b/ProjectStormtrooper/ProjectStormtrooper/StormtooperDelegate.cs @@ -0,0 +1,8 @@ +using ProjectStormtrooper.Drawnings; + +namespace ProjectStormtrooper; +/// +/// Делегат передачи объекта-прорисовки +/// +/// +public delegate void StormtooperDelegate(DrawningBaseStormtrooper stormtrooper); -- 2.25.1 From dbe3954a2154dadaf7db0564390ab4c29245cd54 Mon Sep 17 00:00:00 2001 From: ilyaryabovv Date: Sat, 6 Apr 2024 16:46:28 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=BA=D1=80=D0=B0=D1=81=D0=BE=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectStormtrooper/FormStormtrooperConfig.cs | 15 ++------------- .../ProjectStormtrooper/StormtooperDelegate.cs | 8 -------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 ProjectStormtrooper/ProjectStormtrooper/StormtooperDelegate.cs diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.cs index 8150ddc..e5e4d39 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperConfig.cs @@ -21,12 +21,10 @@ public partial class FormStormtrooperConfig : Form /// private DrawningBaseStormtrooper? _drawningBaseStormtrooper; private event Action? _stormtrooperDelegate; + /// /// Событие для передачи объекта /// - - //private event StormtooperDelegate? _stormtooperDelegate; - public void AddEvent(Action stormtrooperDelegate) { if (_stormtrooperDelegate == null) @@ -57,14 +55,7 @@ public partial class FormStormtrooperConfig : Form buttonCancel.Click += (sender, e) => Close(); } - /// - /// Привязка внешнего метода к событию - /// - /// - //public void AddEvent(StormtooperDelegate stormtooperDelegate) - //{ - // _stormtooperDelegate += stormtooperDelegate; - //} + /// /// Прорисовка объекта /// @@ -120,8 +111,6 @@ public partial class FormStormtrooperConfig : Form (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); } - - //TODO реализовать логику смены цветов: основного и дополнительного ( для продвинутого объекта) private void labelBodyColor_DragEnter(object? sender, DragEventArgs e) { diff --git a/ProjectStormtrooper/ProjectStormtrooper/StormtooperDelegate.cs b/ProjectStormtrooper/ProjectStormtrooper/StormtooperDelegate.cs deleted file mode 100644 index 1dbebcf..0000000 --- a/ProjectStormtrooper/ProjectStormtrooper/StormtooperDelegate.cs +++ /dev/null @@ -1,8 +0,0 @@ -using ProjectStormtrooper.Drawnings; - -namespace ProjectStormtrooper; -/// -/// Делегат передачи объекта-прорисовки -/// -/// -public delegate void StormtooperDelegate(DrawningBaseStormtrooper stormtrooper); -- 2.25.1