diff --git a/ProjectStormtrooper/Entities/EntityStormtrooper.cs b/ProjectStormtrooper/Entities/EntityStormtrooper.cs index 003f8cf..dc19cc3 100644 --- a/ProjectStormtrooper/Entities/EntityStormtrooper.cs +++ b/ProjectStormtrooper/Entities/EntityStormtrooper.cs @@ -7,6 +7,10 @@ public class EntityStormtrooper: EntityStormtrooperBase { public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color additionalColor) + { + AdditionalColor = additionalColor; + } /// /// Признак (опция) наличия ракет diff --git a/ProjectStormtrooper/Entities/EntityStormtrooperBase.cs b/ProjectStormtrooper/Entities/EntityStormtrooperBase.cs index 2487091..df4cc3e 100644 --- a/ProjectStormtrooper/Entities/EntityStormtrooperBase.cs +++ b/ProjectStormtrooper/Entities/EntityStormtrooperBase.cs @@ -20,6 +20,10 @@ public class EntityStormtrooperBase /// /// public Color BodyColor { get; private set; } + public void SetBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } // /// Шаг перемещения штурмовика /// diff --git a/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs b/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs index 8537139..2a8d3b1 100644 --- a/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs +++ b/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddStormtrooperBase = new Button(); + maskedTextBox = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonRemoveStormtrooper = new Button(); + buttonGoToCheck = new Button(); buttonCreateCompany = new Button(); panelStorage = new Panel(); buttonCollectionDel = new Button(); @@ -38,19 +44,12 @@ radioButtonMassive = new RadioButton(); textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); - buttonRefresh = new Button(); - buttonGoToCheck = new Button(); - buttonRemoveStormtrooper = new Button(); - maskedTextBox = new MaskedTextBox(); - buttonAddStormtrooper = new Button(); - buttonAddStormtrooperBase = new Button(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); - panelCompanyTools = new Panel(); groupBoxTools.SuspendLayout(); + panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); - panelCompanyTools.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -67,6 +66,72 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddStormtrooperBase); + panelCompanyTools.Controls.Add(maskedTextBox); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonRemoveStormtrooper); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(6, 361); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(161, 261); + panelCompanyTools.TabIndex = 7; + // + // buttonAddStormtrooperBase + // + buttonAddStormtrooperBase.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddStormtrooperBase.Location = new Point(6, 3); + buttonAddStormtrooperBase.Name = "buttonAddStormtrooperBase"; + buttonAddStormtrooperBase.Size = new Size(154, 39); + buttonAddStormtrooperBase.TabIndex = 1; + buttonAddStormtrooperBase.Text = "Добавление базового Штурмовика"; + buttonAddStormtrooperBase.UseVisualStyleBackColor = true; + buttonAddStormtrooperBase.Click += ButtonAddStormtrooperBase_Click; + // + // maskedTextBox + // + maskedTextBox.Location = new Point(8, 99); + maskedTextBox.Mask = "00"; + maskedTextBox.Name = "maskedTextBox"; + maskedTextBox.Size = new Size(153, 23); + maskedTextBox.TabIndex = 3; + maskedTextBox.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(7, 209); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(155, 32); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonRemoveStormtrooper + // + buttonRemoveStormtrooper.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveStormtrooper.Location = new Point(6, 128); + buttonRemoveStormtrooper.Name = "buttonRemoveStormtrooper"; + buttonRemoveStormtrooper.Size = new Size(166, 33); + buttonRemoveStormtrooper.TabIndex = 4; + buttonRemoveStormtrooper.Text = "Удалить Штурмовик"; + buttonRemoveStormtrooper.UseVisualStyleBackColor = true; + buttonRemoveStormtrooper.Click += ButtonRemoveStormtrooper_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(7, 167); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(166, 36); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(14, 332); @@ -159,71 +224,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(7, 209); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(155, 32); - buttonRefresh.TabIndex = 6; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += ButtonRefresh_Click; - // - // buttonGoToCheck - // - buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(7, 167); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(166, 36); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveStormtrooper - // - buttonRemoveStormtrooper.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveStormtrooper.Location = new Point(6, 128); - buttonRemoveStormtrooper.Name = "buttonRemoveStormtrooper"; - buttonRemoveStormtrooper.Size = new Size(166, 33); - buttonRemoveStormtrooper.TabIndex = 4; - buttonRemoveStormtrooper.Text = "Удалить Штурмовик"; - buttonRemoveStormtrooper.UseVisualStyleBackColor = true; - buttonRemoveStormtrooper.Click += ButtonRemoveStormtrooper_Click; - // - // maskedTextBox - // - maskedTextBox.Location = new Point(8, 99); - maskedTextBox.Mask = "00"; - maskedTextBox.Name = "maskedTextBox"; - maskedTextBox.Size = new Size(153, 23); - maskedTextBox.TabIndex = 3; - maskedTextBox.ValidatingType = typeof(int); - - // - // buttonAddStormtrooper - // - buttonAddStormtrooper.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddStormtrooper.Location = new Point(7, 48); - buttonAddStormtrooper.Name = "buttonAddStormtrooper"; - buttonAddStormtrooper.Size = new Size(155, 45); - buttonAddStormtrooper.TabIndex = 2; - buttonAddStormtrooper.Text = "Добавление Штурмовика"; - buttonAddStormtrooper.UseVisualStyleBackColor = true; - buttonAddStormtrooper.Click += ButtonAddStormtrooper_Click; - // - // buttonAddStormtrooperBase - // - buttonAddStormtrooperBase.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddStormtrooperBase.Location = new Point(6, 3); - buttonAddStormtrooperBase.Name = "buttonAddStormtrooperBase"; - buttonAddStormtrooperBase.Size = new Size(154, 39); - buttonAddStormtrooperBase.TabIndex = 1; - buttonAddStormtrooperBase.Text = "Добавление базового Штурмовика"; - buttonAddStormtrooperBase.UseVisualStyleBackColor = true; - buttonAddStormtrooperBase.Click += ButtonAddStormtrooperBase_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -245,20 +245,6 @@ pictureBox.TabIndex = 3; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddStormtrooperBase); - panelCompanyTools.Controls.Add(buttonAddStormtrooper); - panelCompanyTools.Controls.Add(maskedTextBox); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonRemoveStormtrooper); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(6, 361); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(161, 261); - panelCompanyTools.TabIndex = 7; - // // FormStormtrooperCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -269,11 +255,11 @@ Name = "FormStormtrooperCollection"; Text = "Коллекция штурмовиков"; groupBoxTools.ResumeLayout(false); + panelCompanyTools.ResumeLayout(false); + panelCompanyTools.PerformLayout(); panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); - panelCompanyTools.ResumeLayout(false); - panelCompanyTools.PerformLayout(); ResumeLayout(false); } @@ -282,7 +268,6 @@ private GroupBox groupBoxTools; private Button buttonAddStormtrooperBase; private ComboBox comboBoxSelectorCompany; - private Button buttonAddStormtrooper; private PictureBox pictureBox; private Button buttonRemoveStormtrooper; private MaskedTextBox maskedTextBox; diff --git a/ProjectStormtrooper/FormStormtrooperCollection.cs b/ProjectStormtrooper/FormStormtrooperCollection.cs index cea0b4c..0a28287 100644 --- a/ProjectStormtrooper/FormStormtrooperCollection.cs +++ b/ProjectStormtrooper/FormStormtrooperCollection.cs @@ -24,7 +24,7 @@ public partial class FormStormtrooperCollection : Form /// /// Компания /// - private AbstractCompany? _company = null; + private AbstractCompany? _company; /// /// Конструктор /// @@ -44,34 +44,31 @@ public partial class FormStormtrooperCollection : Form { panelCompanyTools.Enabled = true; } + + /// - /// Создание объекта класса-перемещения + /// Добавление базового штурмовика /// - /// - private void CreateObject(string type) + /// + /// + private void ButtonAddStormtrooperBase_Click(object sender, EventArgs e) { - if (_company == null) + FormStormtrooperConfig form = new(); + form.Show(); + // TODO передать метод + form.AddEvent(SetStormtrooper); + } + /// + /// Добавление штурмовика в коллекцию + /// + /// + private void SetStormtrooper(DrawningStormtrooperBase stormtrooper) + { + if (_company == null || stormtrooper == null) { return; } - Random random = new(); - DrawningStormtrooperBase drawningStormtrooperBase; - switch (type) - { - case nameof(DrawingStormtrooper): - drawningStormtrooperBase = 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; - case nameof(DrawningStormtrooperBase): - drawningStormtrooperBase = new DrawningStormtrooperBase(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - default: - return; - - } - if (_company + drawningStormtrooperBase != -1) + if (_company + stormtrooper != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -81,36 +78,7 @@ 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 ButtonAddStormtrooperBase_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningStormtrooperBase)); - /// - /// Добавление штурмовика - /// - /// - /// - private void ButtonAddStormtrooper_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingStormtrooper)); /// /// Удаление объекта /// @@ -278,5 +246,5 @@ public partial class FormStormtrooperCollection : Form } - + } diff --git a/ProjectStormtrooper/FormStormtrooperConfig.Designer.cs b/ProjectStormtrooper/FormStormtrooperConfig.Designer.cs new file mode 100644 index 0000000..3ddd2ee --- /dev/null +++ b/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(); + panelBlack = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelVellow = new Panel(); + panelBlue = 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(497, 270); + 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(panelVellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(209, 22); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(225, 100); + groupBoxColors.TabIndex = 9; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(175, 64); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(33, 30); + panelPurple.TabIndex = 7; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(116, 64); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(33, 30); + panelBlack.TabIndex = 6; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(60, 64); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(33, 30); + panelGray.TabIndex = 5; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(6, 64); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(33, 30); + panelWhite.TabIndex = 4; + // + // panelVellow + // + panelVellow.BackColor = Color.Yellow; + panelVellow.Location = new Point(175, 25); + panelVellow.Name = "panelVellow"; + panelVellow.Size = new Size(33, 30); + panelVellow.TabIndex = 3; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(116, 25); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(33, 30); + panelBlue.TabIndex = 2; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(60, 25); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(33, 30); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(6, 25); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(33, 30); + panelRed.TabIndex = 0; + // + // checkBoxBombs + // + checkBoxBombs.AutoSize = true; + checkBoxBombs.Location = new Point(12, 125); + checkBoxBombs.Name = "checkBoxBombs"; + checkBoxBombs.Size = new Size(159, 19); + checkBoxBombs.TabIndex = 8; + checkBoxBombs.Text = "Признак наличия бомб"; + checkBoxBombs.UseVisualStyleBackColor = true; + // + // checkBoxRockets + // + checkBoxRockets.AutoSize = true; + checkBoxRockets.Location = new Point(12, 100); + checkBoxRockets.Name = "checkBoxRockets"; + checkBoxRockets.Size = new Size(159, 19); + checkBoxRockets.TabIndex = 7; + checkBoxRockets.Text = "Признак наличия ракет"; + checkBoxRockets.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(80, 59); + 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(107, 23); + numericUpDownWeight.TabIndex = 6; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 59); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 5; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(80, 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(107, 23); + numericUpDownSpeed.TabIndex = 4; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 30); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(62, 15); + labelSpeed.TabIndex = 3; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(334, 130); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(100, 40); + labelModifiedObject.TabIndex = 2; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(209, 130); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(100, 40); + labelSimpleObject.TabIndex = 1; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(9, 47); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(185, 170); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(512, 235); + 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(622, 235); + 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(503, 0); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(205, 229); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(102, 5); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(92, 29); + 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(9, 5); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(89, 29); + 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(709, 270); + 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 labelSimpleObject; + private Label labelModifiedObject; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxRockets; + private CheckBox checkBoxBombs; + private GroupBox groupBoxColors; + private Panel panelRed; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private Panel panelVellow; + private Panel panelBlue; + private Panel panelGreen; + 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/FormStormtrooperConfig.cs b/ProjectStormtrooper/FormStormtrooperConfig.cs new file mode 100644 index 0000000..797eed2 --- /dev/null +++ b/ProjectStormtrooper/FormStormtrooperConfig.cs @@ -0,0 +1,178 @@ +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 DrawningStormtrooperBase? _drawningStormtrooperBase; + private event Action? _stormtrooperDelegate; + + /// + /// Привязка внешнего метода к событию + /// + /// + 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; + panelVellow.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelGray.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + //TODO buttonCancel.Click with lambda с закрытием формы + buttonCancel.Click += (object sender, EventArgs e) => Close(); + + } + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningStormtrooperBase?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _drawningStormtrooperBase?.SetPosition(5, 5); + _drawningStormtrooperBase?.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": + _drawningStormtrooperBase = new DrawningStormtrooperBase((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _drawningStormtrooperBase = new DrawingStormtrooper((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxBombs.Checked, checkBoxRockets.Checked); + break; + } + DrawObject(); + + } + /// + /// Передаем информацию при нажатии Panel_MouseDown + /// + /// + /// + 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 (_drawningStormtrooperBase != null) + { + _drawningStormtrooperBase.EntityStormtrooperBase.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_drawningStormtrooperBase 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 (_drawningStormtrooperBase.EntityStormtrooperBase is EntityStormtrooper stormtrooper) + { + stormtrooper.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + + } + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_drawningStormtrooperBase != null) + { + _stormtrooperDelegate?.Invoke(_drawningStormtrooperBase); + Close(); + } + } +} diff --git a/ProjectStormtrooper/FormStormtrooperConfig.resx b/ProjectStormtrooper/FormStormtrooperConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/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