From 2c4b38c0c38d7b29932c66c2b4b42eb3f5785bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=87=D0=B5=D0=B1=D0=BD=D1=8B=D0=B9?= Date: Mon, 13 Nov 2023 12:43:26 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D1=84=D0=B8=D0=BA=D1=81=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=D1=81=D1=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrawningObjects/DrawningMotorBoat.cs | 14 +++++------ .../FormBoatConfig.Designer.cs | 18 ++++--------- .../ProjectBoat_bae/FormBoatConfig.cs | 25 ++----------------- 3 files changed, 14 insertions(+), 43 deletions(-) diff --git a/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs b/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs index 33d02f8..f31d89d 100644 --- a/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs +++ b/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs @@ -33,16 +33,16 @@ namespace ProjectBoat_bae.DrawningObjects } Pen pen = new(Color.Black); Brush additionalBrush = new SolidBrush(Boat.AdditionalColor); - Brush br = new SolidBrush(EntityBoat.BodyColor); - Brush brRed = new SolidBrush(EntityBoat.BodyColor); - Brush brBlue = new SolidBrush(Color.LightBlue); + Brush brr = new SolidBrush(EntityBoat.BodyColor); - if (Boat.Body) + if (Boat.Wing) { //вёсла - g.FillRectangle(brRed, _startPosX + 35, _startPosY - 5, 5, 65); - g.FillRectangle(brRed, _startPosX + 28, _startPosY + 60, 12, 8); - g.FillRectangle(brRed, _startPosX + 28, _startPosY - 5, 12, 8); + g.FillRectangle(additionalBrush, _startPosX + 35, _startPosY - 5, 5, 65); + g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY + 60, 12, 8); + g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY - 5, 12, 8); + + //флаг } base.DrawTransport(g); } diff --git a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs index e394431..d87eff8 100644 --- a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs +++ b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs @@ -30,7 +30,6 @@ { pictureBoxObject = new PictureBox(); groupBoxBoat = new GroupBox(); - checkBox1 = new CheckBox(); labelModifiedObject = new Label(); labelSimpleObject = new Label(); groupBoxColors = new GroupBox(); @@ -72,7 +71,6 @@ // // groupBoxBoat // - groupBoxBoat.Controls.Add(checkBox1); groupBoxBoat.Controls.Add(labelModifiedObject); groupBoxBoat.Controls.Add(labelSimpleObject); groupBoxBoat.Controls.Add(groupBoxColors); @@ -89,16 +87,6 @@ groupBoxBoat.TabStop = false; groupBoxBoat.Text = "Параметры"; // - // checkBox1 - // - checkBox1.AutoSize = true; - checkBox1.Location = new Point(21, 236); - checkBox1.Name = "checkBox1"; - checkBox1.Size = new Size(230, 29); - checkBox1.TabIndex = 12; - checkBox1.Text = "Признак наличия весел"; - checkBox1.UseVisualStyleBackColor = true; - // // labelModifiedObject // labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; @@ -197,6 +185,7 @@ // // panelRed // + panelRed.AllowDrop = true; panelRed.BackColor = Color.FromArgb(192, 0, 0); panelRed.Location = new Point(17, 45); panelRed.Name = "panelRed"; @@ -285,6 +274,8 @@ LabelAdditionalColor.Size = new Size(93, 27); LabelAdditionalColor.TabIndex = 1; LabelAdditionalColor.Text = "Доп. цвет"; + LabelAdditionalColor.DragDrop += LabelAdditionalColor_DragDrop; + LabelAdditionalColor.DragEnter += LabelAdditionalColor_DragEnter; // // LabelColor // @@ -296,6 +287,8 @@ LabelColor.Size = new Size(53, 27); LabelColor.TabIndex = 0; LabelColor.Text = "Цвет"; + LabelColor.DragDrop += LabelColor_DragDrop; + LabelColor.DragEnter += LabelColor_DragEnter; // // buttonOk // @@ -365,6 +358,5 @@ private Label LabelAdditionalColor; private Label LabelColor; private PictureBox pictureBox1; - private CheckBox checkBox1; } } \ No newline at end of file diff --git a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs index 4d9acb6..0339257 100644 --- a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs +++ b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs @@ -83,28 +83,14 @@ namespace ProjectBoat_bae // Действия при приеме перетаскиваемой информации private void PanelObject_DragDrop(object sender, DragEventArgs e) { - //switch (e.Data?.GetData(DataFormats.Text).ToString()) - //{ - // case "labelSimpleObject": - // _boat = new Drawningboat((int)numericUpDownSpeed.Value, - // (int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width, pictureBoxObject.Height); - // break; - // case "labelModifiedObject": - // _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, - // (int)numericUpDownWeight.Value, Color.White, Color.Black, - // checkBoxBoat.Checked, checkBoxBoat.Checked, pictureBoxObject.Width, pictureBoxObject.Height); - // break; - //} - //LabelColor.BackColor = Color.Empty; - //LabelAdditionalColor.BackColor = Color.Empty; - //DrawBoat(); switch (e.Data?.GetData(DataFormats.Text).ToString()) { case "labelSimpleObject": _boat = new Drawningboat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width, pictureBoxObject.Height); break; case "labelModifiedObject": - _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxBoat.Checked, checkBox1.Checked, pictureBoxObject.Width, pictureBoxObject.Height); + _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, + checkBoxBoat.Checked, checkBoxBoat.Checked, pictureBoxObject.Width, pictureBoxObject.Height); break; } LabelColor.BackColor = Color.Empty; @@ -112,13 +98,6 @@ namespace ProjectBoat_bae DrawBoat(); } - //// Добавление установки - //private void buttonOk_Click(object sender, EventArgs e) - //{ - // EventAddBoat?.Invoke(_boat); - // Close(); - //} - // Отправляем цвет с панели private void PanelColor_MouseDown(object sender, MouseEventArgs e) {