From a37d99446f2fcdbd52dfabc29392103910eba1fc Mon Sep 17 00:00:00 2001 From: Anastasia-Sin Date: Wed, 17 Apr 2024 23:37:09 +0400 Subject: [PATCH] =?UTF-8?q?5=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectCruiser/CruiserDelegate.cs | 10 + ProjectCruiser/Entities/EntityCruiser.cs | 7 + .../Entities/EntityMilitaryCruiser.cs | 7 + ProjectCruiser/FormCruiserConfing.Designer.cs | 370 ++++++++++++++++++ ProjectCruiser/FormCruiserConfing.cs | 177 +++++++++ ProjectCruiser/FormCruiserConfing.resx | 120 ++++++ .../FormCruisersCollection.Designer.cs | 14 - ProjectCruiser/FormCruisersCollection.cs | 72 +--- 8 files changed, 712 insertions(+), 65 deletions(-) create mode 100644 ProjectCruiser/CruiserDelegate.cs create mode 100644 ProjectCruiser/FormCruiserConfing.Designer.cs create mode 100644 ProjectCruiser/FormCruiserConfing.cs create mode 100644 ProjectCruiser/FormCruiserConfing.resx diff --git a/ProjectCruiser/CruiserDelegate.cs b/ProjectCruiser/CruiserDelegate.cs new file mode 100644 index 0000000..bf1a09d --- /dev/null +++ b/ProjectCruiser/CruiserDelegate.cs @@ -0,0 +1,10 @@ +using ProjectCruiser.Drawnings; + +namespace ProjectCruiser; + +/// +/// Делегат передачи объекта класса-прорисвоки +/// +/// +public delegate void CruiserDelegate(DrawningCruiser cruiser); + diff --git a/ProjectCruiser/Entities/EntityCruiser.cs b/ProjectCruiser/Entities/EntityCruiser.cs index d7e81bc..78de7d3 100644 --- a/ProjectCruiser/Entities/EntityCruiser.cs +++ b/ProjectCruiser/Entities/EntityCruiser.cs @@ -10,19 +10,26 @@ public class EntityCruiser /// Скорость /// public int Speed { get; private set; } + /// /// Вес /// public double Weight { get; private set; } + /// /// Основной цвет /// public Color BodyColor { get; private set; } + public void setBodyColor(Color color) + { + BodyColor = color; + } /// /// Шаг перемещения автомобиля /// public double Step => Speed * 100 / Weight; + /// /// Инициализация полей объекта-класса крейсера /// diff --git a/ProjectCruiser/Entities/EntityMilitaryCruiser.cs b/ProjectCruiser/Entities/EntityMilitaryCruiser.cs index 46925ff..40dcab0 100644 --- a/ProjectCruiser/Entities/EntityMilitaryCruiser.cs +++ b/ProjectCruiser/Entities/EntityMilitaryCruiser.cs @@ -6,18 +6,25 @@ /// Признак (опция) наличие вертолетной площадки /// public bool HelicopterArea { get; private set; } + /// /// Признак (опция) наличие шлюпок /// public bool Boat { get; private set; } + /// /// Признак (опция) наличие пушки /// public bool Weapon { get; private set; } + /// /// Дополнительный цвет (для опциональных элементов) /// public Color AdditionalColor { get; private set; } + public void setAdditionalColor(Color color) + { + AdditionalColor = color; + } public EntityMilitaryCruiser(int speed, double weight, Color bodyColor, Color additionalColor, bool helicopterArea, bool boat, bool weapon) : base(speed, weight, bodyColor) { diff --git a/ProjectCruiser/FormCruiserConfing.Designer.cs b/ProjectCruiser/FormCruiserConfing.Designer.cs new file mode 100644 index 0000000..aee4338 --- /dev/null +++ b/ProjectCruiser/FormCruiserConfing.Designer.cs @@ -0,0 +1,370 @@ +namespace ProjectCruiser +{ + partial class FormCruiserConfing + { + /// + /// 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() + { + groupBoxConfing = 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(); + checkBoxWeapon = new CheckBox(); + checkBoxBoat = new CheckBox(); + checkBoxHelicopterArea = 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(); + groupBoxConfing.SuspendLayout(); + groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + panelObject.SuspendLayout(); + SuspendLayout(); + // + // groupBoxConfing + // + groupBoxConfing.Controls.Add(groupBoxColors); + groupBoxConfing.Controls.Add(checkBoxWeapon); + groupBoxConfing.Controls.Add(checkBoxBoat); + groupBoxConfing.Controls.Add(checkBoxHelicopterArea); + groupBoxConfing.Controls.Add(numericUpDownWeight); + groupBoxConfing.Controls.Add(labelWeight); + groupBoxConfing.Controls.Add(numericUpDownSpeed); + groupBoxConfing.Controls.Add(labelSpeed); + groupBoxConfing.Controls.Add(labelModifiedObject); + groupBoxConfing.Controls.Add(labelSimpleObject); + groupBoxConfing.Dock = DockStyle.Left; + groupBoxConfing.Location = new Point(0, 0); + groupBoxConfing.Name = "groupBoxConfing"; + groupBoxConfing.Size = new Size(626, 262); + groupBoxConfing.TabIndex = 0; + groupBoxConfing.TabStop = false; + groupBoxConfing.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(327, 26); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(280, 154); + groupBoxColors.TabIndex = 9; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(217, 96); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(48, 47); + panelPurple.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(149, 96); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(48, 47); + panelBlack.TabIndex = 1; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(82, 96); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(48, 47); + panelGray.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(17, 96); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(48, 47); + panelWhite.TabIndex = 1; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(217, 31); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(48, 47); + panelYellow.TabIndex = 1; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(149, 31); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(48, 47); + panelBlue.TabIndex = 1; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(82, 31); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(48, 47); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(17, 31); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(48, 47); + panelRed.TabIndex = 0; + // + // checkBoxWeapon + // + checkBoxWeapon.AutoSize = true; + checkBoxWeapon.Location = new Point(6, 217); + checkBoxWeapon.Name = "checkBoxWeapon"; + checkBoxWeapon.Size = new Size(202, 24); + checkBoxWeapon.TabIndex = 8; + checkBoxWeapon.Text = "Признак наличие пушки"; + checkBoxWeapon.UseVisualStyleBackColor = true; + // + // checkBoxBoat + // + checkBoxBoat.AutoSize = true; + checkBoxBoat.Location = new Point(6, 169); + checkBoxBoat.Name = "checkBoxBoat"; + checkBoxBoat.Size = new Size(215, 24); + checkBoxBoat.TabIndex = 7; + checkBoxBoat.Text = "Признак наличие шлюпок"; + checkBoxBoat.UseVisualStyleBackColor = true; + // + // checkBoxHelicopterArea + // + checkBoxHelicopterArea.AutoSize = true; + checkBoxHelicopterArea.Location = new Point(6, 123); + checkBoxHelicopterArea.Name = "checkBoxHelicopterArea"; + checkBoxHelicopterArea.Size = new Size(321, 24); + checkBoxHelicopterArea.TabIndex = 6; + checkBoxHelicopterArea.Text = "Признак наличие вертолетной площадки"; + checkBoxHelicopterArea.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(94, 68); + 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(114, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(27, 70); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(36, 20); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(94, 32); + numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownSpeed.Name = "numericUpDownSpeed"; + numericUpDownSpeed.Size = new Size(114, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 32); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(476, 203); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(131, 44); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(327, 203); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(130, 44); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(11, 56); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(183, 125); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(632, 212); + 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(740, 212); + 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(632, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(205, 194); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(108, 11); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(83, 36); + 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(11, 11); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(83, 36); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // FormCruiserConfing + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(838, 262); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfing); + Name = "FormCruiserConfing"; + Text = "Создание объекта"; + groupBoxConfing.ResumeLayout(false); + groupBoxConfing.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 groupBoxConfing; + private Label labelSimpleObject; + private Label labelModifiedObject; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxHelicopterArea; + private CheckBox checkBoxBoat; + private CheckBox checkBoxWeapon; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelBodyColor; + private Label labelAdditionalColor; + } +} \ No newline at end of file diff --git a/ProjectCruiser/FormCruiserConfing.cs b/ProjectCruiser/FormCruiserConfing.cs new file mode 100644 index 0000000..b9324ba --- /dev/null +++ b/ProjectCruiser/FormCruiserConfing.cs @@ -0,0 +1,177 @@ +using ProjectCruiser.Drawnings; +using ProjectCruiser.Entities; + +namespace ProjectCruiser +{ + /// + /// Форма конфигурации объекта + /// + public partial class FormCruiserConfing : Form + { + /// + /// Объект - прорисовка крейсера + /// + private DrawningCruiser _cruiser; + + /// + /// Событие для передачи объекта + /// + private event Action? CruiserDelegate; + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action cruiserDelegate) + { + CruiserDelegate += cruiserDelegate; + } + + /// + /// Конструктор + /// + public FormCruiserConfing() + { + 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 with lambda с закрытием формы + buttonCancel.Click += (sender, e) => Close(); + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _cruiser?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _cruiser?.SetPosition(15, 15); + _cruiser?.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": + _cruiser = new DrawningCruiser((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _cruiser = new + DrawningMilitaryCruiser((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxHelicopterArea.Checked, checkBoxBoat.Checked, checkBoxWeapon.Checked); + break; + } + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + 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 (_cruiser != null) + { + _cruiser.EntityCruiser.setBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_cruiser is DrawningCruiser) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_cruiser.EntityCruiser is EntityMilitaryCruiser militaryCruiser) + { + militaryCruiser.setAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + /// + /// Передача объекта + /// + /// + /// + private void buttonAdd_Click(object sender, EventArgs e) + { + if (_cruiser != null) + { + CruiserDelegate?.Invoke(_cruiser); + Close(); + } + + } + } +} diff --git a/ProjectCruiser/FormCruiserConfing.resx b/ProjectCruiser/FormCruiserConfing.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectCruiser/FormCruiserConfing.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/ProjectCruiser/FormCruisersCollection.Designer.cs b/ProjectCruiser/FormCruisersCollection.Designer.cs index d4100d4..46a6359 100644 --- a/ProjectCruiser/FormCruisersCollection.Designer.cs +++ b/ProjectCruiser/FormCruisersCollection.Designer.cs @@ -41,7 +41,6 @@ comboBoxSelectorCompany = new ComboBox(); panelCompanyTools = new Panel(); ButtonAddCruiser = new Button(); - ButtonAddMilitaryCruiser = new Button(); buttonRefresh = new Button(); ButtonRemoveCruiser = new Button(); maskedTextBoxPosision = new MaskedTextBox(); @@ -173,7 +172,6 @@ // panelCompanyTools // panelCompanyTools.Controls.Add(ButtonAddCruiser); - panelCompanyTools.Controls.Add(ButtonAddMilitaryCruiser); panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(ButtonRemoveCruiser); panelCompanyTools.Controls.Add(maskedTextBoxPosision); @@ -196,17 +194,6 @@ ButtonAddCruiser.UseVisualStyleBackColor = true; ButtonAddCruiser.Click += ButtonAddCruiser_Click; // - // ButtonAddMilitaryCruiser - // - ButtonAddMilitaryCruiser.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - ButtonAddMilitaryCruiser.Location = new Point(18, 49); - ButtonAddMilitaryCruiser.Name = "ButtonAddMilitaryCruiser"; - ButtonAddMilitaryCruiser.Size = new Size(186, 51); - ButtonAddMilitaryCruiser.TabIndex = 2; - ButtonAddMilitaryCruiser.Text = "добваление военного крейсера"; - ButtonAddMilitaryCruiser.UseVisualStyleBackColor = true; - ButtonAddMilitaryCruiser.Click += ButtonAddMilitaryCruiser_Click; - // // buttonRefresh // buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; @@ -280,7 +267,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; - private Button ButtonAddMilitaryCruiser; private Button ButtonAddCruiser; private Button ButtonRemoveCruiser; private Button buttonRefresh; diff --git a/ProjectCruiser/FormCruisersCollection.cs b/ProjectCruiser/FormCruisersCollection.cs index 726ccc5..9ca0c21 100644 --- a/ProjectCruiser/FormCruisersCollection.cs +++ b/ProjectCruiser/FormCruisersCollection.cs @@ -1,5 +1,6 @@ using ProjectCruiser.CollectionGenericObjects; using ProjectCruiser.Drawnings; +using System.Windows.Forms; namespace ProjectCruiser { @@ -34,33 +35,27 @@ namespace ProjectCruiser panelCompanyTools.Enabled = false; } - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + private void ButtonAddCruiser_Click(object sender, EventArgs e) { - if (_company == null) + FormCruiserConfing form = new(); + // TODO передать метод + + form.Show(); + form.AddEvent(SetCruiser); + } + + /// + /// Добавление крейсера в коллекцию + /// + /// + private void SetCruiser(DrawningCruiser cruiser) + { + if (_company == null || cruiser == null) { return; } - Random random = new(); - DrawningCruiser drawningCruiser; - switch (type) - { - case nameof(DrawningCruiser): - drawningCruiser = new DrawningCruiser(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningMilitaryCruiser): - // TODO вызов диалогового окна для выбора цвета - drawningCruiser = new DrawningMilitaryCruiser(random.Next(100, 300), random.Next(1000, 3000), - GetColor(random), GetColor(random), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - if (_company + drawningCruiser != -1) + + if (_company + cruiser != -1) { MessageBox.Show("Объект добавлен"); pictureBoxCruiser.Image = _company.Show(); @@ -72,35 +67,10 @@ namespace ProjectCruiser } /// - /// Получение цвета + /// Удаление объекта /// - /// Генератор случайных чисел - /// - 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 ButtonAddCruiser_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCruiser)); - - //private void ButtonAddMilitaryCruiser_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryCruiser)); - private void ButtonAddCruiser_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawningCruiser)); - } - - private void ButtonAddMilitaryCruiser_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawningMilitaryCruiser)); - } - + /// + /// private void ButtonRemoveCruiser_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBoxPosision.Text) || _company == null)