diff --git a/ProjectMotorBoat/ProjectMotorBoat/BoatDelegate.cs b/ProjectMotorBoat/ProjectMotorBoat/BoatDelegate.cs new file mode 100644 index 0000000..2afff54 --- /dev/null +++ b/ProjectMotorBoat/ProjectMotorBoat/BoatDelegate.cs @@ -0,0 +1,9 @@ +using ProjectMotorBoat.Drawings; + +namespace ProjectMotorBoat; + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void BoatDelegate(DrawingBoat boat); diff --git a/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityBoat.cs b/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityBoat.cs index 313bc2c..d98c381 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityBoat.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityBoat.cs @@ -25,6 +25,8 @@ public class EntityBoat /// public double Step => Speed * 100 / Weight; + //public string SetBodyColor => BodyColor.ToString(); + /// /// Конструктор сущности /// @@ -37,4 +39,9 @@ public class EntityBoat Weight = weight; BodyColor = bodyColor; } + + public void SetBodyColor(Color name) + { + BodyColor = name; + } } diff --git a/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityMotorBoat.cs b/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityMotorBoat.cs index 6b80a0f..5489678 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityMotorBoat.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityMotorBoat.cs @@ -43,4 +43,9 @@ public class EntityMotorBoat : EntityBoat Oar = oar; ProtectiveGlass = protectiveGlass; } + + public void SetAdditionalColor(Color name) + { + AdditionalColor = name; + } } \ No newline at end of file diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.Designer.cs b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.Designer.cs index 7a6af43..1cf8d06 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.Designer.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddBoat = new Button(); + buttonRefresh = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonGoToCheck = new Button(); + buttonRemoveBoat = 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,73 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddBoat); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Controls.Add(buttonRemoveBoat); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 329); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(195, 253); + 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(184, 32); + buttonAddBoat.TabIndex = 1; + buttonAddBoat.Text = "Добавление лодки"; + buttonAddBoat.UseVisualStyleBackColor = true; + buttonAddBoat.Click += ButtonAddBoat_Click; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(3, 184); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(184, 32); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(3, 79); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(189, 23); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(3, 146); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(184, 32); + 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, 108); + buttonRemoveBoat.Name = "buttonRemoveBoat"; + buttonRemoveBoat.Size = new Size(184, 32); + buttonRemoveBoat.TabIndex = 4; + buttonRemoveBoat.Text = "Удалить лодку"; + buttonRemoveBoat.UseVisualStyleBackColor = true; + buttonRemoveBoat.Click += ButtonRemoveBoat_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(6, 300); @@ -159,70 +225,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 184); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(184, 32); - 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, 146); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(184, 32); - 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, 108); - buttonRemoveBoat.Name = "buttonRemoveBoat"; - buttonRemoveBoat.Size = new Size(184, 32); - buttonRemoveBoat.TabIndex = 4; - buttonRemoveBoat.Text = "Удалить лодку"; - buttonRemoveBoat.UseVisualStyleBackColor = true; - buttonRemoveBoat.Click += ButtonRemoveBoat_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(3, 79); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(189, 23); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddMotorBoat - // - buttonAddMotorBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddMotorBoat.Location = new Point(3, 41); - buttonAddMotorBoat.Name = "buttonAddMotorBoat"; - buttonAddMotorBoat.Size = new Size(184, 32); - 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(184, 32); - buttonAddBoat.TabIndex = 1; - buttonAddBoat.Text = "Добавление лодки"; - buttonAddBoat.UseVisualStyleBackColor = true; - buttonAddBoat.Click += ButtonAddBoat_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -244,21 +246,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddBoat); - panelCompanyTools.Controls.Add(buttonAddMotorBoat); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Controls.Add(buttonRemoveBoat); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 329); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(195, 253); - panelCompanyTools.TabIndex = 8; - // // FormBoatCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -269,18 +256,17 @@ 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); } #endregion private GroupBox groupBoxTools; - private Button buttonAddMotorBoat; private Button buttonAddBoat; private ComboBox comboBoxSelectorCompany; private Button buttonGoToCheck; diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs index 96b3d04..22684bd 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs @@ -38,49 +38,30 @@ public partial class FormBoatCollection : Form } /// - /// Добавление обычной лодки + /// Добавление лодки /// /// /// - private void ButtonAddBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingBoat)); - - /// - /// Добавление моторной лодки - /// - /// - /// - private void ButtonAddMotorBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingMotorBoat)); - - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + private void ButtonAddBoat_Click(object sender, EventArgs e) { - if (_company == null) + FormBoatConfig form = new(); + form.Show(); + // передать метод ✔ + form.AddEvent(SetBoat); + } + + /// + /// Добавление лодки в коллекцию + /// + /// + private void SetBoat(DrawingBoat boat) + { + if (_company == null || boat == null) { return; } - Random random = new(); - DrawingBoat drawingBoat; - switch (type) - { - case nameof(DrawingBoat): - drawingBoat = new DrawingBoat(random.Next(100, 300), random.Next(1000, 3000), - GetColor(random)); - break; - case nameof(DrawingMotorBoat): - drawingBoat = new DrawingMotorBoat(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 + drawingBoat >= 0) + if (_company + boat >= 0) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -91,23 +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; - } - /// /// Удаление объекта /// diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormBoatConfig.Designer.cs b/ProjectMotorBoat/ProjectMotorBoat/FormBoatConfig.Designer.cs new file mode 100644 index 0000000..43578ba --- /dev/null +++ b/ProjectMotorBoat/ProjectMotorBoat/FormBoatConfig.Designer.cs @@ -0,0 +1,379 @@ +namespace ProjectMotorBoat +{ + 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(); + panelBlack = new Panel(); + panelWhite = new Panel(); + panelPink = new Panel(); + panelRed = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelOrange = new Panel(); + checkBoxProtectiveGlass = new CheckBox(); + checkBoxOar = new CheckBox(); + checkBoxInboardEngine = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModifiedObject = new Label(); + labelSimpleObject = new Label(); + panelObject = new Panel(); + labelAdditionalColor = new Label(); + labelBodyColor = new Label(); + pictureBoxObject = new PictureBox(); + buttonAdd = new Button(); + buttonCancel = new Button(); + groupBoxConfig.SuspendLayout(); + groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + panelObject.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + SuspendLayout(); + // + // groupBoxConfig + // + groupBoxConfig.Controls.Add(groupBoxColors); + groupBoxConfig.Controls.Add(checkBoxProtectiveGlass); + groupBoxConfig.Controls.Add(checkBoxOar); + groupBoxConfig.Controls.Add(checkBoxInboardEngine); + 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(581, 222); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelPink); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelOrange); + groupBoxColors.Location = new Point(321, 32); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(231, 120); + groupBoxColors.TabIndex = 9; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(78, 73); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(28, 28); + panelBlack.TabIndex = 3; + panelBlack.MouseDown += Panel_MouseDown; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(129, 73); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(28, 28); + panelWhite.TabIndex = 4; + panelWhite.MouseDown += Panel_MouseDown; + // + // panelPink + // + panelPink.BackColor = Color.Pink; + panelPink.Location = new Point(78, 27); + panelPink.Name = "panelPink"; + panelPink.Size = new Size(28, 28); + panelPink.TabIndex = 1; + panelPink.MouseDown += Panel_MouseDown; + // + // panelRed + // + panelRed.BackColor = Color.Firebrick; + panelRed.Location = new Point(180, 73); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(28, 28); + panelRed.TabIndex = 5; + panelRed.MouseDown += Panel_MouseDown; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(129, 27); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(28, 28); + panelYellow.TabIndex = 1; + panelYellow.MouseDown += Panel_MouseDown; + // + // panelBlue + // + panelBlue.BackColor = Color.LightSkyBlue; + panelBlue.Location = new Point(27, 73); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(28, 28); + panelBlue.TabIndex = 2; + panelBlue.MouseDown += Panel_MouseDown; + // + // panelGreen + // + panelGreen.BackColor = Color.Lime; + panelGreen.Location = new Point(180, 27); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(28, 28); + panelGreen.TabIndex = 1; + panelGreen.MouseDown += Panel_MouseDown; + // + // panelOrange + // + panelOrange.BackColor = Color.Coral; + panelOrange.Location = new Point(27, 27); + panelOrange.Name = "panelOrange"; + panelOrange.Size = new Size(28, 28); + panelOrange.TabIndex = 0; + panelOrange.MouseDown += Panel_MouseDown; + // + // checkBoxProtectiveGlass + // + checkBoxProtectiveGlass.AutoSize = true; + checkBoxProtectiveGlass.Location = new Point(29, 175); + checkBoxProtectiveGlass.Name = "checkBoxProtectiveGlass"; + checkBoxProtectiveGlass.Size = new Size(225, 19); + checkBoxProtectiveGlass.TabIndex = 8; + checkBoxProtectiveGlass.Text = "Признак наличия защитного стекла"; + checkBoxProtectiveGlass.UseVisualStyleBackColor = true; + // + // checkBoxOar + // + checkBoxOar.AutoSize = true; + checkBoxOar.Location = new Point(29, 140); + checkBoxOar.Name = "checkBoxOar"; + checkBoxOar.Size = new Size(157, 19); + checkBoxOar.TabIndex = 7; + checkBoxOar.Text = "Признак наличия весла"; + checkBoxOar.UseVisualStyleBackColor = true; + // + // checkBoxInboardEngine + // + checkBoxInboardEngine.AutoSize = true; + checkBoxInboardEngine.Location = new Point(29, 106); + checkBoxInboardEngine.Name = "checkBoxInboardEngine"; + checkBoxInboardEngine.Size = new Size(252, 19); + checkBoxInboardEngine.TabIndex = 6; + checkBoxInboardEngine.Text = "Признак наличия внутреннего двигателя"; + checkBoxInboardEngine.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(94, 65); + 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(108, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.BackColor = SystemColors.Control; + labelWeight.Location = new Point(29, 67); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(26, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(94, 36); + 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(108, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(29, 38); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(59, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(447, 164); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(90, 28); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(343, 164); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(90, 28); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // panelObject + // + panelObject.AllowDrop = true; + panelObject.Controls.Add(labelAdditionalColor); + panelObject.Controls.Add(labelBodyColor); + panelObject.Controls.Add(pictureBoxObject); + panelObject.Location = new Point(587, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(213, 173); + panelObject.TabIndex = 1; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(109, 6); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(90, 28); + labelAdditionalColor.TabIndex = 11; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop; + labelAdditionalColor.DragEnter += LabelColor_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(14, 6); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(90, 28); + labelBodyColor.TabIndex = 10; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelColor_DragEnter; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(14, 47); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(185, 117); + pictureBoxObject.TabIndex = 0; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(613, 191); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(75, 23); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(706, 191); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(75, 23); + buttonCancel.TabIndex = 3; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // FormBoatConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(812, 222); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(panelObject); + Controls.Add(groupBoxConfig); + Name = "FormBoatConfig"; + Text = "Создание объекта"; + groupBoxConfig.ResumeLayout(false); + groupBoxConfig.PerformLayout(); + groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + panelObject.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxConfig; + private Label labelSimpleObject; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private Label labelModifiedObject; + private CheckBox checkBoxInboardEngine; + private CheckBox checkBoxProtectiveGlass; + private CheckBox checkBoxOar; + private GroupBox groupBoxColors; + private Panel panelBlack; + private Panel panelWhite; + private Panel panelPink; + private Panel panelRed; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelOrange; + private Panel panelObject; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Label labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormBoatConfig.cs b/ProjectMotorBoat/ProjectMotorBoat/FormBoatConfig.cs new file mode 100644 index 0000000..91b353e --- /dev/null +++ b/ProjectMotorBoat/ProjectMotorBoat/FormBoatConfig.cs @@ -0,0 +1,159 @@ +using ProjectMotorBoat.Drawings; +using ProjectMotorBoat.Entities; + +/// +/// Форма конфигурации объекта +/// +namespace ProjectMotorBoat +{ + public partial class FormBoatConfig : Form + { + /// + /// Объект - прорисовка лодки + /// + private DrawingBoat? _boat; + + /// + /// Событие для предачи объекта + /// + Action BoatDelegate; + + /// + /// Конструктор + /// + public FormBoatConfig() + { + InitializeComponent(); + panelPink.MouseDown += Panel_MouseDown; + panelOrange.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelRed.MouseDown += Panel_MouseDown; + + // buttonCancel.Click привязать анонимный метод через lambda с закрытием формы ✔ + buttonCancel.Click += (sender, 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(15, 15); + _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 DrawingBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _boat = new DrawingMotorBoat((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxInboardEngine.Checked, checkBoxOar.Checked, checkBoxProtectiveGlass.Checked); + break; + } + + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + // отправка цвета в Drag&Drop ✔ + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy); + } + + // Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта) ✔ + private void LabelColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data?.GetDataPresent(DataFormats.Text) ?? false) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void LabelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_boat != null) + { + _boat?.EntityBoat?.SetBodyColor(Color.FromName(e.Data?.GetData(DataFormats.Text)?.ToString())); + DrawObject(); + } + } + + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_boat?.EntityBoat is EntityMotorBoat _motorBoat) + { + _motorBoat?.SetAdditionalColor(Color.FromName(e.Data?.GetData(DataFormats.Text)?.ToString())); + DrawObject(); + } + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_boat != null) + { + BoatDelegate?.Invoke(_boat); + Close(); + } + } + } +} diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormBoatConfig.resx b/ProjectMotorBoat/ProjectMotorBoat/FormBoatConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectMotorBoat/ProjectMotorBoat/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