diff --git a/ProjectSportCar/ProjectSportCar/Drawnings/DrawningAiroplane.cs b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningAiroplane.cs index c12c8e2..df67e65 100644 --- a/ProjectSportCar/ProjectSportCar/Drawnings/DrawningAiroplane.cs +++ b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningAiroplane.cs @@ -39,8 +39,7 @@ public class DrawningAiroplane : Drawningplane //Радар if (airoplane.Radar) { - Brush brGreen = new SolidBrush(Color.LightGreen); - g.FillEllipse(brGreen, _startPosX.Value + 135, _startPosY.Value + 45, 10, 10); + g.FillEllipse(additionalBrush, _startPosX.Value + 135, _startPosY.Value + 45, 10, 10); g.DrawEllipse(pen, _startPosX.Value + 135, _startPosY.Value + 45, 10, 10); } diff --git a/ProjectSportCar/ProjectSportCar/Entities/EntityAiroplane.cs b/ProjectSportCar/ProjectSportCar/Entities/EntityAiroplane.cs index c72c239..fa2bac6 100644 --- a/ProjectSportCar/ProjectSportCar/Entities/EntityAiroplane.cs +++ b/ProjectSportCar/ProjectSportCar/Entities/EntityAiroplane.cs @@ -30,6 +30,15 @@ public class EntityAiroplane : Entityplane Toplivbak = toplivbak; Radar = radar; } + + /// + /// установка доп. цвета + /// + /// + public void setAdditionalColor(Color color) + { + AdditionalColor = color; + } } diff --git a/ProjectSportCar/ProjectSportCar/Entities/Entityplane.cs b/ProjectSportCar/ProjectSportCar/Entities/Entityplane.cs index 1e9e97c..68c3888 100644 --- a/ProjectSportCar/ProjectSportCar/Entities/Entityplane.cs +++ b/ProjectSportCar/ProjectSportCar/Entities/Entityplane.cs @@ -28,6 +28,16 @@ public class Entityplane /// Шаг перемещения самолета /// public double Step => Speed * 100 / Weight; + + /// + /// Основной цвет + /// + /// + public void setBodyColor(Color color) + { + BodyColor = color; + } + /// /// Конструктор сущности /// diff --git a/ProjectSportCar/ProjectSportCar/FormPlanConfig.Designer.cs b/ProjectSportCar/ProjectSportCar/FormPlanConfig.Designer.cs new file mode 100644 index 0000000..5819661 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/FormPlanConfig.Designer.cs @@ -0,0 +1,359 @@ +namespace ProjectAiroplane +{ + partial class FormPlanConfig + { + /// + /// 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(); + panelGray = new Panel(); + panelBlue = new Panel(); + panelWhite = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxRadar = new CheckBox(); + checkBoxToplivbak = new CheckBox(); + numericUpDownWeght = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModifiedObject = new Label(); + labelSimpleObject = new Label(); + pictureBoxObject = new PictureBox(); + buttonAdd = new Button(); + buttonCancel = new Button(); + panelObject = new Panel(); + labelAdditionalColor = new Label(); + labelBodyColor = new Label(); + groupBoxConfig.SuspendLayout(); + groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeght).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + panelObject.SuspendLayout(); + SuspendLayout(); + // + // groupBoxConfig + // + groupBoxConfig.Controls.Add(groupBoxColors); + groupBoxConfig.Controls.Add(checkBoxRadar); + groupBoxConfig.Controls.Add(checkBoxToplivbak); + groupBoxConfig.Controls.Add(numericUpDownWeght); + 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(542, 253); + groupBoxConfig.TabIndex = 0; + groupBoxConfig.TabStop = false; + groupBoxConfig.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(241, 12); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(270, 138); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(210, 81); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(45, 45); + panelPurple.TabIndex = 3; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(210, 26); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(45, 45); + panelYellow.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(144, 81); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(45, 45); + panelBlack.TabIndex = 4; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(72, 81); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(45, 45); + panelGray.TabIndex = 5; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(144, 26); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(45, 45); + panelBlue.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(6, 81); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(45, 45); + panelWhite.TabIndex = 2; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(72, 26); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(45, 45); + panelGreen.TabIndex = 1; + panelGreen.MouseDown += Panel_MouseDown; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(6, 26); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(45, 45); + panelRed.TabIndex = 0; + panelRed.MouseDown += Panel_MouseDown; + // + // checkBoxRadar + // + checkBoxRadar.AutoSize = true; + checkBoxRadar.Location = new Point(12, 172); + checkBoxRadar.Name = "checkBoxRadar"; + checkBoxRadar.Size = new Size(208, 24); + checkBoxRadar.TabIndex = 7; + checkBoxRadar.Text = "Признак наличия радара"; + checkBoxRadar.UseVisualStyleBackColor = true; + // + // checkBoxToplivbak + // + checkBoxToplivbak.AutoSize = true; + checkBoxToplivbak.Location = new Point(14, 126); + checkBoxToplivbak.Name = "checkBoxToplivbak"; + checkBoxToplivbak.Size = new Size(190, 24); + checkBoxToplivbak.TabIndex = 6; + checkBoxToplivbak.Text = "Признак наличия бака"; + checkBoxToplivbak.UseVisualStyleBackColor = true; + // + // numericUpDownWeght + // + numericUpDownWeght.Location = new Point(96, 74); + numericUpDownWeght.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownWeght.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownWeght.Name = "numericUpDownWeght"; + numericUpDownWeght.Size = new Size(104, 27); + numericUpDownWeght.TabIndex = 5; + numericUpDownWeght.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(14, 76); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(36, 20); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(96, 41); + 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(104, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(14, 41); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(385, 172); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(126, 44); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(241, 172); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(126, 44); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(14, 57); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(236, 133); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(571, 211); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(98, 38); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(709, 211); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(98, 38); + 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(557, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(264, 193); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(152, 18); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(98, 31); + 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(14, 18); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(98, 31); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += LabelBodyColor_DragDrop; + labelBodyColor.DragEnter += LabelBodyColor_DragEnter; + // + // FormPlanConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(835, 253); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormPlanConfig"; + Text = "Создание объекта"; + groupBoxConfig.ResumeLayout(false); + groupBoxConfig.PerformLayout(); + groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeght).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 labelSpeed; + private Label labelModifiedObject; + private NumericUpDown numericUpDownWeght; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private CheckBox checkBoxToplivbak; + private CheckBox checkBoxRadar; + private GroupBox groupBoxColors; + private Panel panelRed; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + 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/ProjectSportCar/ProjectSportCar/FormPlanConfig.cs b/ProjectSportCar/ProjectSportCar/FormPlanConfig.cs new file mode 100644 index 0000000..f4527b9 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/FormPlanConfig.cs @@ -0,0 +1,173 @@ +using ProjectAiroplane.Drawnings; +using ProjectAiroplane.Entities; + +namespace ProjectAiroplane; +/// +/// Форма конфигурации объекта +/// +public partial class FormPlanConfig : Form +{ + /// + /// Объект - прорисовка самолёта + /// + private Drawningplane _plane = null; + + private event Action? PlaneDelegate; + /// + /// Конструктор + /// + public FormPlanConfig() + { + 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(); + } + + /// + /// Привязка внешнего метода к событию вопрос 2.............................................................................. + /// + public void AddEvent(Action planeDelegate) + { + PlaneDelegate += planeDelegate; + } + + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _plane?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _plane?.SetPosition(5, 5); + _plane?.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": + _plane = new Drawningplane((int)numericUpDownSpeed.Value, (double)numericUpDownWeght.Value, Color.White); + break; + case "labelModifiedObject": + _plane = new DrawningAiroplane((int)numericUpDownSpeed.Value, (double)numericUpDownWeght.Value, Color.White, + Color.Black, checkBoxToplivbak.Checked, checkBoxRadar.Checked); + break; + } + labelBodyColor.BackColor = Color.Empty; + labelAdditionalColor.BackColor = Color.Empty; + 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) + { + if (_plane != null) + { + _plane.Entityplane.setBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + /// + /// Передача объекта + /// + /// + /// + private void ButtonAdd_Click(object sender, EventArgs e)// кнопку нажимаем и новый объект передается в форму 2 вопрос............ + { + if (_plane != null) + { + PlaneDelegate?.Invoke(_plane); //Вызов события, с помощью инвок, + Close(); + } + } + + /// + /// действия при перетаскивании доп. цвета + /// + /// + /// + private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_plane.Entityplane is EntityAiroplane _airoplaneplane) + { + _airoplaneplane.setAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + private void LabelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_plane != null && _plane is DrawningAiroplane) + { + if (e.Data?.GetDataPresent(typeof(Color)) ?? false) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } +} diff --git a/ProjectSportCar/ProjectSportCar/FormPlanConfig.resx b/ProjectSportCar/ProjectSportCar/FormPlanConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/FormPlanConfig.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/ProjectSportCar/ProjectSportCar/FormPlaneCollection.Designer.cs b/ProjectSportCar/ProjectSportCar/FormPlaneCollection.Designer.cs index c4e99f2..1c0ea47 100644 --- a/ProjectSportCar/ProjectSportCar/FormPlaneCollection.Designer.cs +++ b/ProjectSportCar/ProjectSportCar/FormPlaneCollection.Designer.cs @@ -29,6 +29,11 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonGoToCheck = new Button(); + buttonDelPlane = new Button(); + maskedTextBox1 = new MaskedTextBox(); + buttonReFresh = new Button(); buttonCreateCompany = new Button(); panelStorage = new Panel(); buttonCollectionDel = new Button(); @@ -38,19 +43,13 @@ radioButtonMassive = new RadioButton(); textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); - buttonReFresh = new Button(); - buttonGoToCheck = new Button(); - buttonDelPlane = new Button(); - maskedTextBox1 = new MaskedTextBox(); - buttonAddAiroplane = new Button(); - buttonAddPlane = new Button(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); - panelCompanyTools = new Panel(); + buttonAddPlane = new Button(); groupBoxTools.SuspendLayout(); + panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); - panelCompanyTools.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -67,6 +66,58 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddPlane); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Controls.Add(buttonDelPlane); + panelCompanyTools.Controls.Add(maskedTextBox1); + panelCompanyTools.Controls.Add(buttonReFresh); + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(9, 380); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(268, 322); + panelCompanyTools.TabIndex = 9; + // + // buttonGoToCheck + // + buttonGoToCheck.Location = new Point(7, 189); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(254, 42); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тест"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // + // buttonDelPlane + // + buttonDelPlane.Location = new Point(7, 140); + buttonDelPlane.Name = "buttonDelPlane"; + buttonDelPlane.Size = new Size(254, 43); + buttonDelPlane.TabIndex = 4; + buttonDelPlane.Text = "Удалить самолёт"; + buttonDelPlane.UseVisualStyleBackColor = true; + buttonDelPlane.Click += ButtonDelPlane_Click; + // + // maskedTextBox1 + // + maskedTextBox1.Location = new Point(7, 107); + maskedTextBox1.Mask = "00"; + maskedTextBox1.Name = "maskedTextBox1"; + maskedTextBox1.Size = new Size(252, 27); + maskedTextBox1.TabIndex = 3; + maskedTextBox1.ValidatingType = typeof(int); + // + // buttonReFresh + // + buttonReFresh.Location = new Point(7, 237); + buttonReFresh.Name = "buttonReFresh"; + buttonReFresh.Size = new Size(252, 40); + buttonReFresh.TabIndex = 6; + buttonReFresh.Text = "Обновить"; + buttonReFresh.UseVisualStyleBackColor = true; + buttonReFresh.Click += ButtonReFresh_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(13, 346); @@ -159,65 +210,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonReFresh - // - buttonReFresh.Location = new Point(7, 237); - buttonReFresh.Name = "buttonReFresh"; - buttonReFresh.Size = new Size(252, 40); - buttonReFresh.TabIndex = 6; - buttonReFresh.Text = "Обновить"; - buttonReFresh.UseVisualStyleBackColor = true; - buttonReFresh.Click += ButtonReFresh_Click; - // - // buttonGoToCheck - // - buttonGoToCheck.Location = new Point(7, 189); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(254, 42); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тест"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonDelPlane - // - buttonDelPlane.Location = new Point(7, 140); - buttonDelPlane.Name = "buttonDelPlane"; - buttonDelPlane.Size = new Size(254, 43); - buttonDelPlane.TabIndex = 4; - buttonDelPlane.Text = "Удалить самолёт"; - buttonDelPlane.UseVisualStyleBackColor = true; - buttonDelPlane.Click += ButtonDelPlane_Click; - // - // maskedTextBox1 - // - maskedTextBox1.Location = new Point(7, 107); - maskedTextBox1.Mask = "00"; - maskedTextBox1.Name = "maskedTextBox1"; - maskedTextBox1.Size = new Size(252, 27); - maskedTextBox1.TabIndex = 3; - maskedTextBox1.ValidatingType = typeof(int); - // - // buttonAddAiroplane - // - buttonAddAiroplane.Location = new Point(7, 60); - buttonAddAiroplane.Name = "buttonAddAiroplane"; - buttonAddAiroplane.Size = new Size(252, 41); - buttonAddAiroplane.TabIndex = 2; - buttonAddAiroplane.Text = "Добавление самолёта с радаром"; - buttonAddAiroplane.UseVisualStyleBackColor = true; - buttonAddAiroplane.Click += ButtonAddAiroplane_Click; - // - // buttonAddPlane - // - buttonAddPlane.Location = new Point(7, 14); - buttonAddPlane.Name = "buttonAddPlane"; - buttonAddPlane.Size = new Size(252, 40); - buttonAddPlane.TabIndex = 1; - buttonAddPlane.Text = "Добавление самолёта"; - buttonAddPlane.UseVisualStyleBackColor = true; - buttonAddPlane.Click += ButtonAddPlane_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -239,19 +231,15 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools + // buttonAddPlane // - panelCompanyTools.Controls.Add(buttonAddPlane); - panelCompanyTools.Controls.Add(buttonAddAiroplane); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Controls.Add(buttonDelPlane); - panelCompanyTools.Controls.Add(maskedTextBox1); - panelCompanyTools.Controls.Add(buttonReFresh); - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(9, 380); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(268, 322); - panelCompanyTools.TabIndex = 9; + buttonAddPlane.Location = new Point(7, 14); + buttonAddPlane.Name = "buttonAddPlane"; + buttonAddPlane.Size = new Size(252, 40); + buttonAddPlane.TabIndex = 1; + buttonAddPlane.Text = "Добавление самолёта"; + buttonAddPlane.UseVisualStyleBackColor = true; + buttonAddPlane.Click += ButtonAddPlane_Click; // // FormPlaneCollection // @@ -263,11 +251,11 @@ Name = "FormPlaneCollection"; 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); } @@ -275,8 +263,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; - private Button buttonAddAiroplane; - private Button buttonAddPlane; private PictureBox pictureBox; private Button buttonDelPlane; private MaskedTextBox maskedTextBox1; @@ -292,5 +278,6 @@ private RadioButton radioButtonList; private Button buttonCreateCompany; private Panel panelCompanyTools; + private Button buttonAddPlane; } } \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormPlaneCollection.cs b/ProjectSportCar/ProjectSportCar/FormPlaneCollection.cs index 18d9cb8..30bf074 100644 --- a/ProjectSportCar/ProjectSportCar/FormPlaneCollection.cs +++ b/ProjectSportCar/ProjectSportCar/FormPlaneCollection.cs @@ -1,5 +1,7 @@ using ProjectAiroplane.CollectionGenericObjects; using ProjectAiroplane.Drawnings; +using System.Windows.Forms; + namespace ProjectAiroplane; public partial class FormPlaneCollection : Form @@ -30,49 +32,35 @@ public partial class FormPlaneCollection : Form /// private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) { - panelCompanyTools.Enabled = false; + panelCompanyTools.Enabled = false; } /// - /// Добавление обычного самолёта + /// Добавление самолёта /// /// /// - private void ButtonAddPlane_Click(object sender, EventArgs e) => CreateObject(nameof(Drawningplane)); - /// - /// Добавление самолёта с радаром - /// - /// - /// - private void ButtonAddAiroplane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAiroplane)); - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + private void ButtonAddPlane_Click(object sender, EventArgs e)//вопрос 2 ........................................................... { - if (_company == null) + FormPlanConfig form = new(); + // TODO передать метод + + form.Show(); + form.AddEvent(SetPlane); ////////////////////////////// + + } + + /// + /// Добавление самолёта в коллекцию + /// + /// + private void SetPlane(Drawningplane? plane) + { + if (_company == null || plane == null) { return; } - Random random = new(); - Drawningplane drawningPlane; - switch (type) - { - case nameof(Drawningplane): - drawningPlane = new Drawningplane(random.Next(100, 300), - random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningAiroplane): - // TODO вызов диалогового окна для выбора цвета - drawningPlane = new DrawningAiroplane(random.Next(100, 300), random.Next(1000, 3000), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - if (_company + drawningPlane != -1) + + if (_company + plane != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -82,21 +70,7 @@ public partial class FormPlaneCollection : 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; - } + /// /// Удаление объекта ///