From 7f2bcf3848a6c7de2709a5d52abfce54729fd64e Mon Sep 17 00:00:00 2001 From: just1valery Date: Thu, 20 Oct 2022 23:23:47 +0400 Subject: [PATCH 1/4] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B2=D1=8B=D0=B9=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarmlyShip/FormShipConfig.Designer.cs | 248 ++++++++++++++++++ WarmlyShip/WarmlyShip/FormShipConfig.cs | 20 ++ WarmlyShip/WarmlyShip/FormShipConfig.resx | 60 +++++ 3 files changed, 328 insertions(+) create mode 100644 WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs create mode 100644 WarmlyShip/WarmlyShip/FormShipConfig.cs create mode 100644 WarmlyShip/WarmlyShip/FormShipConfig.resx diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs new file mode 100644 index 0000000..aa1443f --- /dev/null +++ b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs @@ -0,0 +1,248 @@ +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.labelWeight = new System.Windows.Forms.Label(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.checkBoxPipes = new System.Windows.Forms.CheckBox(); + this.checkBoxFuelCompartment = new System.Windows.Forms.CheckBox(); + this.groupBoxColors = new System.Windows.Forms.GroupBox(); + this.panelRed = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); + this.panelPurple = new System.Windows.Forms.Panel(); + this.panelBlack = new System.Windows.Forms.Panel(); + this.panelGrey = new System.Windows.Forms.Panel(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.groupBoxConfig.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + this.groupBoxColors.SuspendLayout(); + this.SuspendLayout(); + // + // groupBoxConfig + // + this.groupBoxConfig.Controls.Add(this.groupBoxColors); + this.groupBoxConfig.Controls.Add(this.checkBoxFuelCompartment); + this.groupBoxConfig.Controls.Add(this.checkBoxPipes); + 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(737, 246); + this.groupBoxConfig.TabIndex = 0; + this.groupBoxConfig.TabStop = false; + this.groupBoxConfig.Text = "Параметры"; + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(28, 34); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(76, 20); + this.labelSpeed.TabIndex = 0; + this.labelSpeed.Text = "Скорость:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(139, 32); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(117, 27); + this.numericUpDownSpeed.TabIndex = 1; + this.numericUpDownSpeed.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(28, 91); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(36, 20); + this.labelWeight.TabIndex = 2; + this.labelWeight.Text = "Вес:"; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(139, 89); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(117, 27); + this.numericUpDownWeight.TabIndex = 3; + this.numericUpDownWeight.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // checkBoxPipes + // + this.checkBoxPipes.AutoSize = true; + this.checkBoxPipes.Location = new System.Drawing.Point(28, 148); + this.checkBoxPipes.Name = "checkBoxPipes"; + this.checkBoxPipes.Size = new System.Drawing.Size(189, 24); + this.checkBoxPipes.TabIndex = 4; + this.checkBoxPipes.Text = "Призрак наличия труб"; + this.checkBoxPipes.UseVisualStyleBackColor = true; + // + // checkBoxFuelCompartment + // + this.checkBoxFuelCompartment.AutoSize = true; + this.checkBoxFuelCompartment.Location = new System.Drawing.Point(28, 198); + this.checkBoxFuelCompartment.Name = "checkBoxFuelCompartment"; + this.checkBoxFuelCompartment.Size = new System.Drawing.Size(289, 24); + this.checkBoxFuelCompartment.TabIndex = 5; + this.checkBoxFuelCompartment.Text = "Признак наличия топливного отсека"; + this.checkBoxFuelCompartment.UseVisualStyleBackColor = true; + // + // groupBoxColors + // + this.groupBoxColors.Controls.Add(this.panelPurple); + this.groupBoxColors.Controls.Add(this.panelYellow); + this.groupBoxColors.Controls.Add(this.panelBlack); + this.groupBoxColors.Controls.Add(this.panelBlue); + this.groupBoxColors.Controls.Add(this.panelGrey); + this.groupBoxColors.Controls.Add(this.panelGreen); + this.groupBoxColors.Controls.Add(this.panelWhite); + this.groupBoxColors.Controls.Add(this.panelRed); + this.groupBoxColors.Location = new System.Drawing.Point(345, 26); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Size = new System.Drawing.Size(303, 166); + this.groupBoxColors.TabIndex = 6; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Цвета"; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(18, 26); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(50, 50); + this.panelRed.TabIndex = 0; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.panelGreen.Location = new System.Drawing.Point(89, 26); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(50, 50); + this.panelGreen.TabIndex = 0; + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(160, 26); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(50, 50); + this.panelBlue.TabIndex = 1; + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(230, 26); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(50, 50); + this.panelYellow.TabIndex = 2; + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); + this.panelPurple.Location = new System.Drawing.Point(230, 96); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(50, 50); + this.panelPurple.TabIndex = 6; + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(160, 96); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(50, 50); + this.panelBlack.TabIndex = 5; + // + // panelGrey + // + this.panelGrey.BackColor = System.Drawing.Color.Gray; + this.panelGrey.Location = new System.Drawing.Point(89, 96); + this.panelGrey.Name = "panelGrey"; + this.panelGrey.Size = new System.Drawing.Size(50, 50); + this.panelGrey.TabIndex = 3; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(18, 96); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(50, 50); + this.panelWhite.TabIndex = 4; + // + // FormShipConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1187, 283); + 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); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBoxConfig; + private CheckBox checkBoxPipes; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private CheckBox checkBoxFuelCompartment; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelYellow; + private Panel panelBlack; + private Panel panelBlue; + private Panel panelGrey; + private Panel panelGreen; + private Panel panelWhite; + private Panel panelRed; + } +} \ No newline at end of file diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.cs b/WarmlyShip/WarmlyShip/FormShipConfig.cs new file mode 100644 index 0000000..7385846 --- /dev/null +++ b/WarmlyShip/WarmlyShip/FormShipConfig.cs @@ -0,0 +1,20 @@ +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 + { + public FormShipConfig() + { + InitializeComponent(); + } + } +} 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 -- 2.25.1 From 1e2b24b8c80683a69da10e1d6574e9c967cefef2 Mon Sep 17 00:00:00 2001 From: just1valery Date: Fri, 21 Oct 2022 09:33:18 +0400 Subject: [PATCH 2/4] Add config form --- .../WarmlyShip/FormShipConfig.Designer.cs | 324 ++++++++++++------ WarmlyShip/WarmlyShip/FormShipConfig.cs | 44 +++ 2 files changed, 264 insertions(+), 104 deletions(-) diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs index aa1443f..e1fdea1 100644 --- a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs +++ b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs @@ -29,29 +29,41 @@ 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.labelWeight = new System.Windows.Forms.Label(); - this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); - this.checkBoxPipes = new System.Windows.Forms.CheckBox(); - this.checkBoxFuelCompartment = new System.Windows.Forms.CheckBox(); + this.labelModifiedObject = new System.Windows.Forms.Label(); + this.labelSimpleObject = new System.Windows.Forms.Label(); this.groupBoxColors = new System.Windows.Forms.GroupBox(); - this.panelRed = new System.Windows.Forms.Panel(); - this.panelGreen = new System.Windows.Forms.Panel(); - this.panelBlue = new System.Windows.Forms.Panel(); - this.panelYellow = new System.Windows.Forms.Panel(); this.panelPurple = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); this.panelBlack = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); this.panelGrey = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); this.panelWhite = new System.Windows.Forms.Panel(); + this.panelRed = new System.Windows.Forms.Panel(); + this.checkBoxFuelCompartment = new System.Windows.Forms.CheckBox(); + this.checkBoxPipes = new System.Windows.Forms.CheckBox(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.labelWeight = new System.Windows.Forms.Label(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.panelObject = new System.Windows.Forms.Panel(); + this.labelDopColor = new System.Windows.Forms.Label(); + this.labelBaseColor = new System.Windows.Forms.Label(); + this.pictureBoxObject = new System.Windows.Forms.PictureBox(); + this.buttonOk = 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(); + this.panelObject.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); 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.checkBoxFuelCompartment); this.groupBoxConfig.Controls.Add(this.checkBoxPipes); @@ -61,72 +73,32 @@ 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(737, 246); + this.groupBoxConfig.Size = new System.Drawing.Size(660, 246); this.groupBoxConfig.TabIndex = 0; this.groupBoxConfig.TabStop = false; this.groupBoxConfig.Text = "Параметры"; // - // labelSpeed + // labelModifiedObject // - this.labelSpeed.AutoSize = true; - this.labelSpeed.Location = new System.Drawing.Point(28, 34); - this.labelSpeed.Name = "labelSpeed"; - this.labelSpeed.Size = new System.Drawing.Size(76, 20); - this.labelSpeed.TabIndex = 0; - this.labelSpeed.Text = "Скорость:"; + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Location = new System.Drawing.Point(505, 195); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(120, 41); + this.labelModifiedObject.TabIndex = 7; + 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(139, 32); - this.numericUpDownSpeed.Name = "numericUpDownSpeed"; - this.numericUpDownSpeed.Size = new System.Drawing.Size(117, 27); - this.numericUpDownSpeed.TabIndex = 1; - this.numericUpDownSpeed.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // labelWeight - // - this.labelWeight.AutoSize = true; - this.labelWeight.Location = new System.Drawing.Point(28, 91); - this.labelWeight.Name = "labelWeight"; - this.labelWeight.Size = new System.Drawing.Size(36, 20); - this.labelWeight.TabIndex = 2; - this.labelWeight.Text = "Вес:"; - // - // numericUpDownWeight - // - this.numericUpDownWeight.Location = new System.Drawing.Point(139, 89); - this.numericUpDownWeight.Name = "numericUpDownWeight"; - this.numericUpDownWeight.Size = new System.Drawing.Size(117, 27); - this.numericUpDownWeight.TabIndex = 3; - this.numericUpDownWeight.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // checkBoxPipes - // - this.checkBoxPipes.AutoSize = true; - this.checkBoxPipes.Location = new System.Drawing.Point(28, 148); - this.checkBoxPipes.Name = "checkBoxPipes"; - this.checkBoxPipes.Size = new System.Drawing.Size(189, 24); - this.checkBoxPipes.TabIndex = 4; - this.checkBoxPipes.Text = "Призрак наличия труб"; - this.checkBoxPipes.UseVisualStyleBackColor = true; - // - // checkBoxFuelCompartment - // - this.checkBoxFuelCompartment.AutoSize = true; - this.checkBoxFuelCompartment.Location = new System.Drawing.Point(28, 198); - this.checkBoxFuelCompartment.Name = "checkBoxFuelCompartment"; - this.checkBoxFuelCompartment.Size = new System.Drawing.Size(289, 24); - this.checkBoxFuelCompartment.TabIndex = 5; - this.checkBoxFuelCompartment.Text = "Признак наличия топливного отсека"; - this.checkBoxFuelCompartment.UseVisualStyleBackColor = true; + this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelSimpleObject.Location = new System.Drawing.Point(363, 195); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(121, 41); + this.labelSimpleObject.TabIndex = 1; + this.labelSimpleObject.Text = "Простой"; + this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); // // groupBoxColors // @@ -145,29 +117,14 @@ this.groupBoxColors.TabStop = false; this.groupBoxColors.Text = "Цвета"; // - // panelRed + // panelPurple // - this.panelRed.BackColor = System.Drawing.Color.Red; - this.panelRed.Location = new System.Drawing.Point(18, 26); - this.panelRed.Name = "panelRed"; - this.panelRed.Size = new System.Drawing.Size(50, 50); - this.panelRed.TabIndex = 0; - // - // panelGreen - // - this.panelGreen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.panelGreen.Location = new System.Drawing.Point(89, 26); - this.panelGreen.Name = "panelGreen"; - this.panelGreen.Size = new System.Drawing.Size(50, 50); - this.panelGreen.TabIndex = 0; - // - // panelBlue - // - this.panelBlue.BackColor = System.Drawing.Color.Blue; - this.panelBlue.Location = new System.Drawing.Point(160, 26); - this.panelBlue.Name = "panelBlue"; - this.panelBlue.Size = new System.Drawing.Size(50, 50); - this.panelBlue.TabIndex = 1; + this.panelPurple.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); + this.panelPurple.Location = new System.Drawing.Point(230, 96); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(50, 50); + this.panelPurple.TabIndex = 6; + this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); // // panelYellow // @@ -176,14 +133,7 @@ this.panelYellow.Name = "panelYellow"; this.panelYellow.Size = new System.Drawing.Size(50, 50); this.panelYellow.TabIndex = 2; - // - // panelPurple - // - this.panelPurple.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))); - this.panelPurple.Location = new System.Drawing.Point(230, 96); - this.panelPurple.Name = "panelPurple"; - this.panelPurple.Size = new System.Drawing.Size(50, 50); - this.panelPurple.TabIndex = 6; + this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); // // panelBlack // @@ -192,6 +142,16 @@ this.panelBlack.Name = "panelBlack"; this.panelBlack.Size = new System.Drawing.Size(50, 50); this.panelBlack.TabIndex = 5; + this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(160, 26); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(50, 50); + this.panelBlue.TabIndex = 1; + this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); // // panelGrey // @@ -200,6 +160,16 @@ this.panelGrey.Name = "panelGrey"; this.panelGrey.Size = new System.Drawing.Size(50, 50); this.panelGrey.TabIndex = 3; + this.panelGrey.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.panelGreen.Location = new System.Drawing.Point(89, 26); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(50, 50); + this.panelGreen.TabIndex = 0; + this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); // // panelWhite // @@ -208,20 +178,158 @@ this.panelWhite.Name = "panelWhite"; this.panelWhite.Size = new System.Drawing.Size(50, 50); this.panelWhite.TabIndex = 4; + this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(18, 26); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(50, 50); + this.panelRed.TabIndex = 0; + this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // checkBoxFuelCompartment + // + this.checkBoxFuelCompartment.AutoSize = true; + this.checkBoxFuelCompartment.Location = new System.Drawing.Point(28, 198); + this.checkBoxFuelCompartment.Name = "checkBoxFuelCompartment"; + this.checkBoxFuelCompartment.Size = new System.Drawing.Size(289, 24); + this.checkBoxFuelCompartment.TabIndex = 5; + this.checkBoxFuelCompartment.Text = "Признак наличия топливного отсека"; + this.checkBoxFuelCompartment.UseVisualStyleBackColor = true; + // + // checkBoxPipes + // + this.checkBoxPipes.AutoSize = true; + this.checkBoxPipes.Location = new System.Drawing.Point(28, 148); + this.checkBoxPipes.Name = "checkBoxPipes"; + this.checkBoxPipes.Size = new System.Drawing.Size(189, 24); + this.checkBoxPipes.TabIndex = 4; + this.checkBoxPipes.Text = "Призрак наличия труб"; + this.checkBoxPipes.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(139, 89); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(117, 27); + this.numericUpDownWeight.TabIndex = 3; + this.numericUpDownWeight.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(28, 91); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(36, 20); + this.labelWeight.TabIndex = 2; + this.labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(139, 32); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(117, 27); + this.numericUpDownSpeed.TabIndex = 1; + this.numericUpDownSpeed.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(28, 34); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(76, 20); + this.labelSpeed.TabIndex = 0; + this.labelSpeed.Text = "Скорость:"; + // + // 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(678, 25); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(313, 191); + this.panelObject.TabIndex = 8; + this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); + this.panelObject.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(174, 13); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(121, 41); + this.labelDopColor.TabIndex = 9; + this.labelDopColor.Text = "Доп. цвет"; + this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(21, 13); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(121, 41); + this.labelBaseColor.TabIndex = 8; + this.labelBaseColor.Text = "Цвет"; + this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(21, 57); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(274, 122); + this.pictureBoxObject.TabIndex = 0; + this.pictureBoxObject.TabStop = false; + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(683, 229); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(142, 42); + this.buttonOk.TabIndex = 10; + this.buttonOk.Text = "Добавить"; + this.buttonOk.UseVisualStyleBackColor = true; + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(831, 229); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(142, 42); + this.buttonCancel.TabIndex = 11; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; // // FormShipConfig // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1187, 283); + this.ClientSize = new System.Drawing.Size(1004, 283); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + 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.numericUpDownWeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); + this.panelObject.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); this.ResumeLayout(false); } @@ -244,5 +352,13 @@ private Panel panelGreen; private Panel panelWhite; private Panel panelRed; + private Label labelModifiedObject; + private Label labelSimpleObject; + private Panel panelObject; + private PictureBox pictureBoxObject; + private Label labelDopColor; + private Label labelBaseColor; + private Button buttonOk; + private Button buttonCancel; } } \ No newline at end of file diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.cs b/WarmlyShip/WarmlyShip/FormShipConfig.cs index 7385846..eb81be0 100644 --- a/WarmlyShip/WarmlyShip/FormShipConfig.cs +++ b/WarmlyShip/WarmlyShip/FormShipConfig.cs @@ -16,5 +16,49 @@ namespace WarmlyShip { InitializeComponent(); } + DrawningShip _ship = null; + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); + } + + private void DrawShip() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _ship?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _ship?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + 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": + _ship = new DrawningShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _ship = new DrawningWarmlyShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, + checkBoxPipes.Checked, checkBoxFuelCompartment.Checked); + break; + } + DrawShip(); + } + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } } } -- 2.25.1 From 5ae638533203a4da8eed9a8cb5c83e48d2b8fb3e Mon Sep 17 00:00:00 2001 From: just1valery Date: Sun, 23 Oct 2022 09:56:51 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/FormMapWithSetShips.cs | 27 ++-- .../WarmlyShip/FormShipConfig.Designer.cs | 25 ++-- WarmlyShip/WarmlyShip/FormShipConfig.cs | 116 +++++++++++++++++- WarmlyShip/WarmlyShip/ShipDelegate.cs | 14 +++ 4 files changed, 158 insertions(+), 24 deletions(-) create mode 100644 WarmlyShip/WarmlyShip/ShipDelegate.cs diff --git a/WarmlyShip/WarmlyShip/FormMapWithSetShips.cs b/WarmlyShip/WarmlyShip/FormMapWithSetShips.cs index 3fac642..c632610 100644 --- a/WarmlyShip/WarmlyShip/FormMapWithSetShips.cs +++ b/WarmlyShip/WarmlyShip/FormMapWithSetShips.cs @@ -109,24 +109,25 @@ namespace WarmlyShip /// /// private void ButtonAddShip_Click(object sender, EventArgs e) + { + FormShipConfig formShip = new(); + formShip.AddEvent(new(AddShip)); + formShip.Show(); + } + private void AddShip(DrawningShip ship) { if (listBoxMaps.SelectedIndex == -1) { - return; + MessageBox.Show("Перед добавлением объекта необходимо создать карту"); } - FormShip form = new(); - if (form.ShowDialog() == DialogResult.OK) + else 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("Не удалось добавить объект"); } } /// diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs index e1fdea1..580513b 100644 --- a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs +++ b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs @@ -36,7 +36,7 @@ this.panelYellow = new System.Windows.Forms.Panel(); this.panelBlack = new System.Windows.Forms.Panel(); this.panelBlue = new System.Windows.Forms.Panel(); - this.panelGrey = new System.Windows.Forms.Panel(); + this.panelGray = new System.Windows.Forms.Panel(); this.panelGreen = new System.Windows.Forms.Panel(); this.panelWhite = new System.Windows.Forms.Panel(); this.panelRed = new System.Windows.Forms.Panel(); @@ -106,7 +106,7 @@ this.groupBoxColors.Controls.Add(this.panelYellow); this.groupBoxColors.Controls.Add(this.panelBlack); this.groupBoxColors.Controls.Add(this.panelBlue); - this.groupBoxColors.Controls.Add(this.panelGrey); + this.groupBoxColors.Controls.Add(this.panelGray); this.groupBoxColors.Controls.Add(this.panelGreen); this.groupBoxColors.Controls.Add(this.panelWhite); this.groupBoxColors.Controls.Add(this.panelRed); @@ -153,14 +153,14 @@ this.panelBlue.TabIndex = 1; this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); // - // panelGrey + // panelGray // - this.panelGrey.BackColor = System.Drawing.Color.Gray; - this.panelGrey.Location = new System.Drawing.Point(89, 96); - this.panelGrey.Name = "panelGrey"; - this.panelGrey.Size = new System.Drawing.Size(50, 50); - this.panelGrey.TabIndex = 3; - this.panelGrey.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(89, 96); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(50, 50); + this.panelGray.TabIndex = 3; + this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); // // panelGreen // @@ -274,6 +274,8 @@ this.labelDopColor.TabIndex = 9; this.labelDopColor.Text = "Доп. цвет"; this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); + this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragEnter); // // labelBaseColor // @@ -285,6 +287,8 @@ this.labelBaseColor.TabIndex = 8; this.labelBaseColor.Text = "Цвет"; this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop); + this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter); // // pictureBoxObject // @@ -302,6 +306,7 @@ this.buttonOk.TabIndex = 10; this.buttonOk.Text = "Добавить"; this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click); // // buttonCancel // @@ -348,7 +353,7 @@ private Panel panelYellow; private Panel panelBlack; private Panel panelBlue; - private Panel panelGrey; + private Panel panelGray; private Panel panelGreen; private Panel panelWhite; private Panel panelRed; diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.cs b/WarmlyShip/WarmlyShip/FormShipConfig.cs index eb81be0..db9bb11 100644 --- a/WarmlyShip/WarmlyShip/FormShipConfig.cs +++ b/WarmlyShip/WarmlyShip/FormShipConfig.cs @@ -12,11 +12,22 @@ namespace WarmlyShip { public partial class FormShipConfig : Form { + private event ShipDelegate EventAddShip; + + DrawningShip _ship = null; public FormShipConfig() { InitializeComponent(); + panelBlack.MouseDown += PanelColor_MouseDown; + panelPurple.MouseDown += PanelColor_MouseDown; + panelGray.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(); } - DrawningShip _ship = null; private void LabelObject_MouseDown(object sender, MouseEventArgs e) { (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); @@ -30,6 +41,17 @@ namespace WarmlyShip _ship?.DrawTransport(gr); pictureBoxObject.Image = bmp; } + public void AddEvent(ShipDelegate ev) + { + if (EventAddShip == null) + { + EventAddShip = new ShipDelegate(ev); + } + else + { + EventAddShip += ev; + } + } private void PanelObject_DragEnter(object sender, DragEventArgs e) { if (e.Data.GetDataPresent(DataFormats.Text)) @@ -60,5 +82,97 @@ namespace WarmlyShip { (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); } + + private void ButtonOk_Click(object sender, EventArgs e) + { + EventAddShip?.Invoke(_ship); + Close(); + } + + private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data.GetData(DataFormats.Text).ToString()) + { + case "panelRed": + labelBaseColor.BackColor = Color.Red; + break; + case "panelBlack": + labelBaseColor.BackColor = Color.Black; + break; + case "panelGreen": + labelBaseColor.BackColor = Color.Green; + break; + case "panelYellow": + labelBaseColor.BackColor = Color.Yellow; + break; + case "panelBlue": + labelBaseColor.BackColor = Color.Blue; + break; + case "panelPurple": + labelBaseColor.BackColor = Color.Purple; + break; + case "panelGray": + labelBaseColor.BackColor = Color.DarkGray; + break; + case "panelWhite": + labelBaseColor.BackColor = Color.White; + break; + } + } + + 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 LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data.GetData(DataFormats.Text).ToString()) + { + case "panelRed": + labelBaseColor.BackColor = Color.Red; + break; + case "panelBlack": + labelBaseColor.BackColor = Color.Black; + break; + case "panelGreen": + labelBaseColor.BackColor = Color.Green; + break; + case "panelYellow": + labelBaseColor.BackColor = Color.Yellow; + break; + case "panelBlue": + labelBaseColor.BackColor = Color.Blue; + break; + case "panelPurple": + labelBaseColor.BackColor = Color.Purple; + break; + case "panelGray": + labelBaseColor.BackColor = Color.DarkGray; + break; + case "panelWhite": + labelBaseColor.BackColor = Color.White; + break; + } + } + + private void LabelDopColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } } } diff --git a/WarmlyShip/WarmlyShip/ShipDelegate.cs b/WarmlyShip/WarmlyShip/ShipDelegate.cs new file mode 100644 index 0000000..b6d3e65 --- /dev/null +++ b/WarmlyShip/WarmlyShip/ShipDelegate.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WarmlyShip +{ + /// + /// Делегат для передачи объекта-коробля + /// + /// + public delegate void ShipDelegate(DrawningShip car); +} -- 2.25.1 From ccf345af829ea9b64cf7e9747b2c03de43e63b47 Mon Sep 17 00:00:00 2001 From: just1valery Date: Thu, 27 Oct 2022 14:55:42 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D1=84=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=205=20=D0=BB=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarmlyShip/WarmlyShip/DrawningShip.cs | 24 ++++-- WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs | 8 ++ .../WarmlyShip/FormShipConfig.Designer.cs | 4 +- WarmlyShip/WarmlyShip/FormShipConfig.cs | 80 +++---------------- WarmlyShip/WarmlyShip/ShipDelegate.cs | 14 ---- 5 files changed, 40 insertions(+), 90 deletions(-) delete mode 100644 WarmlyShip/WarmlyShip/ShipDelegate.cs diff --git a/WarmlyShip/WarmlyShip/DrawningShip.cs b/WarmlyShip/WarmlyShip/DrawningShip.cs index 4958d26..aa4c10a 100644 --- a/WarmlyShip/WarmlyShip/DrawningShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningShip.cs @@ -181,11 +181,25 @@ _startPosY = _pictureHeight.Value - _shipHeight; } } - /// - /// Получение текущей позиции объекта - /// - /// - public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() + + public void SetBaseColor(Color color) + { + if (Ship is EntityWarmlyShip) + { + Ship = (EntityWarmlyShip)Ship; + if (Ship is not null) + { + Ship = new EntityWarmlyShip(Ship.Speed, Ship.Weight, color, (Ship as EntityWarmlyShip).DopColor, (Ship as EntityWarmlyShip).Pipes, (Ship as EntityWarmlyShip).FuelCompartment); + return; + } + } + Ship = new EntityShip(Ship.Speed, Ship.Weight, color); + } + /// + /// Получение текущей позиции объекта + /// + /// + public (float Left, float Right, float Top, float Bottom) GetCurrentPosition() { return (_startPosX, _startPosY, _startPosX + _shipWidth, _startPosY + _shipHeight); } diff --git a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs index 19fa9a2..9154fd6 100644 --- a/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/DrawningWarmlyShip.cs @@ -53,5 +53,13 @@ namespace WarmlyShip g.DrawRectangle(pen, _startPosX + 135, _startPosY + 70, 10, 5); } } + public void SetDopColor(Color color) + { + Ship = Ship as EntityWarmlyShip; + if (Ship is not null) + { + Ship = new EntityWarmlyShip(Ship.Speed, Ship.Weight, Ship.BodyColor, color, (Ship as EntityWarmlyShip).Pipes, (Ship as EntityWarmlyShip).FuelCompartment); + } + } } } diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs index 580513b..91e35e3 100644 --- a/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs +++ b/WarmlyShip/WarmlyShip/FormShipConfig.Designer.cs @@ -275,7 +275,7 @@ this.labelDopColor.Text = "Доп. цвет"; this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); - this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragEnter); + this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter); // // labelBaseColor // @@ -288,7 +288,7 @@ this.labelBaseColor.Text = "Цвет"; this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop); - this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter); + this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter); // // pictureBoxObject // diff --git a/WarmlyShip/WarmlyShip/FormShipConfig.cs b/WarmlyShip/WarmlyShip/FormShipConfig.cs index db9bb11..bba7b93 100644 --- a/WarmlyShip/WarmlyShip/FormShipConfig.cs +++ b/WarmlyShip/WarmlyShip/FormShipConfig.cs @@ -12,7 +12,7 @@ namespace WarmlyShip { public partial class FormShipConfig : Form { - private event ShipDelegate EventAddShip; + private event Action EventAddShip; DrawningShip _ship = null; public FormShipConfig() @@ -26,7 +26,7 @@ namespace WarmlyShip panelWhite.MouseDown += PanelColor_MouseDown; panelYellow.MouseDown += PanelColor_MouseDown; panelBlue.MouseDown += PanelColor_MouseDown; - buttonCancel.Click += (s, e) => Close(); + buttonCancel.Click += (sender, e) => Close(); } private void LabelObject_MouseDown(object sender, MouseEventArgs e) { @@ -41,11 +41,11 @@ namespace WarmlyShip _ship?.DrawTransport(gr); pictureBoxObject.Image = bmp; } - public void AddEvent(ShipDelegate ev) + public void AddEvent(Action ev) { if (EventAddShip == null) { - EventAddShip = new ShipDelegate(ev); + EventAddShip = new(ev); } else { @@ -91,36 +91,11 @@ namespace WarmlyShip private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) { - switch (e.Data.GetData(DataFormats.Text).ToString()) - { - case "panelRed": - labelBaseColor.BackColor = Color.Red; - break; - case "panelBlack": - labelBaseColor.BackColor = Color.Black; - break; - case "panelGreen": - labelBaseColor.BackColor = Color.Green; - break; - case "panelYellow": - labelBaseColor.BackColor = Color.Yellow; - break; - case "panelBlue": - labelBaseColor.BackColor = Color.Blue; - break; - case "panelPurple": - labelBaseColor.BackColor = Color.Purple; - break; - case "panelGray": - labelBaseColor.BackColor = Color.DarkGray; - break; - case "panelWhite": - labelBaseColor.BackColor = Color.White; - break; - } + _ship.SetBaseColor((Color)e.Data.GetData(typeof(Color))); + DrawShip(); } - private void LabelBaseColor_DragEnter(object sender, DragEventArgs e) + private void LabelColor_DragEnter(object sender, DragEventArgs e) { if (e.Data.GetDataPresent(typeof(Color))) { @@ -134,45 +109,12 @@ namespace WarmlyShip private void LabelDopColor_DragDrop(object sender, DragEventArgs e) { - switch (e.Data.GetData(DataFormats.Text).ToString()) + if (_ship is DrawningWarmlyShip) { - case "panelRed": - labelBaseColor.BackColor = Color.Red; - break; - case "panelBlack": - labelBaseColor.BackColor = Color.Black; - break; - case "panelGreen": - labelBaseColor.BackColor = Color.Green; - break; - case "panelYellow": - labelBaseColor.BackColor = Color.Yellow; - break; - case "panelBlue": - labelBaseColor.BackColor = Color.Blue; - break; - case "panelPurple": - labelBaseColor.BackColor = Color.Purple; - break; - case "panelGray": - labelBaseColor.BackColor = Color.DarkGray; - break; - case "panelWhite": - labelBaseColor.BackColor = Color.White; - break; - } - } - - private void LabelDopColor_DragEnter(object sender, DragEventArgs e) - { - if (e.Data.GetDataPresent(typeof(Color))) - { - e.Effect = DragDropEffects.Copy; - } - else - { - e.Effect = DragDropEffects.None; + var ship = _ship as DrawningWarmlyShip; + ship.SetDopColor((Color)e.Data.GetData(typeof(Color))); } + DrawShip(); } } } diff --git a/WarmlyShip/WarmlyShip/ShipDelegate.cs b/WarmlyShip/WarmlyShip/ShipDelegate.cs deleted file mode 100644 index b6d3e65..0000000 --- a/WarmlyShip/WarmlyShip/ShipDelegate.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace WarmlyShip -{ - /// - /// Делегат для передачи объекта-коробля - /// - /// - public delegate void ShipDelegate(DrawningShip car); -} -- 2.25.1