From ec6e19c626b8a10ba2f686ed788e5f68be65cc10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BC?= Date: Wed, 5 Oct 2022 10:28:26 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DrawingImprovedGasolineTanker.cs | 7 ++--- .../GasolineTanker/FormGasolineTanker.cs | 27 ++++++++++++++----- .../MapWithSetGasolienTankerGeneric.cs | 21 ++++++++------- .../SetGasolineTankerGeneric.cs | 10 +++---- 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/GasolineTanker/GasolineTanker/DrawingImprovedGasolineTanker.cs b/GasolineTanker/GasolineTanker/DrawingImprovedGasolineTanker.cs index 3bc9e09..e76d523 100644 --- a/GasolineTanker/GasolineTanker/DrawingImprovedGasolineTanker.cs +++ b/GasolineTanker/GasolineTanker/DrawingImprovedGasolineTanker.cs @@ -20,13 +20,10 @@ namespace GasolineTanker return; } - Pen pen = new(Color.Black); - Brush dopBrush = new SolidBrush(improvedGasolineTanker.DopColor); - if (improvedGasolineTanker.BodyKit) { - Brush brOrange = new SolidBrush(Color.Orange); - g.FillRectangle(brOrange, _startPosX + 25, _startPosY + 5, 100, 35); + Brush dopBrush = new SolidBrush(improvedGasolineTanker.DopColor); + g.FillRectangle(dopBrush, _startPosX + 25, _startPosY + 5, 100, 35); Brush brRed = new SolidBrush(Color.Red); g.FillRectangle(brRed, _startPosX + 80, _startPosY, 10, 5); } diff --git a/GasolineTanker/GasolineTanker/FormGasolineTanker.cs b/GasolineTanker/GasolineTanker/FormGasolineTanker.cs index b73fe24..1d14c06 100644 --- a/GasolineTanker/GasolineTanker/FormGasolineTanker.cs +++ b/GasolineTanker/GasolineTanker/FormGasolineTanker.cs @@ -32,10 +32,16 @@ namespace GasolineTanker private void ButtonCreate_Click_1(object sender, EventArgs e) { Random rnd = new(); - _gasolineTanker = new DrawingGasolineTanker(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - _gasolineTanker.SetPosition(rnd.Next(10, 100),rnd.Next(50, 100), pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height); + Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),rnd.Next(0, 256)); + ColorDialog dialog = new(); + if (dialog.ShowDialog() == DialogResult.OK) + { + color = dialog.Color; + } + _gasolineTanker = new DrawingGasolineTanker(rnd.Next(100, 300), rnd.Next(1000, 2000),color); SetData(); Draw(); + } private void ButtonMove_Click(object sender, EventArgs e) @@ -69,10 +75,19 @@ namespace GasolineTanker private void ButtonCreateImproved_Click(object sender, EventArgs e) { Random rnd = new(); - _gasolineTanker = new DrawingImprovedGasolineTanker(rnd.Next(100, 300), rnd.Next(1000, 2000), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), - Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); + Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),rnd.Next(0, 256)); + ColorDialog dialog = new(); + if (dialog.ShowDialog() == DialogResult.OK) + { + color = dialog.Color; + } + Color colorDop = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)); + ColorDialog dialogDop = new(); + if (dialogDop.ShowDialog() == DialogResult.OK) + { + colorDop = dialogDop.Color; + } + _gasolineTanker = new DrawingImprovedGasolineTanker(rnd.Next(100, 300), rnd.Next(1000, 2000), color, colorDop, Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); SetData(); Draw(); } diff --git a/GasolineTanker/GasolineTanker/MapWithSetGasolienTankerGeneric.cs b/GasolineTanker/GasolineTanker/MapWithSetGasolienTankerGeneric.cs index 272210a..f25a19d 100644 --- a/GasolineTanker/GasolineTanker/MapWithSetGasolienTankerGeneric.cs +++ b/GasolineTanker/GasolineTanker/MapWithSetGasolienTankerGeneric.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics.Metrics; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -26,9 +27,9 @@ namespace GasolineTanker _map = map; } - public static int operator +(MapWithSetGasolienTankerGeneric map, T GasolineTanker) + public static int operator +(MapWithSetGasolienTankerGeneric map, T gasolineTanker) { - return map._setGasolineTanker.Insert(GasolineTanker); + return map._setGasolineTanker.Insert(gasolineTanker); } public static T operator -(MapWithSetGasolienTankerGeneric map, int position) @@ -50,10 +51,10 @@ namespace GasolineTanker Shaking(); for (int i = 0; i < _setGasolineTanker.Count; i++) { - var GasolineTanker = _setGasolineTanker.Get(i); - if (GasolineTanker != null) + var gasolineTanker = _setGasolineTanker.Get(i); + if (gasolineTanker != null) { - return _map.CreateMap(_pictureWidth, _pictureHeight, GasolineTanker); + return _map.CreateMap(_pictureWidth, _pictureHeight, gasolineTanker); } } return new(_pictureWidth, _pictureHeight); @@ -77,10 +78,10 @@ namespace GasolineTanker { for (; j > i; j--) { - var GasolineTanker = _setGasolineTanker.Get(j); - if (GasolineTanker != null) + var gasolineTanker = _setGasolineTanker.Get(j); + if (gasolineTanker != null) { - _setGasolineTanker.Insert(GasolineTanker, i); + _setGasolineTanker.Insert(gasolineTanker, i); _setGasolineTanker.Remove(j); break; } @@ -109,8 +110,8 @@ namespace GasolineTanker private void DrawGasolineTanker(Graphics g) { - int width = _pictureWidth / _placeSizeWidth; - int height = _pictureHeight / _placeSizeHeight; + int width = _pictureWidth / _placeSizeWidth; + int height = _pictureHeight / _placeSizeHeight; for (int i = 0; i < _setGasolineTanker.Count; i++) { diff --git a/GasolineTanker/GasolineTanker/SetGasolineTankerGeneric.cs b/GasolineTanker/GasolineTanker/SetGasolineTankerGeneric.cs index 69ae434..c546fa5 100644 --- a/GasolineTanker/GasolineTanker/SetGasolineTankerGeneric.cs +++ b/GasolineTanker/GasolineTanker/SetGasolineTankerGeneric.cs @@ -15,7 +15,7 @@ namespace GasolineTanker { _places = new T[count]; } - public int Insert(T GasolineTanker) + public int Insert(T gasolineTanker) { if (_places[Count - 1] == null) { @@ -23,17 +23,17 @@ namespace GasolineTanker { _places[i] = _places[i - 1]; } - _places[0] = GasolineTanker; + _places[0] = gasolineTanker; return 0; } return -1; } - public int Insert(T GasolineTanker, int position) + public int Insert(T gasolineTanker, int position) { if (position < 0 || position >= Count) return -1; if (_places[position] == null) { - _places[position] = GasolineTanker; + _places[position] = gasolineTanker; return position; } else @@ -44,7 +44,7 @@ namespace GasolineTanker { _places[i] = _places[i - 1]; } - _places[position] = GasolineTanker; + _places[position] = gasolineTanker; return position; } return -1;