ChipsEater/PIbd-23_Polevoy_S.V._SelfPropelledArtilleryUnit_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: ChipsEater:master
Branches Tags
ChipsEater:master
ChipsEater:LabWork08
ChipsEater:LabWork07
ChipsEater:LabWork06
ChipsEater:LabWork04
ChipsEater:LabWork05
ChipsEater:LabWork03
ChipsEater:LabWork02
ChipsEater:LabWork01
..
compare: ChipsEater:84aa33b44f9e43fe14c3dccd24e34b3a1543516e
Branches Tags
ChipsEater:LabWork08
ChipsEater:LabWork07
ChipsEater:LabWork06
ChipsEater:LabWork04
ChipsEater:LabWork05
ChipsEater:LabWork03
ChipsEater:LabWork02
ChipsEater:LabWork01
ChipsEater:master

No commits in common. "master" and "84aa33b44f9e43fe14c3dccd24e34b3a1543516e" have entirely different histories.
master ... 84aa33b44f

3 changed files with 12 additions and 19 deletions
Show Stats Expand all files Collapse all files

17
SelfPropelledArtilleryUnit/DrawingArtillery.cs
View File

@ -84,15 +84,14 @@ namespace Artilleries
g.FillRectangle(brush, _startPosX + _artilleryWidth / 8 * 2, _startPosY, _artilleryWidth / 8 * 4, _artilleryWidth / 5); g.FillRectangle(brush, _startPosX + _artilleryWidth / 8 * 2, _startPosY, _artilleryWidth / 8 * 4, _artilleryWidth / 5);
g.FillRectangle(brush, _startPosX, _startPosY + _artilleryHeight / 5, _artilleryWidth, _artilleryHeight / 3); g.FillRectangle(brush, _startPosX, _startPosY + _artilleryHeight / 5, _artilleryWidth, _artilleryHeight / 3);
Brush blackBrush = new SolidBrush(Color.Black); Pen blackPen = new(Color.Black);
Brush grayBrush = new SolidBrush(Color.Gray); g.DrawEllipse(blackPen, _startPosX, _startPosY + _artilleryHeight * 2 / 5, _artilleryWidth, _artilleryHeight * 2 / 5);
g.FillEllipse(grayBrush, _startPosX, _startPosY + _artilleryHeight * 2 / 5, _artilleryWidth, _artilleryHeight * 2 / 5); g.DrawEllipse(blackPen, _startPosX + _artilleryWidth / 20, _startPosY + _artilleryHeight * 7 / 15, _artilleryWidth * 4 / 20, _artilleryHeight * 10 / 32);
g.FillEllipse(blackBrush, _startPosX + _artilleryWidth / 20, _startPosY + _artilleryHeight * 7 / 15, _artilleryWidth * 4 / 20, _artilleryHeight * 10 / 32); g.DrawEllipse(blackPen, _startPosX + _artilleryWidth * 5 / 20, _startPosY + _artilleryHeight * 9 / 16, _artilleryWidth * 3 / 20, _artilleryHeight * 8 / 32);
g.FillEllipse(blackBrush, _startPosX + _artilleryWidth * 5 / 20, _startPosY + _artilleryHeight * 9 / 16, _artilleryWidth * 3 / 20, _artilleryHeight * 8 / 32); g.DrawEllipse(blackPen, _startPosX + _artilleryWidth * 8 / 20, _startPosY + _artilleryHeight * 10 / 16, _artilleryWidth * 2 / 20, _artilleryHeight * 6 / 32);
g.FillEllipse(blackBrush, _startPosX + _artilleryWidth * 8 / 20, _startPosY + _artilleryHeight * 10 / 16, _artilleryWidth * 2 / 20, _artilleryHeight * 6 / 32); g.DrawEllipse(blackPen, _startPosX + _artilleryWidth * 10 / 20, _startPosY + _artilleryHeight * 10 / 16, _artilleryWidth * 2 / 20, _artilleryHeight * 6 / 32);
g.FillEllipse(blackBrush, _startPosX + _artilleryWidth * 10 / 20, _startPosY + _artilleryHeight * 10 / 16, _artilleryWidth * 2 / 20, _artilleryHeight * 6 / 32); g.DrawEllipse(blackPen, _startPosX + _artilleryWidth * 12 / 20, _startPosY + _artilleryHeight * 9 / 16, _artilleryWidth * 3 / 20, _artilleryHeight * 8 / 32);
g.FillEllipse(blackBrush, _startPosX + _artilleryWidth * 12 / 20, _startPosY + _artilleryHeight * 9 / 16, _artilleryWidth * 3 / 20, _artilleryHeight * 8 / 32); g.DrawEllipse(blackPen, _startPosX + _artilleryWidth * 15 / 20, _startPosY + _artilleryHeight * 7 / 15, _artilleryWidth * 4 / 20, _artilleryHeight * 10 / 32);
g.FillEllipse(blackBrush, _startPosX + _artilleryWidth * 15 / 20, _startPosY + _artilleryHeight * 7 / 15, _artilleryWidth * 4 / 20, _artilleryHeight * 10 / 32);
} }
public void ChangeBorders(int width, int height) public void ChangeBorders(int width, int height)

5
SelfPropelledArtilleryUnit/FormArtillery.Designer.cs generated
View File

@ -86,7 +86,6 @@
this.pictureBoxArtilleries.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBoxArtilleries.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pictureBoxArtilleries.TabIndex = 1; this.pictureBoxArtilleries.TabIndex = 1;
this.pictureBoxArtilleries.TabStop = false; this.pictureBoxArtilleries.TabStop = false;
this.pictureBoxArtilleries.SizeChanged += new System.EventHandler(this.pictureBoxArtilleries_Resize);
// //
// buttonCreate // buttonCreate
// //
@ -101,7 +100,6 @@
// //
// buttonLeft // buttonLeft
// //
this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonLeft.BackgroundImage = global::SelfPropelledArtilleryUnit.Properties.Resources.ArrowLeft; this.buttonLeft.BackgroundImage = global::SelfPropelledArtilleryUnit.Properties.Resources.ArrowLeft;
this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.buttonLeft.Location = new System.Drawing.Point(509, 375); this.buttonLeft.Location = new System.Drawing.Point(509, 375);
@ -113,7 +111,6 @@
// //
// buttonUp // buttonUp
// //
this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonUp.BackgroundImage = global::SelfPropelledArtilleryUnit.Properties.Resources.ArrowUp; this.buttonUp.BackgroundImage = global::SelfPropelledArtilleryUnit.Properties.Resources.ArrowUp;
this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.buttonUp.Location = new System.Drawing.Point(543, 342); this.buttonUp.Location = new System.Drawing.Point(543, 342);
@ -125,7 +122,6 @@
// //
// buttonDown // buttonDown
// //
this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonDown.BackgroundImage = global::SelfPropelledArtilleryUnit.Properties.Resources.ArrowDown; this.buttonDown.BackgroundImage = global::SelfPropelledArtilleryUnit.Properties.Resources.ArrowDown;
this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.buttonDown.Location = new System.Drawing.Point(543, 375); this.buttonDown.Location = new System.Drawing.Point(543, 375);
@ -137,7 +133,6 @@
// //
// buttonRight // buttonRight
// //
this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonRight.BackgroundImage = global::SelfPropelledArtilleryUnit.Properties.Resources.ArrowRight; this.buttonRight.BackgroundImage = global::SelfPropelledArtilleryUnit.Properties.Resources.ArrowRight;
this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.buttonRight.Location = new System.Drawing.Point(579, 375); this.buttonRight.Location = new System.Drawing.Point(579, 375);

9
SelfPropelledArtilleryUnit/FormArtillery.cs
View File

@ -8,7 +8,6 @@ namespace Artilleries
{ {
InitializeComponent(); InitializeComponent();
} }
private void Draw() private void Draw()
{ {
Bitmap bmp = new(pictureBoxArtilleries.Width, pictureBoxArtilleries.Height); Bitmap bmp = new(pictureBoxArtilleries.Width, pictureBoxArtilleries.Height);
@ -22,10 +21,10 @@ namespace Artilleries
Random rnd = new(); Random rnd = new();
_artillery = new DrawingArtillery(); _artillery = new DrawingArtillery();
_artillery.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); _artillery.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
_artillery.SetPosition(rnd.Next(pictureBoxArtilleries.Width - 161, pictureBoxArtilleries.Width - 81), rnd.Next(10, 100), pictureBoxArtilleries.Width, pictureBoxArtilleries.Height); _artillery.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxArtilleries.Width, pictureBoxArtilleries.Height);
SpeedStatusLabel.Text = $"Скорость: {_artillery.Artillery.Speed}"; SpeedStatusLabel.Text = $"Ñêîðîñòü: {_artillery.Artillery.Speed}";
WeightStatusLabel.Text = $"Вес: {_artillery.Artillery.Weight}"; WeightStatusLabel.Text = $"Âåñ: {_artillery.Artillery.Weight}";
ColorStatusLabel.Text = $"Цвет: {_artillery.Artillery.BodyColor.Name}"; ColorStatusLabel.Text = $"Öâåò: {_artillery.Artillery.BodyColor.Name}";
Draw(); Draw();
} }