diff --git a/Traktor/Traktor/MultiTraktorDraw.cs b/Traktor/Traktor/DrawningMultiTraktor.cs similarity index 94% rename from Traktor/Traktor/MultiTraktorDraw.cs rename to Traktor/Traktor/DrawningMultiTraktor.cs index 7bdc5be..5769452 100644 --- a/Traktor/Traktor/MultiTraktorDraw.cs +++ b/Traktor/Traktor/DrawningMultiTraktor.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace Traktor { // Класс, отвечающий за прорисовку и перемещение объекта-сущности - internal class MultiTraktorDraw : TraktorDraw + internal class DrawningMultiTraktor : DrawningTraktor { /// Инициализация свойств /// Скорость @@ -17,7 +17,7 @@ namespace Traktor /// Дополнительный цвет /// Ширина отрисовки автомобиля /// Высота отрисовки автомобиля - public MultiTraktorDraw(int speed, float weight, Color bodyColor, Color dopColor) : base(speed, weight, bodyColor, 188, 100) + public DrawningMultiTraktor(int speed, float weight, Color bodyColor, Color dopColor) : base(speed, weight, bodyColor, 188, 100) { Traktor = new MultiTraktor(speed, weight, bodyColor, dopColor); } diff --git a/Traktor/Traktor/DrawningObjectTraktor.cs b/Traktor/Traktor/DrawningObjectTraktor.cs index a0963ed..c52daf6 100644 --- a/Traktor/Traktor/DrawningObjectTraktor.cs +++ b/Traktor/Traktor/DrawningObjectTraktor.cs @@ -8,9 +8,9 @@ namespace Traktor { internal class DrawningObjectTraktor : IDrawningObject { - private TraktorDraw _traktor = null; + private DrawningTraktor _traktor = null; - public DrawningObjectTraktor(TraktorDraw traktor) + public DrawningObjectTraktor(DrawningTraktor traktor) { _traktor = traktor; } diff --git a/Traktor/Traktor/TraktorDraw.cs b/Traktor/Traktor/DrawningTraktor.cs similarity index 96% rename from Traktor/Traktor/TraktorDraw.cs rename to Traktor/Traktor/DrawningTraktor.cs index 457b516..be6404b 100644 --- a/Traktor/Traktor/TraktorDraw.cs +++ b/Traktor/Traktor/DrawningTraktor.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace Traktor { // Класс, отвечающий за прорисовку и перемещение объекта-сущности - internal class TraktorDraw + internal class DrawningTraktor { //Сущность public EntityTraktor Traktor { get; protected set; } @@ -26,7 +26,7 @@ namespace Traktor /// Высота отрисовки сущности private readonly int entHeight = 100; - public TraktorDraw(int speed, float weight, Color bodycolor) + public DrawningTraktor(int speed, float weight, Color bodycolor) { Traktor = new EntityTraktor(speed, weight, bodycolor); } @@ -36,7 +36,7 @@ namespace Traktor /// Цвет кузова /// Ширина отрисовки автомобиля /// Высота отрисовки автомобиля - protected TraktorDraw(int speed, float weight, Color bodyColor, int trktrWidth, int trktrHeight) : this(speed, weight, bodyColor) + protected DrawningTraktor(int speed, float weight, Color bodyColor, int trktrWidth, int trktrHeight) : this(speed, weight, bodyColor) { entWidth = trktrWidth; entHeight = trktrHeight; diff --git a/Traktor/Traktor/FormMap.cs b/Traktor/Traktor/FormMap.cs index db99664..94cb77e 100644 --- a/Traktor/Traktor/FormMap.cs +++ b/Traktor/Traktor/FormMap.cs @@ -21,7 +21,7 @@ namespace Traktor } //Заполнение информации по объекту - private void SetData(TraktorDraw traktor) + private void SetData(DrawningTraktor traktor) { toolStripStatusLabelSpeed.Text = $"Скорость: {traktor.Traktor.Speed}"; toolStripStatusLabelWeight.Text = $"Вес: {traktor.Traktor.Weight}"; @@ -34,7 +34,7 @@ namespace Traktor private void ButtonCreate_Click(object sender, EventArgs e) { Random random = new(); - var car = new TraktorDraw(random.Next(100, 200), random.Next(2500, 5000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); + var car = new DrawningTraktor(random.Next(100, 200), random.Next(2500, 5000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); SetData(car); } @@ -65,7 +65,7 @@ namespace Traktor private void buttonCreateModif_Click(object sender, EventArgs e) { Random random = new Random(); - var _Traktor = new MultiTraktorDraw(random.Next(100, 200), random.Next(2500, 5000), + var _Traktor = new DrawningMultiTraktor(random.Next(100, 200), random.Next(2500, 5000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); SetData(_Traktor); diff --git a/Traktor/Traktor/DrawField.Designer.cs b/Traktor/Traktor/FormTraktor.Designer.cs similarity index 99% rename from Traktor/Traktor/DrawField.Designer.cs rename to Traktor/Traktor/FormTraktor.Designer.cs index e38b790..30fa0ee 100644 --- a/Traktor/Traktor/DrawField.Designer.cs +++ b/Traktor/Traktor/FormTraktor.Designer.cs @@ -1,6 +1,6 @@ namespace Traktor { - partial class DrawField + partial class FormTraktor { /// /// Required designer variable. diff --git a/Traktor/Traktor/DrawField.cs b/Traktor/Traktor/FormTraktor.cs similarity index 86% rename from Traktor/Traktor/DrawField.cs rename to Traktor/Traktor/FormTraktor.cs index 510260c..7f17a81 100644 --- a/Traktor/Traktor/DrawField.cs +++ b/Traktor/Traktor/FormTraktor.cs @@ -2,11 +2,11 @@ using System; namespace Traktor { - public partial class DrawField : Form + public partial class FormTraktor : Form { - private TraktorDraw _Traktor; + private DrawningTraktor _Traktor; - public DrawField() + public FormTraktor() { InitializeComponent(); } @@ -34,7 +34,7 @@ namespace Traktor private void ButtonCreate_Click(object sender, EventArgs e) { Random random = new Random(); - _Traktor = new TraktorDraw(random.Next(100, 200), random.Next(2500, 5000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); + _Traktor = new DrawningTraktor(random.Next(100, 200), random.Next(2500, 5000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); SetData(); Draw(); } @@ -71,7 +71,7 @@ namespace Traktor private void buttonCreateModif_Click(object sender, EventArgs e) { Random random = new Random(); - _Traktor = new MultiTraktorDraw(random.Next(100, 200), random.Next(2500, 5000), + _Traktor = new DrawningMultiTraktor(random.Next(100, 200), random.Next(2500, 5000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); SetData(); diff --git a/Traktor/Traktor/DrawField.resx b/Traktor/Traktor/FormTraktor.resx similarity index 100% rename from Traktor/Traktor/DrawField.resx rename to Traktor/Traktor/FormTraktor.resx