diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavator.cs b/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavator.cs index 6c0acc9..38c37ce 100644 --- a/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavator.cs +++ b/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavator.cs @@ -22,9 +22,15 @@ public class EntityExcavator : EntityExcavatorEmpty /// Признак (опция) наличие бульдозерного отвала /// public bool BulldozerDump { get; private set; } - - - + + /// + /// установка доп. цвета + /// + /// + public void setAdditionalColor(Color color) + { + AdditionalColor = color; + } /// /// Конструктор /// diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavatorEmpty.cs b/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavatorEmpty.cs index 5b43622..d7f2a7b 100644 --- a/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavatorEmpty.cs +++ b/WinFormsAppExcavator/WinFormsAppExcavator/Entity/EntityExcavatorEmpty.cs @@ -25,6 +25,15 @@ public class EntityExcavatorEmpty /// public double Step => Speed * 100 / Weight; + /// + /// Основной цвет + /// + /// + public void setBodyColor(Color color) + { + BodyColor = color; + } + /// /// конструктор сущности /// diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/ExcavatorDelegate.cs b/WinFormsAppExcavator/WinFormsAppExcavator/ExcavatorDelegate.cs new file mode 100644 index 0000000..d983dfe --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/ExcavatorDelegate.cs @@ -0,0 +1,9 @@ +using WinFormsAppExcavator.Drawings; + +namespace WinFormsAppExcavator; + +/// +/// Делегат для передачи объекта-экскаватора +/// +/// +public delegate void ExcavatorDelegate(DrawingExcavatorEmpty excavator); \ No newline at end of file diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorCollection.Designer.cs b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorCollection.Designer.cs index 8bbbc7e..4622a81 100644 --- a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorCollection.Designer.cs +++ b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + maskedTextBox = new MaskedTextBox(); + buttonAddExcavatorEmpty = new Button(); + buttonGoToCheck = new Button(); + buttonRemoveExcavator = new Button(); + 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(); - buttonRemoveExcavator = new Button(); - maskedTextBox = new MaskedTextBox(); - buttonAddExcavator = new Button(); - buttonAddExcavatorEmpty = 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(maskedTextBox); + panelCompanyTools.Controls.Add(buttonAddExcavatorEmpty); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Controls.Add(buttonRemoveExcavator); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 324); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(214, 228); + panelCompanyTools.TabIndex = 9; + // + // maskedTextBox + // + maskedTextBox.Location = new Point(3, 96); + maskedTextBox.Mask = "00"; + maskedTextBox.Name = "maskedTextBox"; + maskedTextBox.Size = new Size(208, 27); + maskedTextBox.TabIndex = 3; + maskedTextBox.ValidatingType = typeof(int); + // + // buttonAddExcavatorEmpty + // + buttonAddExcavatorEmpty.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddExcavatorEmpty.Location = new Point(5, 0); + buttonAddExcavatorEmpty.Name = "buttonAddExcavatorEmpty"; + buttonAddExcavatorEmpty.Size = new Size(209, 53); + buttonAddExcavatorEmpty.TabIndex = 1; + buttonAddExcavatorEmpty.Text = "Добавление экскаватора простого"; + buttonAddExcavatorEmpty.UseVisualStyleBackColor = true; + buttonAddExcavatorEmpty.Click += ButtonAddExcavatorEmpty_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(5, 163); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(206, 29); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Отправление на тест"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // + // buttonRemoveExcavator + // + buttonRemoveExcavator.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveExcavator.Location = new Point(5, 127); + buttonRemoveExcavator.Name = "buttonRemoveExcavator"; + buttonRemoveExcavator.Size = new Size(206, 30); + buttonRemoveExcavator.TabIndex = 4; + buttonRemoveExcavator.Text = "Удаление экскаватора"; + buttonRemoveExcavator.UseVisualStyleBackColor = true; + buttonRemoveExcavator.Click += ButtonRemoveExcavator_Click; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(5, 198); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(206, 27); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(6, 292); @@ -158,70 +224,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(5, 198); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(206, 27); - 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(5, 163); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(206, 29); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Отправление на тест"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveExcavator - // - buttonRemoveExcavator.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveExcavator.Location = new Point(5, 127); - buttonRemoveExcavator.Name = "buttonRemoveExcavator"; - buttonRemoveExcavator.Size = new Size(206, 30); - buttonRemoveExcavator.TabIndex = 4; - buttonRemoveExcavator.Text = "Удаление экскаватора"; - buttonRemoveExcavator.UseVisualStyleBackColor = true; - buttonRemoveExcavator.Click += ButtonRemoveExcavator_Click; - // - // maskedTextBox - // - maskedTextBox.Location = new Point(3, 96); - maskedTextBox.Mask = "00"; - maskedTextBox.Name = "maskedTextBox"; - maskedTextBox.Size = new Size(208, 27); - maskedTextBox.TabIndex = 3; - maskedTextBox.ValidatingType = typeof(int); - // - // buttonAddExcavator - // - buttonAddExcavator.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddExcavator.Location = new Point(0, 59); - buttonAddExcavator.Name = "buttonAddExcavator"; - buttonAddExcavator.Size = new Size(214, 31); - buttonAddExcavator.TabIndex = 2; - buttonAddExcavator.Text = "Добавление экскаватора"; - buttonAddExcavator.UseVisualStyleBackColor = true; - buttonAddExcavator.Click += ButtonAddExcavator_Click; - // - // buttonAddExcavatorEmpty - // - buttonAddExcavatorEmpty.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddExcavatorEmpty.Location = new Point(5, 0); - buttonAddExcavatorEmpty.Name = "buttonAddExcavatorEmpty"; - buttonAddExcavatorEmpty.Size = new Size(209, 53); - buttonAddExcavatorEmpty.TabIndex = 1; - buttonAddExcavatorEmpty.Text = "Добавление экскаватора простого"; - buttonAddExcavatorEmpty.UseVisualStyleBackColor = true; - buttonAddExcavatorEmpty.Click += ButtonAddExcavatorEmpty_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -243,21 +245,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(maskedTextBox); - panelCompanyTools.Controls.Add(buttonAddExcavator); - panelCompanyTools.Controls.Add(buttonAddExcavatorEmpty); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Controls.Add(buttonRemoveExcavator); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 324); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(214, 228); - panelCompanyTools.TabIndex = 9; - // // FormExcavatorCollection // AutoScaleDimensions = new SizeF(8F, 20F); @@ -268,11 +255,11 @@ Name = "FormExcavatorCollection"; 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); } @@ -280,7 +267,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; - private Button buttonAddExcavator; private Button buttonAddExcavatorEmpty; private Button buttonRemoveExcavator; private MaskedTextBox maskedTextBox; diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorCollection.cs b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorCollection.cs index f4b6191..c4f7caf 100644 --- a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorCollection.cs +++ b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorCollection.cs @@ -38,44 +38,27 @@ public partial class FormExcavatorCollection : Form /// /// /// - private void ButtonAddExcavatorEmpty_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingExcavatorEmpty)); - - /// - /// Добавление полного экскаватора - /// - /// - /// - private void ButtonAddExcavator_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingExcavator)); - - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + private void ButtonAddExcavatorEmpty_Click(object sender, EventArgs e) { - if (_company == null) + FormExcavatorConfig form= new (); + // TODO передать метод + + form.Show(); + form.AddEvent(SetExcavator); + + } + /// + /// Добавление экскаватора + /// + /// + private void SetExcavator(DrawingExcavatorEmpty? excavator) + { + if (_company == null || excavator == null) { return; } - Random random = new(); - DrawingExcavatorEmpty drawningExcavatorEmpty; - switch (type) - { - case nameof(DrawingExcavatorEmpty): - drawningExcavatorEmpty = new DrawingExcavatorEmpty(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawingExcavator): - // TODO вызов диалогового окна для выбора цвета - drawningExcavatorEmpty = new DrawingExcavator(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 + excavator == 1) + if (_company + excavator != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -85,24 +68,6 @@ public partial class FormExcavatorCollection : Form MessageBox.Show("Не удалось добавить объект"); } } - - /// - /// Получение цвета - /// - /// Генератор случайных чисел - /// - 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; - } - /// /// Удаление объекта /// @@ -133,7 +98,11 @@ public partial class FormExcavatorCollection : Form } } - + /// + /// Кнопка передачи на тест + /// + /// + /// private void ButtonGoToCheck_Click(object sender, EventArgs e) { if (_company == null) @@ -164,7 +133,11 @@ public partial class FormExcavatorCollection : Form }; form.ShowDialog(); } - + /// + /// Кнопка обновления + /// + /// + /// private void ButtonRefresh_Click(object sender, EventArgs e) { if (_company == null) @@ -199,6 +172,10 @@ public partial class FormExcavatorCollection : Form _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType); RerfreshListBoxItems(); } + + /// + /// обновление элементов + /// private void RerfreshListBoxItems() { listBoxCollection.Items.Clear(); diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorConfig.Designer.cs b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorConfig.Designer.cs new file mode 100644 index 0000000..1e2e62f --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorConfig.Designer.cs @@ -0,0 +1,410 @@ +namespace WinFormsAppExcavator +{ + 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(); + panel2 = new Panel(); + pictureBox1 = new PictureBox(); + panel1 = new Panel(); + groupBoxColors = new GroupBox(); + panelPurple = new Panel(); + panelYellow = new Panel(); + panelBlack = new Panel(); + panelBlue = new Panel(); + panelGray = new Panel(); + panelGreen = new Panel(); + panelWhite = new Panel(); + panelRed = new Panel(); + checkBoxBulldozerDump = new CheckBox(); + checkBoxSupport = new CheckBox(); + checkBoxBucket = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + numericUpDownSpeed = new NumericUpDown(); + labelWeight = new Label(); + labelSpeed = new Label(); + labelModifiedObject = new Label(); + labelSimpleObject = new Label(); + panelObject = new Panel(); + labelBodyColor = new Label(); + pictureBoxObject = new PictureBox(); + labelAdditionalColor = new Label(); + buttonAdd = new Button(); + buttonCancel = new Button(); + groupBoxConfig.SuspendLayout(); + panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit(); + groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + panelObject.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + SuspendLayout(); + // + // groupBoxConfig + // + groupBoxConfig.Controls.Add(panel2); + groupBoxConfig.Controls.Add(panel1); + groupBoxConfig.Controls.Add(groupBoxColors); + groupBoxConfig.Controls.Add(checkBoxBulldozerDump); + groupBoxConfig.Controls.Add(checkBoxSupport); + groupBoxConfig.Controls.Add(checkBoxBucket); + groupBoxConfig.Controls.Add(numericUpDownWeight); + groupBoxConfig.Controls.Add(numericUpDownSpeed); + groupBoxConfig.Controls.Add(labelWeight); + 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(571, 251); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // panel2 + // + panel2.Controls.Add(pictureBox1); + panel2.Location = new Point(578, 10); + panel2.Name = "panel2"; + panel2.Size = new Size(250, 125); + panel2.TabIndex = 1; + // + // pictureBox1 + // + pictureBox1.Location = new Point(59, 48); + pictureBox1.Name = "pictureBox1"; + pictureBox1.Size = new Size(125, 62); + pictureBox1.TabIndex = 0; + pictureBox1.TabStop = false; + // + // panel1 + // + panel1.Location = new Point(594, 12); + panel1.Name = "panel1"; + panel1.Size = new Size(226, 144); + panel1.TabIndex = 1; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(316, 21); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(256, 125); + groupBoxColors.TabIndex = 9; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(189, 81); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(35, 33); + panelPurple.TabIndex = 7; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(189, 36); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(35, 33); + panelYellow.TabIndex = 3; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(130, 81); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(35, 33); + panelBlack.TabIndex = 6; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(130, 36); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(35, 33); + panelBlue.TabIndex = 2; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(74, 81); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(35, 33); + panelGray.TabIndex = 5; + // + // panelGreen + // + panelGreen.BackColor = Color.FromArgb(0, 192, 0); + panelGreen.Location = new Point(74, 36); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(35, 33); + panelGreen.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(23, 81); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(35, 33); + panelWhite.TabIndex = 4; + // + // panelRed + // + panelRed.AllowDrop = true; + panelRed.AutoSize = true; + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(23, 36); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(35, 33); + panelRed.TabIndex = 0; + panelRed.MouseDown += Panel_MouseDown; + // + // checkBoxBulldozerDump + // + checkBoxBulldozerDump.AutoSize = true; + checkBoxBulldozerDump.Location = new Point(13, 162); + checkBoxBulldozerDump.Name = "checkBoxBulldozerDump"; + checkBoxBulldozerDump.Size = new Size(315, 24); + checkBoxBulldozerDump.TabIndex = 8; + checkBoxBulldozerDump.Text = "Признак наличие бульдозерного отвала"; + checkBoxBulldozerDump.UseVisualStyleBackColor = true; + // + // checkBoxSupport + // + checkBoxSupport.AutoSize = true; + checkBoxSupport.Location = new Point(12, 132); + checkBoxSupport.Name = "checkBoxSupport"; + checkBoxSupport.Size = new Size(209, 24); + checkBoxSupport.TabIndex = 7; + checkBoxSupport.Text = "Признак наличие опоры "; + checkBoxSupport.UseVisualStyleBackColor = true; + // + // checkBoxBucket + // + checkBoxBucket.AutoSize = true; + checkBoxBucket.Location = new Point(13, 102); + checkBoxBucket.Name = "checkBoxBucket"; + checkBoxBucket.Size = new Size(202, 24); + checkBoxBucket.TabIndex = 6; + checkBoxBucket.Text = "Признак наличия ковша"; + checkBoxBucket.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(91, 54); + 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(150, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(91, 21); + 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(150, 27); + numericUpDownSpeed.TabIndex = 4; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 61); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(33, 20); + labelWeight.TabIndex = 3; + labelWeight.Text = "Вес"; + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 23); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(73, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(161, 201); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(113, 25); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(33, 201); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(98, 25); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // panelObject + // + panelObject.AllowDrop = true; + panelObject.Controls.Add(labelBodyColor); + panelObject.Controls.Add(pictureBoxObject); + panelObject.Controls.Add(labelAdditionalColor); + panelObject.Location = new Point(575, 7); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(250, 197); + panelObject.TabIndex = 1; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.AutoSize = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(31, 19); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(44, 22); + labelBodyColor.TabIndex = 1; + labelBodyColor.Text = "Цвет"; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(19, 44); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(216, 150); + pictureBoxObject.TabIndex = 0; + pictureBoxObject.TabStop = false; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.AutoSize = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(158, 19); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(77, 22); + labelAdditionalColor.TabIndex = 2; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop; + labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter; + // + // buttonAdd + // + buttonAdd.Location = new Point(578, 210); + 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(716, 210); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 3; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // FormExcavatorConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(822, 251); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(panelObject); + Controls.Add(groupBoxConfig); + Name = "FormExcavatorConfig"; + Text = "Создание объекта"; + groupBoxConfig.ResumeLayout(false); + groupBoxConfig.PerformLayout(); + panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit(); + groupBoxColors.ResumeLayout(false); + groupBoxColors.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + panelObject.ResumeLayout(false); + panelObject.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxConfig; + private Label labelModifiedObject; + private Label labelSimpleObject; + private NumericUpDown numericUpDownWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelWeight; + private Label labelSpeed; + private CheckBox checkBoxBulldozerDump; + private CheckBox checkBoxSupport; + private CheckBox checkBoxBucket; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelYellow; + private Panel panelBlack; + private Panel panelBlue; + private Panel panelGray; + private Panel panelGreen; + private Panel panelWhite; + private Panel panelRed; + private Panel panel1; + private Panel panel2; + private PictureBox pictureBox1; + 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/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorConfig.cs b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorConfig.cs new file mode 100644 index 0000000..a607fbb --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorConfig.cs @@ -0,0 +1,218 @@ +using WinFormsAppExcavator.Drawings; +using WinFormsAppExcavator.Entity; + + +namespace WinFormsAppExcavator +{ + /// + /// форма конфигурации объекта + /// + public partial class FormExcavatorConfig : Form + { + + private DrawingExcavatorEmpty? _excavatorempty; + + /// + /// событие для передачи объекта + /// + + 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; + panelGray.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + // TODO buttonCancel.Click привязать анонимный метод через lambda закрытием формы + buttonCancel.Click += (sender, e) => Close(); + + } + + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action excavatorDelegate) + { + ExcavatorDelegate += excavatorDelegate; + } + + /// + /// Отрисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _excavatorempty?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _excavatorempty?.SetPosition(15, 15); + _excavatorempty?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + + /// + /// Передаем информацию при нажатии на Labe + /// + /// + /// + + 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) + { + if (e.Data?.GetDataPresent(DataFormats.Text) ?? false) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + /// + /// действия при приеме перетаскиваемой информации + /// + /// + /// + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data?.GetData(DataFormats.Text)?.ToString()) + { + case "labelSimpleObject": + _excavatorempty = new DrawingExcavatorEmpty((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _excavatorempty = new DrawingExcavator((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, + Color.White, + Color.Black, checkBoxBucket.Checked, + checkBoxSupport.Checked, checkBoxBulldozerDump.Checked); + break; + } + labelBodyColor.BackColor = Color.Empty; + labelAdditionalColor.BackColor = Color.Empty; + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + // TODO отправка цвета в Drag&Drop + (sender as Control)?.DoDragDrop((sender as Control)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + + // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта) + + /// + /// Проверка получаемой информации по основному цвету + /// + /// + /// + private void labelBodyColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + /// + /// действия при приеме перетаскиваемого основного цвета + /// + /// + /// + private void labelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_excavatorempty != null) + { + _excavatorempty.EntityExcavatorEmpty.setBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + /// + /// проверка получаемой информации по доп. цвету + /// + /// + /// + private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_excavatorempty is DrawingExcavator) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + /// + /// действия при перетаскивании доп. цвета + /// + /// + /// + private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_excavatorempty.EntityExcavatorEmpty is EntityExcavator _excavator) + { + _excavator.setAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_excavatorempty != null) + { + ExcavatorDelegate?.Invoke(_excavatorempty); + Close(); + } + } + + } + + + + + + + + +} diff --git a/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorConfig.resx b/WinFormsAppExcavator/WinFormsAppExcavator/FormExcavatorConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/WinFormsAppExcavator/WinFormsAppExcavator/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