diff --git a/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs b/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs index 8589d4a..dca6159 100644 --- a/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs +++ b/ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs @@ -35,22 +35,6 @@ 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) { @@ -58,7 +42,22 @@ 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); - } + } + + //флажок + Point[] points; + if (Boat.Body) + { + points = new Point[] + { + new Point(Convert.ToInt32(_startPosX+70),Convert.ToInt32(_startPosY-20)), + new Point(Convert.ToInt32(_startPosX+70),Convert.ToInt32(_startPosY+10)), + new Point(Convert.ToInt32(_startPosX+90),Convert.ToInt32(_startPosY)), + new Point(Convert.ToInt32(_startPosX+90),Convert.ToInt32(_startPosY-20)), + }; + g.FillPolygon(additionalBrush, points); + g.DrawPolygon(pen, points); + } base.DrawTransport(g); } } diff --git a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs index 4783be2..14605c7 100644 --- a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs +++ b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs @@ -30,6 +30,7 @@ { pictureBoxObject = new PictureBox(); groupBoxBoat = new GroupBox(); + checkBoxBoat2 = new CheckBox(); labelModifiedObject = new Label(); labelSimpleObject = new Label(); groupBoxColors = new GroupBox(); @@ -52,7 +53,6 @@ LabelColor = new Label(); buttonOk = new Button(); buttonCancel = new Button(); - checkBoxBoat2 = new CheckBox(); ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); groupBoxBoat.SuspendLayout(); groupBoxColors.SuspendLayout(); @@ -89,6 +89,16 @@ groupBoxBoat.TabStop = false; groupBoxBoat.Text = "Параметры"; // + // checkBoxBoat2 + // + checkBoxBoat2.AutoSize = true; + checkBoxBoat2.Location = new Point(21, 227); + checkBoxBoat2.Name = "checkBoxBoat2"; + checkBoxBoat2.Size = new Size(230, 29); + checkBoxBoat2.TabIndex = 12; + checkBoxBoat2.Text = "Признак наличия вёсел"; + checkBoxBoat2.UseVisualStyleBackColor = true; + // // labelModifiedObject // labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; @@ -109,7 +119,6 @@ labelSimpleObject.TabIndex = 10; labelSimpleObject.Text = "Простой"; labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; - //labelSimpleObject.Click += labelSimpleObject_Click; labelSimpleObject.MouseDown += LabelObject_MouseDown; // // groupBoxColors @@ -228,11 +237,10 @@ checkBoxBoat.AutoSize = true; checkBoxBoat.Location = new Point(21, 176); checkBoxBoat.Name = "checkBoxBoat"; - checkBoxBoat.Size = new Size(230, 29); + checkBoxBoat.Size = new Size(246, 29); checkBoxBoat.TabIndex = 6; - checkBoxBoat.Text = "Признак наличия весел"; + checkBoxBoat.Text = "Признак наличия флажка"; checkBoxBoat.UseVisualStyleBackColor = true; - checkBoxBoat.CheckedChanged += checkBoxBoat_CheckedChanged; // // Weight // @@ -311,16 +319,6 @@ 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); diff --git a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs index 1810ad4..9333b3f 100644 --- a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs +++ b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs @@ -90,7 +90,7 @@ namespace ProjectBoat_bae break; case "labelModifiedObject": _boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, - checkBoxBoat.Checked, checkBoxBoat.Checked, pictureBoxObject.Width, pictureBoxObject.Height); + checkBoxBoat.Checked, checkBoxBoat2.Checked, pictureBoxObject.Width, pictureBoxObject.Height); break; } LabelColor.BackColor = Color.Empty;