diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/Entities/EntityAircraftCarrier.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/Entities/EntityAircraftCarrier.cs index 5df894c..67852b2 100644 --- a/ProjectAircraftCarrier/ProjectAircraftCarrier/Entities/EntityAircraftCarrier.cs +++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/Entities/EntityAircraftCarrier.cs @@ -10,6 +10,11 @@ public class EntityAircraftCarrier : EntityWarship /// public Color AdditionalColor { get; private set; } + public void setAdditionalColor(Color color) + { + AdditionalColor = color; + } + /// /// Признак (опция) наличие взлётно-посадочной полосы /// diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/Entities/EntityWarship.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/Entities/EntityWarship.cs index b3cc1d4..db1da5b 100644 --- a/ProjectAircraftCarrier/ProjectAircraftCarrier/Entities/EntityWarship.cs +++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/Entities/EntityWarship.cs @@ -20,6 +20,11 @@ public class EntityWarship /// public Color BodyColor { get; private set; } + public void setBodyColor(Color color) + { + BodyColor = color; + } + /// /// Шаг перемещения авианосца /// diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipCollection.Designer.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipCollection.Designer.cs index 1615060..fa1b215 100644 --- a/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipCollection.Designer.cs +++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddWarship = new Button(); + maskedTextBox = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonRemoveWarship = 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(); - buttonRemoveWarship = new Button(); - maskedTextBox = new MaskedTextBox(); - buttonAddAircraftCarrier = new Button(); - buttonAddWarship = 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,73 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddWarship); + panelCompanyTools.Controls.Add(maskedTextBox); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonRemoveWarship); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 428); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(199, 328); + panelCompanyTools.TabIndex = 9; + // + // buttonAddWarship + // + buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddWarship.Location = new Point(3, 3); + buttonAddWarship.Name = "buttonAddWarship"; + buttonAddWarship.Size = new Size(193, 52); + buttonAddWarship.TabIndex = 1; + buttonAddWarship.Text = "Добавление\r\nвоенного корабля"; + buttonAddWarship.UseVisualStyleBackColor = true; + buttonAddWarship.Click += ButtonAddWarship_Click; + // + // maskedTextBox + // + maskedTextBox.Location = new Point(3, 119); + maskedTextBox.Mask = "00"; + maskedTextBox.Name = "maskedTextBox"; + maskedTextBox.Size = new Size(193, 27); + maskedTextBox.TabIndex = 3; + maskedTextBox.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(3, 268); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(193, 52); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonRemoveWarship + // + buttonRemoveWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveWarship.Location = new Point(3, 152); + buttonRemoveWarship.Name = "buttonRemoveWarship"; + buttonRemoveWarship.Size = new Size(193, 52); + buttonRemoveWarship.TabIndex = 4; + buttonRemoveWarship.Text = "Удалить \r\nвоенный корабль"; + buttonRemoveWarship.UseVisualStyleBackColor = true; + buttonRemoveWarship.Click += ButtonRemoveWarship_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(3, 210); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(193, 52); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(6, 369); @@ -159,70 +225,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 268); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(193, 52); - 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(3, 210); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(193, 52); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveWarship - // - buttonRemoveWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveWarship.Location = new Point(3, 152); - buttonRemoveWarship.Name = "buttonRemoveWarship"; - buttonRemoveWarship.Size = new Size(193, 52); - buttonRemoveWarship.TabIndex = 4; - buttonRemoveWarship.Text = "Удалить \r\nвоенный корабль"; - buttonRemoveWarship.UseVisualStyleBackColor = true; - buttonRemoveWarship.Click += ButtonRemoveWarship_Click; - // - // maskedTextBox - // - maskedTextBox.Location = new Point(3, 119); - maskedTextBox.Mask = "00"; - maskedTextBox.Name = "maskedTextBox"; - maskedTextBox.Size = new Size(193, 27); - maskedTextBox.TabIndex = 3; - maskedTextBox.ValidatingType = typeof(int); - // - // buttonAddAircraftCarrier - // - buttonAddAircraftCarrier.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddAircraftCarrier.Location = new Point(3, 61); - buttonAddAircraftCarrier.Name = "buttonAddAircraftCarrier"; - buttonAddAircraftCarrier.Size = new Size(193, 52); - buttonAddAircraftCarrier.TabIndex = 2; - buttonAddAircraftCarrier.Text = "Добавление\r\nавианосца"; - buttonAddAircraftCarrier.UseVisualStyleBackColor = true; - buttonAddAircraftCarrier.Click += ButtonAddAircraftCarrier_Click; - // - // buttonAddWarship - // - buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddWarship.Location = new Point(3, 3); - buttonAddWarship.Name = "buttonAddWarship"; - buttonAddWarship.Size = new Size(193, 52); - buttonAddWarship.TabIndex = 1; - buttonAddWarship.Text = "Добавление\r\nвоенного корабля"; - buttonAddWarship.UseVisualStyleBackColor = true; - buttonAddWarship.Click += ButtonAddWarship_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -244,21 +246,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddWarship); - panelCompanyTools.Controls.Add(buttonAddAircraftCarrier); - panelCompanyTools.Controls.Add(maskedTextBox); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonRemoveWarship); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 428); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(199, 328); - panelCompanyTools.TabIndex = 9; - // // FormWarshipCollection // AutoScaleDimensions = new SizeF(8F, 20F); @@ -269,11 +256,11 @@ Name = "FormWarshipCollection"; 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); } @@ -283,7 +270,6 @@ private ComboBox comboBoxSelectorCompany; private Button buttonAddWarship; private MaskedTextBox maskedTextBox; - private Button buttonAddAircraftCarrier; private PictureBox pictureBox; private Button buttonRemoveWarship; private Button buttonRefresh; diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipCollection.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipCollection.cs index f2e0c3b..993bfa1 100644 --- a/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipCollection.cs +++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipCollection.cs @@ -43,34 +43,21 @@ public partial class FormWarshipCollection : Form panelCompanyTools.Enabled = false; } - /// - /// Создание объекта класса-перемещение - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + private void ButtonAddWarship_Click(object sender, EventArgs e) { - if (_company == null) + FormWarshipConfig form = new(); + // TODO передать метод + form.Show(); + form.AddEvent(SetWarship); + } + + private void SetWarship(DrawningWarship? warship) + { + if (_company == null || warship == null) { return; } - - Random random = new(); - DrawningWarship drawningWarship; - switch (type) - { - case nameof(DrawningWarship): - drawningWarship = new DrawningWarship(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningAircraftCarrier): - drawningWarship = new DrawningAircraftCarrier(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 + drawningWarship != -1) + if (_company + warship != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -81,22 +68,6 @@ public partial class FormWarshipCollection : Form } } - private static Color GetColor(Random random) - { - Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)); - ColorDialog dialog = new(); - if (dialog.ShowDialog() == DialogResult.OK) - { - color = dialog.Color; - } - - return color; - } - - private void ButtonAddWarship_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningWarship)); - - private void ButtonAddAircraftCarrier_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAircraftCarrier)); - private void ButtonRemoveWarship_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null) diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipConfig.Designer.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipConfig.Designer.cs new file mode 100644 index 0000000..c06eaa4 --- /dev/null +++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipConfig.Designer.cs @@ -0,0 +1,357 @@ +namespace ProjectAircraftCarrier +{ + 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(); + panelYellow = new Panel(); + panelBlack = new Panel(); + panelBlue = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxControlRoom = new CheckBox(); + checkBoxAircraftDeck = 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(checkBoxControlRoom); + groupBoxConfig.Controls.Add(checkBoxAircraftDeck); + 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(686, 215); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(386, 20); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(271, 134); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(212, 77); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(40, 40); + panelPurple.TabIndex = 3; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(212, 26); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(40, 40); + panelYellow.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(148, 77); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(40, 40); + panelBlack.TabIndex = 4; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(148, 26); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(40, 40); + panelBlue.TabIndex = 1; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(84, 77); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(40, 40); + panelGray.TabIndex = 5; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(20, 77); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(40, 40); + panelWhite.TabIndex = 2; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(84, 26); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(40, 40); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(20, 26); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(40, 40); + panelRed.TabIndex = 0; + // + // checkBoxControlRoom + // + checkBoxControlRoom.AutoSize = true; + checkBoxControlRoom.Location = new Point(6, 130); + checkBoxControlRoom.Name = "checkBoxControlRoom"; + checkBoxControlRoom.Size = new Size(286, 24); + checkBoxControlRoom.TabIndex = 7; + checkBoxControlRoom.Text = "Признак наличия рубки управления"; + checkBoxControlRoom.UseVisualStyleBackColor = true; + // + // checkBoxAircraftDeck + // + checkBoxAircraftDeck.AutoSize = true; + checkBoxAircraftDeck.Location = new Point(6, 172); + checkBoxAircraftDeck.Name = "checkBoxAircraftDeck"; + checkBoxAircraftDeck.Size = new Size(361, 24); + checkBoxAircraftDeck.TabIndex = 6; + checkBoxAircraftDeck.Text = "Признак наличия взлётно-посадочной полосы"; + checkBoxAircraftDeck.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(122, 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, 39); + 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(122, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 41); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(538, 162); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(119, 43); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(386, 162); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(119, 43); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(48, 65); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(154, 102); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(703, 176); + 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(814, 176); + 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(683, 0); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(239, 170); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(131, 9); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(94, 43); + 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(20, 9); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(94, 43); + 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(923, 215); + 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 NumericUpDown numericUpDownWeight; + private CheckBox checkBoxAircraftDeck; + private CheckBox checkBoxControlRoom; + 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/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipConfig.cs b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipConfig.cs new file mode 100644 index 0000000..c60c9b8 --- /dev/null +++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipConfig.cs @@ -0,0 +1,152 @@ +using ProjectAircraftCarrier.Drawnings; +using ProjectAircraftCarrier.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 ProjectAircraftCarrier; + +public partial class FormWarshipConfig : Form +{ + private DrawningWarship? _warship = null; + + 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; + // TODO 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; + } + + 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 DrawningWarship((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _warship = new DrawningAircraftCarrier((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, + Color.White, Color.Black, checkBoxAircraftDeck.Checked, checkBoxControlRoom.Checked); + break; + } + labelBodyColor.BackColor = Color.Empty; + labelAdditionalColor.BackColor = Color.Empty; + 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 (_warship != null) + { + _warship.EntityWarship.setBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_warship is DrawningAircraftCarrier) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_warship.EntityWarship is EntityAircraftCarrier _aircraftcarrier) + { + _aircraftcarrier.setAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_warship != null) + { + WarshipDelegate?.Invoke(_warship); + Close(); + } + } +} diff --git a/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipConfig.resx b/ProjectAircraftCarrier/ProjectAircraftCarrier/FormWarshipConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectAircraftCarrier/ProjectAircraftCarrier/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