diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs index 77ed170..3e87b05 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs @@ -42,4 +42,13 @@ public class EntityAircraftCarrier : EntityWarship ControlCabin = controlCabin; FighterJet = fighterJet; } + + /// + /// Смена дополнительного цвета + /// + /// + public void AdditionalColorChange(Color newColor) + { + AdditionalColor = newColor; + } } \ No newline at end of file diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs index 461a100..23ab4d3 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs @@ -38,4 +38,12 @@ public class EntityWarship BodyColor = bodyColor; } + /// + /// Смена основного цвета + /// + /// + public void BodyColorChange(Color newColor) + { + BodyColor = newColor; + } } diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.Designer.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.Designer.cs index c977f39..84c88c2 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.Designer.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.Designer.cs @@ -30,8 +30,6 @@ { groupBoxTools = new GroupBox(); panelCompanyTools = new Panel(); - buttonAddAircraftCarrier = new Button(); - buttonAddWarship = new Button(); maskedTextBoxPosition = new MaskedTextBox(); buttonRefresh = new Button(); buttonRemoveWarship = new Button(); @@ -47,6 +45,7 @@ labelCollectionName = new Label(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); + buttonAddWarship = new Button(); groupBoxTools.SuspendLayout(); panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); @@ -69,7 +68,6 @@ // // panelCompanyTools // - panelCompanyTools.Controls.Add(buttonAddAircraftCarrier); panelCompanyTools.Controls.Add(buttonAddWarship); panelCompanyTools.Controls.Add(maskedTextBoxPosition); panelCompanyTools.Controls.Add(buttonRefresh); @@ -82,28 +80,6 @@ panelCompanyTools.Size = new Size(320, 429); panelCompanyTools.TabIndex = 9; // - // buttonAddAircraftCarrier - // - buttonAddAircraftCarrier.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddAircraftCarrier.Location = new Point(3, 81); - buttonAddAircraftCarrier.Name = "buttonAddAircraftCarrier"; - buttonAddAircraftCarrier.Size = new Size(314, 72); - buttonAddAircraftCarrier.TabIndex = 2; - buttonAddAircraftCarrier.Text = "Добавление авианосца"; - 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(314, 72); - buttonAddWarship.TabIndex = 1; - buttonAddWarship.Text = "Добавление военного корабля"; - buttonAddWarship.UseVisualStyleBackColor = true; - buttonAddWarship.Click += ButtonAddWarship_Click; - // // maskedTextBoxPosition // maskedTextBoxPosition.Location = new Point(3, 159); @@ -259,6 +235,17 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // + // buttonAddWarship + // + buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddWarship.Location = new Point(3, 3); + buttonAddWarship.Name = "buttonAddWarship"; + buttonAddWarship.Size = new Size(314, 72); + buttonAddWarship.TabIndex = 1; + buttonAddWarship.Text = "Добавление военного корабля"; + buttonAddWarship.UseVisualStyleBackColor = true; + buttonAddWarship.Click += ButtonAddWarship_Click; + // // FormWarshipCollection // AutoScaleDimensions = new SizeF(12F, 30F); @@ -280,9 +267,7 @@ #endregion private GroupBox groupBoxTools; - private Button buttonAddWarship; private ComboBox comboBoxSelectorCompany; - private Button buttonAddAircraftCarrier; private PictureBox pictureBox; private Button buttonRefresh; private Button buttonGoToCheck; @@ -298,5 +283,6 @@ private Button buttonCollectionAdd; private Button buttonCreateCompany; private Panel panelCompanyTools; + private Button buttonAddWarship; } } \ No newline at end of file diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.cs index 7d45fa5..e861476 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.cs @@ -38,32 +38,30 @@ public partial class FormWarshipCollection : Form } /// - /// Создание объекта класса-перемещения + /// Добавление военного корабля /// - /// Тип создаваемого объекта - private void CreateObject(string type) + /// + /// + private void ButtonAddWarship_Click(object sender, EventArgs e) { - if (_company == null) + FormWarshipConfig form = new(); + // TODO передать метод + + form.AddEvent(SetWarship); + form.Show(); + } + + /// + /// Добавление военного корабля в коллекцию + /// + /// + 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)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - - if (_company + drawningWarship != -1) + if (_company + warship != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -74,37 +72,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)); - /// /// Удаление объекта /// diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipConfig.Designer.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipConfig.Designer.cs new file mode 100644 index 0000000..10672d5 --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipConfig.Designer.cs @@ -0,0 +1,378 @@ +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(); + panelBlack = new Panel(); + panelPink = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelBlue = new Panel(); + panelOrange = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxFighterJet = new CheckBox(); + checkBoxControlCabin = new CheckBox(); + checkBoxDeckForAircraftTakeOff = 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(checkBoxFighterJet); + groupBoxConfig.Controls.Add(checkBoxControlCabin); + groupBoxConfig.Controls.Add(checkBoxDeckForAircraftTakeOff); + 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(918, 328); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelPink); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelOrange); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(533, 34); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(362, 181); + groupBoxColors.TabIndex = 9; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(193, 109); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(55, 55); + panelBlack.TabIndex = 3; + panelBlack.MouseDown += Panel_MouseDown; + // + // panelPink + // + panelPink.BackColor = Color.Pink; + panelPink.Location = new Point(274, 109); + panelPink.Name = "panelPink"; + panelPink.Size = new Size(55, 55); + panelPink.TabIndex = 4; + panelPink.MouseDown += Panel_MouseDown; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(109, 109); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(55, 55); + panelGray.TabIndex = 5; + panelGray.MouseDown += Panel_MouseDown; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(27, 109); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(55, 55); + panelWhite.TabIndex = 2; + panelWhite.MouseDown += Panel_MouseDown; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(193, 34); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(55, 55); + panelBlue.TabIndex = 1; + panelBlue.MouseDown += Panel_MouseDown; + // + // panelOrange + // + panelOrange.BackColor = Color.Orange; + panelOrange.Location = new Point(274, 34); + panelOrange.Name = "panelOrange"; + panelOrange.Size = new Size(55, 55); + panelOrange.TabIndex = 1; + panelOrange.MouseDown += Panel_MouseDown; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(109, 34); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(55, 55); + panelGreen.TabIndex = 1; + panelGreen.MouseDown += Panel_MouseDown; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(27, 34); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(55, 55); + panelRed.TabIndex = 0; + panelRed.MouseDown += Panel_MouseDown; + // + // checkBoxFighterJet + // + checkBoxFighterJet.AutoSize = true; + checkBoxFighterJet.Location = new Point(12, 143); + checkBoxFighterJet.Name = "checkBoxFighterJet"; + checkBoxFighterJet.Size = new Size(333, 34); + checkBoxFighterJet.TabIndex = 8; + checkBoxFighterJet.Text = "Признак наличия истребителя"; + checkBoxFighterJet.UseVisualStyleBackColor = true; + // + // checkBoxControlCabin + // + checkBoxControlCabin.AutoSize = true; + checkBoxControlCabin.Location = new Point(12, 197); + checkBoxControlCabin.Name = "checkBoxControlCabin"; + checkBoxControlCabin.Size = new Size(388, 34); + checkBoxControlCabin.TabIndex = 7; + checkBoxControlCabin.Text = "Признак наличия рубки управления"; + checkBoxControlCabin.UseVisualStyleBackColor = true; + // + // checkBoxDeckForAircraftTakeOff + // + checkBoxDeckForAircraftTakeOff.AutoSize = true; + checkBoxDeckForAircraftTakeOff.Location = new Point(12, 254); + checkBoxDeckForAircraftTakeOff.Name = "checkBoxDeckForAircraftTakeOff"; + checkBoxDeckForAircraftTakeOff.Size = new Size(499, 34); + checkBoxDeckForAircraftTakeOff.TabIndex = 6; + checkBoxDeckForAircraftTakeOff.Text = "Признак наличия палубы для взлета самолетов"; + checkBoxDeckForAircraftTakeOff.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(125, 91); + 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(155, 35); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 93); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(51, 30); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(125, 42); + 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(155, 35); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 44); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(107, 30); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(726, 242); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(169, 56); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(533, 242); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(169, 56); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(9, 68); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(308, 171); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(933, 276); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(138, 40); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(1103, 276); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(138, 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(924, 0); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(326, 254); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(179, 9); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(138, 41); + 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, 9); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(138, 41); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter; + // + // FormWarshipConfig + // + AutoScaleDimensions = new SizeF(12F, 30F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1253, 328); + 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 labelSpeed; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private CheckBox checkBoxDeckForAircraftTakeOff; + private CheckBox checkBoxControlCabin; + private CheckBox checkBoxFighterJet; + private GroupBox groupBoxColors; + private Panel panelBlue; + private Panel panelOrange; + private Panel panelGreen; + private Panel panelRed; + private Panel panelBlack; + private Panel panelPink; + 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..04e9b9f --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipConfig.cs @@ -0,0 +1,174 @@ +using ProjectAircraftCarrier_.Drawnings; +using ProjectAircraftCarrier_.Entities; + +namespace ProjectAircraftCarrier_; + +/// +/// Форма конфигурации объекта +/// +public partial class FormWarshipConfig : Form +{ + /// + /// Объект - прорисовка автомобиля + /// + private DrawningWarship? _warship; + + /// + /// Событие для передачи объекта + /// + private event Action? WarshipDelegate; + + /// + /// Конструктор + /// + public FormWarshipConfig() + { + InitializeComponent(); + + panelRed.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelOrange.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelGray.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelPink.MouseDown += Panel_MouseDown; + + // TODO buttonCancel.Click привязать анонимный метод через lambda с закрытием формы + + buttonCancel.Click += (sender, e) => Close(); + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action warshipDelegate) + { + 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(85, 60); + _warship?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + /// + /// Передаем информацию при нажатии на Label(Объект) + /// + /// + /// + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy); + } + + /// + /// Проверка получаемой информации(Объект) (ее типа на соответствие требуемому) + /// + /// + /// + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + 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": + _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, checkBoxDeckForAircraftTakeOff.Checked, checkBoxControlCabin.Checked, checkBoxFighterJet.Checked); + break; + } + + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel(Цвет) + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + // TODO отправка цвета в Drag&Drop + + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.Black, DragDropEffects.Move | DragDropEffects.Copy); + } + + // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта) + + /// + /// Проверка получаемой информации(Основной цвет) (ее типа на соответствие требуемому) + /// + /// + /// + private void LabelBodyColor_DragEnter(object sender, DragEventArgs e) + { + e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None; + } + + /// + /// Действия при приеме перетаскиваемой информации(Основной цвет) + /// + /// + /// + private void LabelBodyColor_DragDrop(object sender, DragEventArgs e) + { + _warship?.EntityWarship?.BodyColorChange((Color)e.Data?.GetData(typeof(Color))); + DrawObject(); + } + + /// + /// Проверка получаемой информации(Доп. цвет) (ее типа на соответствие требуемому) + /// + /// + /// + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None; + } + + /// + /// Действия при приеме перетаскиваемой информации(Доп. цвет) + /// + /// + /// + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_warship?.EntityWarship is EntityAircraftCarrier _aircraftCarrier) + { + _aircraftCarrier.AdditionalColorChange((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 diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/WarshipDelegate.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/WarshipDelegate.cs new file mode 100644 index 0000000..a8b6131 --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/WarshipDelegate.cs @@ -0,0 +1,9 @@ +using ProjectAircraftCarrier_.Drawnings; + +namespace ProjectAircraftCarrier_; + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void WarshipDelegate(DrawningWarship warship);