From 6806a3c9ca49419a433a6671cda52fe351fffcbe Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 29 Nov 2022 01:44:43 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=AD=D1=82=D0=B0=D0=BF1.=20=D1=81=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BC=D0=B0=D1=81=D1=81=D0=B8=D0=B2=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WinFormsApp1/MapWithSetTraktorGeneric.cs | 10 ++-- WinFormsApp1/SetTraktorGeneric.cs | 71 ++++++++++++++++-------- 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/WinFormsApp1/MapWithSetTraktorGeneric.cs b/WinFormsApp1/MapWithSetTraktorGeneric.cs index 4fdf93d..328bfaf 100644 --- a/WinFormsApp1/MapWithSetTraktorGeneric.cs +++ b/WinFormsApp1/MapWithSetTraktorGeneric.cs @@ -52,7 +52,7 @@ namespace WinFormsApp1 Shaking(); for (int i = 0; i < _setTraktors.Count; i++) { - var bus = _setTraktors.Get(i); + var bus = _setTraktors[i]; if (bus != null) { return _map.CreateMap(_pictureWidth, _pictureHeight, bus); @@ -75,11 +75,11 @@ namespace WinFormsApp1 int j = _setTraktors.Count - 1; for (int i = 0; i < _setTraktors.Count; i++) { - if (_setTraktors.Get(i) == null) + if (_setTraktors[i] == null) { for (; j > i; j--) { - var bus = _setTraktors.Get(j); + var bus = _setTraktors[j]; if (bus != null) { _setTraktors.Insert(bus, i); @@ -121,10 +121,10 @@ namespace WinFormsApp1 for (int i = _setTraktors.Count; i >= 0; i--) { - _setTraktors.Get(i)?.SetObject( + _setTraktors[i]?.SetObject( _pictureWidth - _placeSizeWidth * curWidth - 60, curHeight * _placeSizeHeight + 30, _pictureWidth, _pictureHeight); - _setTraktors.Get(i)?.DrawningObject(g); + _setTraktors[i]?.DrawningObject(g); if (curWidth < widthEl) curWidth++; diff --git a/WinFormsApp1/SetTraktorGeneric.cs b/WinFormsApp1/SetTraktorGeneric.cs index 7b5093e..657063a 100644 --- a/WinFormsApp1/SetTraktorGeneric.cs +++ b/WinFormsApp1/SetTraktorGeneric.cs @@ -9,13 +9,15 @@ namespace WinFormsApp1 internal class SetTraktorGeneric where T : class { - private readonly T[] _places; - public int Count => _places.Length; + private readonly List _places; + public int Count => _places.Count; + private readonly int _maxCount; private int TractorPlaces = 0; public SetTraktorGeneric(int count) { - _places = new T[count]; + _maxCount = count; + _places = new List(); ; } public int Insert(T tractor) @@ -25,38 +27,61 @@ namespace WinFormsApp1 public int Insert(T tractor, int position) { - if (position < 0 || position >= _places.Length || TractorPlaces == _places.Length) + if (position < 0 && position > _maxCount) { return -1; } - TractorPlaces++; - while (_places[position] != null) + else { - for (int i = _places.Length - 1; i > 0; --i) - { - if (_places[i] == null && _places[i - 1] != null) - { - _places[i] = _places[i - 1]; - _places[i - 1] = null; - } - } + _places.Insert(position, tractor); + return position; } - _places[position] = tractor; - return position; } public T Remove(int position) { - if (position < 0 || position >= _places.Length) return null; - T savedTractor = _places[position]; - _places[position] = null; - return savedTractor; + if (position < 0 || position >= _maxCount) + { + return null; + } + var result = _places[position]; + _places.RemoveAt(position); + return result; } - public T Get(int position) + + public T this[int position] { - if (position < 0 || position >= _places.Length) return null; - return _places[position]; + get + { + if (position >= 0 && position < _maxCount && position < Count) + { + return _places[position]; + } + else + { + return null; + } + } + set + { + Insert(value, position); + } + } + + public IEnumerable GetBuses() + { + foreach (var traktor in _places) + { + if (traktor != null) + { + yield return traktor; + } + else + { + yield break; + } + } } } } -- 2.25.1 From ed2a685f667854b120eec32fd9cc6f06786a3c62 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 29 Nov 2022 01:53:02 +0400 Subject: [PATCH 2/3] =?UTF-8?q?2=20=D1=8D=D1=82=D0=B0=D0=BF.=20=D0=9A?= =?UTF-8?q?=D0=BB=D0=B0=D1=81=D1=81=20MapsCollection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WinFormsApp1/MapWithSetTraktorGeneric.cs | 44 +++++++++----------- WinFormsApp1/MapsCollection.cs | 53 ++++++++++++++++++++++++ WinFormsApp1/SetTraktorGeneric.cs | 2 +- 3 files changed, 74 insertions(+), 25 deletions(-) create mode 100644 WinFormsApp1/MapsCollection.cs diff --git a/WinFormsApp1/MapWithSetTraktorGeneric.cs b/WinFormsApp1/MapWithSetTraktorGeneric.cs index 328bfaf..750ed9c 100644 --- a/WinFormsApp1/MapWithSetTraktorGeneric.cs +++ b/WinFormsApp1/MapWithSetTraktorGeneric.cs @@ -50,13 +50,9 @@ namespace WinFormsApp1 public Bitmap ShowOnMap() { Shaking(); - for (int i = 0; i < _setTraktors.Count; i++) + foreach (var traktor in _setTraktors.GetTraktor()) { - var bus = _setTraktors[i]; - if (bus != null) - { - return _map.CreateMap(_pictureWidth, _pictureHeight, bus); - } + return _map.CreateMap(_pictureWidth, _pictureHeight, traktor); } return new(_pictureWidth, _pictureHeight); } @@ -113,31 +109,31 @@ namespace WinFormsApp1 private void DrawTraktors(Graphics g) { - int widthEl = _pictureWidth / _placeSizeWidth; - int heightEl = _pictureHeight / _placeSizeHeight; + - int curWidth = 0; - int curHeight = 0; - for (int i = _setTraktors.Count; i >= 0; i--) + int currentWidth = _pictureWidth / _placeSizeWidth - 1; + int currentHeight = _pictureHeight / _placeSizeHeight - 1; + + foreach (var traktor in _setTraktors.GetTraktor()) { - _setTraktors[i]?.SetObject( - _pictureWidth - _placeSizeWidth * curWidth - 60, - curHeight * _placeSizeHeight + 30, _pictureWidth, _pictureHeight); - _setTraktors[i]?.DrawningObject(g); + traktor?.SetObject( + currentWidth * _placeSizeWidth + 50, currentHeight * _placeSizeHeight + 10, _pictureWidth, _pictureHeight); + traktor?.DrawningObject(g); - if (curWidth < widthEl) - curWidth++; + if (currentWidth > 0) + { + currentWidth -= 1; + } else { - curWidth = 1; - curHeight++; + if (currentHeight > 0) + { + currentHeight -= 1; + currentWidth = _pictureWidth / _placeSizeWidth - 1; + } + else return; } - if (curHeight > heightEl) - { - return; - } - } } } diff --git a/WinFormsApp1/MapsCollection.cs b/WinFormsApp1/MapsCollection.cs new file mode 100644 index 0000000..498b24f --- /dev/null +++ b/WinFormsApp1/MapsCollection.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace WinFormsApp1 +{ + internal class MapsCollection + { + readonly Dictionary> _mapStorages; + + public List Keys => _mapStorages.Keys.ToList(); + + private readonly int _pictureWidth; + + private readonly int _pictureHeight; + + public MapsCollection(int pictureWidth, int pictureHeight) + { + _mapStorages = new Dictionary>(); + _pictureWidth = pictureWidth; + _pictureHeight = pictureHeight; + } + + public void AddMap(string name, AbstractMap map) + { + if (_mapStorages.ContainsKey(name)) return; //уникальное имя + else + { + _mapStorages.Add(name, new MapWithSetTraktorGeneric(_pictureWidth, _pictureHeight, map)); + } + } + + public void DelMap(string name) + { + if (_mapStorages.ContainsKey(name)) + { + _mapStorages.Remove(name); + } + } + + public MapWithSetTraktorGeneric this[string ind] + { + get + { + _mapStorages.TryGetValue(ind, out var MapWithSetDoubleDeckerBusGeneric); + return MapWithSetDoubleDeckerBusGeneric; + } + + } + } +} diff --git a/WinFormsApp1/SetTraktorGeneric.cs b/WinFormsApp1/SetTraktorGeneric.cs index 657063a..b4c2e7e 100644 --- a/WinFormsApp1/SetTraktorGeneric.cs +++ b/WinFormsApp1/SetTraktorGeneric.cs @@ -69,7 +69,7 @@ namespace WinFormsApp1 } } - public IEnumerable GetBuses() + public IEnumerable GetTraktor() { foreach (var traktor in _places) { -- 2.25.1 From 2a53b2840c71ff0dc766373f7a05c7c481f016c1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 29 Nov 2022 02:16:22 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=A4=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D1=8D=D1=82=D0=B0=D0=BF=20-=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=88=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormMapWithSetTraktor.Designer.cs | 268 +++++++++++------- WinFormsApp1/FormMapWithSetTraktor.cs | 94 +++++- 2 files changed, 256 insertions(+), 106 deletions(-) diff --git a/WinFormsApp1/FormMapWithSetTraktor.Designer.cs b/WinFormsApp1/FormMapWithSetTraktor.Designer.cs index ea8d8b2..01ce979 100644 --- a/WinFormsApp1/FormMapWithSetTraktor.Designer.cs +++ b/WinFormsApp1/FormMapWithSetTraktor.Designer.cs @@ -31,6 +31,12 @@ namespace WinFormsApp1 private void InitializeComponent() { this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBoxMaps = new System.Windows.Forms.GroupBox(); + this.listBoxMaps = new System.Windows.Forms.ListBox(); + this.buttonDeleteMap = new System.Windows.Forms.Button(); + this.buttonAddMap = new System.Windows.Forms.Button(); + this.textBoxNewMapName = new System.Windows.Forms.TextBox(); + this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); this.buttonRight = new System.Windows.Forms.Button(); this.buttonDown = new System.Windows.Forms.Button(); this.buttonLeft = new System.Windows.Forms.Button(); @@ -40,14 +46,15 @@ namespace WinFormsApp1 this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox(); this.buttonRemoveTraktor = new System.Windows.Forms.Button(); this.buttonAddTraktor = new System.Windows.Forms.Button(); - this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); this.pictureBox = new System.Windows.Forms.PictureBox(); this.groupBox1.SuspendLayout(); + this.groupBoxMaps.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); this.SuspendLayout(); // // groupBox1 // + this.groupBox1.Controls.Add(this.groupBoxMaps); this.groupBox1.Controls.Add(this.buttonRight); this.groupBox1.Controls.Add(this.buttonDown); this.groupBox1.Controls.Add(this.buttonLeft); @@ -57,109 +64,66 @@ namespace WinFormsApp1 this.groupBox1.Controls.Add(this.maskedTextBoxPosition); this.groupBox1.Controls.Add(this.buttonRemoveTraktor); this.groupBox1.Controls.Add(this.buttonAddTraktor); - this.groupBox1.Controls.Add(this.comboBoxSelectorMap); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right; - this.groupBox1.Location = new System.Drawing.Point(832, 0); + this.groupBox1.Location = new System.Drawing.Point(596, 0); + this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(250, 518); + this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupBox1.Size = new System.Drawing.Size(219, 476); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "Инструменты"; // - // buttonUp + // groupBoxMaps // - this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonUp.BackgroundImage = global::Tractors.Properties.Resources._2EdzyM4iEKw; - this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(55, 426); - this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(40, 40); - this.buttonUp.TabIndex = 7; - this.buttonUp.UseVisualStyleBackColor = true; - this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + this.groupBoxMaps.Controls.Add(this.listBoxMaps); + this.groupBoxMaps.Controls.Add(this.buttonDeleteMap); + this.groupBoxMaps.Controls.Add(this.buttonAddMap); + this.groupBoxMaps.Controls.Add(this.textBoxNewMapName); + this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap); + this.groupBoxMaps.Location = new System.Drawing.Point(7, 20); + this.groupBoxMaps.Name = "groupBoxMaps"; + this.groupBoxMaps.Size = new System.Drawing.Size(200, 244); + this.groupBoxMaps.TabIndex = 2; + this.groupBoxMaps.TabStop = false; + this.groupBoxMaps.Text = "Карты"; // - // buttonLeft + // listBoxMaps // - this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLeft.BackgroundImage = global::Tractors.Properties.Resources.Hhxt4dLqV5g; - this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(15, 466); - this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(40, 40); - this.buttonLeft.TabIndex = 8; - this.buttonLeft.UseVisualStyleBackColor = true; - this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + this.listBoxMaps.FormattingEnabled = true; + this.listBoxMaps.ItemHeight = 15; + this.listBoxMaps.Location = new System.Drawing.Point(6, 109); + this.listBoxMaps.Name = "listBoxMaps"; + this.listBoxMaps.Size = new System.Drawing.Size(188, 94); + this.listBoxMaps.TabIndex = 4; + this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.listBoxMaps_SelectedIndexChanged); // - // buttonDown + // buttonDeleteMap // - this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonDown.BackgroundImage = global::Tractors.Properties.Resources.MbV2DYU_nPM; - this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(55, 466); - this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(40, 40); - this.buttonDown.TabIndex = 9; - this.buttonDown.UseVisualStyleBackColor = true; - this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + this.buttonDeleteMap.Location = new System.Drawing.Point(6, 215); + this.buttonDeleteMap.Name = "buttonDeleteMap"; + this.buttonDeleteMap.Size = new System.Drawing.Size(188, 23); + this.buttonDeleteMap.TabIndex = 3; + this.buttonDeleteMap.Text = "Удалить карту"; + this.buttonDeleteMap.UseVisualStyleBackColor = true; + this.buttonDeleteMap.Click += new System.EventHandler(this.buttonDeleteMap_Click); // - // buttonRight + // buttonAddMap // - this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRight.BackgroundImage = global::Tractors.Properties.Resources.RkYIe2_6DuQ; - this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(95, 466); - this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(40, 40); - this.buttonRight.TabIndex = 10; - this.buttonRight.UseVisualStyleBackColor = true; - this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + this.buttonAddMap.Location = new System.Drawing.Point(6, 80); + this.buttonAddMap.Name = "buttonAddMap"; + this.buttonAddMap.Size = new System.Drawing.Size(188, 23); + this.buttonAddMap.TabIndex = 2; + this.buttonAddMap.Text = " Добавить карту"; + this.buttonAddMap.UseVisualStyleBackColor = true; + this.buttonAddMap.Click += new System.EventHandler(this.buttonAddMap_Click); // - // buttonShowOnMap + // textBoxNewMapName // - this.buttonShowOnMap.Location = new System.Drawing.Point(6, 281); - this.buttonShowOnMap.Name = "buttonShowOnMap"; - this.buttonShowOnMap.Size = new System.Drawing.Size(193, 29); - this.buttonShowOnMap.TabIndex = 5; - this.buttonShowOnMap.Text = "Посмотреть карту"; - this.buttonShowOnMap.UseVisualStyleBackColor = true; - this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click); - // - // buttonShowStorage - // - this.buttonShowStorage.Location = new System.Drawing.Point(6, 246); - this.buttonShowStorage.Name = "buttonShowStorage"; - this.buttonShowStorage.Size = new System.Drawing.Size(193, 29); - this.buttonShowStorage.TabIndex = 4; - this.buttonShowStorage.Text = "Посмотреть хранилище"; - this.buttonShowStorage.UseVisualStyleBackColor = true; - this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click); - // - // maskedTextBoxPosition - // - this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 122); - this.maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - this.maskedTextBoxPosition.Size = new System.Drawing.Size(100, 27); - this.maskedTextBoxPosition.TabIndex = 11; - // - // buttonRemoveTraktor - // - this.buttonRemoveTraktor.Location = new System.Drawing.Point(6, 155); - this.buttonRemoveTraktor.Name = "buttonRemoveTraktor"; - this.buttonRemoveTraktor.Size = new System.Drawing.Size(151, 32); - this.buttonRemoveTraktor.TabIndex = 2; - this.buttonRemoveTraktor.Text = "Удалить трактор"; - this.buttonRemoveTraktor.UseVisualStyleBackColor = true; - this.buttonRemoveTraktor.Click += new System.EventHandler(this.ButtonRemoveTraktor_Click); - // - // buttonAddTraktor - // - this.buttonAddTraktor.Location = new System.Drawing.Point(6, 83); - this.buttonAddTraktor.Name = "buttonAddTraktor"; - this.buttonAddTraktor.Size = new System.Drawing.Size(151, 33); - this.buttonAddTraktor.TabIndex = 1; - this.buttonAddTraktor.Text = "Добавить трактор"; - this.buttonAddTraktor.UseVisualStyleBackColor = true; - this.buttonAddTraktor.Click += new System.EventHandler(this.ButtonAddTraktor_Click); + this.textBoxNewMapName.Location = new System.Drawing.Point(6, 22); + this.textBoxNewMapName.Name = "textBoxNewMapName"; + this.textBoxNewMapName.Size = new System.Drawing.Size(188, 23); + this.textBoxNewMapName.TabIndex = 1; // // comboBoxSelectorMap // @@ -167,32 +131,141 @@ namespace WinFormsApp1 this.comboBoxSelectorMap.Items.AddRange(new object[] { "Простая карта", "Поле"}); - this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 26); + this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 52); + this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; - this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 28); + this.comboBoxSelectorMap.Size = new System.Drawing.Size(188, 23); this.comboBoxSelectorMap.TabIndex = 0; this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::Tractors.Properties.Resources.RkYIe2_6DuQ; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(126, 435); + this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(35, 30); + this.buttonRight.TabIndex = 10; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::Tractors.Properties.Resources.MbV2DYU_nPM; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(91, 435); + this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(35, 30); + this.buttonDown.TabIndex = 9; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::Tractors.Properties.Resources.Hhxt4dLqV5g; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(56, 435); + this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(35, 30); + this.buttonLeft.TabIndex = 8; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::Tractors.Properties.Resources._2EdzyM4iEKw; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(91, 405); + this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(35, 30); + this.buttonUp.TabIndex = 7; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonShowOnMap + // + this.buttonShowOnMap.Location = new System.Drawing.Point(7, 380); + this.buttonShowOnMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonShowOnMap.Name = "buttonShowOnMap"; + this.buttonShowOnMap.Size = new System.Drawing.Size(207, 22); + this.buttonShowOnMap.TabIndex = 5; + this.buttonShowOnMap.Text = "Посмотреть карту"; + this.buttonShowOnMap.UseVisualStyleBackColor = true; + this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click); + // + // buttonShowStorage + // + this.buttonShowStorage.Location = new System.Drawing.Point(7, 353); + this.buttonShowStorage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonShowStorage.Name = "buttonShowStorage"; + this.buttonShowStorage.Size = new System.Drawing.Size(207, 22); + this.buttonShowStorage.TabIndex = 4; + this.buttonShowStorage.Text = "Посмотреть хранилище"; + this.buttonShowStorage.UseVisualStyleBackColor = true; + this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click); + // + // maskedTextBoxPosition + // + this.maskedTextBoxPosition.Location = new System.Drawing.Point(7, 298); + this.maskedTextBoxPosition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + this.maskedTextBoxPosition.Size = new System.Drawing.Size(207, 23); + this.maskedTextBoxPosition.TabIndex = 11; + // + // buttonRemoveTraktor + // + this.buttonRemoveTraktor.Location = new System.Drawing.Point(7, 325); + this.buttonRemoveTraktor.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonRemoveTraktor.Name = "buttonRemoveTraktor"; + this.buttonRemoveTraktor.Size = new System.Drawing.Size(207, 24); + this.buttonRemoveTraktor.TabIndex = 2; + this.buttonRemoveTraktor.Text = "Удалить трактор"; + this.buttonRemoveTraktor.UseVisualStyleBackColor = true; + this.buttonRemoveTraktor.Click += new System.EventHandler(this.ButtonRemoveTraktor_Click); + // + // buttonAddTraktor + // + this.buttonAddTraktor.Location = new System.Drawing.Point(7, 269); + this.buttonAddTraktor.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonAddTraktor.Name = "buttonAddTraktor"; + this.buttonAddTraktor.Size = new System.Drawing.Size(207, 25); + this.buttonAddTraktor.TabIndex = 1; + this.buttonAddTraktor.Text = "Добавить трактор"; + this.buttonAddTraktor.UseVisualStyleBackColor = true; + this.buttonAddTraktor.Click += new System.EventHandler(this.ButtonAddTraktor_Click); + // // pictureBox // this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill; this.pictureBox.Location = new System.Drawing.Point(0, 0); + this.pictureBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox.Name = "pictureBox"; - this.pictureBox.Size = new System.Drawing.Size(832, 518); + this.pictureBox.Size = new System.Drawing.Size(596, 476); this.pictureBox.TabIndex = 1; this.pictureBox.TabStop = false; // // FormMapWithSetTraktor // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1082, 518); + this.ClientSize = new System.Drawing.Size(815, 476); this.Controls.Add(this.pictureBox); this.Controls.Add(this.groupBox1); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "FormMapWithSetTraktor"; - this.Text = "Трактор"; + this.Text = "Автобус"; this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + this.groupBoxMaps.ResumeLayout(false); + this.groupBoxMaps.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); this.ResumeLayout(false); @@ -212,5 +285,10 @@ namespace WinFormsApp1 private Button buttonDown; private Button buttonLeft; private Button buttonUp; + private GroupBox groupBoxMaps; + private Button buttonDeleteMap; + private Button buttonAddMap; + private TextBox textBoxNewMapName; + private ListBox listBoxMaps; } } \ No newline at end of file diff --git a/WinFormsApp1/FormMapWithSetTraktor.cs b/WinFormsApp1/FormMapWithSetTraktor.cs index 2ab0829..66abe83 100644 --- a/WinFormsApp1/FormMapWithSetTraktor.cs +++ b/WinFormsApp1/FormMapWithSetTraktor.cs @@ -15,17 +15,46 @@ namespace WinFormsApp1 { private MapWithSetTraktorGeneric _mapTraktorCollectionGeneric; - //DrawingBus SelectedBus { get; private set; } + private readonly Dictionary _mapsDict = new() + { + {"Простая карта", new SimpleMap() }, + {"Поле", new FieldMap() } + }; + + private readonly MapsCollection _mapsCollection; public FormMapWithSetTraktor() { InitializeComponent(); - AbstractMap map = new SimpleMap(); - _mapTraktorCollectionGeneric = new MapWithSetTraktorGeneric( - pictureBox.Width, pictureBox.Height, map); + _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height); + comboBoxSelectorMap.Items.Clear(); + foreach (var item in _mapsDict) + { + comboBoxSelectorMap.Items.Add(item.Key); + } } + private void ReloadMaps() + { + int index = listBoxMaps.SelectedIndex; + + listBoxMaps.Items.Clear(); + for (int i = 0; i < _mapsCollection.Keys.Count; i++) + { + listBoxMaps.Items.Add(_mapsCollection.Keys[i]); + } + + if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count)) + { + listBoxMaps.SelectedIndex = 0; + } + else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count) + { + listBoxMaps.SelectedIndex = index; + } + } + private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) { AbstractMap map = null; @@ -52,7 +81,7 @@ namespace WinFormsApp1 private void ButtonAddTraktor_Click(object sender, EventArgs e) { - if (_mapTraktorCollectionGeneric == null) + if (listBoxMaps.SelectedIndex == -1) { return; } @@ -67,10 +96,10 @@ namespace WinFormsApp1 DrawningObjectTractor bus = new(form.SelectedTractor); - if (_mapTraktorCollectionGeneric + bus != -1) + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + bus != -1) { MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapTraktorCollectionGeneric.ShowSet(); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); } else { @@ -81,21 +110,29 @@ namespace WinFormsApp1 private void ButtonRemoveTraktor_Click(object sender, EventArgs e) { + if (listBoxMaps.SelectedIndex == -1) + { + return; + } + if (string.IsNullOrEmpty(maskedTextBoxPosition.Text)) { return; } + if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { return; } + int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - if (_mapTraktorCollectionGeneric - pos != null) + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null) { MessageBox.Show("Объект удален"); - pictureBox.Image = _mapTraktorCollectionGeneric.ShowSet(); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); } + else { MessageBox.Show("Не удалось удалить объект"); @@ -108,7 +145,7 @@ namespace WinFormsApp1 { return; } - pictureBox.Image = _mapTraktorCollectionGeneric.ShowSet(); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); } private void ButtonShowOnMap_Click(object sender, EventArgs e) @@ -117,7 +154,7 @@ namespace WinFormsApp1 { return; } - pictureBox.Image = _mapTraktorCollectionGeneric.ShowOnMap(); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap(); } private void ButtonMove_Click(object sender, EventArgs e) @@ -146,5 +183,40 @@ namespace WinFormsApp1 } pictureBox.Image = _mapTraktorCollectionGeneric.MoveObject(dir); } + + private void buttonAddMap_Click(object sender, EventArgs e) + { + if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text)) + { + MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text)) + { + MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]); + ReloadMaps(); + } + + private void listBoxMaps_SelectedIndexChanged(object sender, EventArgs e) + { + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + + private void buttonDeleteMap_Click(object sender, EventArgs e) + { + if (listBoxMaps.SelectedIndex == -1) + { + return; + } + + if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty); + ReloadMaps(); + } + } } } -- 2.25.1