diff --git a/GasolineTanker/GasolineTanker/Entities/EntityGasolineTanker.cs b/GasolineTanker/GasolineTanker/Entities/EntityGasolineTanker.cs index 87529d1..e5d977a 100644 --- a/GasolineTanker/GasolineTanker/Entities/EntityGasolineTanker.cs +++ b/GasolineTanker/GasolineTanker/Entities/EntityGasolineTanker.cs @@ -37,4 +37,9 @@ public class EntityGasolineTanker : EntityTanker SignalBeacon = signalBeacon; Cistern = cistern; } + + public void SetAdditionalColor(Color color) + { + AdditionalColor = color; + } } diff --git a/GasolineTanker/GasolineTanker/Entities/EntityTanker.cs b/GasolineTanker/GasolineTanker/Entities/EntityTanker.cs index 011cf59..dff7d79 100644 --- a/GasolineTanker/GasolineTanker/Entities/EntityTanker.cs +++ b/GasolineTanker/GasolineTanker/Entities/EntityTanker.cs @@ -44,4 +44,9 @@ public class EntityTanker Weight = weight; BodyColor = bodyColor; } + + public void SetBodyColor(Color bodyColor) + { + BodyColor = bodyColor; + } } diff --git a/GasolineTanker/GasolineTanker/FormTankerCollection.Designer.cs b/GasolineTanker/GasolineTanker/FormTankerCollection.Designer.cs index 653770b..ac5989f 100644 --- a/GasolineTanker/GasolineTanker/FormTankerCollection.Designer.cs +++ b/GasolineTanker/GasolineTanker/FormTankerCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddTanker = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonRemoveTanker = new Button(); + buttonGoToCheck = 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(); - buttonRemoveTanker = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddGasolineTanker = new Button(); - buttonAddTanker = 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,72 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddTanker); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonRemoveTanker); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(14, 331); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(165, 269); + panelCompanyTools.TabIndex = 9; + // + // buttonAddTanker + // + buttonAddTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddTanker.Location = new Point(7, 43); + buttonAddTanker.Name = "buttonAddTanker"; + buttonAddTanker.Size = new Size(150, 35); + buttonAddTanker.TabIndex = 1; + buttonAddTanker.Text = "Добавление грузовика"; + buttonAddTanker.UseVisualStyleBackColor = true; + buttonAddTanker.Click += ButtonAddTanker_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(7, 121); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(155, 23); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(4, 224); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(149, 33); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonRemoveTanker + // + buttonRemoveTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveTanker.Location = new Point(6, 150); + buttonRemoveTanker.Name = "buttonRemoveTanker"; + buttonRemoveTanker.Size = new Size(149, 31); + buttonRemoveTanker.TabIndex = 4; + buttonRemoveTanker.Text = "Удаление грузовика"; + buttonRemoveTanker.UseVisualStyleBackColor = true; + buttonRemoveTanker.Click += ButtonRemoveTanker_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(6, 187); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(147, 31); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Отправить на проверку"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(14, 302); @@ -158,70 +223,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(4, 224); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(149, 33); - 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(6, 187); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(147, 31); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Отправить на проверку"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveTanker - // - buttonRemoveTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveTanker.Location = new Point(6, 150); - buttonRemoveTanker.Name = "buttonRemoveTanker"; - buttonRemoveTanker.Size = new Size(149, 31); - buttonRemoveTanker.TabIndex = 4; - buttonRemoveTanker.Text = "Удаление грузовика"; - buttonRemoveTanker.UseVisualStyleBackColor = true; - buttonRemoveTanker.Click += ButtonRemoveTanker_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(7, 121); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(155, 23); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddGasolineTanker - // - buttonAddGasolineTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddGasolineTanker.Location = new Point(4, 84); - buttonAddGasolineTanker.Name = "buttonAddGasolineTanker"; - buttonAddGasolineTanker.Size = new Size(151, 31); - buttonAddGasolineTanker.TabIndex = 2; - buttonAddGasolineTanker.Text = "Добавление бензовоза"; - buttonAddGasolineTanker.UseVisualStyleBackColor = true; - buttonAddGasolineTanker.Click += ButtonAddGasolineTanker_Click; - // - // buttonAddTanker - // - buttonAddTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddTanker.Location = new Point(7, 43); - buttonAddTanker.Name = "buttonAddTanker"; - buttonAddTanker.Size = new Size(150, 35); - buttonAddTanker.TabIndex = 1; - buttonAddTanker.Text = "Добавление грузовика"; - buttonAddTanker.UseVisualStyleBackColor = true; - buttonAddTanker.Click += ButtonAddTanker_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -243,20 +244,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddTanker); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonRemoveTanker); - panelCompanyTools.Controls.Add(buttonAddGasolineTanker); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(14, 331); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(165, 269); - panelCompanyTools.TabIndex = 9; - // // FormTankerCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -267,11 +254,11 @@ Name = "FormTankerCollection"; 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 buttonAddTanker; - private Button buttonAddGasolineTanker; private PictureBox pictureBox; private MaskedTextBox maskedTextBoxPosition; private Button buttonRemoveTanker; diff --git a/GasolineTanker/GasolineTanker/FormTankerCollection.cs b/GasolineTanker/GasolineTanker/FormTankerCollection.cs index 574e99a..dff6246 100644 --- a/GasolineTanker/GasolineTanker/FormTankerCollection.cs +++ b/GasolineTanker/GasolineTanker/FormTankerCollection.cs @@ -38,47 +38,29 @@ public partial class FormTankerCollection : Form } /// - /// Добавление обычного грузовика + /// Добавление грузовика /// /// /// - private void ButtonAddTanker_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTanker)); - - /// - /// Добавление бензовоза - /// - /// - /// - private void ButtonAddGasolineTanker_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningGasolineTanker)); - - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + private void ButtonAddTanker_Click(object sender, EventArgs e) { - if (_company == null) + FormTankerConfig form = new(); + form.AddEvent(SetTanker); + form.Show(); + } + + /// + /// Добавление грузовика в коллекцию + /// + /// + private void SetTanker(DrawningTanker? tanker) + { + if (_company == null || tanker == null) { return; } - Random random = new(); - DrawningTanker drawningTanker; - switch (type) - { - case nameof(DrawningTanker): - drawningTanker = new DrawningTanker(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningGasolineTanker): - drawningTanker = new DrawningGasolineTanker(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 + drawningTanker) + if (_company + tanker) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -89,23 +71,6 @@ public partial class FormTankerCollection : Form } } - /// - /// Получение цвета - /// - /// Генератор случайных чисел - /// - private static Color GetColor(Random random) - { - Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)); - ColorDialog dialog = new(); - if (dialog.ShowDialog() == DialogResult.OK) - { - color = dialog.Color; - } - - return color; - } - /// /// Удаление объекта /// diff --git a/GasolineTanker/GasolineTanker/FormTankerConfig.Designer.cs b/GasolineTanker/GasolineTanker/FormTankerConfig.Designer.cs new file mode 100644 index 0000000..6378b9c --- /dev/null +++ b/GasolineTanker/GasolineTanker/FormTankerConfig.Designer.cs @@ -0,0 +1,357 @@ +namespace GasolineTanker +{ + partial class FormTankerConfig + { + /// + /// 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(); + panelWhite = new Panel(); + panelPurple = new Panel(); + panelGrey = new Panel(); + panelBlack = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxCistern = new CheckBox(); + checkBoxSignalBeacon = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModifiedObject = new Label(); + labelSimpleObject = new Label(); + buttonAdd = new Button(); + buttonCancel = new Button(); + panelObject = new Panel(); + labelAdditionalColor = new Label(); + labelBodyColor = new Label(); + pictureBoxObject = new PictureBox(); + groupBoxConfig.SuspendLayout(); + groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + panelObject.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + SuspendLayout(); + // + // groupBoxConfig + // + groupBoxConfig.Controls.Add(groupBoxColors); + groupBoxConfig.Controls.Add(checkBoxCistern); + groupBoxConfig.Controls.Add(checkBoxSignalBeacon); + 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(527, 240); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelGrey); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(287, 22); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(226, 106); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(6, 67); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(33, 33); + panelWhite.TabIndex = 7; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(175, 67); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(33, 33); + panelPurple.TabIndex = 6; + // + // panelGrey + // + panelGrey.BackColor = Color.Gray; + panelGrey.Location = new Point(58, 67); + panelGrey.Name = "panelGrey"; + panelGrey.Size = new Size(33, 33); + panelGrey.TabIndex = 5; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(116, 67); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(33, 33); + panelBlack.TabIndex = 4; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(175, 22); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(33, 33); + panelYellow.TabIndex = 3; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(116, 22); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(33, 33); + panelBlue.TabIndex = 2; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(58, 22); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(33, 33); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(6, 22); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(33, 33); + panelRed.TabIndex = 0; + // + // checkBoxCistern + // + checkBoxCistern.AutoSize = true; + checkBoxCistern.Location = new Point(12, 165); + checkBoxCistern.Name = "checkBoxCistern"; + checkBoxCistern.Size = new Size(180, 19); + checkBoxCistern.TabIndex = 7; + checkBoxCistern.Text = "Признак наличия цистерны"; + checkBoxCistern.UseVisualStyleBackColor = true; + // + // checkBoxSignalBeacon + // + checkBoxSignalBeacon.AutoSize = true; + checkBoxSignalBeacon.Location = new Point(12, 132); + checkBoxSignalBeacon.Name = "checkBoxSignalBeacon"; + checkBoxSignalBeacon.Size = new Size(239, 19); + checkBoxSignalBeacon.TabIndex = 6; + checkBoxSignalBeacon.Text = "Признак наличия сигнального маячка"; + checkBoxSignalBeacon.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(80, 87); + 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(85, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 87); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(80, 51); + 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(85, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 51); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(62, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(403, 146); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(110, 38); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(287, 146); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(110, 38); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // buttonAdd + // + buttonAdd.Location = new Point(549, 187); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(106, 41); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(676, 187); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(106, 41); + 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(533, 10); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(265, 171); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(143, 12); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(106, 26); + labelAdditionalColor.TabIndex = 11; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop; + labelAdditionalColor.DragEnter += labelColor_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(16, 12); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(106, 26); + labelBodyColor.TabIndex = 10; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelColor_DragEnter; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(16, 41); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(233, 127); + pictureBoxObject.TabIndex = 9; + pictureBoxObject.TabStop = false; + // + // FormTankerConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(809, 240); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormTankerConfig"; + Text = "Создание объекта"; + groupBoxConfig.ResumeLayout(false); + groupBoxConfig.PerformLayout(); + groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + panelObject.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxConfig; + private Label labelSimpleObject; + private Label labelModifiedObject; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private CheckBox checkBoxSignalBeacon; + private CheckBox checkBoxCistern; + private GroupBox groupBoxColors; + private Panel panelRed; + private Panel panelGreen; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelWhite; + private Panel panelPurple; + private Panel panelGrey; + private Panel panelBlack; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private PictureBox pictureBoxObject; + private Label labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/GasolineTanker/GasolineTanker/FormTankerConfig.cs b/GasolineTanker/GasolineTanker/FormTankerConfig.cs new file mode 100644 index 0000000..03e0093 --- /dev/null +++ b/GasolineTanker/GasolineTanker/FormTankerConfig.cs @@ -0,0 +1,199 @@ +using GasolineTanker.Drawnings; +using GasolineTanker.Entities; + +namespace GasolineTanker; + +/// +/// Форма конфигурации объекта +/// +public partial class FormTankerConfig : Form +{ + /// + /// Объект - прорисовка грузовика + /// + private DrawningTanker? _tanker; + + /// + /// Событие + /// + + private event Action? EventAddTanker; + + /// + /// Конструктор + /// + public FormTankerConfig() + { + 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; + + buttonCancel.Click += (sender, e) => Close(); + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _tanker?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _tanker?.SetPosition(15, 15); + _tanker?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + /// + /// Передаем информацию при нажатии на Label + /// + /// + /// + + private void labelObject_MouseDown(object sender, MouseEventArgs e) + { + var label = sender as Label; + label?.DoDragDrop(label.Name, 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": + _tanker = new DrawningTanker((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _tanker = new DrawningGasolineTanker((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxSignalBeacon.Checked, checkBoxCistern.Checked); + break; + } + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + var panel = sender as Panel; + panel?.DoDragDrop(panel.BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + 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 labelBodyColor_DragDrop(object? sender, DragEventArgs e) + { + if (_tanker == null) + { + return; + } + _tanker.EntityTanker?.SetBodyColor((Color)e.Data?.GetData(typeof(Color))); + DrawObject(); + } + + /// + /// Перекраска дополнительного цвета + /// + + private void labelAdditionalColor_DragDrop(object? sender, DragEventArgs e) + { + if (_tanker == null) + { + return; + } + + Color addColor = (Color)e.Data?.GetData(typeof(Color)); + if (_tanker is DrawningGasolineTanker) + { + EntityGasolineTanker? _gasolineTanker = _tanker.EntityTanker as EntityGasolineTanker; + _gasolineTanker?.SetAdditionalColor(addColor); + } + else + { + MessageBox.Show("Нельзя задать доп. цвет обычному объекту"); + } + DrawObject(); + } + + /// + /// Добавление события + /// + /// Привязанный метод + public void AddEvent(Action ev) + { + if (EventAddTanker == null) + { + EventAddTanker = ev; + } + else + { + EventAddTanker += ev; + } + } + + /// + /// Передача объекта + /// + /// + /// + + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_tanker != null) + { + EventAddTanker?.Invoke(_tanker); + Close(); + } + } +} \ No newline at end of file diff --git a/GasolineTanker/GasolineTanker/FormTankerConfig.resx b/GasolineTanker/GasolineTanker/FormTankerConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/GasolineTanker/GasolineTanker/FormTankerConfig.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