diff --git a/ProjectTrolleybus/ProjectTrolleybus/Drawnings/DrawningTrolleyB.cs b/ProjectTrolleybus/ProjectTrolleybus/Drawnings/DrawningTrolleyB.cs index 0ff37af..cf2d12f 100644 --- a/ProjectTrolleybus/ProjectTrolleybus/Drawnings/DrawningTrolleyB.cs +++ b/ProjectTrolleybus/ProjectTrolleybus/Drawnings/DrawningTrolleyB.cs @@ -130,7 +130,7 @@ public class DrawningTrolleyB /// /// Координата X /// Координата Y - public void SetPosition(int x, int y, int width, int height) + public void SetPosition(int x, int y) { if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) { diff --git a/ProjectTrolleybus/ProjectTrolleybus/Entities/EntityTrolleyB.cs b/ProjectTrolleybus/ProjectTrolleybus/Entities/EntityTrolleyB.cs index caba453..dde604a 100644 --- a/ProjectTrolleybus/ProjectTrolleybus/Entities/EntityTrolleyB.cs +++ b/ProjectTrolleybus/ProjectTrolleybus/Entities/EntityTrolleyB.cs @@ -20,6 +20,11 @@ public class EntityTrolleyB /// public Color BodyColor { get; private set; } + public void setBodyColor(Color color) + { + BodyColor = color; + } + /// /// Шаг перемещения автомобиля /// diff --git a/ProjectTrolleybus/ProjectTrolleybus/Entities/EntityTrolleybus.cs b/ProjectTrolleybus/ProjectTrolleybus/Entities/EntityTrolleybus.cs index aaa49ca..142893f 100644 --- a/ProjectTrolleybus/ProjectTrolleybus/Entities/EntityTrolleybus.cs +++ b/ProjectTrolleybus/ProjectTrolleybus/Entities/EntityTrolleybus.cs @@ -9,6 +9,11 @@ public class EntityTrolleybus : EntityTrolleyB /// public Color AdditionalColor { get; private set; } + public void setAdditionalColor(Color color) + { + AdditionalColor = color; + } + /// /// Признак (опция) наличия отсека под батареи /// diff --git a/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.Designer.cs b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.Designer.cs index bcceda7..27b8b56 100644 --- a/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.Designer.cs +++ b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddTrolleyB = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonRemoveTrolleyB = 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(); - buttonRemoveTrolleyB = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddTrolleybus = new Button(); - buttonAddTrolleyB = 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,74 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddTrolleyB); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonRemoveTrolleyB); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 364); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(195, 278); + panelCompanyTools.TabIndex = 8; + // + // buttonAddTrolleyB + // + buttonAddTrolleyB.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddTrolleyB.Location = new Point(3, 12); + buttonAddTrolleyB.Name = "buttonAddTrolleyB"; + buttonAddTrolleyB.Size = new Size(189, 41); + buttonAddTrolleyB.TabIndex = 1; + buttonAddTrolleyB.Text = "Добавление троллейбуса"; + buttonAddTrolleyB.UseVisualStyleBackColor = true; + buttonAddTrolleyB.Click += ButtonAddTrolleyB_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + maskedTextBoxPosition.Location = new Point(3, 106); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(189, 23); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(3, 229); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(189, 41); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonRemoveTrolleyB + // + buttonRemoveTrolleyB.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveTrolleyB.Location = new Point(3, 135); + buttonRemoveTrolleyB.Name = "buttonRemoveTrolleyB"; + buttonRemoveTrolleyB.Size = new Size(189, 41); + buttonRemoveTrolleyB.TabIndex = 4; + buttonRemoveTrolleyB.Text = "Удалить троллейбус"; + buttonRemoveTrolleyB.UseVisualStyleBackColor = true; + buttonRemoveTrolleyB.Click += ButtonRemoveTrolleyB_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(3, 182); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(189, 41); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(12, 335); @@ -159,71 +226,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 229); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(189, 41); - buttonRefresh.TabIndex = 6; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += ButtonRefresh_Click; - // - // buttonGoToCheck - // - buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(3, 182); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(189, 41); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveTrolleyB - // - buttonRemoveTrolleyB.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveTrolleyB.Location = new Point(3, 135); - buttonRemoveTrolleyB.Name = "buttonRemoveTrolleyB"; - buttonRemoveTrolleyB.Size = new Size(189, 41); - buttonRemoveTrolleyB.TabIndex = 4; - buttonRemoveTrolleyB.Text = "Удалить троллейбус"; - buttonRemoveTrolleyB.UseVisualStyleBackColor = true; - buttonRemoveTrolleyB.Click += ButtonRemoveTrolleyB_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - maskedTextBoxPosition.Location = new Point(3, 106); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(189, 23); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddTrolleybus - // - buttonAddTrolleybus.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddTrolleybus.Location = new Point(3, 59); - buttonAddTrolleybus.Name = "buttonAddTrolleybus"; - buttonAddTrolleybus.Size = new Size(189, 41); - buttonAddTrolleybus.TabIndex = 2; - buttonAddTrolleybus.Text = "Добавление улучшенного троллейбуса"; - buttonAddTrolleybus.UseVisualStyleBackColor = true; - buttonAddTrolleybus.Click += ButtonAddTrolleybus_Click; - // - // buttonAddTrolleyB - // - buttonAddTrolleyB.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddTrolleyB.Location = new Point(3, 12); - buttonAddTrolleyB.Name = "buttonAddTrolleyB"; - buttonAddTrolleyB.Size = new Size(189, 41); - buttonAddTrolleyB.TabIndex = 1; - buttonAddTrolleyB.Text = "Добавление троллейбуса"; - buttonAddTrolleyB.UseVisualStyleBackColor = true; - buttonAddTrolleyB.Click += ButtonAddTrolleyB_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -245,21 +247,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddTrolleyB); - panelCompanyTools.Controls.Add(buttonAddTrolleybus); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonRemoveTrolleyB); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 364); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(195, 278); - panelCompanyTools.TabIndex = 8; - // // FormTrolleyBCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -270,11 +257,11 @@ Name = "FormTrolleyBCollection"; 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 Button buttonAddTrolleybus; private Button buttonAddTrolleyB; private PictureBox pictureBox; private Button buttonRemoveTrolleyB; diff --git a/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.cs b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.cs index 9088e7a..233da71 100644 --- a/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.cs +++ b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBCollection.cs @@ -39,71 +39,35 @@ public partial class FormTrolleyBCollection : Form /// /// /// - private void ButtonAddTrolleyB_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTrolleyB)); - - /// - /// Добавление улучшенного троллейбуса - /// - /// - /// - private void ButtonAddTrolleybus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningTrolleybus)); - - /// - /// Создание объекта класса-перемещения - /// - /// Тип создания объекта - private void CreateObject(string type) + private void ButtonAddTrolleyB_Click(object sender, EventArgs e) { - if (_company == null) + FormTrolleyBConfig form = new(); + form.AddEvent(SetTrolleyB); + form.Show(); + } + + /// + /// Добавление автомобиля в коллекцию + /// + /// + private void SetTrolleyB(DrawningTrolleyB? trolleyB) + { + if (_company == null || trolleyB == null) { return; } - Random random = new(); - DrawningTrolleyB drawningTrolleyB; - switch (type) - { - case nameof(DrawningTrolleyB): - drawningTrolleyB = new DrawningTrolleyB(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningTrolleybus): - drawningTrolleyB = new DrawningTrolleybus(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 + drawningTrolleyB != -1) + if (_company + trolleyB != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); } - else { MessageBox.Show("Не удалось добавить объект"); } } - /// - /// Выбор цвета - /// - /// - /// - private static Color GetColor(Random random) - { - Color color = Color.FromArgb(random.Next(0, 255), random.Next(0, 255), random.Next(0, 255)); - ColorDialog dialog = new(); - if (dialog.ShowDialog() == DialogResult.OK) - { - color = dialog.Color; - } - - return color; - } /// /// Удаление троллейбуса с места diff --git a/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.Designer.cs b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.Designer.cs new file mode 100644 index 0000000..3b370b2 --- /dev/null +++ b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.Designer.cs @@ -0,0 +1,351 @@ +namespace ProjectTrolleybus +{ + partial class FormTrolleyBConfig + { + /// + /// 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(); + panelYellow = new Panel(); + panelBlack = new Panel(); + panelBlue = new Panel(); + panelGray = new Panel(); + panelGreen = new Panel(); + panelWhite = new Panel(); + panelRed = new Panel(); + checkBoxHorns = new CheckBox(); + checkBoxBatteryCompartment = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModifiedObkect = 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(checkBoxHorns); + groupBoxConfig.Controls.Add(checkBoxBatteryCompartment); + groupBoxConfig.Controls.Add(numericUpDownWeight); + groupBoxConfig.Controls.Add(labelWeight); + groupBoxConfig.Controls.Add(numericUpDownSpeed); + groupBoxConfig.Controls.Add(labelSpeed); + groupBoxConfig.Controls.Add(labelModifiedObkect); + groupBoxConfig.Controls.Add(labelSimpleObject); + groupBoxConfig.Dock = DockStyle.Left; + groupBoxConfig.Location = new Point(0, 0); + groupBoxConfig.Name = "groupBoxConfig"; + groupBoxConfig.Size = new Size(427, 263); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // 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(12, 139); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(209, 118); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(154, 71); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(29, 26); + panelPurple.TabIndex = 3; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(154, 22); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(29, 26); + panelYellow.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(105, 71); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(29, 26); + panelBlack.TabIndex = 4; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(105, 22); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(29, 26); + panelBlue.TabIndex = 1; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(56, 71); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(29, 26); + panelGray.TabIndex = 5; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(56, 22); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(29, 26); + panelGreen.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(6, 71); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(29, 26); + panelWhite.TabIndex = 2; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(6, 22); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(29, 26); + panelRed.TabIndex = 0; + // + // checkBoxHorns + // + checkBoxHorns.AutoSize = true; + checkBoxHorns.Location = new Point(12, 114); + checkBoxHorns.Name = "checkBoxHorns"; + checkBoxHorns.Size = new Size(325, 19); + checkBoxHorns.TabIndex = 7; + checkBoxHorns.Text = "Признак наличия \"Рогов\" для подключения проводов"; + checkBoxHorns.UseVisualStyleBackColor = true; + // + // checkBoxBatteryCompartment + // + checkBoxBatteryCompartment.AutoSize = true; + checkBoxBatteryCompartment.Location = new Point(12, 89); + checkBoxBatteryCompartment.Name = "checkBoxBatteryCompartment"; + checkBoxBatteryCompartment.Size = new Size(232, 19); + checkBoxBatteryCompartment.TabIndex = 6; + checkBoxBatteryCompartment.Text = "Признак наличия отсека под батареи"; + checkBoxBatteryCompartment.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(80, 60); + 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(115, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(45, 62); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(80, 17); + 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(115, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 19); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(62, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObkect + // + labelModifiedObkect.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObkect.Location = new Point(336, 210); + labelModifiedObkect.Name = "labelModifiedObkect"; + labelModifiedObkect.Size = new Size(85, 39); + labelModifiedObkect.TabIndex = 1; + labelModifiedObkect.Text = "Продвинутый"; + labelModifiedObkect.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObkect.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(242, 210); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(88, 39); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(15, 89); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(186, 106); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(443, 210); + 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(554, 210); + 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(428, 0); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(213, 204); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(126, 17); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(75, 39); + labelAdditionalColor.TabIndex = 10; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + // + // labelBodyColor + // + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(15, 17); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(75, 39); + labelBodyColor.TabIndex = 9; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + // + // FormTrolleyBConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(641, 263); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormTrolleyBConfig"; + 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 labelModifiedObkect; + private Label labelSimpleObject; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private CheckBox checkBoxBatteryCompartment; + private CheckBox checkBoxHorns; + private GroupBox groupBoxColors; + private Panel panelRed; + private Panel panelPurple; + private Panel panelYellow; + private Panel panelBlack; + private Panel panelBlue; + private Panel panelGray; + private Panel panelGreen; + private Panel panelWhite; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelBodyColor; + private Label labelAdditionalColor; + } +} \ No newline at end of file diff --git a/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.cs b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.cs new file mode 100644 index 0000000..1d744b0 --- /dev/null +++ b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.cs @@ -0,0 +1,161 @@ +using ProjectTrolleybus.Drawnings; +using ProjectTrolleybus.Entities; + +namespace ProjectTrolleybus; + +/// +/// Форма конфигурации объекта +/// +public partial class FormTrolleyBConfig : Form +{ + /// + /// Объект - прорисовка автомобиля + /// + private DrawningTrolleyB _trolleyB; + + + /// + /// Событие для передачи объекта + /// + private event TrolleyBDelegate? TrolleyBDelegate; + + /// + /// Конструктор + /// + public FormTrolleyBConfig() + { + 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; + + buttonCancel.Click += (s, e) => Close(); + + InitializeComponent(); + } + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(TrolleyBDelegate trolleyBDelegate) + { + TrolleyBDelegate = trolleyBDelegate; + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _trolleyB?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _trolleyB?.SetPosition(5, 5); + _trolleyB?.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": + _trolleyB = new DrawningTrolleyB((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _trolleyB = new DrawningTrolleybus((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxBatteryCompartment.Checked, checkBoxHorns.Checked); + break; + } + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object? sender, MouseEventArgs e) + { + (sender as Panel)?.DoDragDrop((sender as 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 labelColor_DragDrop(object sender, DragEventArgs e) + { + if (_trolleyB == null) + { + return; + } + + switch (((Label)sender).Name) + { + case "labelBodyColor": + _trolleyB.EntityTrolleyB.setBodyColor((Color)e.Data.GetData(typeof(Color))); + break; + case "labelAdditionalColor": + if (_trolleyB is not DrawningTrolleybus) + { + return; + } + (_trolleyB.EntityTrolleyB as EntityTrolleybus).setAdditionalColor((Color)e.Data.GetData(typeof(Color))); + break; + } + DrawObject(); + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e) + { + if (_trolleyB != null) + { + TrolleyBDelegate?.Invoke(_trolleyB); + Close(); + } + } +} diff --git a/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.resx b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectTrolleybus/ProjectTrolleybus/FormTrolleyBConfig.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProjectTrolleybus/ProjectTrolleybus/TrolleyBDelegate.cs b/ProjectTrolleybus/ProjectTrolleybus/TrolleyBDelegate.cs new file mode 100644 index 0000000..fc7c35c --- /dev/null +++ b/ProjectTrolleybus/ProjectTrolleybus/TrolleyBDelegate.cs @@ -0,0 +1,5 @@ +using ProjectTrolleybus.Drawnings; + +namespace ProjectTrolleybus; + +public delegate void TrolleyBDelegate(DrawningTrolleyB trolleyB);