diff --git a/ProjectAirbus/ProjectAirbus/Entities/EntityAirbus.cs b/ProjectAirbus/ProjectAirbus/Entities/EntityAirbus.cs index 97d6ad5..a0d9e58 100644 --- a/ProjectAirbus/ProjectAirbus/Entities/EntityAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/Entities/EntityAirbus.cs @@ -25,6 +25,8 @@ public class EntityAirbus : EntityBus /// public double Step => Speed * 100 / Weight; + public void SetAdditionalColor(Color color) { AdditionalColor = color; } + /// /// Инициализация полей объекта-класса аэробуса /// diff --git a/ProjectAirbus/ProjectAirbus/Entities/EntityBus.cs b/ProjectAirbus/ProjectAirbus/Entities/EntityBus.cs index 4fa528e..9a29e8c 100644 --- a/ProjectAirbus/ProjectAirbus/Entities/EntityBus.cs +++ b/ProjectAirbus/ProjectAirbus/Entities/EntityBus.cs @@ -31,6 +31,8 @@ public class EntityBus /// public double Step => Speed * 100 / Weight; + public void SetBodyColor(Color color) { BodyColor = color; } + /// /// Конструктор сущности /// diff --git a/ProjectAirbus/ProjectAirbus/FormBusCollection.Designer.cs b/ProjectAirbus/ProjectAirbus/FormBusCollection.Designer.cs index 1b8676d..f60d12e 100644 --- a/ProjectAirbus/ProjectAirbus/FormBusCollection.Designer.cs +++ b/ProjectAirbus/ProjectAirbus/FormBusCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddBus = new Button(); + buttonRemoveBus = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonGoToCheck = new Button(); buttonCreateCompany = new Button(); panelStorage = new Panel(); buttonCollectionDell = new Button(); @@ -38,19 +44,12 @@ radioButtonMassive = new RadioButton(); textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); - buttonRefresh = new Button(); - buttonGoToCheck = new Button(); - buttonRemoveBus = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddAirbus = new Button(); - buttonAddBus = 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(buttonAddBus); + panelCompanyTools.Controls.Add(buttonRemoveBus); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Location = new Point(3, 452); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(194, 324); + panelCompanyTools.TabIndex = 8; + // + // buttonAddBus + // + buttonAddBus.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddBus.Location = new Point(6, 7); + buttonAddBus.Name = "buttonAddBus"; + buttonAddBus.Size = new Size(176, 43); + buttonAddBus.TabIndex = 1; + buttonAddBus.Text = "Добавление аэробуса"; + buttonAddBus.UseVisualStyleBackColor = true; + buttonAddBus.Click += buttonAddBus_Click; + // + // buttonRemoveBus + // + buttonRemoveBus.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveBus.Location = new Point(6, 166); + buttonRemoveBus.Name = "buttonRemoveBus"; + buttonRemoveBus.Size = new Size(176, 43); + buttonRemoveBus.TabIndex = 4; + buttonRemoveBus.Text = "Удалить аэробус"; + buttonRemoveBus.UseVisualStyleBackColor = true; + buttonRemoveBus.Click += buttonRemoveBus_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(6, 122); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(179, 23); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(6, 264); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(176, 43); + 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, 215); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(176, 43); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += buttonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(6, 392); @@ -159,70 +224,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(6, 264); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(176, 43); - 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, 215); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(176, 43); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += buttonGoToCheck_Click; - // - // buttonRemoveBus - // - buttonRemoveBus.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveBus.Location = new Point(6, 166); - buttonRemoveBus.Name = "buttonRemoveBus"; - buttonRemoveBus.Size = new Size(176, 43); - buttonRemoveBus.TabIndex = 4; - buttonRemoveBus.Text = "Удалить аэробус"; - buttonRemoveBus.UseVisualStyleBackColor = true; - buttonRemoveBus.Click += buttonRemoveBus_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(6, 122); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(179, 23); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddAirbus - // - buttonAddAirbus.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddAirbus.Location = new Point(6, 56); - buttonAddAirbus.Name = "buttonAddAirbus"; - buttonAddAirbus.Size = new Size(176, 43); - buttonAddAirbus.TabIndex = 2; - buttonAddAirbus.Text = "Добавление аэробуса"; - buttonAddAirbus.UseVisualStyleBackColor = true; - buttonAddAirbus.Click += buttonAddAirbus_Click; - // - // buttonAddBus - // - buttonAddBus.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddBus.Location = new Point(6, 7); - buttonAddBus.Name = "buttonAddBus"; - buttonAddBus.Size = new Size(176, 43); - buttonAddBus.TabIndex = 1; - buttonAddBus.Text = "Добавление базового аэробуса"; - buttonAddBus.UseVisualStyleBackColor = true; - buttonAddBus.Click += buttonAddBus_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -244,20 +245,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddBus); - panelCompanyTools.Controls.Add(buttonAddAirbus); - panelCompanyTools.Controls.Add(buttonRemoveBus); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Location = new Point(3, 452); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(194, 324); - panelCompanyTools.TabIndex = 8; - // // FormBusCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -268,11 +255,11 @@ Name = "FormBusCollection"; 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 buttonAddAirbus; private Button buttonAddBus; private Button buttonRemoveBus; private MaskedTextBox maskedTextBoxPosition; diff --git a/ProjectAirbus/ProjectAirbus/FormBusCollection.cs b/ProjectAirbus/ProjectAirbus/FormBusCollection.cs index 086d438..5bff1df 100644 --- a/ProjectAirbus/ProjectAirbus/FormBusCollection.cs +++ b/ProjectAirbus/ProjectAirbus/FormBusCollection.cs @@ -14,7 +14,6 @@ namespace ProjectAirbus { public partial class FormBusCollection : Form { - /// /// Хранилише коллекций /// @@ -39,33 +38,20 @@ namespace ProjectAirbus panelCompanyTools.Enabled = false; } - /// - /// Создание объекта класса-перемещения - /// - /// - private void CreateObject(string type) + private void buttonAddBus_Click(object sender, EventArgs e) { - if (_company == null) + FormBusConfig form = new(); + form.Show(); + form.AddEvent(SetBus); + } + + private void SetBus(DrawningBus? bus) + { + if (_company == null || bus == null) { return; } - Random random = new(); - DrawningBus drawningBus; - switch (type) - { - case nameof(DrawningBus): - drawningBus = new DrawningBus(random.Next(100, 300), random.Next(1000, 3000), - GetColor(random)); - break; - case nameof(DrawningAirbus): - drawningBus = new DrawningAirbus(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 + drawningBus >= 0) + if (_company + bus >= 0) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -75,27 +61,6 @@ namespace ProjectAirbus 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; - } - - private void buttonAddAirbus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirbus)); - - private void buttonAddBus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBus)); - /// /// Удаление объекта /// diff --git a/ProjectAirbus/ProjectAirbus/FormBusConfig.Designer.cs b/ProjectAirbus/ProjectAirbus/FormBusConfig.Designer.cs new file mode 100644 index 0000000..4d32983 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/FormBusConfig.Designer.cs @@ -0,0 +1,357 @@ +namespace ProjectAirbus +{ + partial class FormBusConfig + { + /// + /// 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(); + checkBoxEngine = new CheckBox(); + checkBoxCompartment = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModifiedObject = new Label(); + labelSimpleObject = new Label(); + pictureBoxObject = new PictureBox(); + buttonAddClick = 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(checkBoxEngine); + groupBoxConfig.Controls.Add(checkBoxCompartment); + 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(677, 259); + 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(379, 22); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(298, 163); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.MediumSlateBlue; + panelPurple.Location = new Point(245, 100); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(47, 45); + panelPurple.TabIndex = 7; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(173, 100); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(47, 45); + panelBlack.TabIndex = 6; + // + // panelGrey + // + panelGrey.BackColor = Color.SlateGray; + panelGrey.Location = new Point(91, 100); + panelGrey.Name = "panelGrey"; + panelGrey.Size = new Size(47, 45); + panelGrey.TabIndex = 5; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(13, 100); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(47, 45); + panelWhite.TabIndex = 4; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(245, 29); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(47, 45); + panelYellow.TabIndex = 3; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(173, 29); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(47, 45); + panelBlue.TabIndex = 2; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(91, 29); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(47, 45); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(13, 29); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(47, 45); + panelRed.TabIndex = 0; + // + // checkBoxEngine + // + checkBoxEngine.AutoSize = true; + checkBoxEngine.Location = new Point(12, 184); + checkBoxEngine.Name = "checkBoxEngine"; + checkBoxEngine.Size = new Size(284, 19); + checkBoxEngine.TabIndex = 7; + checkBoxEngine.Text = "Признак наличия дополнительных двигателей"; + checkBoxEngine.UseVisualStyleBackColor = true; + // + // checkBoxCompartment + // + checkBoxCompartment.AutoSize = true; + checkBoxCompartment.Location = new Point(12, 221); + checkBoxCompartment.Name = "checkBoxCompartment"; + checkBoxCompartment.Size = new Size(355, 19); + checkBoxCompartment.TabIndex = 6; + checkBoxCompartment.Text = "Признак наличия дополнительного отсека для пассажиров"; + checkBoxCompartment.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(86, 92); + 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(120, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(18, 92); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(86, 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(120, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(18, 53); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(62, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(546, 209); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(125, 41); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(379, 209); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(125, 41); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(18, 71); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(232, 118); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAddClick + // + buttonAddClick.Location = new Point(686, 209); + buttonAddClick.Name = "buttonAddClick"; + buttonAddClick.Size = new Size(121, 42); + buttonAddClick.TabIndex = 2; + buttonAddClick.Text = "Добавить"; + buttonAddClick.UseVisualStyleBackColor = true; + buttonAddClick.Click += ButtonAddClick_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(825, 209); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(125, 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(683, 0); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(267, 203); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(142, 9); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(125, 41); + labelAdditionalColor.TabIndex = 3; + labelAdditionalColor.Text = "Доп цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop; + labelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(3, 9); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(125, 41); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter; + // + // FormBusConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(973, 259); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAddClick); + Controls.Add(groupBoxConfig); + Name = "FormBusConfig"; + 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 labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private Label labelModifiedObject; + private CheckBox checkBoxCompartment; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxEngine; + private GroupBox groupBoxColors; + private Panel panelRed; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGrey; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private PictureBox pictureBoxObject; + private Button buttonAddClick; + private Button buttonCancel; + private Panel panelObject; + private Label labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/FormBusConfig.cs b/ProjectAirbus/ProjectAirbus/FormBusConfig.cs new file mode 100644 index 0000000..df10539 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/FormBusConfig.cs @@ -0,0 +1,169 @@ +using ProjectAirbus.Drawning; +using ProjectAirbus.Entities; +using System; +using System.Collections.Generic; +using System.ComponentModel; + + +namespace ProjectAirbus; + +/// +/// Форма конфигурации объекта +/// +public partial class FormBusConfig : Form +{ + private event Action DrawningBusEvent; + + /// + /// Объект - прорисовка + /// + private DrawningBus _bus; + + /// + /// Конструктор + /// + public FormBusConfig() + { + 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 += (object sender, EventArgs e) => Close(); + + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action busDelegate) + { + DrawningBusEvent += busDelegate; + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _bus?.SetPictureSize(pictureBoxObject.Width, + pictureBoxObject.Height); + _bus?.SetPosition(15, 15); + _bus?.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": + _bus = new DrawningBus((int)numericUpDownSpeed.Value, + (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _bus = new + DrawningAirbus((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, + Color.White, + Color.Black, checkBoxCompartment.Checked, + checkBoxEngine.Checked); + break; + } + DrawObject(); + } + + 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) + { + _bus?.EntityBus.SetBodyColor((Color)e.Data.GetData(typeof(Color))); + + DrawObject(); + } + + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_bus is DrawningAirbus) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_bus.EntityBus is EntityAirbus _airbus) + { + _airbus.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + private void ButtonAddClick_Click(object sender, EventArgs e) + { + if (_bus != null) + { + DrawningBusEvent?.Invoke(_bus); + Close(); + } + } +} \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/FormBusConfig.resx b/ProjectAirbus/ProjectAirbus/FormBusConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/FormBusConfig.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