diff --git a/MotorBoat/MotorBoat/BoatDelegate.cs b/MotorBoat/MotorBoat/BoatDelegate.cs new file mode 100644 index 0000000..717fcd2 --- /dev/null +++ b/MotorBoat/MotorBoat/BoatDelegate.cs @@ -0,0 +1,13 @@ +using MotorBoat.Drawnings; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorBoat; +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void BoatDelegate(DrawningBoat boat); diff --git a/MotorBoat/MotorBoat/Entities/EntityBoat.cs b/MotorBoat/MotorBoat/Entities/EntityBoat.cs index 3390697..4f45ac5 100644 --- a/MotorBoat/MotorBoat/Entities/EntityBoat.cs +++ b/MotorBoat/MotorBoat/Entities/EntityBoat.cs @@ -27,6 +27,11 @@ namespace MotorBoat.Entities /// Шаг перемещения лодки /// public double Step => Speed * 100 / Weight; + + public void SetBodyColor(Color color) + { + BodyColor = color; + } /// /// Конструктор сущности /// diff --git a/MotorBoat/MotorBoat/Entities/EntityMotorBoat.cs b/MotorBoat/MotorBoat/Entities/EntityMotorBoat.cs index 8d522e2..423736c 100644 --- a/MotorBoat/MotorBoat/Entities/EntityMotorBoat.cs +++ b/MotorBoat/MotorBoat/Entities/EntityMotorBoat.cs @@ -21,6 +21,11 @@ /// Шаг перемещения лодки /// public double Step => Speed * 100 / Weight; + + public void SetAdditionalColor(Color addColor) + { + AdditionalColor = addColor; + } /// /// Инициализация полей объекта-класса моторной лодки /// diff --git a/MotorBoat/MotorBoat/FormBoatCollection.Designer.cs b/MotorBoat/MotorBoat/FormBoatCollection.Designer.cs index 0d76e82..756f4ce 100644 --- a/MotorBoat/MotorBoat/FormBoatCollection.Designer.cs +++ b/MotorBoat/MotorBoat/FormBoatCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddBoat = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonRemoveBoat = 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(); - buttonRemoveBoat = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddMotorBoat = new Button(); - buttonAddBoat = new Button(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); - panelCompanyTools = new Panel(); groupBoxTools.SuspendLayout(); + panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); - panelCompanyTools.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -67,6 +66,72 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddBoat); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonRemoveBoat); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 316); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(164, 193); + panelCompanyTools.TabIndex = 8; + // + // buttonAddBoat + // + buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddBoat.Location = new Point(3, 3); + buttonAddBoat.Name = "buttonAddBoat"; + buttonAddBoat.Size = new Size(158, 27); + buttonAddBoat.TabIndex = 1; + buttonAddBoat.Text = "Добавление лодки"; + buttonAddBoat.UseVisualStyleBackColor = true; + buttonAddBoat.Click += ButtonAddBoat_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(3, 70); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(158, 23); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(3, 162); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(158, 25); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonRemoveBoat + // + buttonRemoveBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveBoat.Location = new Point(3, 99); + buttonRemoveBoat.Name = "buttonRemoveBoat"; + buttonRemoveBoat.Size = new Size(158, 26); + buttonRemoveBoat.TabIndex = 4; + buttonRemoveBoat.Text = "Удалить лодку"; + buttonRemoveBoat.UseVisualStyleBackColor = true; + buttonRemoveBoat.Click += ButtonRemoveBoat_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(3, 131); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(158, 25); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(6, 287); @@ -159,70 +224,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 162); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(158, 25); - 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, 131); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(158, 25); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveBoat - // - buttonRemoveBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveBoat.Location = new Point(3, 99); - buttonRemoveBoat.Name = "buttonRemoveBoat"; - buttonRemoveBoat.Size = new Size(158, 26); - buttonRemoveBoat.TabIndex = 4; - buttonRemoveBoat.Text = "Удалить лодку"; - buttonRemoveBoat.UseVisualStyleBackColor = true; - buttonRemoveBoat.Click += ButtonRemoveBoat_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(3, 70); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(158, 23); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddMotorBoat - // - buttonAddMotorBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddMotorBoat.Location = new Point(3, 36); - buttonAddMotorBoat.Name = "buttonAddMotorBoat"; - buttonAddMotorBoat.Size = new Size(158, 28); - buttonAddMotorBoat.TabIndex = 2; - buttonAddMotorBoat.Text = "Добавление моторной лодки"; - buttonAddMotorBoat.UseVisualStyleBackColor = true; - buttonAddMotorBoat.Click += ButtonAddMotorBoat_Click; - // - // buttonAddBoat - // - buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddBoat.Location = new Point(3, 3); - buttonAddBoat.Name = "buttonAddBoat"; - buttonAddBoat.Size = new Size(158, 27); - buttonAddBoat.TabIndex = 1; - buttonAddBoat.Text = "Добавление лодки"; - buttonAddBoat.UseVisualStyleBackColor = true; - buttonAddBoat.Click += ButtonAddBoat_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -244,20 +245,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddBoat); - panelCompanyTools.Controls.Add(buttonAddMotorBoat); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonRemoveBoat); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 316); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(164, 193); - panelCompanyTools.TabIndex = 8; - // // FormBoatCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -268,11 +255,11 @@ Name = "FormBoatCollection"; 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); } @@ -281,7 +268,6 @@ private GroupBox groupBoxTools; private Button buttonAddBoat; private ComboBox comboBoxSelectorCompany; - private Button buttonAddMotorBoat; private PictureBox pictureBox; private Button buttonGoToCheck; private Button buttonRemoveBoat; diff --git a/MotorBoat/MotorBoat/FormBoatCollection.cs b/MotorBoat/MotorBoat/FormBoatCollection.cs index d213b7d..b9ced0c 100644 --- a/MotorBoat/MotorBoat/FormBoatCollection.cs +++ b/MotorBoat/MotorBoat/FormBoatCollection.cs @@ -31,39 +31,37 @@ public partial class FormBoatCollection : Form /// private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) { - panelCompanyTools.Enabled = true; + panelCompanyTools.Enabled = false; } /// - /// Создание объекта класса-перемещения + /// Добавление лодки /// - /// Тип создаваемого объекта - private void CreateObject(string type) + /// + /// + private void ButtonAddBoat_Click(object sender, EventArgs e) { if (_company == null) { return; } - Random random = new(); - DrawningBoat drawningBoat; - switch (type) + FormBoatConfig form = new(); + form.AddEvent(SetBoat); + form.Show(); + } + + /// + /// Добавление лодки в коллекцию + /// + /// + private void SetBoat(DrawningBoat boat) + { + if (_company == null || boat == null) { - case nameof(DrawningBoat): - drawningBoat = new DrawningBoat(random.Next(100, 300), - random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningMotorBoat): - drawningBoat = new DrawningMotorBoat(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; + return; } - if (_company + drawningBoat != -1) + + if (_company + boat != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -74,35 +72,6 @@ public partial class FormBoatCollection : 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 ButtonAddBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat)); - /// - /// Добавление моторной лодки - /// - /// - /// - private void ButtonAddMotorBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMotorBoat)); - /// /// Удаление лодки /// /// diff --git a/MotorBoat/MotorBoat/FormBoatConfig.Designer.cs b/MotorBoat/MotorBoat/FormBoatConfig.Designer.cs new file mode 100644 index 0000000..ede281f --- /dev/null +++ b/MotorBoat/MotorBoat/FormBoatConfig.Designer.cs @@ -0,0 +1,358 @@ +namespace MotorBoat +{ + partial class FormBoatConfig + { + /// + /// 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(); + panelGrey = new Panel(); + panelGreen = new Panel(); + panelWhite = new Panel(); + panelRed = new Panel(); + checkBoxProtectiveGlass = new CheckBox(); + checkBoxEngine = 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(checkBoxProtectiveGlass); + groupBoxConfig.Controls.Add(checkBoxEngine); + 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(555, 221); + 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(panelGrey); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(255, 25); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(283, 129); + groupBoxColors.TabIndex = 10; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(223, 73); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(40, 40); + panelPurple.TabIndex = 7; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(223, 22); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(40, 40); + panelYellow.TabIndex = 3; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(154, 73); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(40, 40); + panelBlack.TabIndex = 6; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(154, 22); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(40, 40); + panelBlue.TabIndex = 2; + // + // panelGrey + // + panelGrey.BackColor = Color.Gray; + panelGrey.Location = new Point(86, 73); + panelGrey.Name = "panelGray"; + panelGrey.Size = new Size(40, 40); + panelGrey.TabIndex = 5; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(86, 22); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(40, 40); + panelGreen.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(21, 73); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(40, 40); + panelWhite.TabIndex = 4; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(21, 22); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(40, 40); + panelRed.TabIndex = 0; + // + // checkBoxProtectiveGlass + // + checkBoxProtectiveGlass.AutoSize = true; + checkBoxProtectiveGlass.Location = new Point(12, 173); + checkBoxProtectiveGlass.Name = "checkBoxProtectiveGlass"; + checkBoxProtectiveGlass.Size = new Size(254, 19); + checkBoxProtectiveGlass.TabIndex = 9; + checkBoxProtectiveGlass.Text = "Признак наличия защитного стекла"; + checkBoxProtectiveGlass.UseVisualStyleBackColor = true; + // + // checkBoxEngine + // + checkBoxEngine.AutoSize = true; + checkBoxEngine.Location = new Point(12, 135); + checkBoxEngine.Name = "checkBoxEngine"; + checkBoxEngine.Size = new Size(161, 19); + checkBoxEngine.TabIndex = 8; + checkBoxEngine.Text = "Признак наличия мотора"; + checkBoxEngine.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(80, 59); + numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownWeight.Name = "numericUpDownWeight"; + numericUpDownWeight.Size = new Size(93, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 67); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(80, 25); + 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(93, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 33); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(62, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(403, 161); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(115, 41); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(276, 161); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(115, 41); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(7, 50); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(220, 121); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(568, 180); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(93, 29); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(695, 180); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(93, 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(561, 0); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(234, 174); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(134, 9); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(93, 32); + labelAdditionalColor.TabIndex = 12; + 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(7, 9); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(93, 32); + labelBodyColor.TabIndex = 11; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // FormBoatConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 221); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormBoatConfig"; + Text = "Создание объекта"; + groupBoxConfig.ResumeLayout(false); + groupBoxConfig.PerformLayout(); + groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + panelObject.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxConfig; + private Label labelSimpleObject; + private Label labelModifiedObject; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private CheckBox checkBoxProtectiveGlass; + private CheckBox checkBoxEngine; + private CheckBox checkBoxTank; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelYellow; + private Panel panelBlack; + private Panel panelBlue; + private Panel panelGrey; + private Panel panelGreen; + private Panel panelWhite; + 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/MotorBoat/MotorBoat/FormBoatConfig.cs b/MotorBoat/MotorBoat/FormBoatConfig.cs new file mode 100644 index 0000000..a72376d --- /dev/null +++ b/MotorBoat/MotorBoat/FormBoatConfig.cs @@ -0,0 +1,193 @@ +using MotorBoat.Drawnings; +using MotorBoat.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; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.TrackBar; + +namespace MotorBoat; +/// +/// Форма конфигурации объекта +/// +public partial class FormBoatConfig : Form +{ + /// + /// Объект прорисовки лодки + /// + private DrawningBoat? _boat; + /// + /// Событие для передачи объекта + /// + public event Action? BoatDelegate; + /// + /// Конструктор + /// + public FormBoatConfig() + { + InitializeComponent(); + panelRed.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelGrey.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + + buttonCancel.Click += (events, e) => Close(); + } + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action? boatDelegate) + { + BoatDelegate += boatDelegate; + } + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _boat?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _boat?.SetPosition(5, 5); + _boat?.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": + _boat = new DrawningBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxProtectiveGlass.Checked, checkBoxEngine.Checked); + break; + } + + DrawObject(); + } + + /// + /// Передаём информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.White, DragDropEffects.Move | DragDropEffects.Copy); + } + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_boat != null) + { + BoatDelegate?.Invoke(_boat); + Close(); + } + } + + /// + /// Передача основного цвета + /// + /// + /// + 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 (_boat != null) + { + _boat.EntityBoat?.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + /// + /// Прорисовка дополнительным цветом + /// + /// + /// + private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_boat?.EntityBoat is EntityMotorBoat _motorBoat) + { + _motorBoat.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + /// + /// Передача дополнительного цвета + /// + /// + /// + private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_boat is DrawningMotorBoat) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } +} diff --git a/MotorBoat/MotorBoat/FormBoatConfig.resx b/MotorBoat/MotorBoat/FormBoatConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/MotorBoat/MotorBoat/FormBoatConfig.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