From 850db9bf712c4a6cf0351df2b620efed2a2a2048 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: Sat, 25 Nov 2023 15:09:27 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D1=8F=D0=B7=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrawningObjects/DrawningBoat.cs | 8 ++++---- .../DrawningObjects/DrawningMotorBoat.cs | 19 +++++++++++++++++-- .../FormBoatConfig.Designer.cs | 15 ++++++++++++++- .../ProjectBoat_bae/FormBoatConfig.cs | 10 ---------- 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningBoat.cs b/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningBoat.cs index 965fb6f..4b1a586 100644 --- a/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningBoat.cs +++ b/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningBoat.cs @@ -88,7 +88,7 @@ namespace ProjectBoat_bae.DrawningObjects Pen pen = new(Color.Black); //корпус Brush br = new SolidBrush(EntityBoat.BodyColor); - g.FillRectangle(br, _startPosX + 20, _startPosY + 5, 70, 50); + g.FillRectangle(br, _startPosX + 20, _startPosY + 5, 100, 50); //мотор Brush brRed = new SolidBrush(EntityBoat.BodyColor); @@ -96,10 +96,10 @@ namespace ProjectBoat_bae.DrawningObjects //стекла Brush brBlue = new SolidBrush(Color.LightBlue); - g.FillRectangle(brBlue, _startPosX + 70, _startPosY + 10, 5, + g.FillRectangle(brBlue, _startPosX + 115, _startPosY + 10, 5, 40); - g.FillRectangle(brBlue, _startPosX + 35, _startPosY + 8, 35, 2); - g.FillRectangle(brBlue, _startPosX + 35, _startPosY + 51, 35, 2); + g.FillRectangle(brBlue, _startPosX + 65, _startPosY + 8, 55, 2); + g.FillRectangle(brBlue, _startPosX + 65, _startPosY + 51, 55, 2); } // Проверка, что объект может переместится по указанному направлению diff --git a/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs b/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs index f31d89d..8589d4a 100644 --- a/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs +++ b/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; +using System.Reflection; using System.Text; using ProjectBoat_bae.Entities; @@ -34,6 +35,22 @@ namespace ProjectBoat_bae.DrawningObjects Pen pen = new(Color.Black); Brush additionalBrush = new SolidBrush(Boat.AdditionalColor); Brush brr = new SolidBrush(EntityBoat.BodyColor); + + //флажок + Point[] points; + if (Boat.Body) + { + points = new Point[] + { + new Point(Convert.ToInt32(_startPosX+50),Convert.ToInt32(_startPosY-20)), + new Point(Convert.ToInt32(_startPosX+50),Convert.ToInt32(_startPosY+10)), + new Point(Convert.ToInt32(_startPosX+70),Convert.ToInt32(_startPosY)), + new Point(Convert.ToInt32(_startPosX+70),Convert.ToInt32(_startPosY-20)), + }; + ..g.FillRectangle(additionalBrush, _startPosX + 50, _startPosY - 20, 5, 15); + g.FillPolygon(additionalBrush, points); + g.DrawPolygon(pen, points); + } if (Boat.Wing) { @@ -41,8 +58,6 @@ namespace ProjectBoat_bae.DrawningObjects 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 d87eff8..4783be2 100644 --- a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs +++ b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs @@ -52,6 +52,7 @@ LabelColor = new Label(); buttonOk = new Button(); buttonCancel = new Button(); + checkBoxBoat2 = new CheckBox(); ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); groupBoxBoat.SuspendLayout(); groupBoxColors.SuspendLayout(); @@ -71,6 +72,7 @@ // // groupBoxBoat // + groupBoxBoat.Controls.Add(checkBoxBoat2); groupBoxBoat.Controls.Add(labelModifiedObject); groupBoxBoat.Controls.Add(labelSimpleObject); groupBoxBoat.Controls.Add(groupBoxColors); @@ -107,7 +109,7 @@ labelSimpleObject.TabIndex = 10; labelSimpleObject.Text = "Простой"; labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; - labelSimpleObject.Click += labelSimpleObject_Click; + //labelSimpleObject.Click += labelSimpleObject_Click; labelSimpleObject.MouseDown += LabelObject_MouseDown; // // groupBoxColors @@ -309,6 +311,16 @@ buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; // + // checkBoxBoat2 + // + checkBoxBoat2.AutoSize = true; + checkBoxBoat2.Location = new Point(21, 227); + checkBoxBoat2.Name = "checkBoxBoat2"; + checkBoxBoat2.Size = new Size(246, 29); + checkBoxBoat2.TabIndex = 12; + checkBoxBoat2.Text = "Признак наличия флажка"; + checkBoxBoat2.UseVisualStyleBackColor = true; + // // FormBoatConfig // AutoScaleDimensions = new SizeF(10F, 25F); @@ -358,5 +370,6 @@ private Label LabelAdditionalColor; private Label LabelColor; private PictureBox pictureBox1; + private CheckBox checkBoxBoat2; } } \ No newline at end of file diff --git a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs index 0339257..1810ad4 100644 --- a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs +++ b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs @@ -156,16 +156,6 @@ namespace ProjectBoat_bae DrawBoat(); } - private void checkBoxBoat_CheckedChanged(object sender, EventArgs e) - { - - } - - private void labelSimpleObject_Click(object sender, EventArgs e) - { - - } - private void buttonOk_Click_1(object sender, EventArgs e) { EventAddBoat?.Invoke(_boat);