Kristina/ISEbd-22_Musatkina_K._Y._Speedboat_Base
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

зафиксировать всё

Browse Source
This commit is contained in:
Учебный 2023-11-25 15:45:07 +04:00
parent 850db9bf71
commit 18cfa60a37
3 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs
View File

@ -36,22 +36,6 @@ namespace ProjectBoat_bae.DrawningObjects
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)
{ {
//вёсла //вёсла
@ -59,6 +43,21 @@ namespace ProjectBoat_bae.DrawningObjects
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);
} }
//флажок
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); base.DrawTransport(g);
} }
} }

28
ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs generated
View File

@ -30,6 +30,7 @@
{ {
pictureBoxObject = new PictureBox(); pictureBoxObject = new PictureBox();
groupBoxBoat = new GroupBox(); groupBoxBoat = new GroupBox();
checkBoxBoat2 = new CheckBox();
labelModifiedObject = new Label(); labelModifiedObject = new Label();
labelSimpleObject = new Label(); labelSimpleObject = new Label();
groupBoxColors = new GroupBox(); groupBoxColors = new GroupBox();
@ -52,7 +53,6 @@
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();
@ -89,6 +89,16 @@
groupBoxBoat.TabStop = false; groupBoxBoat.TabStop = false;
groupBoxBoat.Text = "Параметры"; 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
// //
labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
@ -109,7 +119,6 @@
labelSimpleObject.TabIndex = 10; labelSimpleObject.TabIndex = 10;
labelSimpleObject.Text = "Простой"; labelSimpleObject.Text = "Простой";
labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
//labelSimpleObject.Click += labelSimpleObject_Click;
labelSimpleObject.MouseDown += LabelObject_MouseDown; labelSimpleObject.MouseDown += LabelObject_MouseDown;
// //
// groupBoxColors // groupBoxColors
@ -228,11 +237,10 @@
checkBoxBoat.AutoSize = true; checkBoxBoat.AutoSize = true;
checkBoxBoat.Location = new Point(21, 176); checkBoxBoat.Location = new Point(21, 176);
checkBoxBoat.Name = "checkBoxBoat"; checkBoxBoat.Name = "checkBoxBoat";
checkBoxBoat.Size = new Size(230, 29); checkBoxBoat.Size = new Size(246, 29);
checkBoxBoat.TabIndex = 6; checkBoxBoat.TabIndex = 6;
checkBoxBoat.Text = "Признак наличия весел"; checkBoxBoat.Text = "Признак наличия флажка";
checkBoxBoat.UseVisualStyleBackColor = true; checkBoxBoat.UseVisualStyleBackColor = true;
checkBoxBoat.CheckedChanged += checkBoxBoat_CheckedChanged;
// //
// Weight // Weight
// //
@ -311,16 +319,6 @@
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);

2
ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs
View File

@ -90,7 +90,7 @@ namespace ProjectBoat_bae
break; break;
case "labelModifiedObject": case "labelModifiedObject":
_boat = new DrawningMotorBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, _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; break;
} }
LabelColor.BackColor = Color.Empty; LabelColor.BackColor = Color.Empty;