diff --git a/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ListGenericObjects.cs b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ListGenericObjects.cs index e66abd6..f136c26 100644 --- a/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ListGenericObjects.cs @@ -56,7 +56,7 @@ public class ListGenericObjects : ICollectionGenericObjects return -1; // TODO вставка по позиции - _collection.Insert(0, obj); + _collection.Insert(position, obj); return position; } diff --git a/ProjectExcavator/ProjectExcavator/Entities/EntityBulldozer.cs b/ProjectExcavator/ProjectExcavator/Entities/EntityBulldozer.cs index a0ba79e..3cc851d 100644 --- a/ProjectExcavator/ProjectExcavator/Entities/EntityBulldozer.cs +++ b/ProjectExcavator/ProjectExcavator/Entities/EntityBulldozer.cs @@ -18,6 +18,10 @@ public class EntityBulldozer /// Основной цвет /// public Color BodyColor { get; private set; } + public void setBodyColor(Color color) + { + BodyColor = color; + } /// /// Шаг перемещения экскаватора diff --git a/ProjectExcavator/ProjectExcavator/Entities/EntityExcavator.cs b/ProjectExcavator/ProjectExcavator/Entities/EntityExcavator.cs index ae6af3f..e878ec4 100644 --- a/ProjectExcavator/ProjectExcavator/Entities/EntityExcavator.cs +++ b/ProjectExcavator/ProjectExcavator/Entities/EntityExcavator.cs @@ -8,6 +8,10 @@ public class EntityExcavator : EntityBulldozer /// Дополнительный цвет (для опциональных элементов) /// public Color AdditionalColor { get; private set; } + public void setAdditionalColor(Color color) + { + AdditionalColor = color; + } /// /// Признак наличия опор diff --git a/ProjectExcavator/ProjectExcavator/ExcavatorDelegate.cs b/ProjectExcavator/ProjectExcavator/ExcavatorDelegate.cs new file mode 100644 index 0000000..a622de6 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/ExcavatorDelegate.cs @@ -0,0 +1,9 @@ +using ProjectExcavator.Drawnings; + +namespace ProjectExcavator; + +/// +/// Делегат передачи объекта класса-прорисовки +/// +/// +public delegate void ExcavatorDelegate(DrawningBulldozer bulldozer); \ No newline at end of file diff --git a/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.Designer.cs b/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.Designer.cs index fb237a5..145a2e1 100644 --- a/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.Designer.cs +++ b/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonGoToCheck = new Button(); + buttonAddBulldozer = new Button(); + buttonRemoveCar = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonRefresh = 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(); - buttonRemoveCar = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddExcavator = new Button(); - buttonAddBulldozer = 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(buttonGoToCheck); + panelCompanyTools.Controls.Add(buttonAddBulldozer); + panelCompanyTools.Controls.Add(buttonRemoveCar); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 328); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(181, 269); + panelCompanyTools.TabIndex = 9; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(12, 177); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(160, 42); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // + // buttonAddBulldozer + // + buttonAddBulldozer.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddBulldozer.Location = new Point(12, 4); + buttonAddBulldozer.Name = "buttonAddBulldozer"; + buttonAddBulldozer.Size = new Size(160, 42); + buttonAddBulldozer.TabIndex = 1; + buttonAddBulldozer.Text = "Добавление бульдозера"; + buttonAddBulldozer.UseVisualStyleBackColor = true; + buttonAddBulldozer.Click += ButtonAddBulldozer_Click; + // + // buttonRemoveCar + // + buttonRemoveCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveCar.Location = new Point(12, 129); + buttonRemoveCar.Name = "buttonRemoveCar"; + buttonRemoveCar.Size = new Size(160, 42); + buttonRemoveCar.TabIndex = 4; + buttonRemoveCar.Text = "Удалить автомобиль"; + buttonRemoveCar.UseVisualStyleBackColor = true; + buttonRemoveCar.Click += ButtonRemoveCar_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(12, 100); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(160, 23); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(12, 225); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(160, 42); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(15, 299); @@ -159,70 +225,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции: "; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(12, 225); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(160, 42); - 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(12, 177); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(160, 42); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveCar - // - buttonRemoveCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveCar.Location = new Point(12, 129); - buttonRemoveCar.Name = "buttonRemoveCar"; - buttonRemoveCar.Size = new Size(160, 42); - buttonRemoveCar.TabIndex = 4; - buttonRemoveCar.Text = "Удалить автомобиль"; - buttonRemoveCar.UseVisualStyleBackColor = true; - buttonRemoveCar.Click += ButtonRemoveCar_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(12, 100); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(160, 23); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddExcavator - // - buttonAddExcavator.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddExcavator.Location = new Point(12, 52); - buttonAddExcavator.Name = "buttonAddExcavator"; - buttonAddExcavator.Size = new Size(160, 42); - buttonAddExcavator.TabIndex = 2; - buttonAddExcavator.Text = "Добавление экскаватора"; - buttonAddExcavator.UseVisualStyleBackColor = true; - buttonAddExcavator.Click += ButtonAddExcavator_Click; - // - // buttonAddBulldozer - // - buttonAddBulldozer.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddBulldozer.Location = new Point(12, 4); - buttonAddBulldozer.Name = "buttonAddBulldozer"; - buttonAddBulldozer.Size = new Size(160, 42); - buttonAddBulldozer.TabIndex = 1; - buttonAddBulldozer.Text = "Добавление бульдозера"; - buttonAddBulldozer.UseVisualStyleBackColor = true; - buttonAddBulldozer.Click += ButtonAddBulldozer_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -244,21 +246,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Controls.Add(buttonAddBulldozer); - panelCompanyTools.Controls.Add(buttonRemoveCar); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonAddExcavator); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 328); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(181, 269); - panelCompanyTools.TabIndex = 9; - // // FormBulldozerCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -269,11 +256,11 @@ Name = "FormBulldozerCollection"; 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); } @@ -282,7 +269,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; private MaskedTextBox maskedTextBoxPosition; - private Button buttonAddExcavator; private Button buttonAddBulldozer; private PictureBox pictureBox; private Button buttonRemoveCar; diff --git a/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.cs b/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.cs index 734e605..ba06339 100644 --- a/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.cs +++ b/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.cs @@ -42,44 +42,26 @@ public partial class FormBulldozerCollection : Form /// /// /// - private void ButtonAddBulldozer_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBulldozer)); - - /// - /// Добавление экскаватора - /// - /// - /// - private void ButtonAddExcavator_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningExcavator)); - - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + private void ButtonAddBulldozer_Click(object sender, EventArgs e) { - if (_company == null) + FormExcavatorConfig form = new(); + // TODO передать метод + form.AddEvent(SetBulldozer); + form.Show(); + } + + /// + /// Добавление автомобиля в коллекцию + /// + /// + private void SetBulldozer(DrawningBulldozer bulldozer) + { + if (_company == null || bulldozer == null) { return; } - Random random = new(); - DrawningBulldozer drawningBulldozer; - switch (type) - { - case nameof(DrawningBulldozer): - drawningBulldozer = new DrawningBulldozer(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningExcavator): - drawningBulldozer = new DrawningExcavator(random.Next(100, 300), random.Next(1000, 3000), - GetColor(random), - GetColor(random), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(1, 2))); - break; - default: - return; - } - - if (_company + drawningBulldozer != -1) + if (_company + bulldozer != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -90,18 +72,6 @@ public partial class FormBulldozerCollection : 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 ButtonRemoveCar_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null) diff --git a/ProjectExcavator/ProjectExcavator/FormExcavatorConfig.Designer.cs b/ProjectExcavator/ProjectExcavator/FormExcavatorConfig.Designer.cs new file mode 100644 index 0000000..cb79ac3 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/FormExcavatorConfig.Designer.cs @@ -0,0 +1,357 @@ +namespace ProjectExcavator +{ + partial class FormExcavatorConfig + { + /// + /// 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(); + panelGrey = new Panel(); + panelWhite = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxLadle = new CheckBox(); + checkBoxProp = 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(checkBoxLadle); + groupBoxConfig.Controls.Add(checkBoxProp); + 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(492, 204); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelGrey); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(230, 16); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(230, 110); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(185, 68); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(37, 36); + panelPurple.TabIndex = 3; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(126, 68); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(37, 36); + panelBlack.TabIndex = 4; + // + // panelGrey + // + panelGrey.BackColor = Color.Gray; + panelGrey.Location = new Point(65, 68); + panelGrey.Name = "panelGrey"; + panelGrey.Size = new Size(37, 36); + panelGrey.TabIndex = 5; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(7, 68); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(37, 36); + panelWhite.TabIndex = 2; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(185, 15); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(37, 36); + panelYellow.TabIndex = 1; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(126, 15); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(37, 36); + panelBlue.TabIndex = 1; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(65, 15); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(37, 36); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(7, 15); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(37, 36); + panelRed.TabIndex = 0; + // + // checkBoxLadle + // + checkBoxLadle.AutoSize = true; + checkBoxLadle.Location = new Point(12, 113); + checkBoxLadle.Name = "checkBoxLadle"; + checkBoxLadle.Size = new Size(162, 19); + checkBoxLadle.TabIndex = 7; + checkBoxLadle.Text = "Признак наличия ковша"; + checkBoxLadle.UseVisualStyleBackColor = true; + // + // checkBoxProp + // + checkBoxProp.AutoSize = true; + checkBoxProp.Location = new Point(13, 78); + checkBoxProp.Name = "checkBoxProp"; + checkBoxProp.Size = new Size(154, 19); + checkBoxProp.TabIndex = 6; + checkBoxProp.Text = "Признак наличия опор"; + checkBoxProp.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(78, 49); + 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(100, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(13, 51); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(78, 16); + 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(100, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(13, 18); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(59, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(360, 152); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(100, 33); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(230, 152); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(100, 33); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(12, 51); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(144, 96); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(498, 169); + 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(591, 169); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(75, 23); + 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(498, 0); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(168, 163); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(93, 6); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(63, 33); + labelAdditionalColor.TabIndex = 10; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += labelColor_DragDrop; + labelAdditionalColor.DragEnter += labelColor_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(12, 6); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(63, 33); + labelBodyColor.TabIndex = 9; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelColor_DragDrop; + labelBodyColor.DragEnter += labelColor_DragEnter; + // + // FormExcavatorConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(675, 204); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormExcavatorConfig"; + 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 labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private Label labelModifiedObject; + private Label labelSimpleObject; + private CheckBox checkBoxProp; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxLadle; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGrey; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/ProjectExcavator/ProjectExcavator/FormExcavatorConfig.cs b/ProjectExcavator/ProjectExcavator/FormExcavatorConfig.cs new file mode 100644 index 0000000..d71228c --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/FormExcavatorConfig.cs @@ -0,0 +1,164 @@ +using ProjectExcavator.Drawnings; +using ProjectExcavator.Entities; + +namespace ProjectExcavator; + +/// +/// Форма конфигурации объекта +/// +public partial class FormExcavatorConfig : Form +{ + /// + /// Объект - прорисовка экскаватора + /// + private DrawningBulldozer? _bulldozer; + + /// + /// Событие для передачи объекта + /// + private event Action ExcavatorDelegate; + + /// + /// Конструктор + /// + public FormExcavatorConfig() + { + 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; + + // TODO buttonCancel.Click привязать анонимный метод через lambda с закрытием формы + buttonCancel.Click += (s, e) => Close(); + + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action excavatorDelegate) + { + ExcavatorDelegate += excavatorDelegate; + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _bulldozer?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _bulldozer?.SetPosition(5, 5, Width, Height); + _bulldozer?.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": + _bulldozer = new DrawningBulldozer((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _bulldozer = new DrawningExcavator((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxProp.Checked, checkBoxLadle.Checked); + break; + } + + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + // TODO отправка цвета в Drag&Drop + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + // TODO Реализовать логику смены цветов: основного и дополнительного + private void labelColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data?.GetDataPresent(typeof(Color)) ?? false) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void labelColor_DragDrop(object sender, DragEventArgs e) + { + if (_bulldozer == null) + { + return; + } + + switch (((Label)sender).Name) + { + case "labelBodyColor": + _bulldozer.EntityBulldozer.setBodyColor((Color)e.Data.GetData(typeof(Color))); + break; + case "labelAdditionalColor": + if (_bulldozer is not DrawningExcavator) + { + return; + } + (_bulldozer.EntityBulldozer as EntityExcavator).setAdditionalColor((Color)e.Data.GetData(typeof(Color))); + break; + } + DrawObject(); + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_bulldozer != null) + { + ExcavatorDelegate?.Invoke(_bulldozer); + Close(); + } + } + +} diff --git a/ProjectExcavator/ProjectExcavator/FormExcavatorConfig.resx b/ProjectExcavator/ProjectExcavator/FormExcavatorConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectExcavator/ProjectExcavator/FormExcavatorConfig.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