diff --git a/AccordionBus/AccordionBus/Drawnings/DrawningAccordionBus.cs b/AccordionBus/AccordionBus/Drawnings/DrawningAccordionBus.cs index 53ecb43..964120a 100644 --- a/AccordionBus/AccordionBus/Drawnings/DrawningAccordionBus.cs +++ b/AccordionBus/AccordionBus/Drawnings/DrawningAccordionBus.cs @@ -37,12 +37,9 @@ public class DrawningAccordionBus:DrawningBus { g.DrawRectangle(new Pen(Color.Black), _startPosX.Value + 70, _startPosY.Value, 40, 30); g.FillRectangle(new HatchBrush(HatchStyle.Vertical, Color.Black, EntityBus.BodyColor), _startPosX.Value + 70, _startPosY.Value, 40, 30); - } - - g.DrawRectangle(new Pen(Color.Black), _startPosX.Value, _startPosY.Value, 70, 30); + g.DrawRectangle(new Pen(Color.Black), _startPosX.Value, _startPosY.Value, 70, 30); g.DrawRectangle(new Pen(Color.Black), _startPosX.Value + 110, _startPosY.Value, 70, 30); - - + } //стекла if (accordionBus.BodyGlass) { diff --git a/AccordionBus/AccordionBus/Drawnings/DrawningBus.cs b/AccordionBus/AccordionBus/Drawnings/DrawningBus.cs index cbac30d..826fa71 100644 --- a/AccordionBus/AccordionBus/Drawnings/DrawningBus.cs +++ b/AccordionBus/AccordionBus/Drawnings/DrawningBus.cs @@ -171,7 +171,10 @@ public class DrawningBus { if (EntityBus == null || !_startPosX.HasValue || !_startPosY.HasValue) return; - + //кузов + Brush br = new SolidBrush(EntityBus.BodyColor); + g.FillRectangle(br, _startPosX.Value, _startPosY.Value, 180, 30); + g.DrawRectangle(new Pen(Color.Black), _startPosX.Value, _startPosY.Value, 180, 30); //диски Brush brWhite = new SolidBrush(Color.White); g.FillEllipse(brWhite, _startPosX.Value, _startPosY.Value + 25, 20, 15); @@ -182,14 +185,6 @@ public class DrawningBus g.FillEllipse(brWheel, _startPosX.Value + 110, _startPosY.Value + 25, 20, 15); g.FillEllipse(brWheel, _startPosX.Value + 160, _startPosY.Value + 25, 20, 15); - //кузов - Brush br = new SolidBrush(EntityBus.BodyColor); - g.FillRectangle(br, _startPosX.Value, _startPosY.Value, 70, 30); - g.FillRectangle(br, _startPosX.Value + 110, _startPosY.Value, 70, 30); - - g.DrawRectangle(new Pen(Color.Black), _startPosX.Value, _startPosY.Value, 70, 30); - g.DrawRectangle(new Pen(Color.Black), _startPosX.Value + 110, _startPosY.Value, 70, 30); - Pen penWheel = new Pen(Color.Black); g.DrawEllipse(penWheel, _startPosX.Value, _startPosY.Value + 25, 20, 15); g.DrawEllipse(penWheel, _startPosX.Value + 50, _startPosY.Value + 25, 20, 15); diff --git a/AccordionBus/AccordionBus/FormAccordionBus.Designer.cs b/AccordionBus/AccordionBus/FormAccordionBus.Designer.cs index 9e1bb22..cdb6f1b 100644 --- a/AccordionBus/AccordionBus/FormAccordionBus.Designer.cs +++ b/AccordionBus/AccordionBus/FormAccordionBus.Designer.cs @@ -118,7 +118,7 @@ buttonCreateBus.Name = "buttonCreateBus"; buttonCreateBus.Size = new Size(216, 23); buttonCreateBus.TabIndex = 11; - buttonCreateBus.Text = "Создать автобус без гармошки"; + buttonCreateBus.Text = "Создать автобус"; buttonCreateBus.UseVisualStyleBackColor = true; buttonCreateBus.Click += buttonCreateBus_Click; //