diff --git a/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs index 9f98d29..dbbca20 100644 --- a/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs +++ b/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs @@ -10,6 +10,8 @@ public class EntityContainerShip : EntityShip /// public Color AdditionalColor { get; private set; } + public void SetAdditionalColor(Color color) => AdditionalColor = color; + /// /// Признак (опция) наличия крана /// diff --git a/ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs b/ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs index f231d27..8cbf4de 100644 --- a/ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs +++ b/ProjectContainerShip/ProjectContainerShip/Entities/EntityShip.cs @@ -20,6 +20,8 @@ public class EntityShip /// public Color BodyColor { get; private set; } + public void SetBodyColor(Color color) => BodyColor = color; + /// /// Шаг перемещения грузового судна /// diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs index f71e799..6cbaf21 100644 --- a/ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs +++ b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddShip = new Button(); + maskedTextBox = new MaskedTextBox(); + buttonRemoveShip = new Button(); + buttonGoToCheck = new Button(); + buttonRefresh = new Button(); buttonCreateCompany = new Button(); panelStorage = new Panel(); radioButtonMassive = new RadioButton(); @@ -38,19 +44,12 @@ radioButtonList = new RadioButton(); textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); - buttonAddContainerShip = new Button(); - buttonRefresh = new Button(); - buttonGoToCheck = new Button(); - buttonRemoveShip = new Button(); - maskedTextBox = new MaskedTextBox(); - buttonAddShip = 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 @@ -68,6 +67,73 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddShip); + panelCompanyTools.Controls.Add(maskedTextBox); + panelCompanyTools.Controls.Add(buttonRemoveShip); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 598); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(382, 511); + panelCompanyTools.TabIndex = 10; + // + // buttonAddShip + // + buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddShip.Location = new Point(3, 35); + buttonAddShip.Name = "buttonAddShip"; + buttonAddShip.Size = new Size(370, 77); + buttonAddShip.TabIndex = 1; + buttonAddShip.Text = "Добавление корабля"; + buttonAddShip.UseVisualStyleBackColor = true; + buttonAddShip.Click += ButtonAddShip_Click; + // + // maskedTextBox + // + maskedTextBox.Location = new Point(3, 201); + maskedTextBox.Mask = "00"; + maskedTextBox.Name = "maskedTextBox"; + maskedTextBox.Size = new Size(370, 39); + maskedTextBox.TabIndex = 3; + maskedTextBox.ValidatingType = typeof(int); + // + // buttonRemoveShip + // + buttonRemoveShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveShip.Location = new Point(3, 246); + buttonRemoveShip.Name = "buttonRemoveShip"; + buttonRemoveShip.Size = new Size(370, 77); + buttonRemoveShip.TabIndex = 4; + buttonRemoveShip.Text = "Удалить корабль"; + buttonRemoveShip.UseVisualStyleBackColor = true; + buttonRemoveShip.Click += ButtonRemoveShip_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(3, 329); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(370, 77); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(3, 412); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(370, 77); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(6, 546); @@ -159,70 +225,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonAddContainerShip - // - buttonAddContainerShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddContainerShip.Location = new Point(3, 118); - buttonAddContainerShip.Name = "buttonAddContainerShip"; - buttonAddContainerShip.Size = new Size(370, 77); - buttonAddContainerShip.TabIndex = 7; - buttonAddContainerShip.Text = "Добавление контейнеровоза"; - buttonAddContainerShip.UseVisualStyleBackColor = true; - buttonAddContainerShip.Click += ButtonAddContainerShip_Click; - // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 412); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(370, 77); - 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, 329); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(370, 77); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveShip - // - buttonRemoveShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveShip.Location = new Point(3, 246); - buttonRemoveShip.Name = "buttonRemoveShip"; - buttonRemoveShip.Size = new Size(370, 77); - buttonRemoveShip.TabIndex = 4; - buttonRemoveShip.Text = "Удалить корабль"; - buttonRemoveShip.UseVisualStyleBackColor = true; - buttonRemoveShip.Click += ButtonRemoveShip_Click; - // - // maskedTextBox - // - maskedTextBox.Location = new Point(3, 201); - maskedTextBox.Mask = "00"; - maskedTextBox.Name = "maskedTextBox"; - maskedTextBox.Size = new Size(370, 39); - maskedTextBox.TabIndex = 3; - maskedTextBox.ValidatingType = typeof(int); - // - // buttonAddShip - // - buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddShip.Location = new Point(3, 35); - buttonAddShip.Name = "buttonAddShip"; - buttonAddShip.Size = new Size(370, 77); - buttonAddShip.TabIndex = 1; - buttonAddShip.Text = "Добавление корабля"; - buttonAddShip.UseVisualStyleBackColor = true; - buttonAddShip.Click += ButtonAddShip_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -244,21 +246,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddShip); - panelCompanyTools.Controls.Add(maskedTextBox); - panelCompanyTools.Controls.Add(buttonRemoveShip); - panelCompanyTools.Controls.Add(buttonAddContainerShip); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 598); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(382, 511); - panelCompanyTools.TabIndex = 10; - // // FormShipCollection // AutoScaleDimensions = new SizeF(13F, 32F); @@ -269,11 +256,11 @@ Name = "FormShipCollection"; 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); } @@ -287,7 +274,6 @@ private MaskedTextBox maskedTextBox; private PictureBox pictureBox; private Button buttonRefresh; - private Button buttonAddContainerShip; private Panel panelStorage; private Label labelCollectionName; private RadioButton radioButtonList; diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs index aeeda7b..34a4f11 100644 --- a/ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs +++ b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs @@ -37,34 +37,29 @@ public partial class FormShipCollection : Form } /// - /// Создание объекта класса-перемещения + /// Добавление корабля /// - /// - private void CreateObject(string type) + /// + /// + private void ButtonAddShip_Click(object sender, EventArgs e) { - if (_company == null) + FormShipConfig form = new(); + form.AddEvent(SetShip); + form.Show(); + } + + /// + /// Добавление корабля в коллекцнию + /// + /// + private void SetShip(DrawningShip ship) + { + if (_company == null || ship == null) { return; } - Random random = new(); - DrawningShip drawningShip; - switch (type) - { - case nameof(DrawningShip): - drawningShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningContainerShip): - // TODO вызов диалогового окна для выбора цвета (made) - drawningShip = new DrawningContainerShip(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; - } - - if (_company + drawningShip != -1) + if (_company + ship != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -75,38 +70,6 @@ public partial class FormShipCollection : 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 ColorDialog(); - - if (dialog.ShowDialog() == DialogResult.OK) - { - color = dialog.Color; - } - - return color; - } - - /// - /// Добавление корабля - /// - /// - /// - private void ButtonAddShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip)); - - /// - /// Добавление контейнеровоза - /// - /// - /// - private void ButtonAddContainerShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningContainerShip)); - /// /// Удаление объекта /// diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.Designer.cs b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.Designer.cs new file mode 100644 index 0000000..72f4792 --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.Designer.cs @@ -0,0 +1,384 @@ +namespace ProjectContainerShip +{ + partial class FormShipConfig + { + /// + /// 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(); + checkBoxCrane = new CheckBox(); + checkBoxContainer = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModifiedObject = new Label(); + labelSimpleObject = new Label(); + pictureBoxObject = new PictureBox(); + buttonCancel = new Button(); + panelObject = new Panel(); + labelAdditionalColor = new Label(); + labelBodyColor = new Label(); + buttonAdd = new Button(); + 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(checkBoxCrane); + groupBoxConfig.Controls.Add(checkBoxContainer); + 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.Margin = new Padding(2, 1, 2, 1); + groupBoxConfig.Name = "groupBoxConfig"; + groupBoxConfig.Padding = new Padding(2, 1, 2, 1); + groupBoxConfig.Size = new Size(621, 172); + 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(258, 15); + groupBoxColors.Margin = new Padding(2, 1, 2, 1); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Padding = new Padding(2, 1, 2, 1); + groupBoxColors.Size = new Size(311, 117); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(257, 72); + panelPurple.Margin = new Padding(2, 1, 2, 1); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(41, 38); + panelPurple.TabIndex = 7; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(176, 72); + panelBlack.Margin = new Padding(2, 1, 2, 1); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(41, 38); + panelBlack.TabIndex = 6; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(93, 72); + panelGray.Margin = new Padding(2, 1, 2, 1); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(41, 38); + panelGray.TabIndex = 5; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(12, 72); + panelWhite.Margin = new Padding(2, 1, 2, 1); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(41, 38); + panelWhite.TabIndex = 4; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(257, 18); + panelYellow.Margin = new Padding(2, 1, 2, 1); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(41, 38); + panelYellow.TabIndex = 3; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(176, 18); + panelBlue.Margin = new Padding(2, 1, 2, 1); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(41, 38); + panelBlue.TabIndex = 2; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(93, 18); + panelGreen.Margin = new Padding(2, 1, 2, 1); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(41, 38); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(12, 18); + panelRed.Margin = new Padding(2, 1, 2, 1); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(41, 38); + panelRed.TabIndex = 0; + // + // checkBoxCrane + // + checkBoxCrane.AutoSize = true; + checkBoxCrane.Location = new Point(6, 99); + checkBoxCrane.Margin = new Padding(2, 1, 2, 1); + checkBoxCrane.Name = "checkBoxCrane"; + checkBoxCrane.Size = new Size(158, 19); + checkBoxCrane.TabIndex = 7; + checkBoxCrane.Text = "Признак наличия крана"; + checkBoxCrane.UseVisualStyleBackColor = true; + // + // checkBoxContainer + // + checkBoxContainer.AutoSize = true; + checkBoxContainer.Location = new Point(6, 128); + checkBoxContainer.Margin = new Padding(2, 1, 2, 1); + checkBoxContainer.Name = "checkBoxContainer"; + checkBoxContainer.Size = new Size(197, 19); + checkBoxContainer.TabIndex = 6; + checkBoxContainer.Text = "Признак наличия контейнеров"; + checkBoxContainer.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(72, 55); + numericUpDownWeight.Margin = new Padding(2, 1, 2, 1); + 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(102, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(6, 56); + labelWeight.Margin = new Padding(2, 0, 2, 0); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(72, 26); + numericUpDownSpeed.Margin = new Padding(2, 1, 2, 1); + 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(102, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(6, 27); + labelSpeed.Margin = new Padding(2, 0, 2, 0); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(59, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(423, 136); + labelModifiedObject.Margin = new Padding(2, 0, 2, 0); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(147, 31); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(258, 136); + labelSimpleObject.Margin = new Padding(2, 0, 2, 0); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(148, 31); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(8, 41); + pictureBoxObject.Margin = new Padding(2, 1, 2, 1); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(193, 81); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonCancel + // + buttonCancel.Location = new Point(743, 140); + buttonCancel.Margin = new Padding(2, 1, 2, 1); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(81, 22); + 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(624, 0); + panelObject.Margin = new Padding(2, 1, 2, 1); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(209, 131); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(108, 8); + labelAdditionalColor.Margin = new Padding(2, 0, 2, 0); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(93, 26); + labelAdditionalColor.TabIndex = 5; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += LabelColor_DragDrop; + labelAdditionalColor.DragEnter += LabelObject_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(8, 8); + labelBodyColor.Margin = new Padding(2, 0, 2, 0); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(93, 26); + labelBodyColor.TabIndex = 4; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelColor_DragDrop; + labelBodyColor.DragEnter += LabelObject_DragEnter; + // + // buttonAdd + // + buttonAdd.Location = new Point(632, 140); + buttonAdd.Margin = new Padding(2, 1, 2, 1); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(81, 22); + buttonAdd.TabIndex = 5; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // FormShipConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(839, 172); + Controls.Add(buttonAdd); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(groupBoxConfig); + Margin = new Padding(2, 1, 2, 1); + Name = "FormShipConfig"; + 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 labelSpeed; + private Label labelModifiedObject; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private CheckBox checkBoxContainer; + private CheckBox checkBoxCrane; + private GroupBox groupBoxColors; + private Panel panelRed; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private PictureBox pictureBoxObject; + private Button buttonCancel; + private Panel panelObject; + private Button buttonAdd; + private Label labelBodyColor; + private Label labelAdditionalColor; + } +} \ No newline at end of file diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs new file mode 100644 index 0000000..f11a4dc --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs @@ -0,0 +1,164 @@ +using ProjectContainerShip.Drawings; +using ProjectContainerShip.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 ProjectContainerShip; + +/// +/// Форма конфигурации объекта +/// +public partial class FormShipConfig : Form +{ + /// + /// Объект - прорисовка корабля + /// + private DrawningShip? _ship; + + /// + /// Событие для передачи объекта + /// + private event Action? ShipDelegate; + + /// + /// Конструктор + /// + public FormShipConfig() + { + InitializeComponent(); + panelRed.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelGray.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + + // TODO buttonCancel.Click with lambda + buttonCancel.Click += (sender, e) => Close(); + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action shipDelegate) + { + ShipDelegate += shipDelegate; + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _ship?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _ship?.SetPosition(110, 75); + _ship?.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": + _ship = new DrawningShip((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _ship = new DrawningContainerShip((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxCrane.Checked, checkBoxContainer.Checked); + break; + } + DrawObject(); + } + + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.White, DragDropEffects.Move | DragDropEffects.Copy); + } + + private void LabelObject_DragEnter(object sender, DragEventArgs e) + { + if (!e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.None; + } + else + { + e.Effect = DragDropEffects.Copy; + } + } + + private void LabelColor_DragDrop(object sender, DragEventArgs e) + { + if (_ship == null) return; + switch ((sender as Label).Name) + { + case "labelBodyColor": + _ship.EntityShip?.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + break; + case "labelAdditionalColor": + if (_ship is DrawningContainerShip containerShip) + { + ((EntityContainerShip)containerShip.EntityShip)?.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + break; + } + + + DrawObject(); + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_ship != null) + { + ShipDelegate?.Invoke(_ship); + Close(); + } + } +} + + diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.resx b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.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/ProjectContainerShip/ProjectContainerShip/ShipDelegate.cs b/ProjectContainerShip/ProjectContainerShip/ShipDelegate.cs new file mode 100644 index 0000000..ffebb09 --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/ShipDelegate.cs @@ -0,0 +1,9 @@ +using ProjectContainerShip.Drawings; + +namespace ProjectContainerShip; + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void ShipDelegate(DrawningShip ship); \ No newline at end of file