обязательно
This commit is contained in:
parent
2c4b38c0c3
commit
850db9bf71
@ -88,7 +88,7 @@ namespace ProjectBoat_bae.DrawningObjects
|
|||||||
Pen pen = new(Color.Black);
|
Pen pen = new(Color.Black);
|
||||||
//корпус
|
//корпус
|
||||||
Brush br = new SolidBrush(EntityBoat.BodyColor);
|
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);
|
Brush brRed = new SolidBrush(EntityBoat.BodyColor);
|
||||||
@ -96,10 +96,10 @@ namespace ProjectBoat_bae.DrawningObjects
|
|||||||
|
|
||||||
//стекла
|
//стекла
|
||||||
Brush brBlue = new SolidBrush(Color.LightBlue);
|
Brush brBlue = new SolidBrush(Color.LightBlue);
|
||||||
g.FillRectangle(brBlue, _startPosX + 70, _startPosY + 10, 5,
|
g.FillRectangle(brBlue, _startPosX + 115, _startPosY + 10, 5,
|
||||||
40);
|
40);
|
||||||
g.FillRectangle(brBlue, _startPosX + 35, _startPosY + 8, 35, 2);
|
g.FillRectangle(brBlue, _startPosX + 65, _startPosY + 8, 55, 2);
|
||||||
g.FillRectangle(brBlue, _startPosX + 35, _startPosY + 51, 35, 2);
|
g.FillRectangle(brBlue, _startPosX + 65, _startPosY + 51, 55, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Проверка, что объект может переместится по указанному направлению
|
// Проверка, что объект может переместится по указанному направлению
|
||||||
|
@ -4,6 +4,7 @@ using System.ComponentModel;
|
|||||||
using System.Data;
|
using System.Data;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Reflection;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
using ProjectBoat_bae.Entities;
|
using ProjectBoat_bae.Entities;
|
||||||
@ -34,6 +35,22 @@ namespace ProjectBoat_bae.DrawningObjects
|
|||||||
Pen pen = new(Color.Black);
|
Pen pen = new(Color.Black);
|
||||||
Brush additionalBrush = new SolidBrush(Boat.AdditionalColor);
|
Brush additionalBrush = new SolidBrush(Boat.AdditionalColor);
|
||||||
Brush brr = new SolidBrush(EntityBoat.BodyColor);
|
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)
|
if (Boat.Wing)
|
||||||
{
|
{
|
||||||
@ -41,8 +58,6 @@ namespace ProjectBoat_bae.DrawningObjects
|
|||||||
g.FillRectangle(additionalBrush, _startPosX + 35, _startPosY - 5, 5, 65);
|
g.FillRectangle(additionalBrush, _startPosX + 35, _startPosY - 5, 5, 65);
|
||||||
g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY + 60, 12, 8);
|
g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY + 60, 12, 8);
|
||||||
g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY - 5, 12, 8);
|
g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY - 5, 12, 8);
|
||||||
|
|
||||||
//флаг
|
|
||||||
}
|
}
|
||||||
base.DrawTransport(g);
|
base.DrawTransport(g);
|
||||||
}
|
}
|
||||||
|
@ -52,6 +52,7 @@
|
|||||||
LabelColor = new Label();
|
LabelColor = new Label();
|
||||||
buttonOk = new Button();
|
buttonOk = new Button();
|
||||||
buttonCancel = new Button();
|
buttonCancel = new Button();
|
||||||
|
checkBoxBoat2 = new CheckBox();
|
||||||
((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
|
((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
|
||||||
groupBoxBoat.SuspendLayout();
|
groupBoxBoat.SuspendLayout();
|
||||||
groupBoxColors.SuspendLayout();
|
groupBoxColors.SuspendLayout();
|
||||||
@ -71,6 +72,7 @@
|
|||||||
//
|
//
|
||||||
// groupBoxBoat
|
// groupBoxBoat
|
||||||
//
|
//
|
||||||
|
groupBoxBoat.Controls.Add(checkBoxBoat2);
|
||||||
groupBoxBoat.Controls.Add(labelModifiedObject);
|
groupBoxBoat.Controls.Add(labelModifiedObject);
|
||||||
groupBoxBoat.Controls.Add(labelSimpleObject);
|
groupBoxBoat.Controls.Add(labelSimpleObject);
|
||||||
groupBoxBoat.Controls.Add(groupBoxColors);
|
groupBoxBoat.Controls.Add(groupBoxColors);
|
||||||
@ -107,7 +109,7 @@
|
|||||||
labelSimpleObject.TabIndex = 10;
|
labelSimpleObject.TabIndex = 10;
|
||||||
labelSimpleObject.Text = "Простой";
|
labelSimpleObject.Text = "Простой";
|
||||||
labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
|
labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
|
||||||
labelSimpleObject.Click += labelSimpleObject_Click;
|
//labelSimpleObject.Click += labelSimpleObject_Click;
|
||||||
labelSimpleObject.MouseDown += LabelObject_MouseDown;
|
labelSimpleObject.MouseDown += LabelObject_MouseDown;
|
||||||
//
|
//
|
||||||
// groupBoxColors
|
// groupBoxColors
|
||||||
@ -309,6 +311,16 @@
|
|||||||
buttonCancel.Text = "Отмена";
|
buttonCancel.Text = "Отмена";
|
||||||
buttonCancel.UseVisualStyleBackColor = true;
|
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
|
// FormBoatConfig
|
||||||
//
|
//
|
||||||
AutoScaleDimensions = new SizeF(10F, 25F);
|
AutoScaleDimensions = new SizeF(10F, 25F);
|
||||||
@ -358,5 +370,6 @@
|
|||||||
private Label LabelAdditionalColor;
|
private Label LabelAdditionalColor;
|
||||||
private Label LabelColor;
|
private Label LabelColor;
|
||||||
private PictureBox pictureBox1;
|
private PictureBox pictureBox1;
|
||||||
|
private CheckBox checkBoxBoat2;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -156,16 +156,6 @@ namespace ProjectBoat_bae
|
|||||||
DrawBoat();
|
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)
|
private void buttonOk_Click_1(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
EventAddBoat?.Invoke(_boat);
|
EventAddBoat?.Invoke(_boat);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user