From 1781efe7029ee27fdd03ffac4e9d8bc801e73328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=A8=D0=B8=D0=BF?= =?UTF-8?q?=D0=B8=D0=BB=D0=BE=D0=B2?= <116575516+LAYT73@users.noreply.github.com> Date: Mon, 29 Apr 2024 02:47:57 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=965?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectSeaplane/Entities/EntityPlane.cs | 4 + .../Entities/EntitySeaplane.cs | 4 + .../FormPlaneConfig.Designer.cs | 357 ++++++++++++++++++ .../ProjectSeaplane/FormPlaneConfig.cs | 143 +++++++ .../ProjectSeaplane/FormPlaneConfig.resx | 120 ++++++ .../FormSeaplaneCollection.Designer.cs | 155 ++++---- .../ProjectSeaplane/FormSeaplaneCollection.cs | 24 +- 7 files changed, 721 insertions(+), 86 deletions(-) create mode 100644 ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.Designer.cs create mode 100644 ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.cs create mode 100644 ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.resx diff --git a/ProjectSeaplane/ProjectSeaplane/Entities/EntityPlane.cs b/ProjectSeaplane/ProjectSeaplane/Entities/EntityPlane.cs index d7d0d27..e96f6ae 100644 --- a/ProjectSeaplane/ProjectSeaplane/Entities/EntityPlane.cs +++ b/ProjectSeaplane/ProjectSeaplane/Entities/EntityPlane.cs @@ -14,6 +14,10 @@ public class EntityPlane public double Weight { get; set; } public Color BodyColor { get; private set; } + public void setBodyColor(Color color) + { + BodyColor = color; + } public double Step => Speed * 100 / Weight; diff --git a/ProjectSeaplane/ProjectSeaplane/Entities/EntitySeaplane.cs b/ProjectSeaplane/ProjectSeaplane/Entities/EntitySeaplane.cs index 7a7996c..2051fe4 100644 --- a/ProjectSeaplane/ProjectSeaplane/Entities/EntitySeaplane.cs +++ b/ProjectSeaplane/ProjectSeaplane/Entities/EntitySeaplane.cs @@ -8,6 +8,10 @@ namespace ProjectSeaplane.Entities; public class EntitySeaplane : EntityPlane { public Color AdditionalColor { get; private set; } + public void setAdditionalColor(Color color) + { + AdditionalColor = color; + } public bool Floats { get; private set; } diff --git a/ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.Designer.cs b/ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.Designer.cs new file mode 100644 index 0000000..0a29b04 --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.Designer.cs @@ -0,0 +1,357 @@ +namespace ProjectSeaplane +{ + partial class FormPlaneConfig + { + /// + /// 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(); + checkBoxInflatableBoat = new CheckBox(); + checkBoxFloats = new CheckBox(); + numericUpDownWeight = 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)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + panelObject.SuspendLayout(); + SuspendLayout(); + // + // groupBoxConfig + // + groupBoxConfig.Controls.Add(groupBoxColors); + groupBoxConfig.Controls.Add(checkBoxInflatableBoat); + groupBoxConfig.Controls.Add(checkBoxFloats); + 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(466, 233); + 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(210, 22); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(212, 112); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(164, 62); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(37, 35); + panelPurple.TabIndex = 7; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(164, 21); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(37, 35); + panelYellow.TabIndex = 3; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(111, 62); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(37, 35); + panelBlack.TabIndex = 6; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(59, 62); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(37, 35); + panelGray.TabIndex = 5; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(111, 21); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(37, 35); + panelBlue.TabIndex = 2; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(6, 62); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(37, 35); + panelWhite.TabIndex = 4; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(59, 21); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(37, 35); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(6, 21); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(37, 35); + panelRed.TabIndex = 0; + // + // checkBoxInflatableBoat + // + checkBoxInflatableBoat.AutoSize = true; + checkBoxInflatableBoat.Location = new Point(12, 148); + checkBoxInflatableBoat.Name = "checkBoxInflatableBoat"; + checkBoxInflatableBoat.Size = new Size(113, 19); + checkBoxInflatableBoat.TabIndex = 7; + checkBoxInflatableBoat.Text = "Надувная лодка"; + checkBoxInflatableBoat.UseVisualStyleBackColor = true; + // + // checkBoxFloats + // + checkBoxFloats.AutoSize = true; + checkBoxFloats.Location = new Point(12, 115); + checkBoxFloats.Name = "checkBoxFloats"; + checkBoxFloats.Size = new Size(81, 19); + checkBoxFloats.TabIndex = 6; + checkBoxFloats.Text = "Поплавки"; + checkBoxFloats.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(74, 61); + 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(6, 63); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(74, 31); + 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(6, 33); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(62, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(322, 148); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(100, 31); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(210, 148); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(100, 31); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(10, 49); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(220, 124); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(507, 198); + 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(602, 198); + 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(472, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(240, 180); + panelObject.TabIndex = 4; + panelObject.DragDrop += panelObject_DragDrop; + panelObject.DragEnter += panelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(130, 10); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(100, 31); + labelAdditionalColor.TabIndex = 10; + 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(10, 10); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(100, 31); + labelBodyColor.TabIndex = 9; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // FormPlaneConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(724, 233); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormPlaneConfig"; + 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 NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private Label labelModifiedObject; + private CheckBox checkBoxFloats; + private CheckBox checkBoxInflatableBoat; + private GroupBox groupBoxColors; + private Panel panelGreen; + private Panel panelRed; + private Panel panelYellow; + private Panel panelBlue; + 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/ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.cs b/ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.cs new file mode 100644 index 0000000..773c1a0 --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.cs @@ -0,0 +1,143 @@ +using ProjectSeaplane.Drawings; +using ProjectSeaplane.Entities; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ProjectSeaplane; + +public partial class FormPlaneConfig : Form +{ + private DrawingPlane _plane; + private event Action? PlaneDelegate; + public FormPlaneConfig() + { + InitializeComponent(); + panelRed.MouseDown += panel_MouseDown; + panelGreen.MouseDown += panel_MouseDown; + panelBlue.MouseDown += panel_MouseDown; + panelYellow.MouseDown += panel_MouseDown; + panelWhite.MouseDown += panel_MouseDown; + panelGray.MouseDown += panel_MouseDown; + panelBlack.MouseDown += panel_MouseDown; + panelPurple.MouseDown += panel_MouseDown; + // TODO buttonCancel.Click привязать анонимный метод через lambda с закрытием формы + buttonCancel.Click += (sender, e) => Close(); + } + + public void AddEvent(Action planeDelegate) + { + if (PlaneDelegate == null) + { + PlaneDelegate = planeDelegate; + } + else + { + PlaneDelegate += planeDelegate; + } + } + + private void buttonAdd_Click(object sender, EventArgs e) + { + if (_plane != null) + { + PlaneDelegate?.Invoke(_plane); + Close(); + } + } + + 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 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; + } + + private void panelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data?.GetData(DataFormats.Text)?.ToString()) + { + case "labelSimpleObject": + _plane = new DrawingPlane((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _plane = new DrawingSeaplane((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, + Color.White, Color.Black, checkBoxFloats.Checked, checkBoxInflatableBoat.Checked); + break; + } + DrawObject(); + } + + 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 labelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_plane is DrawingSeaplane) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_plane.EntityPlane is EntitySeaplane _seaplane) + { + _seaplane.setAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + private void panel_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + private void panelRed_Paint(object sender, PaintEventArgs e) + { + + } +} diff --git a/ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.resx b/ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/FormPlaneConfig.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/ProjectSeaplane/ProjectSeaplane/FormSeaplaneCollection.Designer.cs b/ProjectSeaplane/ProjectSeaplane/FormSeaplaneCollection.Designer.cs index 1c80c37..5c4690d 100644 --- a/ProjectSeaplane/ProjectSeaplane/FormSeaplaneCollection.Designer.cs +++ b/ProjectSeaplane/ProjectSeaplane/FormSeaplaneCollection.Designer.cs @@ -29,6 +29,12 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); + panelCompanyTools = new Panel(); + buttonAddPlane = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonDelPlane = 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(); - buttonDelPlane = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddSeaplane = new Button(); - buttonAddPlane = 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,68 @@ groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddPlane); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonDelPlane); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(6, 346); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(188, 269); + panelCompanyTools.TabIndex = 8; + // + // buttonAddPlane + // + buttonAddPlane.Location = new Point(3, 3); + buttonAddPlane.Name = "buttonAddPlane"; + buttonAddPlane.Size = new Size(182, 41); + buttonAddPlane.TabIndex = 1; + buttonAddPlane.Text = "Добавление самолета"; + buttonAddPlane.UseVisualStyleBackColor = true; + buttonAddPlane.Click += ButtonAddPlane_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(3, 97); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(182, 23); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Location = new Point(3, 216); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(182, 41); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += buttonRefresh_Click; + // + // buttonDelPlane + // + buttonDelPlane.Location = new Point(3, 126); + buttonDelPlane.Name = "buttonDelPlane"; + buttonDelPlane.Size = new Size(182, 41); + buttonDelPlane.TabIndex = 4; + buttonDelPlane.Text = "Удаление самолета"; + buttonDelPlane.UseVisualStyleBackColor = true; + buttonDelPlane.Click += buttonDelPlane_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Location = new Point(3, 173); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(182, 41); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += buttonGoToCheck_Click; + // // buttonCreateCompany // buttonCreateCompany.Location = new Point(6, 300); @@ -159,65 +220,6 @@ labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // - // buttonRefresh - // - buttonRefresh.Location = new Point(3, 216); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(182, 41); - buttonRefresh.TabIndex = 6; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += buttonRefresh_Click; - // - // buttonGoToCheck - // - buttonGoToCheck.Location = new Point(3, 173); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(182, 41); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += buttonGoToCheck_Click; - // - // buttonDelPlane - // - buttonDelPlane.Location = new Point(3, 126); - buttonDelPlane.Name = "buttonDelPlane"; - buttonDelPlane.Size = new Size(182, 41); - buttonDelPlane.TabIndex = 4; - buttonDelPlane.Text = "Удаление самолета"; - buttonDelPlane.UseVisualStyleBackColor = true; - buttonDelPlane.Click += buttonDelPlane_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(3, 97); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(182, 23); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonAddSeaplane - // - buttonAddSeaplane.Location = new Point(3, 50); - buttonAddSeaplane.Name = "buttonAddSeaplane"; - buttonAddSeaplane.Size = new Size(182, 41); - buttonAddSeaplane.TabIndex = 2; - buttonAddSeaplane.Text = "Добавление водного самолета"; - buttonAddSeaplane.UseVisualStyleBackColor = true; - buttonAddSeaplane.Click += ButtonAddSeaplane_Click; - // - // buttonAddPlane - // - buttonAddPlane.Location = new Point(3, 3); - buttonAddPlane.Name = "buttonAddPlane"; - buttonAddPlane.Size = new Size(182, 41); - buttonAddPlane.TabIndex = 1; - buttonAddPlane.Text = "Добавление самолета"; - buttonAddPlane.UseVisualStyleBackColor = true; - buttonAddPlane.Click += ButtonAddPlane_Click; - // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; @@ -239,20 +241,6 @@ pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddPlane); - panelCompanyTools.Controls.Add(buttonAddSeaplane); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Controls.Add(buttonDelPlane); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(6, 346); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(188, 269); - panelCompanyTools.TabIndex = 8; - // // FormSeaplaneCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -263,11 +251,11 @@ Name = "FormSeaplaneCollection"; Text = "FormSeaplaneCollection"; 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 +268,6 @@ private Button buttonGoToCheck; private Button buttonDelPlane; private MaskedTextBox maskedTextBoxPosition; - private Button buttonAddSeaplane; private PictureBox pictureBox; private Panel panelStorage; private Label labelCollectionName; diff --git a/ProjectSeaplane/ProjectSeaplane/FormSeaplaneCollection.cs b/ProjectSeaplane/ProjectSeaplane/FormSeaplaneCollection.cs index 60eeb7c..74495cf 100644 --- a/ProjectSeaplane/ProjectSeaplane/FormSeaplaneCollection.cs +++ b/ProjectSeaplane/ProjectSeaplane/FormSeaplaneCollection.cs @@ -21,9 +21,29 @@ public partial class FormSeaplaneCollection : Form panelCompanyTools.Enabled = false; } - private void ButtonAddPlane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingPlane)); + private void ButtonAddPlane_Click(object sender, EventArgs e) + { + FormPlaneConfig form = new(); + form.Show(); + form.AddEvent(SetPlane); + } - private void ButtonAddSeaplane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingSeaplane)); + private void SetPlane(DrawingPlane? plane) + { + if (_company == null || plane == null) + { + return; + } + if (_company + plane != -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _company.Show(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } private void CreateObject(string type) {