diff --git a/ProjectSportCar/ProjectSportCar/Drawnings/DrawingWarship.cs b/ProjectSportCar/ProjectSportCar/Drawnings/DrawingWarship.cs index b74ebf5..fcbec3f 100644 --- a/ProjectSportCar/ProjectSportCar/Drawnings/DrawingWarship.cs +++ b/ProjectSportCar/ProjectSportCar/Drawnings/DrawingWarship.cs @@ -267,12 +267,6 @@ public class DrawingWarship g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 35); g.DrawLine(pen, _startPosX.Value + 50, _startPosY.Value + 45, _startPosX.Value + 67, _startPosY.Value + 55); - //Моторы - Brush br = new SolidBrush(Color.Black); - g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 59, 5, 15); - g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 59, 5, 15); - g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 10, 5, 15); - g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 10, 5, 15); } diff --git a/ProjectSportCar/ProjectSportCar/Drawnings/DrawningLinkor.cs b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningLinkor.cs index 09544c1..960cb51 100644 --- a/ProjectSportCar/ProjectSportCar/Drawnings/DrawningLinkor.cs +++ b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningLinkor.cs @@ -46,7 +46,7 @@ public class DrawningLinkor : DrawingWarship g.FillEllipse(additionalBrush, _startPosX.Value + 95, _startPosY.Value + 32, 20, 20); } - //Дополнительнst ракетs + //Дополнительная ракета if (linkor.Сompartment) { //границы ракет @@ -61,5 +61,15 @@ public class DrawningLinkor : DrawingWarship } + //Мотор + if (linkor.LinkorMotor) + { + Brush br = new SolidBrush(Color.Black); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 59, 5, 15); + g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 59, 5, 15); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 10, 5, 15); + g.FillRectangle(br, _startPosX.Value, _startPosY.Value + 10, 5, 15); + } + } } diff --git a/ProjectSportCar/ProjectSportCar/Entities/EntityLinkor.cs b/ProjectSportCar/ProjectSportCar/Entities/EntityLinkor.cs index 9d5f749..020be05 100644 --- a/ProjectSportCar/ProjectSportCar/Entities/EntityLinkor.cs +++ b/ProjectSportCar/ProjectSportCar/Entities/EntityLinkor.cs @@ -23,18 +23,23 @@ public class EntityLinkor : EntityWarship /// public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color color) + { + AdditionalColor = color; + } + /// /// Признак (опция) наличия орудийной башни /// public bool GunTurret { get; private set; } /// - /// Признак (опция) наличия отсека под ракеты + /// Признак (опция) наличия доп. ракеты /// public bool Сompartment { get; private set; } /// - /// Признак (опция) наличия + /// Признак (опция) наличия моторов /// public bool LinkorMotor { get; private set; } diff --git a/ProjectSportCar/ProjectSportCar/Entities/EntityWarship.cs b/ProjectSportCar/ProjectSportCar/Entities/EntityWarship.cs index 6e22d99..7ee63e7 100644 --- a/ProjectSportCar/ProjectSportCar/Entities/EntityWarship.cs +++ b/ProjectSportCar/ProjectSportCar/Entities/EntityWarship.cs @@ -17,6 +17,11 @@ public class EntityWarship /// Основной цвет /// public Color BodyColor { get; private set; } + public void SetBodyColor(Color color) + { + BodyColor = color; + } + /// /// Перемещение военного корабля /// diff --git a/ProjectSportCar/ProjectSportCar/FormWarshipCollection.Designer.cs b/ProjectSportCar/ProjectSportCar/FormWarshipCollection.Designer.cs index 7698fdb..74d48da 100644 --- a/ProjectSportCar/ProjectSportCar/FormWarshipCollection.Designer.cs +++ b/ProjectSportCar/ProjectSportCar/FormWarshipCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddWarship = new Button(); + maskedTextBox1 = new MaskedTextBox(); + buttonRemoveWarship = new Button(); + buttonRefresh = new Button(); + buttonGoToCheck = new Button(); buttonCreateCompany = new Button(); panelStorage = new Panel(); buttonCollectionDel = new Button(); @@ -38,18 +44,11 @@ radioButtonMassive = new RadioButton(); textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); - maskedTextBox1 = new MaskedTextBox(); - buttonRefresh = new Button(); - buttonGoToCheck = new Button(); - buttonRemoveWarship = new Button(); - buttonAddBattleship = new Button(); - buttonAddWarship = new Button(); comboBoxSelectionCompany = new ComboBox(); - panelCompanyTools = new Panel(); pictureBox = new PictureBox(); groupBoxTools.SuspendLayout(); - panelStorage.SuspendLayout(); panelCompanyTools.SuspendLayout(); + panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); SuspendLayout(); // @@ -67,6 +66,73 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddWarship); + panelCompanyTools.Controls.Add(maskedTextBox1); + panelCompanyTools.Controls.Add(buttonRemoveWarship); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 390); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(286, 311); + panelCompanyTools.TabIndex = 9; + // + // buttonAddWarship + // + buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddWarship.Location = new Point(3, 16); + buttonAddWarship.Name = "buttonAddWarship"; + buttonAddWarship.Size = new Size(271, 33); + buttonAddWarship.TabIndex = 1; + buttonAddWarship.Text = "Добавление военного корабля"; + buttonAddWarship.UseVisualStyleBackColor = true; + buttonAddWarship.Click += ButtonAddWarship_Click; + // + // maskedTextBox1 + // + maskedTextBox1.Anchor = AnchorStyles.Left | AnchorStyles.Right; + maskedTextBox1.Location = new Point(3, 91); + maskedTextBox1.Mask = "00"; + maskedTextBox1.Name = "maskedTextBox1"; + maskedTextBox1.Size = new Size(271, 27); + maskedTextBox1.TabIndex = 7; + // + // buttonRemoveWarship + // + buttonRemoveWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveWarship.Location = new Point(3, 124); + buttonRemoveWarship.Name = "buttonRemoveWarship"; + buttonRemoveWarship.Size = new Size(271, 42); + buttonRemoveWarship.TabIndex = 4; + buttonRemoveWarship.Text = "Удалить корабль"; + buttonRemoveWarship.UseVisualStyleBackColor = true; + buttonRemoveWarship.Click += ButtonRemoveWarship_Click_1; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(3, 220); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(271, 30); + 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, 172); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(271, 42); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(6, 339); @@ -159,70 +225,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // maskedTextBox1 - // - maskedTextBox1.Anchor = AnchorStyles.Left | AnchorStyles.Right; - maskedTextBox1.Location = new Point(3, 91); - maskedTextBox1.Mask = "00"; - maskedTextBox1.Name = "maskedTextBox1"; - maskedTextBox1.Size = new Size(271, 27); - maskedTextBox1.TabIndex = 7; - // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 220); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(271, 30); - 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, 172); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(271, 42); - 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, 124); - buttonRemoveWarship.Name = "buttonRemoveWarship"; - buttonRemoveWarship.Size = new Size(271, 42); - buttonRemoveWarship.TabIndex = 4; - buttonRemoveWarship.Text = "Удалить корабль"; - buttonRemoveWarship.UseVisualStyleBackColor = true; - buttonRemoveWarship.Click += ButtonRemoveWarship_Click_1; - // - // buttonAddBattleship - // - buttonAddBattleship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddBattleship.Location = new Point(3, 55); - buttonAddBattleship.Name = "buttonAddBattleship"; - buttonAddBattleship.Size = new Size(271, 30); - buttonAddBattleship.TabIndex = 2; - buttonAddBattleship.Text = "Добавление линкора"; - buttonAddBattleship.UseVisualStyleBackColor = true; - buttonAddBattleship.Click += ButtonAddLinkor_Click; - // - // buttonAddWarship - // - buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddWarship.Location = new Point(3, 16); - buttonAddWarship.Name = "buttonAddWarship"; - buttonAddWarship.Size = new Size(271, 33); - buttonAddWarship.TabIndex = 1; - buttonAddWarship.Text = "Добавление военного корабля"; - buttonAddWarship.UseVisualStyleBackColor = true; - buttonAddWarship.Click += ButtonAddWarship_Click; - // // comboBoxSelectionCompany // comboBoxSelectionCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -235,21 +237,6 @@ comboBoxSelectionCompany.TabIndex = 0; comboBoxSelectionCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddWarship); - panelCompanyTools.Controls.Add(buttonAddBattleship); - panelCompanyTools.Controls.Add(maskedTextBox1); - panelCompanyTools.Controls.Add(buttonRemoveWarship); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 390); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(286, 311); - panelCompanyTools.TabIndex = 9; - // // pictureBox // pictureBox.Dock = DockStyle.Fill; @@ -269,10 +256,10 @@ Name = "FormWarshipCollection"; Text = "Коллекция кораблей"; groupBoxTools.ResumeLayout(false); - panelStorage.ResumeLayout(false); - panelStorage.PerformLayout(); panelCompanyTools.ResumeLayout(false); panelCompanyTools.PerformLayout(); + panelStorage.ResumeLayout(false); + panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); ResumeLayout(false); } @@ -280,7 +267,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectionCompany; - private Button buttonAddBattleship; private Button buttonAddWarship; private Button buttonRemoveWarship; private PictureBox pictureBox; diff --git a/ProjectSportCar/ProjectSportCar/FormWarshipCollection.cs b/ProjectSportCar/ProjectSportCar/FormWarshipCollection.cs index 5909ec9..f9cfd2e 100644 --- a/ProjectSportCar/ProjectSportCar/FormWarshipCollection.cs +++ b/ProjectSportCar/ProjectSportCar/FormWarshipCollection.cs @@ -37,60 +37,6 @@ public partial class FormWarshipCollection : Form panelCompanyTools.Enabled = false; } - /// - /// Создание объекта - /// - /// - private void CreateObject(string type) - { - if (_company == null) - { - return; - } - Random random = new(); - DrawingWarship drawingWarship; - switch (type) - { - case nameof(DrawingWarship): - drawingWarship = new DrawingWarship(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningLinkor): - drawingWarship = new DrawningLinkor(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 + drawingWarship != -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _company.Show(); - } - else - { - 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; - } - /// /// Передача на тесты /// @@ -126,23 +72,38 @@ public partial class FormWarshipCollection : Form } /// - /// Добавление линкора - /// - /// - /// - private void ButtonAddLinkor_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawningLinkor)); - } - - /// - /// Добавление военного корабля + /// Добавление корабля /// /// /// private void ButtonAddWarship_Click(object sender, EventArgs e) { - CreateObject(nameof(DrawingWarship)); + FormWarshipConfig form = new(); + form.Show(); + form.AddEvent(SetWarship); + } + + /// + /// Добавление корабля в коллекцию + /// + /// + private void SetWarship(DrawingWarship warship) + { + if (_company == null || warship == null) + { + return; + } + + if (_company + warship != -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _company.Show(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } /// diff --git a/ProjectSportCar/ProjectSportCar/FormWarshipConfig.Designer.cs b/ProjectSportCar/ProjectSportCar/FormWarshipConfig.Designer.cs new file mode 100644 index 0000000..a6812f5 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/FormWarshipConfig.Designer.cs @@ -0,0 +1,370 @@ +namespace ProjectLinkor +{ + 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(); + panelBlack = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxLinkorMotor = new CheckBox(); + checkBoxСompartment = new CheckBox(); + checkBoxGunTurret = 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(checkBoxLinkorMotor); + groupBoxConfig.Controls.Add(checkBoxСompartment); + groupBoxConfig.Controls.Add(checkBoxGunTurret); + 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(591, 331); + 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(panelYellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(305, 26); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(268, 141); + groupBoxColors.TabIndex = 9; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(211, 80); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(51, 48); + panelPurple.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(143, 80); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(51, 48); + panelBlack.TabIndex = 1; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(75, 80); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(51, 48); + panelGray.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(6, 80); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(51, 48); + panelWhite.TabIndex = 1; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(211, 26); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(51, 48); + panelYellow.TabIndex = 1; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(143, 26); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(51, 48); + panelBlue.TabIndex = 1; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(75, 26); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(51, 48); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(6, 26); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(51, 48); + panelRed.TabIndex = 0; + // + // checkBoxLinkorMotor + // + checkBoxLinkorMotor.AutoSize = true; + checkBoxLinkorMotor.Location = new Point(12, 173); + checkBoxLinkorMotor.Name = "checkBoxLinkorMotor"; + checkBoxLinkorMotor.Size = new Size(219, 24); + checkBoxLinkorMotor.TabIndex = 8; + checkBoxLinkorMotor.Text = "Признак наличия моторов"; + checkBoxLinkorMotor.UseVisualStyleBackColor = true; + // + // checkBoxСompartment + // + checkBoxСompartment.AutoSize = true; + checkBoxСompartment.Location = new Point(12, 143); + checkBoxСompartment.Name = "checkBoxСompartment"; + checkBoxСompartment.Size = new Size(229, 24); + checkBoxСompartment.TabIndex = 7; + checkBoxСompartment.Text = "Признак наличия доп. ракет"; + checkBoxСompartment.UseVisualStyleBackColor = true; + // + // checkBoxGunTurret + // + checkBoxGunTurret.AutoSize = true; + checkBoxGunTurret.Location = new Point(12, 113); + checkBoxGunTurret.Name = "checkBoxGunTurret"; + checkBoxGunTurret.Size = new Size(287, 24); + checkBoxGunTurret.TabIndex = 6; + checkBoxGunTurret.Text = "Признак наличия орудийной башни"; + checkBoxGunTurret.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(94, 63); + 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(87, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 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(87, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 34); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(458, 192); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(115, 46); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(305, 192); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(115, 46); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(25, 73); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(205, 128); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(622, 249); + 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(733, 249); + 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(597, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(255, 226); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(136, 35); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(110, 27); + labelAdditionalColor.TabIndex = 11; + 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(14, 35); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(116, 27); + labelBodyColor.TabIndex = 10; + 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(855, 331); + 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 labelSimpleObject; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private Label labelModifiedObject; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private CheckBox checkBoxGunTurret; + private CheckBox checkBoxСompartment; + private GroupBox groupBoxColors; + private CheckBox checkBoxLinkorMotor; + 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 labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormWarshipConfig.cs b/ProjectSportCar/ProjectSportCar/FormWarshipConfig.cs new file mode 100644 index 0000000..b2bbcd2 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/FormWarshipConfig.cs @@ -0,0 +1,190 @@ +using ProjectLinkor.Drawnings; +using ProjectLinkor.Entities; + +namespace ProjectLinkor; + +/// +/// Форма конфигурации объекта +/// +public partial class FormWarshipConfig : Form +{ + + /// + /// Объект - прорисовка корабля + /// + private DrawingWarship? _warship; + + /// + /// Событие для передачи объекта + /// + 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; + + //к 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; + } + + /// + /// Передаем информацию при нажатии 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) + { + 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 DrawingWarship((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _warship = new DrawningLinkor((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxGunTurret.Checked, checkBoxСompartment.Checked, checkBoxLinkorMotor.Checked); + break; + } + + DrawObject(); + } + + //Логика смены цветов + + private void LabelBodyColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data?.GetDataPresent(typeof(Color)) ?? false) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void LabelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_warship != null) + { + if (e.Data?.GetDataPresent(typeof(Color)) ?? false) + { + _warship.EntityWarship.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + + } + DrawObject(); + } + } + + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_warship != null && _warship is DrawningLinkor) + { + if (e.Data?.GetDataPresent(typeof(Color)) ?? false) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_warship != null && _warship.EntityWarship is EntityLinkor _battleship) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + _battleship.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + + } + DrawObject(); + } + } + + private void Panel_MouseDown(object sender, MouseEventArgs e) + { + // TODO отправка цвета в Drag&Drop + (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_warship != null) + { + WarshipDelegate?.Invoke(_warship); + Close(); + } + } +} diff --git a/ProjectSportCar/ProjectSportCar/FormWarshipConfig.resx b/ProjectSportCar/ProjectSportCar/FormWarshipConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/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/ProjectSportCar/ProjectSportCar/WarshipDelegate.cs b/ProjectSportCar/ProjectSportCar/WarshipDelegate.cs new file mode 100644 index 0000000..dd50c42 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/WarshipDelegate.cs @@ -0,0 +1,10 @@ +using ProjectLinkor.Drawnings; + +namespace ProjectLinkor; + +/// +/// Делегат передачи объекта прорисовки +/// +/// +public delegate void WarshipDelegate(DrawingWarship warship); +