From 330dffaa87a564a3f46675d20df9ca1931f0d7cb Mon Sep 17 00:00:00 2001 From: IlyasValiulov <148232695+IlyasValiulov@users.noreply.github.com> Date: Sun, 31 Mar 2024 12:18:02 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=B0=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=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Drawnings/DrawningWarmlyShip.cs | 4 + .../ProjectWarmlyShip/Entities/EntityShip.cs | 4 + .../Entities/EntityWarmlyShip.cs | 4 + .../FormShipCollection.Designer.cs | 14 - .../ProjectWarmlyShip/FormShipCollection.cs | 49 +-- .../FormShipConfig.Designer.cs | 357 ++++++++++++++++++ .../ProjectWarmlyShip/FormShipConfig.cs | 132 +++++++ .../ProjectWarmlyShip/FormShipConfig.resx | 120 ++++++ .../ProjectWarmlyShip/ShipDelegate.cs | 6 + 9 files changed, 637 insertions(+), 53 deletions(-) create mode 100644 ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.Designer.cs create mode 100644 ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.cs create mode 100644 ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.resx create mode 100644 ProjectWarmlyShip/ProjectWarmlyShip/ShipDelegate.cs diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningWarmlyShip.cs b/ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningWarmlyShip.cs index fd00dc6..b01d039 100644 --- a/ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningWarmlyShip.cs +++ b/ProjectWarmlyShip/ProjectWarmlyShip/Drawnings/DrawningWarmlyShip.cs @@ -14,6 +14,10 @@ public class DrawningWarmlyShip : DrawningShip { EntityShip = new EntityWarmlyShip(speed, weight, bodycolor, additionalcolor, shpipipes, fueltank); //дописать конструктор } + public void setAdditionalColor(Color color) + { + ((EntityWarmlyShip)EntityShip).setAdditionalColor(color); + } public override void DrawTransport(Graphics g) { //оператор is совместимость объекта с заданным типом diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityShip.cs b/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityShip.cs index 4da86e7..bf228a9 100644 --- a/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityShip.cs +++ b/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityShip.cs @@ -14,6 +14,10 @@ public class EntityShip /// Основной цвет /// public Color BodyColor { get; private set; } + public void setBodyColor(Color color) + { + BodyColor = color; + } /// /// Шаг перемещения судна /// diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityWarmlyShip.cs b/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityWarmlyShip.cs index a4a6396..8a76f1a 100644 --- a/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityWarmlyShip.cs +++ b/ProjectWarmlyShip/ProjectWarmlyShip/Entities/EntityWarmlyShip.cs @@ -6,6 +6,10 @@ public class EntityWarmlyShip : EntityShip /// Дополнительтный цвет /// public Color AdditionalColor { get; private set; } + public void setAdditionalColor(Color color) + { + AdditionalColor = color; + } /// /// Признак наличия труб /// diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.Designer.cs b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.Designer.cs index 79168ab..a823314 100644 --- a/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.Designer.cs +++ b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.Designer.cs @@ -31,7 +31,6 @@ groupBoxTools = new GroupBox(); panelCompanyTools = new Panel(); buttonAddShip = new Button(); - buttonAddWarmlyShip = new Button(); buttonRefresh = new Button(); maskedTextBox = new MaskedTextBox(); buttonGoToCheck = new Button(); @@ -69,7 +68,6 @@ // panelCompanyTools // panelCompanyTools.Controls.Add(buttonAddShip); - panelCompanyTools.Controls.Add(buttonAddWarmlyShip); panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(maskedTextBox); panelCompanyTools.Controls.Add(buttonGoToCheck); @@ -91,17 +89,6 @@ buttonAddShip.UseVisualStyleBackColor = true; buttonAddShip.Click += buttonAddShip_Click; // - // buttonAddWarmlyShip - // - buttonAddWarmlyShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddWarmlyShip.Location = new Point(3, 47); - buttonAddWarmlyShip.Name = "buttonAddWarmlyShip"; - buttonAddWarmlyShip.Size = new Size(128, 40); - buttonAddWarmlyShip.TabIndex = 2; - buttonAddWarmlyShip.Text = "Добавление теплохода"; - buttonAddWarmlyShip.UseVisualStyleBackColor = true; - buttonAddWarmlyShip.Click += buttonAddWarmlyShip_Click; - // // buttonRefresh // buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; @@ -280,7 +267,6 @@ private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; - private Button buttonAddWarmlyShip; private Button buttonAddShip; private Button buttonGoToCheck; private Button buttonRemoveShip; diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.cs b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.cs index 650e6c4..03f710b 100644 --- a/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.cs +++ b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.cs @@ -16,30 +16,20 @@ public partial class FormShipCollection : Form { panelCompanyTools.Enabled = false; } - private void CreateObject(string type) + private void buttonAddShip_Click(object sender, EventArgs e) { - if (_company == null) + FormShipConfig form = new(); + // TODO передать метод + form.Show(); + form.AddEvent(SetShip); + } + private void SetShip(DrawningShip? ship) + { + if (_company == null || ship == null) { return; } - Random random = new(); - DrawningShip drawningShip; - switch (type) - { - case nameof(DrawningShip): - drawningShip = new DrawningShip(random.Next(100, 300), - random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningWarmlyShip): - // TODO вызов диалогового окна для выбора цвета (made) - drawningShip = new DrawningWarmlyShip(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 + drawningShip != -1) + if (_company + ship != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -49,25 +39,6 @@ public partial class FormShipCollection : 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; - } - - private void buttonAddShip_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawningShip)); - } - private void buttonAddWarmlyShip_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawningWarmlyShip)); - } private void buttonRemoveShip_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null) diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.Designer.cs b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.Designer.cs new file mode 100644 index 0000000..d14073c --- /dev/null +++ b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.Designer.cs @@ -0,0 +1,357 @@ +namespace ProjectWarmlyShip +{ + partial class FormShipConfig + { + /// + /// 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(); + checkBoxFuelTank = new CheckBox(); + checkBoxPipes = 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(checkBoxFuelTank); + groupBoxConfig.Controls.Add(checkBoxPipes); + 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(478, 239); + 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(211, 22); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(231, 122); + groupBoxColors.TabIndex = 8; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(176, 73); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(35, 32); + panelPurple.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(118, 73); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(35, 32); + panelBlack.TabIndex = 1; + // + // panelGrey + // + panelGrey.BackColor = Color.Gray; + panelGrey.Location = new Point(65, 73); + panelGrey.Name = "panelGrey"; + panelGrey.Size = new Size(35, 32); + panelGrey.TabIndex = 4; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(15, 73); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(35, 32); + panelWhite.TabIndex = 3; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(176, 22); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(35, 32); + panelYellow.TabIndex = 1; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(118, 22); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(35, 32); + panelBlue.TabIndex = 2; + // + // panelGreen + // + panelGreen.BackColor = Color.FromArgb(0, 192, 0); + panelGreen.Location = new Point(65, 22); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(35, 32); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(15, 22); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(35, 32); + panelRed.TabIndex = 0; + // + // checkBoxFuelTank + // + checkBoxFuelTank.AutoSize = true; + checkBoxFuelTank.Location = new Point(6, 202); + checkBoxFuelTank.Name = "checkBoxFuelTank"; + checkBoxFuelTank.Size = new Size(219, 19); + checkBoxFuelTank.TabIndex = 7; + checkBoxFuelTank.Text = "Признак наличия топливного бака"; + checkBoxFuelTank.UseVisualStyleBackColor = true; + // + // checkBoxPipes + // + checkBoxPipes.AutoSize = true; + checkBoxPipes.Location = new Point(6, 160); + checkBoxPipes.Name = "checkBoxPipes"; + checkBoxPipes.Size = new Size(151, 19); + checkBoxPipes.TabIndex = 6; + checkBoxPipes.Text = "Признак наличия труб"; + checkBoxPipes.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(80, 68); + 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(62, 23); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(12, 70); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(29, 15); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(80, 32); + 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(62, 23); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 34); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(62, 15); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(354, 194); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(88, 33); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(248, 194); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(88, 33); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(23, 26); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(158, 152); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(498, 204); + 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(579, 204); + 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(484, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(194, 186); + panelObject.TabIndex = 4; + panelObject.DragDrop += panelObject_DragDrop; + panelObject.DragEnter += panelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(93, 0); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(88, 21); + 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, 0); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(75, 21); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // FormShipConfig + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(679, 239); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfig); + Name = "FormShipConfig"; + 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 labelModifiedObject; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private CheckBox checkBoxPipes; + private CheckBox checkBoxFuelTank; + 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 buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelAdditionalColor; + private Label labelBodyColor; + } +} \ No newline at end of file diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.cs b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.cs new file mode 100644 index 0000000..ecd4c08 --- /dev/null +++ b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.cs @@ -0,0 +1,132 @@ +using ProjectWarmlyShip.Drawnings; + +namespace ProjectWarmlyShip; + +public partial class FormShipConfig : Form +{ + private DrawningShip? _ship = null; + //что делать с пользовательским делегатом + private event Action? ShipDelegate; + public FormShipConfig() + { + 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; + // TODO buttonCancel.Click привязать анонимный метод через lambda с закрытием формы + buttonCancel.Click += (sender, e) => Close(); + } + public void AddEvent(Action shipDelegate) + { + if (ShipDelegate == null) + { + ShipDelegate = shipDelegate; + } + else + { + ShipDelegate += shipDelegate; + } + } + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _ship?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _ship?.SetPosition(5, 5); + _ship?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + 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) + { + if (e.Data?.GetDataPresent(DataFormats.Text) ?? false) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + private void panelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data?.GetData(DataFormats.Text)?.ToString()) + { + case "labelSimpleObject": + _ship = new DrawningShip((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _ship = new DrawningWarmlyShip((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, + Color.White, Color.Black, checkBoxPipes.Checked, checkBoxFuelTank.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 (_ship != null) + { + _ship.EntityShip.setBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_ship is DrawningWarmlyShip) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_ship is DrawningWarmlyShip _warmlyship) + { + _warmlyship.setAdditionalColor((Color)e.Data.GetData(typeof(Color))); + + } + DrawObject(); + } + private void buttonAdd_Click(object sender, EventArgs e) + { + if (_ship != null) + { + ShipDelegate?.Invoke(_ship); + Close(); + } + } +} diff --git a/ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.resx b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectWarmlyShip/ProjectWarmlyShip/FormShipConfig.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/ProjectWarmlyShip/ProjectWarmlyShip/ShipDelegate.cs b/ProjectWarmlyShip/ProjectWarmlyShip/ShipDelegate.cs new file mode 100644 index 0000000..42615da --- /dev/null +++ b/ProjectWarmlyShip/ProjectWarmlyShip/ShipDelegate.cs @@ -0,0 +1,6 @@ +using ProjectWarmlyShip.Drawnings; + +namespace ProjectWarmlyShip; + +public delegate void ShipDelegate(DrawningShip ship); +