From a41a77ca03c133ef0e2ac92772ff3d8ea9ade956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=20=D0=91=D0=BE=D0=BD=D0=B4=D0=B0?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Thu, 10 Nov 2022 23:08:53 +0400 Subject: [PATCH 1/6] =?UTF-8?q?=D0=A1=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarmlyShip/FormShipConfig.Designer.cs | 351 ++++++++++++++++++ WarmlyShip/WarmlyShip/FormShipConfig.cs | 125 +++++++ WarmlyShip/WarmlyShip/FormShipConfig.resx | 60 +++ WarmlyShip/WarmlyShip/ShipDelegate.cs | 10 + 4 files changed, 546 insertions(+) create mode 100644 WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs create mode 100644 WarmlyShip/WarmlyShip/FormShipConfig.cs create mode 100644 WarmlyShip/WarmlyShip/FormShipConfig.resx create mode 100644 WarmlyShip/WarmlyShip/ShipDelegate.cs diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs new file mode 100644 index 0000000..3ca68a5 --- /dev/null +++ b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs @@ -0,0 +1,351 @@ +namespace WarmlyShip +{ + 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() + { + this.groupBoxConfig = new System.Windows.Forms.GroupBox(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.labelWeight = new System.Windows.Forms.Label(); + this.checkBoxTubes = new System.Windows.Forms.CheckBox(); + this.checkBoxCistern = new System.Windows.Forms.CheckBox(); + this.groupBoxColors = new System.Windows.Forms.GroupBox(); + this.panelPink = new System.Windows.Forms.Panel(); + this.panelRed = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelCyan = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.panelBlack = new System.Windows.Forms.Panel(); + this.labelSimpleObject = new System.Windows.Forms.Label(); + this.labelModifiedObject = new System.Windows.Forms.Label(); + this.pictureBoxObject = new System.Windows.Forms.PictureBox(); + this.panelObject = new System.Windows.Forms.Panel(); + this.labelBaseColor = new System.Windows.Forms.Label(); + this.labelDopColor = new System.Windows.Forms.Label(); + this.buttonAddShip = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.groupBoxConfig.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + this.groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + this.panelObject.SuspendLayout(); + this.SuspendLayout(); + // + // groupBoxConfig + // + this.groupBoxConfig.Controls.Add(this.labelModifiedObject); + this.groupBoxConfig.Controls.Add(this.labelSimpleObject); + this.groupBoxConfig.Controls.Add(this.groupBoxColors); + this.groupBoxConfig.Controls.Add(this.checkBoxCistern); + this.groupBoxConfig.Controls.Add(this.checkBoxTubes); + this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); + this.groupBoxConfig.Controls.Add(this.labelWeight); + this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed); + this.groupBoxConfig.Controls.Add(this.labelSpeed); + this.groupBoxConfig.Location = new System.Drawing.Point(12, 12); + this.groupBoxConfig.Name = "groupBoxConfig"; + this.groupBoxConfig.Size = new System.Drawing.Size(454, 259); + this.groupBoxConfig.TabIndex = 0; + this.groupBoxConfig.TabStop = false; + this.groupBoxConfig.Text = "Параметры"; + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(32, 24); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(62, 15); + this.labelSpeed.TabIndex = 0; + this.labelSpeed.Text = "Скорость:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(100, 22); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(120, 23); + this.numericUpDownSpeed.TabIndex = 1; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(100, 51); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(120, 23); + this.numericUpDownWeight.TabIndex = 3; + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(32, 53); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(29, 15); + this.labelWeight.TabIndex = 2; + this.labelWeight.Text = "Вес:"; + // + // checkBoxTubes + // + this.checkBoxTubes.AutoSize = true; + this.checkBoxTubes.Location = new System.Drawing.Point(32, 91); + this.checkBoxTubes.Name = "checkBoxTubes"; + this.checkBoxTubes.Size = new System.Drawing.Size(151, 19); + this.checkBoxTubes.TabIndex = 4; + this.checkBoxTubes.Text = "Признак наличия труб"; + this.checkBoxTubes.UseVisualStyleBackColor = true; + // + // checkBoxCistern + // + this.checkBoxCistern.AutoSize = true; + this.checkBoxCistern.Location = new System.Drawing.Point(32, 116); + this.checkBoxCistern.Name = "checkBoxCistern"; + this.checkBoxCistern.Size = new System.Drawing.Size(180, 19); + this.checkBoxCistern.TabIndex = 5; + this.checkBoxCistern.Text = "Признак наличия цистерны"; + this.checkBoxCistern.UseVisualStyleBackColor = true; + // + // groupBoxColors + // + this.groupBoxColors.Controls.Add(this.panelBlack); + this.groupBoxColors.Controls.Add(this.panelWhite); + this.groupBoxColors.Controls.Add(this.panelBlue); + this.groupBoxColors.Controls.Add(this.panelYellow); + this.groupBoxColors.Controls.Add(this.panelCyan); + this.groupBoxColors.Controls.Add(this.panelGreen); + this.groupBoxColors.Controls.Add(this.panelRed); + this.groupBoxColors.Controls.Add(this.panelPink); + this.groupBoxColors.Location = new System.Drawing.Point(239, 22); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.groupBoxColors.Size = new System.Drawing.Size(194, 113); + this.groupBoxColors.TabIndex = 6; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Цвета"; + // + // panelPink + // + this.panelPink.BackColor = System.Drawing.Color.Fuchsia; + this.panelPink.Location = new System.Drawing.Point(6, 22); + this.panelPink.Name = "panelPink"; + this.panelPink.Size = new System.Drawing.Size(41, 39); + this.panelPink.TabIndex = 0; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(53, 22); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(41, 39); + this.panelRed.TabIndex = 1; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Lime; + this.panelGreen.Location = new System.Drawing.Point(100, 22); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(41, 39); + this.panelGreen.TabIndex = 2; + // + // panelCyan + // + this.panelCyan.BackColor = System.Drawing.Color.Cyan; + this.panelCyan.Location = new System.Drawing.Point(147, 22); + this.panelCyan.Name = "panelCyan"; + this.panelCyan.Size = new System.Drawing.Size(41, 39); + this.panelCyan.TabIndex = 3; + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(6, 69); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(41, 39); + this.panelYellow.TabIndex = 4; + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(53, 67); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(41, 39); + this.panelBlue.TabIndex = 1; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(100, 67); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(41, 39); + this.panelWhite.TabIndex = 1; + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(147, 67); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(41, 39); + this.panelBlack.TabIndex = 1; + // + // labelSimpleObject + // + this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelSimpleObject.Location = new System.Drawing.Point(233, 149); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(100, 23); + this.labelSimpleObject.TabIndex = 7; + this.labelSimpleObject.Text = "Простой"; + this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // labelModifiedObject + // + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Location = new System.Drawing.Point(339, 149); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(100, 23); + this.labelModifiedObject.TabIndex = 8; + this.labelModifiedObject.Text = "Продвинутый"; + this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(3, 32); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(429, 185); + this.pictureBoxObject.TabIndex = 1; + this.pictureBoxObject.TabStop = false; + // + // panelObject + // + this.panelObject.AllowDrop = true; + this.panelObject.Controls.Add(this.labelDopColor); + this.panelObject.Controls.Add(this.labelBaseColor); + this.panelObject.Controls.Add(this.pictureBoxObject); + this.panelObject.Location = new System.Drawing.Point(472, 22); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(435, 220); + this.panelObject.TabIndex = 2; + this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); + this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(119, 6); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(100, 23); + this.labelBaseColor.TabIndex = 8; + this.labelBaseColor.Text = "Цвет"; + this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); + this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); + // + // labelDopColor + // + this.labelDopColor.AllowDrop = true; + this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelDopColor.Location = new System.Drawing.Point(225, 6); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(100, 23); + this.labelDopColor.TabIndex = 9; + this.labelDopColor.Text = "Доп. Цвет"; + this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); + this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); + // + // buttonAddShip + // + this.buttonAddShip.Location = new System.Drawing.Point(616, 248); + this.buttonAddShip.Name = "buttonAddShip"; + this.buttonAddShip.Size = new System.Drawing.Size(75, 23); + this.buttonAddShip.TabIndex = 3; + this.buttonAddShip.Text = "Добавить"; + this.buttonAddShip.UseVisualStyleBackColor = true; + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(697, 248); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 4; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // FormShipConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(919, 283); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonAddShip); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.groupBoxConfig); + this.Name = "FormShipConfig"; + this.Text = "Создание объекта"; + this.groupBoxConfig.ResumeLayout(false); + this.groupBoxConfig.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); + this.groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.panelObject.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBoxConfig; + private CheckBox checkBoxTubes; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private CheckBox checkBoxCistern; + private GroupBox groupBoxColors; + private Panel panelBlack; + private Panel panelWhite; + private Panel panelBlue; + private Panel panelYellow; + private Panel panelCyan; + private Panel panelGreen; + private Panel panelRed; + private Panel panelPink; + private Label labelSimpleObject; + private Label labelModifiedObject; + private PictureBox pictureBoxObject; + private Panel panelObject; + private Label labelDopColor; + private Label labelBaseColor; + private Button buttonAddShip; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.cs b/WarmlyShip/WarmlyShip/FormShipConfig.cs new file mode 100644 index 0000000..496b7e1 --- /dev/null +++ b/WarmlyShip/WarmlyShip/FormShipConfig.cs @@ -0,0 +1,125 @@ +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 WarmlyShip +{ + public partial class FormShipConfig : Form + { + + DrawingWarmlyShip _warmlyShip = null; + + private event ShipDelegate EventAddShip; + + public FormShipConfig() + { + InitializeComponent(); + panelBlack.MouseDown += PanelColor_MouseDown; + panelPink.MouseDown += PanelColor_MouseDown; + panelGreen.MouseDown += PanelColor_MouseDown; + panelGreen.MouseDown += PanelColor_MouseDown; + panelRed.MouseDown += PanelColor_MouseDown; + panelWhite.MouseDown += PanelColor_MouseDown; + panelYellow.MouseDown += PanelColor_MouseDown; + panelBlue.MouseDown += PanelColor_MouseDown; + + buttonCancel.Click += (s, e) => Close(); + } + + private void DrawShip() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _warmlyShip?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _warmlyShip?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + public void AddEvent(ShipDelegate ev) + { + if (EventAddShip == null) + { + EventAddShip = new ShipDelegate(ev); + } + else + { + EventAddShip += ev; + } + } + + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); + } + + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(DataFormats.Text)) + { + 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": + _warmlyShip = new DrawingWarmlyShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _warmlyShip = new DrawningMotorShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxTubes.Checked, checkBoxCistern.Checked); + break; + } + DrawShip(); + } + + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + private void LabelBaseColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) + { + if (_warmlyShip == null) return; + + + + DrawShip(); + } + + private void LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + // TODO Call method from object _car if _car is DrawningSportCar and set dop color + } + + private void ButtonOk_Click(object sender, EventArgs e) + { + EventAddShip?.Invoke(_warmlyShip); + Close(); + } + + } +} diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.resx b/WarmlyShip/WarmlyShip/FormShipConfig.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/WarmlyShip/WarmlyShip/FormShipConfig.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/WarmlyShip/WarmlyShip/ShipDelegate.cs b/WarmlyShip/WarmlyShip/ShipDelegate.cs new file mode 100644 index 0000000..c80372b --- /dev/null +++ b/WarmlyShip/WarmlyShip/ShipDelegate.cs @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyShip +{ + public delegate void ShipDelegate(DrawingWarmlyShip warmlyShip); +} -- 2.25.1 From f092f6cd87aaa2a22bd1f0660f56eb4b19d3b2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=20=D0=91=D0=BE=D0=BD=D0=B4=D0=B0?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Thu, 10 Nov 2022 23:29:07 +0400 Subject: [PATCH 2/6] Event --- WarmlyShip/WarmlyShip/FormMapWithSetShip.cs | 27 ++++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/WarmlyShip/WarmlyShip/FormMapWithSetShip.cs b/WarmlyShip/WarmlyShip/FormMapWithSetShip.cs index e821865..cbf17ab 100644 --- a/WarmlyShip/WarmlyShip/FormMapWithSetShip.cs +++ b/WarmlyShip/WarmlyShip/FormMapWithSetShip.cs @@ -88,24 +88,27 @@ namespace WarmlyShip } private void ButtonAddShip_Click(object sender, EventArgs e) + { + FormShipConfig formShipConfig = new(); + formShipConfig.AddEvent(AddShip); + formShipConfig.Show(); + } + + private void AddShip(DrawingWarmlyShip ship) { if (listBoxMaps.SelectedIndex == -1) { return; } - FormClass form = new(); - if (form.ShowDialog() == DialogResult.OK) + + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectShip(ship) > -1) { - DrawningObjectShip ship = new(form.SelectedShip); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + ship > -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); } } -- 2.25.1 From 6b3edfe5e6de74ed852ba2e7f56e6d2c7c14c2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=20=D0=91=D0=BE=D0=BD=D0=B4=D0=B0?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Fri, 11 Nov 2022 01:12:45 +0400 Subject: [PATCH 3/6] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D1=82=D0=B8=20=D1=81?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/DrawingWarmlyShip.cs | 5 + WarmlyShip/WarmlyShip/DrawningMotorShip.cs | 6 + .../WarmlyShip/FormShipConfig.Designer.cs | 303 +++++++++--------- WarmlyShip/WarmlyShip/FormShipConfig.cs | 17 +- 4 files changed, 177 insertions(+), 154 deletions(-) diff --git a/WarmlyShip/WarmlyShip/DrawingWarmlyShip.cs b/WarmlyShip/WarmlyShip/DrawingWarmlyShip.cs index 05f9aff..b6f892a 100644 --- a/WarmlyShip/WarmlyShip/DrawingWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/DrawingWarmlyShip.cs @@ -119,5 +119,10 @@ namespace WarmlyShip { return (_startPosX, _startPosX + _warmlyShipWidth, _startPosY, _startPosY + _warmlyShipHeight); } + + public DrawingWarmlyShip ModifShip(int? speed = null, float? weight = null, Color? bodyColor = null) + { + return new DrawingWarmlyShip(speed ?? warmlyShip.Speed, weight ?? warmlyShip.Weight, bodyColor ?? warmlyShip.BodyColor); + } } } diff --git a/WarmlyShip/WarmlyShip/DrawningMotorShip.cs b/WarmlyShip/WarmlyShip/DrawningMotorShip.cs index 0d17867..a422328 100644 --- a/WarmlyShip/WarmlyShip/DrawningMotorShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningMotorShip.cs @@ -40,5 +40,11 @@ namespace WarmlyShip g.DrawEllipse(pen, _startPosX, _startPosY + 25, 25, 20); } } + + public DrawningMotorShip ModifShip(int? speed = null, float? weight = null, Color? bodyColor = null, Color? dopColor = null, bool? tubes = null, bool? cistern = null) + { + EntityMotorShip motorShip = (EntityMotorShip)warmlyShip; + return new DrawningMotorShip(speed ?? warmlyShip.Speed, weight ?? warmlyShip.Weight, bodyColor ?? warmlyShip.BodyColor, dopColor ?? motorShip.DopColor, tubes ?? motorShip.Tubes, cistern ?? motorShip.Cistern); + } } } \ No newline at end of file diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs index 3ca68a5..61efdb5 100644 --- a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs +++ b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs @@ -29,33 +29,33 @@ private void InitializeComponent() { this.groupBoxConfig = new System.Windows.Forms.GroupBox(); - this.labelSpeed = new System.Windows.Forms.Label(); - this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.labelModifiedObject = new System.Windows.Forms.Label(); + this.labelSimpleObject = new System.Windows.Forms.Label(); + this.groupBoxColors = new System.Windows.Forms.GroupBox(); + this.panelBlack = new System.Windows.Forms.Panel(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); + this.panelCyan = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelRed = new System.Windows.Forms.Panel(); + this.panelPink = new System.Windows.Forms.Panel(); + this.checkBoxCistern = new System.Windows.Forms.CheckBox(); + this.checkBoxTubes = new System.Windows.Forms.CheckBox(); this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); this.labelWeight = new System.Windows.Forms.Label(); - this.checkBoxTubes = new System.Windows.Forms.CheckBox(); - this.checkBoxCistern = new System.Windows.Forms.CheckBox(); - this.groupBoxColors = new System.Windows.Forms.GroupBox(); - this.panelPink = new System.Windows.Forms.Panel(); - this.panelRed = new System.Windows.Forms.Panel(); - this.panelGreen = new System.Windows.Forms.Panel(); - this.panelCyan = new System.Windows.Forms.Panel(); - this.panelYellow = new System.Windows.Forms.Panel(); - this.panelBlue = new System.Windows.Forms.Panel(); - this.panelWhite = new System.Windows.Forms.Panel(); - this.panelBlack = new System.Windows.Forms.Panel(); - this.labelSimpleObject = new System.Windows.Forms.Label(); - this.labelModifiedObject = new System.Windows.Forms.Label(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.labelSpeed = new System.Windows.Forms.Label(); this.pictureBoxObject = new System.Windows.Forms.PictureBox(); this.panelObject = new System.Windows.Forms.Panel(); - this.labelBaseColor = new System.Windows.Forms.Label(); this.labelDopColor = new System.Windows.Forms.Label(); + this.labelBaseColor = new System.Windows.Forms.Label(); this.buttonAddShip = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); this.groupBoxConfig.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); this.groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); this.panelObject.SuspendLayout(); this.SuspendLayout(); @@ -78,57 +78,27 @@ this.groupBoxConfig.TabStop = false; this.groupBoxConfig.Text = "Параметры"; // - // labelSpeed + // labelModifiedObject // - this.labelSpeed.AutoSize = true; - this.labelSpeed.Location = new System.Drawing.Point(32, 24); - this.labelSpeed.Name = "labelSpeed"; - this.labelSpeed.Size = new System.Drawing.Size(62, 15); - this.labelSpeed.TabIndex = 0; - this.labelSpeed.Text = "Скорость:"; + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Location = new System.Drawing.Point(339, 149); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(100, 23); + this.labelModifiedObject.TabIndex = 8; + this.labelModifiedObject.Text = "Продвинутый"; + this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); // - // numericUpDownSpeed + // labelSimpleObject // - this.numericUpDownSpeed.Location = new System.Drawing.Point(100, 22); - this.numericUpDownSpeed.Name = "numericUpDownSpeed"; - this.numericUpDownSpeed.Size = new System.Drawing.Size(120, 23); - this.numericUpDownSpeed.TabIndex = 1; - // - // numericUpDownWeight - // - this.numericUpDownWeight.Location = new System.Drawing.Point(100, 51); - this.numericUpDownWeight.Name = "numericUpDownWeight"; - this.numericUpDownWeight.Size = new System.Drawing.Size(120, 23); - this.numericUpDownWeight.TabIndex = 3; - // - // labelWeight - // - this.labelWeight.AutoSize = true; - this.labelWeight.Location = new System.Drawing.Point(32, 53); - this.labelWeight.Name = "labelWeight"; - this.labelWeight.Size = new System.Drawing.Size(29, 15); - this.labelWeight.TabIndex = 2; - this.labelWeight.Text = "Вес:"; - // - // checkBoxTubes - // - this.checkBoxTubes.AutoSize = true; - this.checkBoxTubes.Location = new System.Drawing.Point(32, 91); - this.checkBoxTubes.Name = "checkBoxTubes"; - this.checkBoxTubes.Size = new System.Drawing.Size(151, 19); - this.checkBoxTubes.TabIndex = 4; - this.checkBoxTubes.Text = "Признак наличия труб"; - this.checkBoxTubes.UseVisualStyleBackColor = true; - // - // checkBoxCistern - // - this.checkBoxCistern.AutoSize = true; - this.checkBoxCistern.Location = new System.Drawing.Point(32, 116); - this.checkBoxCistern.Name = "checkBoxCistern"; - this.checkBoxCistern.Size = new System.Drawing.Size(180, 19); - this.checkBoxCistern.TabIndex = 5; - this.checkBoxCistern.Text = "Признак наличия цистерны"; - this.checkBoxCistern.UseVisualStyleBackColor = true; + this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelSimpleObject.Location = new System.Drawing.Point(233, 149); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(100, 23); + this.labelSimpleObject.TabIndex = 7; + this.labelSimpleObject.Text = "Простой"; + this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); // // groupBoxColors // @@ -148,53 +118,13 @@ this.groupBoxColors.TabStop = false; this.groupBoxColors.Text = "Цвета"; // - // panelPink + // panelBlack // - this.panelPink.BackColor = System.Drawing.Color.Fuchsia; - this.panelPink.Location = new System.Drawing.Point(6, 22); - this.panelPink.Name = "panelPink"; - this.panelPink.Size = new System.Drawing.Size(41, 39); - this.panelPink.TabIndex = 0; - // - // panelRed - // - this.panelRed.BackColor = System.Drawing.Color.Red; - this.panelRed.Location = new System.Drawing.Point(53, 22); - this.panelRed.Name = "panelRed"; - this.panelRed.Size = new System.Drawing.Size(41, 39); - this.panelRed.TabIndex = 1; - // - // panelGreen - // - this.panelGreen.BackColor = System.Drawing.Color.Lime; - this.panelGreen.Location = new System.Drawing.Point(100, 22); - this.panelGreen.Name = "panelGreen"; - this.panelGreen.Size = new System.Drawing.Size(41, 39); - this.panelGreen.TabIndex = 2; - // - // panelCyan - // - this.panelCyan.BackColor = System.Drawing.Color.Cyan; - this.panelCyan.Location = new System.Drawing.Point(147, 22); - this.panelCyan.Name = "panelCyan"; - this.panelCyan.Size = new System.Drawing.Size(41, 39); - this.panelCyan.TabIndex = 3; - // - // panelYellow - // - this.panelYellow.BackColor = System.Drawing.Color.Yellow; - this.panelYellow.Location = new System.Drawing.Point(6, 69); - this.panelYellow.Name = "panelYellow"; - this.panelYellow.Size = new System.Drawing.Size(41, 39); - this.panelYellow.TabIndex = 4; - // - // panelBlue - // - this.panelBlue.BackColor = System.Drawing.Color.Blue; - this.panelBlue.Location = new System.Drawing.Point(53, 67); - this.panelBlue.Name = "panelBlue"; - this.panelBlue.Size = new System.Drawing.Size(41, 39); - this.panelBlue.TabIndex = 1; + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(147, 67); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(41, 39); + this.panelBlack.TabIndex = 1; // // panelWhite // @@ -204,35 +134,105 @@ this.panelWhite.Size = new System.Drawing.Size(41, 39); this.panelWhite.TabIndex = 1; // - // panelBlack + // panelBlue // - this.panelBlack.BackColor = System.Drawing.Color.Black; - this.panelBlack.Location = new System.Drawing.Point(147, 67); - this.panelBlack.Name = "panelBlack"; - this.panelBlack.Size = new System.Drawing.Size(41, 39); - this.panelBlack.TabIndex = 1; + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(53, 67); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(41, 39); + this.panelBlue.TabIndex = 1; // - // labelSimpleObject + // panelYellow // - this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelSimpleObject.Location = new System.Drawing.Point(233, 149); - this.labelSimpleObject.Name = "labelSimpleObject"; - this.labelSimpleObject.Size = new System.Drawing.Size(100, 23); - this.labelSimpleObject.TabIndex = 7; - this.labelSimpleObject.Text = "Простой"; - this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(6, 69); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(41, 39); + this.panelYellow.TabIndex = 4; // - // labelModifiedObject + // panelCyan // - this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelModifiedObject.Location = new System.Drawing.Point(339, 149); - this.labelModifiedObject.Name = "labelModifiedObject"; - this.labelModifiedObject.Size = new System.Drawing.Size(100, 23); - this.labelModifiedObject.TabIndex = 8; - this.labelModifiedObject.Text = "Продвинутый"; - this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + this.panelCyan.BackColor = System.Drawing.Color.Cyan; + this.panelCyan.Location = new System.Drawing.Point(147, 22); + this.panelCyan.Name = "panelCyan"; + this.panelCyan.Size = new System.Drawing.Size(41, 39); + this.panelCyan.TabIndex = 3; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Lime; + this.panelGreen.Location = new System.Drawing.Point(100, 22); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(41, 39); + this.panelGreen.TabIndex = 2; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(53, 22); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(41, 39); + this.panelRed.TabIndex = 1; + // + // panelPink + // + this.panelPink.BackColor = System.Drawing.Color.Fuchsia; + this.panelPink.Location = new System.Drawing.Point(6, 22); + this.panelPink.Name = "panelPink"; + this.panelPink.Size = new System.Drawing.Size(41, 39); + this.panelPink.TabIndex = 0; + // + // checkBoxCistern + // + this.checkBoxCistern.AutoSize = true; + this.checkBoxCistern.Location = new System.Drawing.Point(32, 116); + this.checkBoxCistern.Name = "checkBoxCistern"; + this.checkBoxCistern.Size = new System.Drawing.Size(180, 19); + this.checkBoxCistern.TabIndex = 5; + this.checkBoxCistern.Text = "Признак наличия цистерны"; + this.checkBoxCistern.UseVisualStyleBackColor = true; + // + // checkBoxTubes + // + this.checkBoxTubes.AutoSize = true; + this.checkBoxTubes.Location = new System.Drawing.Point(32, 91); + this.checkBoxTubes.Name = "checkBoxTubes"; + this.checkBoxTubes.Size = new System.Drawing.Size(151, 19); + this.checkBoxTubes.TabIndex = 4; + this.checkBoxTubes.Text = "Признак наличия труб"; + this.checkBoxTubes.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(100, 51); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(120, 23); + this.numericUpDownWeight.TabIndex = 3; + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(32, 53); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(29, 15); + this.labelWeight.TabIndex = 2; + this.labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(100, 22); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(120, 23); + this.numericUpDownSpeed.TabIndex = 1; + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(32, 24); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(62, 15); + this.labelSpeed.TabIndex = 0; + this.labelSpeed.Text = "Скорость:"; // // pictureBoxObject // @@ -255,19 +255,6 @@ this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); // - // labelBaseColor - // - this.labelBaseColor.AllowDrop = true; - this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelBaseColor.Location = new System.Drawing.Point(119, 6); - this.labelBaseColor.Name = "labelBaseColor"; - this.labelBaseColor.Size = new System.Drawing.Size(100, 23); - this.labelBaseColor.TabIndex = 8; - this.labelBaseColor.Text = "Цвет"; - this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); - this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); - // // labelDopColor // this.labelDopColor.AllowDrop = true; @@ -281,6 +268,19 @@ this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(119, 6); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(100, 23); + this.labelBaseColor.TabIndex = 8; + this.labelBaseColor.Text = "Цвет"; + this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); + this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); + // // buttonAddShip // this.buttonAddShip.Location = new System.Drawing.Point(616, 248); @@ -289,6 +289,7 @@ this.buttonAddShip.TabIndex = 3; this.buttonAddShip.Text = "Добавить"; this.buttonAddShip.UseVisualStyleBackColor = true; + this.buttonAddShip.Click += new System.EventHandler(this.ButtonOk_Click); // // buttonCancel // @@ -312,9 +313,9 @@ this.Text = "Создание объекта"; this.groupBoxConfig.ResumeLayout(false); this.groupBoxConfig.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); this.groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); this.panelObject.ResumeLayout(false); this.ResumeLayout(false); diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.cs b/WarmlyShip/WarmlyShip/FormShipConfig.cs index 496b7e1..7802092 100644 --- a/WarmlyShip/WarmlyShip/FormShipConfig.cs +++ b/WarmlyShip/WarmlyShip/FormShipConfig.cs @@ -105,15 +105,26 @@ namespace WarmlyShip { if (_warmlyShip == null) return; - + if (_warmlyShip is DrawningMotorShip) + { + _warmlyShip = ((DrawningMotorShip)_warmlyShip).ModifShip(bodyColor: (Color)e.Data.GetData(typeof(Color))); + } + else + { + _warmlyShip = _warmlyShip.ModifShip(bodyColor: (Color)e.Data.GetData(typeof(Color))); + } DrawShip(); } private void LabelDopColor_DragDrop(object sender, DragEventArgs e) { - // TODO Call method from object _car if _car is DrawningSportCar and set dop color - } + if (_warmlyShip == null || !(_warmlyShip is DrawningMotorShip)) return; + + _warmlyShip = ((DrawningMotorShip)_warmlyShip).ModifShip(dopColor: (Color)e.Data.GetData(typeof(Color))); + + DrawShip(); + } private void ButtonOk_Click(object sender, EventArgs e) { -- 2.25.1 From c94df016dee561494c0b499b9374af2824fc2516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=20=D0=91=D0=BE=D0=BD=D0=B4=D0=B0?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Fri, 11 Nov 2022 15:46:52 +0400 Subject: [PATCH 4/6] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=87=D0=B0=D1=8F?= =?UTF-8?q?=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs index 61efdb5..6d701b3 100644 --- a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs +++ b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs @@ -265,8 +265,8 @@ this.labelDopColor.TabIndex = 9; this.labelDopColor.Text = "Доп. Цвет"; this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); - this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); + this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); + this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter); // // labelBaseColor // @@ -278,8 +278,8 @@ this.labelBaseColor.TabIndex = 8; this.labelBaseColor.Text = "Цвет"; this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); - this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); + this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop); + this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter); // // buttonAddShip // -- 2.25.1 From 117d18566a61375809b358314e5b60399ba30bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=20=D0=91=D0=BE=D0=BD=D0=B4=D0=B0?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Fri, 11 Nov 2022 16:06:26 +0400 Subject: [PATCH 5/6] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/DrawningMotorShip.cs | 3 +-- WarmlyShip/WarmlyShip/EntityWarmlyShip.cs | 4 ++-- WarmlyShip/WarmlyShip/FormShipConfig.cs | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/WarmlyShip/WarmlyShip/DrawningMotorShip.cs b/WarmlyShip/WarmlyShip/DrawningMotorShip.cs index a422328..4e8821f 100644 --- a/WarmlyShip/WarmlyShip/DrawningMotorShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningMotorShip.cs @@ -43,8 +43,7 @@ namespace WarmlyShip public DrawningMotorShip ModifShip(int? speed = null, float? weight = null, Color? bodyColor = null, Color? dopColor = null, bool? tubes = null, bool? cistern = null) { - EntityMotorShip motorShip = (EntityMotorShip)warmlyShip; - return new DrawningMotorShip(speed ?? warmlyShip.Speed, weight ?? warmlyShip.Weight, bodyColor ?? warmlyShip.BodyColor, dopColor ?? motorShip.DopColor, tubes ?? motorShip.Tubes, cistern ?? motorShip.Cistern); + return new DrawningMotorShip(speed ?? warmlyShip.Speed, weight ?? warmlyShip.Weight, bodyColor ?? warmlyShip.BodyColor, dopColor ?? ((EntityMotorShip)warmlyShip).DopColor, tubes ?? ((EntityMotorShip)warmlyShip).Tubes, cistern ?? ((EntityMotorShip)warmlyShip).Cistern); } } } \ No newline at end of file diff --git a/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs b/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs index e36f167..79878fb 100644 --- a/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/EntityWarmlyShip.cs @@ -17,8 +17,8 @@ namespace WarmlyShip public EntityWarmlyShip(int speed, float weight, Color bodyColor) { Random random = new Random(); - Speed = speed <= 0 ? random.Next(50, 150) : speed; - Weight = weight <= 0 ? random.Next(40, 70) : weight; + Speed = speed <= 0 ? random.Next(100, 300) : speed; + Weight = weight <= 0 ? random.Next(1000, 2000) : weight; BodyColor = bodyColor; } } diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.cs b/WarmlyShip/WarmlyShip/FormShipConfig.cs index 7802092..8e7fa69 100644 --- a/WarmlyShip/WarmlyShip/FormShipConfig.cs +++ b/WarmlyShip/WarmlyShip/FormShipConfig.cs @@ -23,7 +23,7 @@ namespace WarmlyShip panelBlack.MouseDown += PanelColor_MouseDown; panelPink.MouseDown += PanelColor_MouseDown; panelGreen.MouseDown += PanelColor_MouseDown; - panelGreen.MouseDown += PanelColor_MouseDown; + panelCyan.MouseDown += PanelColor_MouseDown; panelRed.MouseDown += PanelColor_MouseDown; panelWhite.MouseDown += PanelColor_MouseDown; panelYellow.MouseDown += PanelColor_MouseDown; -- 2.25.1 From 14ea9c0a894730cea36caef147f308153e607cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=20=D0=91=D0=BE=D0=BD=D0=B4=D0=B0?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BA=D0=BE?= Date: Sun, 13 Nov 2022 16:03:22 +0400 Subject: [PATCH 6/6] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B4=D0=B5=D0=BB=D0=B5=D0=B3=D0=B0=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/FormShipConfig.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.cs b/WarmlyShip/WarmlyShip/FormShipConfig.cs index 8e7fa69..11452fc 100644 --- a/WarmlyShip/WarmlyShip/FormShipConfig.cs +++ b/WarmlyShip/WarmlyShip/FormShipConfig.cs @@ -15,7 +15,7 @@ namespace WarmlyShip DrawingWarmlyShip _warmlyShip = null; - private event ShipDelegate EventAddShip; + private Action EventAddShip; public FormShipConfig() { @@ -41,11 +41,11 @@ namespace WarmlyShip pictureBoxObject.Image = bmp; } - public void AddEvent(ShipDelegate ev) + public void AddEvent(Action ev) { if (EventAddShip == null) { - EventAddShip = new ShipDelegate(ev); + EventAddShip = ev; } else { -- 2.25.1