diff --git a/ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs b/ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs index 1cc8f3f..0221af7 100644 --- a/ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs @@ -26,6 +26,11 @@ public class EntityBoat /// public Color BodyColor { get; private set; } + public void SetBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } + /// /// /// diff --git a/ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran.cs index 57ebd06..07fa9e7 100644 --- a/ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran.cs @@ -11,6 +11,11 @@ public class EntityCatamaran : EntityBoat /// public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color additionalColor) + { + AdditionalColor = additionalColor; + } + /// /// Признак (опция) наличия левого поплавка /// diff --git a/ProjectCatamaran/ProjectCatamaran/FormBoatCollection.Designer.cs b/ProjectCatamaran/ProjectCatamaran/FormBoatCollection.Designer.cs index e6fe517..b8efc31 100644 --- a/ProjectCatamaran/ProjectCatamaran/FormBoatCollection.Designer.cs +++ b/ProjectCatamaran/ProjectCatamaran/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(); radioButtonList = new RadioButton(); @@ -38,19 +44,12 @@ buttonCollectionaAdd = new Button(); textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); - buttonRefresh = new Button(); - buttonGoToCheck = new Button(); - buttonRemoveBoat = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddCatamaran = new Button(); - buttonAddBoat = new Button(); comboBoxSelectorCompany = new ComboBox(); pictureBoxBoat = new PictureBox(); - panelCompanyTools = new Panel(); groupBoxTools.SuspendLayout(); + panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBoxBoat).BeginInit(); - panelCompanyTools.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -67,6 +66,74 @@ 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.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 397); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(273, 229); + 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(267, 32); + buttonAddBoat.TabIndex = 1; + buttonAddBoat.Text = "Добавление лодки"; + buttonAddBoat.UseVisualStyleBackColor = true; + buttonAddBoat.Click += ButtonAddBoat_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + maskedTextBoxPosition.Location = new Point(3, 80); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(267, 27); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(3, 181); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(267, 31); + 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, 113); + buttonRemoveBoat.Name = "buttonRemoveBoat"; + buttonRemoveBoat.Size = new Size(267, 27); + 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(4, 146); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(266, 29); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(16, 353); @@ -158,71 +225,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 181); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(267, 31); - 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(4, 146); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(266, 29); - 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, 113); - buttonRemoveBoat.Name = "buttonRemoveBoat"; - buttonRemoveBoat.Size = new Size(267, 27); - buttonRemoveBoat.TabIndex = 4; - buttonRemoveBoat.Text = "Удалить лодку"; - buttonRemoveBoat.UseVisualStyleBackColor = true; - buttonRemoveBoat.Click += ButtonRemoveBoat_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - maskedTextBoxPosition.Location = new Point(3, 80); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(267, 27); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddCatamaran - // - buttonAddCatamaran.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddCatamaran.Location = new Point(3, 41); - buttonAddCatamaran.Name = "buttonAddCatamaran"; - buttonAddCatamaran.Size = new Size(267, 33); - buttonAddCatamaran.TabIndex = 2; - buttonAddCatamaran.Text = "Добавление катамарана"; - buttonAddCatamaran.UseVisualStyleBackColor = true; - buttonAddCatamaran.Click += ButtonAddCatamaran_Click; - // - // buttonAddBoat - // - buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddBoat.Location = new Point(3, 3); - buttonAddBoat.Name = "buttonAddBoat"; - buttonAddBoat.Size = new Size(267, 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 @@ pictureBoxBoat.TabIndex = 1; pictureBoxBoat.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddCatamaran); - panelCompanyTools.Controls.Add(buttonAddBoat); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonRemoveBoat); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 397); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(273, 229); - panelCompanyTools.TabIndex = 8; - // // FormBoatCollection // AutoScaleDimensions = new SizeF(8F, 20F); @@ -269,18 +256,17 @@ Name = "FormBoatCollection"; Text = "Коллекция лодок"; groupBoxTools.ResumeLayout(false); + panelCompanyTools.ResumeLayout(false); + panelCompanyTools.PerformLayout(); panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBoxBoat).EndInit(); - panelCompanyTools.ResumeLayout(false); - panelCompanyTools.PerformLayout(); ResumeLayout(false); } #endregion private GroupBox groupBoxTools; - private Button buttonAddCatamaran; private Button buttonAddBoat; private ComboBox comboBoxSelectorCompany; private Button buttonRefresh; diff --git a/ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs b/ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs index bef142a..dc5bfd2 100644 --- a/ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs +++ b/ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs @@ -22,7 +22,7 @@ public partial class FormBoatCollection : Form /// /// Компания /// - private AbstractCompany? _company = null; + private AbstractCompany? _company; public FormBoatCollection() { @@ -42,33 +42,30 @@ public partial class FormBoatCollection : Form } - + /// + /// Добавление лодки + /// + /// + /// + private void ButtonAddBoat_Click(object sender, EventArgs e) + { + FormBoatConfig form = new(); + form.Show(); + form.AddEvent(SetBoat); + } /// - /// Создание объекта класса-перемещение + /// Добавление автомобиля в коллекцию /// - /// - private void CreateObject(string type) + /// + private void SetBoat(DrawningBoat boat) { - if (_company == null) + if (_company == null || boat == null) { return; } - Random random = new(); - DrawningBoat drawningBoat; - switch (type) - { - case nameof(DrawningBoat): - drawningBoat = new DrawningBoat(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningCatamaran): - drawningBoat = new DrawningCatamaran(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 + drawningBoat != -1) + + if (_company + boat != -1) { MessageBox.Show("объект добавлен"); pictureBoxBoat.Image = _company.Show(); @@ -79,35 +76,6 @@ public partial class FormBoatCollection : Form } } - /// - /// Получение цвета - /// - /// - /// - private 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 ButtonAddCatamaran_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCatamaran)); /// /// Удаление объекта @@ -121,7 +89,8 @@ public partial class FormBoatCollection : Form return; } - if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) + if (MessageBox.Show("Удалить объект?", "Удаление", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; } diff --git a/ProjectCatamaran/ProjectCatamaran/FormBoatConfig.Designer.cs b/ProjectCatamaran/ProjectCatamaran/FormBoatConfig.Designer.cs new file mode 100644 index 0000000..a702d86 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/FormBoatConfig.Designer.cs @@ -0,0 +1,379 @@ +namespace ProjectCatamaran +{ + 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(); + label1 = new Label(); + 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(); + checkBoxRightfloater = new CheckBox(); + checkBoxLeftfloater = new CheckBox(); + checkBoxSail = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelSimpleObject = new Label(); + labelModifiedObject = 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(label1); + groupBoxConfig.Controls.Add(groupBoxColors); + groupBoxConfig.Controls.Add(checkBoxRightfloater); + groupBoxConfig.Controls.Add(checkBoxLeftfloater); + groupBoxConfig.Controls.Add(checkBoxSail); + groupBoxConfig.Controls.Add(numericUpDownWeight); + groupBoxConfig.Controls.Add(labelWeight); + groupBoxConfig.Controls.Add(numericUpDownSpeed); + groupBoxConfig.Controls.Add(labelSpeed); + groupBoxConfig.Controls.Add(labelSimpleObject); + groupBoxConfig.Controls.Add(labelModifiedObject); + groupBoxConfig.Dock = DockStyle.Left; + groupBoxConfig.Location = new Point(0, 0); + groupBoxConfig.Name = "groupBoxConfig"; + groupBoxConfig.Size = new Size(629, 263); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // label1 + // + label1.Location = new Point(0, 0); + label1.Name = "label1"; + label1.Size = new Size(100, 23); + label1.TabIndex = 0; + // + // 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(342, 14); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(268, 147); + groupBoxColors.TabIndex = 10; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(205, 87); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(46, 45); + panelPurple.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(143, 87); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(46, 45); + panelBlack.TabIndex = 1; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(78, 87); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(46, 45); + panelGray.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(15, 87); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(46, 45); + panelWhite.TabIndex = 1; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(205, 27); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(46, 45); + panelYellow.TabIndex = 1; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(143, 27); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(46, 45); + panelBlue.TabIndex = 1; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(78, 27); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(46, 45); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(15, 27); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(46, 45); + panelRed.TabIndex = 0; + panelRed.MouseDown += Panel_MouseDown; + // + // checkBoxRightfloater + // + checkBoxRightfloater.AutoSize = true; + checkBoxRightfloater.Location = new Point(12, 212); + checkBoxRightfloater.Name = "checkBoxRightfloater"; + checkBoxRightfloater.Size = new Size(286, 24); + checkBoxRightfloater.TabIndex = 8; + checkBoxRightfloater.Text = "Признак наличия правого поплавка"; + checkBoxRightfloater.UseVisualStyleBackColor = true; + // + // checkBoxLeftfloater + // + checkBoxLeftfloater.Location = new Point(12, 170); + checkBoxLeftfloater.Name = "checkBoxLeftfloater"; + checkBoxLeftfloater.Size = new Size(280, 24); + checkBoxLeftfloater.TabIndex = 9; + checkBoxLeftfloater.Text = "Признак наличия левого поплавка"; + // + // checkBoxSail + // + checkBoxSail.AutoSize = true; + checkBoxSail.Location = new Point(12, 132); + checkBoxSail.Name = "checkBoxSail"; + checkBoxSail.Size = new Size(206, 24); + checkBoxSail.TabIndex = 6; + checkBoxSail.Text = "Признак наличия паруса"; + checkBoxSail.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(94, 74); + 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(124, 27); + numericUpDownWeight.TabIndex = 0; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 74); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(36, 20); + labelWeight.TabIndex = 5; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(94, 41); + 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(124, 27); + numericUpDownSpeed.TabIndex = 0; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 41); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 3; + labelSpeed.Text = "Скорость:"; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(347, 212); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(117, 35); + labelSimpleObject.TabIndex = 1; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(485, 212); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(117, 35); + labelModifiedObject.TabIndex = 2; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(12, 63); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(240, 131); + pictureBoxObject.TabIndex = 0; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(671, 218); + 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(781, 218); + 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(635, 0); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(263, 212); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(151, 14); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(101, 35); + 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(12, 14); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(101, 35); + labelBodyColor.TabIndex = 11; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // FormBoatConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(906, 263); + 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 NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private Label labelModifiedObject; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private CheckBox checkBoxRightfloater; + private CheckBox checkBoxLeftfloater; + private CheckBox checkBoxSail; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label label1; + private Label labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/FormBoatConfig.cs b/ProjectCatamaran/ProjectCatamaran/FormBoatConfig.cs new file mode 100644 index 0000000..8eb656b --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/FormBoatConfig.cs @@ -0,0 +1,192 @@ +using ProjectCatamaran.Drawnings; +using ProjectCatamaran.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; + +namespace ProjectCatamaran; + +public partial class FormBoatConfig : Form +{ + /// + /// Объект - прорисовка лодки + /// + private DrawningBoat? _boat; + + /// + /// Событие для передачи объекта + /// + private 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; + panelGray.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + + buttonCancel.Click += (sender, e) => Close(); + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action boatDelegate) + { + if (BoatDelegate != null) + { + BoatDelegate = boatDelegate; + } + else + { + 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 DrawningBoat((int)numericUpDownSpeed.Value, + (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _boat = new + DrawningCatamaran((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, + Color.White, + Color.Black, checkBoxLeftfloater.Checked, checkBoxRightfloater.Checked, checkBoxSail.Checked); + break; + } + DrawObject(); + } + + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, + DragDropEffects.Move | DragDropEffects.Copy); + } + + + + private void labelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_boat != null) + { + _boat.EntityBoat.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + 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 labelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_boat.EntityBoat is EntityCatamaran catamaran) + { + catamaran.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_boat is DrawningCatamaran) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_boat != null) + { + BoatDelegate?.Invoke(_boat); + Close(); + } + } +} diff --git a/ProjectCatamaran/ProjectCatamaran/FormBoatConfig.resx b/ProjectCatamaran/ProjectCatamaran/FormBoatConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/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