From 069691bec582b4b368c78009145b9bb2803e301c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?10=D0=93=20=D0=95=D0=B3=D0=BE=D1=80=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Sun, 4 Dec 2022 23:08:42 +0400 Subject: [PATCH 1/6] =?UTF-8?q?7=20=D0=BB=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HoistingCrane/HoistingCrane/App.config | 66 ++++++++++++++ .../FormMapWithSetHoistingCrane.Designer.cs | 14 +-- .../FormMapWithSetHoistingCrane.cs | 89 ++++++++++++++----- .../HoistingCrane/HoistingCrane.csproj | 14 +++ .../HoistingCraneNotFoundException.cs | 21 +++++ HoistingCrane/HoistingCrane/MapsCollection.cs | 10 +-- HoistingCrane/HoistingCrane/Program.cs | 29 +++++- .../Properties/Settings.Designer.cs | 30 +++++++ .../HoistingCrane/SetHoistingCraneGeneric.cs | 49 +++++++--- .../HoistingCrane/StorageOverflowException.cs | 21 +++++ HoistingCrane/HoistingCrane/packages.config | 48 ++++++++++ 11 files changed, 341 insertions(+), 50 deletions(-) create mode 100644 HoistingCrane/HoistingCrane/App.config create mode 100644 HoistingCrane/HoistingCrane/HoistingCraneNotFoundException.cs create mode 100644 HoistingCrane/HoistingCrane/Properties/Settings.Designer.cs create mode 100644 HoistingCrane/HoistingCrane/StorageOverflowException.cs create mode 100644 HoistingCrane/HoistingCrane/packages.config diff --git a/HoistingCrane/HoistingCrane/App.config b/HoistingCrane/HoistingCrane/App.config new file mode 100644 index 0000000..bc02e6b --- /dev/null +++ b/HoistingCrane/HoistingCrane/App.config @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs index 7523fe8..73f94b7 100644 --- a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs +++ b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs @@ -155,7 +155,7 @@ // // maskedTextBoxPosition // - this.maskedTextBoxPosition.Location = new System.Drawing.Point(21, 459); + this.maskedTextBoxPosition.Location = new System.Drawing.Point(21, 436); this.maskedTextBoxPosition.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.maskedTextBoxPosition.Mask = "00"; this.maskedTextBoxPosition.Name = "maskedTextBoxPosition"; @@ -165,7 +165,7 @@ // // buttonRemoveHoistingCrane // - this.buttonRemoveHoistingCrane.Location = new System.Drawing.Point(20, 494); + this.buttonRemoveHoistingCrane.Location = new System.Drawing.Point(20, 471); this.buttonRemoveHoistingCrane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.buttonRemoveHoistingCrane.Name = "buttonRemoveHoistingCrane"; this.buttonRemoveHoistingCrane.Size = new System.Drawing.Size(199, 47); @@ -176,7 +176,7 @@ // // buttonShowStorage // - this.buttonShowStorage.Location = new System.Drawing.Point(20, 549); + this.buttonShowStorage.Location = new System.Drawing.Point(20, 526); this.buttonShowStorage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.buttonShowStorage.Name = "buttonShowStorage"; this.buttonShowStorage.Size = new System.Drawing.Size(199, 47); @@ -239,10 +239,10 @@ // // buttonShowOnMap // - this.buttonShowOnMap.Location = new System.Drawing.Point(20, 604); + this.buttonShowOnMap.Location = new System.Drawing.Point(21, 584); this.buttonShowOnMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.buttonShowOnMap.Name = "buttonShowOnMap"; - this.buttonShowOnMap.Size = new System.Drawing.Size(193, 47); + this.buttonShowOnMap.Size = new System.Drawing.Size(198, 47); this.buttonShowOnMap.TabIndex = 5; this.buttonShowOnMap.Text = "Посмотреть карту"; this.buttonShowOnMap.UseVisualStyleBackColor = true; @@ -250,7 +250,7 @@ // // buttonAddHoistingCrane // - this.buttonAddHoistingCrane.Location = new System.Drawing.Point(20, 404); + this.buttonAddHoistingCrane.Location = new System.Drawing.Point(20, 381); this.buttonAddHoistingCrane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.buttonAddHoistingCrane.Name = "buttonAddHoistingCrane"; this.buttonAddHoistingCrane.Size = new System.Drawing.Size(199, 47); @@ -286,7 +286,7 @@ this.saveToolStripMenuItem, this.loadToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(54, 29); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24); this.fileToolStripMenuItem.Text = "File"; // // saveToolStripMenuItem diff --git a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs index 6a9c813..1485f78 100644 --- a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs +++ b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs @@ -1,4 +1,5 @@ using System; +using Microsoft.Extensions.Logging; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -22,12 +23,17 @@ namespace HoistingCrane /// /// Объект от коллекции карт /// + /// Логер + /// + private readonly ILogger _logger; + /// private readonly MapsCollection _mapsCollection; /// private MapWithSetHoistingCraneGeneric _mapHoistingCraneCollectionGeneric; - public FormMapWithSetHoistingCrane() + public FormMapWithSetHoistingCrane(ILogger logger) { InitializeComponent(); + _logger = logger; _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height); comboBoxSelectorMap.Items.Clear(); foreach (var elem in _mapsDict) @@ -99,10 +105,12 @@ namespace HoistingCrane } _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]); ReloadMaps(); + _logger.LogInformation($"Добавлена карта {textBoxNewMapName.Text}"); } private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e) { pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + _logger.LogInformation($"Переход на карту {listBoxMaps.SelectedItem?.ToString()}"); } /// /// Удаление карты @@ -119,6 +127,7 @@ namespace HoistingCrane { _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty); ReloadMaps(); + _logger.LogInformation($"Удалена карта {listBoxMaps.SelectedItem?.ToString()}"); } } private void ButtonAddHoistingCrane_Click(object sender, EventArgs e) @@ -133,15 +142,33 @@ namespace HoistingCrane } private void AddHoistingCrane(DrawingHoistingCrane drawingHoistingCrane) { - DrawingObjectHoistingCrane hoistingCrane = new DrawingObjectHoistingCrane(drawingHoistingCrane); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + hoistingCrane != -1) + try { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + if (listBoxMaps.SelectedIndex == -1) + { + MessageBox.Show("Перед добавлением объекта необходимо создать карту"); + } + else if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawingObjectHoistingCrane(drawingHoistingCrane) != -1) + { + _logger.LogInformation($"Добавлен кран {drawingHoistingCrane}"); + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + else + { + _logger.LogWarning("Не удалось добавить кран"); + MessageBox.Show("Не удалось добавить объект"); + } } - else + catch (StorageOverflowException ex) { - MessageBox.Show("Не удалось добавить объект"); + _logger.LogWarning($"Ошибка переполнения хранилища: {ex.Message}"); + MessageBox.Show($"Ошибка переполнения хранилища: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + catch (Exception ex) + { + _logger.LogWarning($"Неизвестная ошибка: {ex.Message}"); + MessageBox.Show($"Неизвестная ошибка: {ex.Message}"); } } private void ButtonRemoveHoistingCrane_Click(object sender, EventArgs e) @@ -155,14 +182,28 @@ namespace HoistingCrane return; } int pos = Convert.ToInt32(maskedTextBoxPosition.Text); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null) + try { - MessageBox.Show("Объект удален"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null) + { + MessageBox.Show("Объект удален"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + _logger.LogInformation($"Удален объект {pos}"); + } + else + { + MessageBox.Show("Не удалось удалить объект"); + } } - else + catch (HoistingCraneNotFoundException ex) { - MessageBox.Show("Не удалось удалить объект"); + _logger.LogWarning($"Ошибка {ex.Message}"); + MessageBox.Show($"Ошибка удаления: {ex.Message}"); + } + catch (Exception ex) + { + _logger.LogWarning($"Ошибка {ex.Message}"); + MessageBox.Show($"Неизвестная ошибка: {ex.Message}"); } } private void ButtonShowStorage_Click(object sender, EventArgs e) @@ -210,15 +251,18 @@ namespace HoistingCrane { if (saveFileDialog.ShowDialog() == DialogResult.OK) { - if (_mapsCollection.SaveData(saveFileDialog.FileName)) + try { + _mapsCollection.SaveData(saveFileDialog.FileName); MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + _logger.LogInformation($"Сохранение данных"); } - else + catch (Exception ex) { - MessageBox.Show("Не сохранилось", "Результат", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", + MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogWarning($"Ошибка {ex.Message}"); } } @@ -227,16 +271,19 @@ namespace HoistingCrane { if (openFileDialog.ShowDialog() == DialogResult.OK) { - if (_mapsCollection.LoadData(openFileDialog.FileName)) + try { + _mapsCollection.LoadData(openFileDialog.FileName); + ReloadMaps(); MessageBox.Show("Открытие прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); - ReloadMaps(); + _logger.LogInformation($"Загрузка данных"); } - else + catch (Exception ex) { - MessageBox.Show("Не удалось открыть", "Результат", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show($"Не удалось открыть: {ex.Message}", "Результат", + MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogWarning($"Ошибка {ex.Message}"); } } } diff --git a/HoistingCrane/HoistingCrane/HoistingCrane.csproj b/HoistingCrane/HoistingCrane/HoistingCrane.csproj index b57c89e..f08bb8d 100644 --- a/HoistingCrane/HoistingCrane/HoistingCrane.csproj +++ b/HoistingCrane/HoistingCrane/HoistingCrane.csproj @@ -8,4 +8,18 @@ enable + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HoistingCrane/HoistingCrane/HoistingCraneNotFoundException.cs b/HoistingCrane/HoistingCrane/HoistingCraneNotFoundException.cs new file mode 100644 index 0000000..4be24c4 --- /dev/null +++ b/HoistingCrane/HoistingCrane/HoistingCraneNotFoundException.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace HoistingCrane +{ + [Serializable] + internal class HoistingCraneNotFoundException : ApplicationException + { + public HoistingCraneNotFoundException(int i) : base($"Не найден объект по позиции {i}") { } + public HoistingCraneNotFoundException() : base() { } + public HoistingCraneNotFoundException(string message) : base(message) { } + public HoistingCraneNotFoundException(string message, Exception exception) : + base(message, exception) + { } + protected HoistingCraneNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { } + } +} diff --git a/HoistingCrane/HoistingCrane/MapsCollection.cs b/HoistingCrane/HoistingCrane/MapsCollection.cs index bfefcfd..6ac3396 100644 --- a/HoistingCrane/HoistingCrane/MapsCollection.cs +++ b/HoistingCrane/HoistingCrane/MapsCollection.cs @@ -81,7 +81,7 @@ namespace HoistingCrane /// Сохранение информации про лодки м в хранилище в файл /// /// Путь и имя файла - public bool SaveData(string filename) + public void SaveData(string filename) { if (File.Exists(filename)) { @@ -99,15 +99,14 @@ namespace HoistingCrane ); } } - return true; } /// Загрузка информации по локомотивам в депо из файла - public bool LoadData(string filename) + public void LoadData(string filename) { if (!File.Exists(filename)) { - return false; + throw new FileNotFoundException(filename); } using (FileStream fs = new(filename, FileMode.Open)) using (StreamReader sr = new StreamReader(fs, Encoding.UTF8)) @@ -116,7 +115,7 @@ namespace HoistingCrane if (!curLine.Contains("MapsCollection")) { - return false; + throw new FormatException(curLine); } _mapStorages.Clear(); while ((curLine = sr.ReadLine()) != null) @@ -138,7 +137,6 @@ namespace HoistingCrane _mapStorages.Add(elems[0], new MapWithSetHoistingCraneGeneric(_pictureWidth, _pictureHeight, map)); _mapStorages[elems[0]].LoadData(elems[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries)); } - return true; } } } diff --git a/HoistingCrane/HoistingCrane/Program.cs b/HoistingCrane/HoistingCrane/Program.cs index 8b6d8ae..055801b 100644 --- a/HoistingCrane/HoistingCrane/Program.cs +++ b/HoistingCrane/HoistingCrane/Program.cs @@ -1,3 +1,9 @@ + +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Configuration; +using Serilog; + namespace HoistingCrane { internal static class Program @@ -8,10 +14,25 @@ namespace HoistingCrane [STAThread] static void Main() { - // To customize application configuration such as set high DPI settings or default font, - // see https://aka.ms/applicationconfiguration. - ApplicationConfiguration.Initialize(); - Application.Run(new FormMapWithSetHoistingCrane()); + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + var services = new ServiceCollection(); + ConfigureServices(services); + using (ServiceProvider serviceProvider = services.BuildServiceProvider()) + { + Application.Run(serviceProvider.GetRequiredService()); + } + } + private static void ConfigureServices(ServiceCollection services) + { + services.AddSingleton() + .AddLogging(option => + { + var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile(path: "appsettings.json", optional: false, reloadOnChange: true).Build(); + var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger(); + option.SetMinimumLevel(LogLevel.Information); + option.AddSerilog(logger); + }); } } } \ No newline at end of file diff --git a/HoistingCrane/HoistingCrane/Properties/Settings.Designer.cs b/HoistingCrane/HoistingCrane/Properties/Settings.Designer.cs new file mode 100644 index 0000000..c1d4294 --- /dev/null +++ b/HoistingCrane/HoistingCrane/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace HoistingCrane.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} \ No newline at end of file diff --git a/HoistingCrane/HoistingCrane/SetHoistingCraneGeneric.cs b/HoistingCrane/HoistingCrane/SetHoistingCraneGeneric.cs index 73c0856..710d61a 100644 --- a/HoistingCrane/HoistingCrane/SetHoistingCraneGeneric.cs +++ b/HoistingCrane/HoistingCrane/SetHoistingCraneGeneric.cs @@ -19,27 +19,52 @@ namespace HoistingCrane } public int Insert(T hoistingCrane) { - return Insert(hoistingCrane, 0); + for (int i = 0; i < _maxCount; i++) + { + if (i == Count) + { + _places.Insert(i, hoistingCrane); + return i; + } + } + throw new StorageOverflowException(_maxCount); + } public int Insert(T hoistingCrane, int position) { - if (position < 0 || position > Count || _maxCount == Count) + if (position < 0 || position >= _maxCount) { return -1; + + } + if (position == Count) + { + _places.Insert(position, hoistingCrane); + return position; + } + else + { + for (int i = position + 1; i < _maxCount; i++) + { + if (i == Count) + { + for (int j = i - 1; j >= position; j--) + { + _places[j + 1] = _places[j]; + } + _places.Insert(position, hoistingCrane); + return position; + } + } + throw new StorageOverflowException(_maxCount); } - _places.Insert(position, hoistingCrane); - return position; } public T Remove(int position) { - if (position < Count && position >= 0 && _places[position] != null) - { - _places[position] = null; - T removed = _places[position]; - return removed; - } - - return null; + if (position < 0 || position >= Count) throw new HoistingCraneNotFoundException(); + var result = _places[position]; + _places.RemoveAt(position); + return result; } public T this[int position] { diff --git a/HoistingCrane/HoistingCrane/StorageOverflowException.cs b/HoistingCrane/HoistingCrane/StorageOverflowException.cs new file mode 100644 index 0000000..7a74a0f --- /dev/null +++ b/HoistingCrane/HoistingCrane/StorageOverflowException.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace HoistingCrane +{ + [Serializable] + internal class StorageOverflowException : ApplicationException + { + public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: {count}") { } + public StorageOverflowException() : base() { } + public StorageOverflowException(string message) : base(message) { } + public StorageOverflowException(string message, Exception exception) : + base(message, exception) + { } + protected StorageOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { } + } +} diff --git a/HoistingCrane/HoistingCrane/packages.config b/HoistingCrane/HoistingCrane/packages.config new file mode 100644 index 0000000..e05e131 --- /dev/null +++ b/HoistingCrane/HoistingCrane/packages.config @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- 2.25.1 From 666c51d70b0dd53ff6f1965c97af59d05f467c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?10=D0=93=20=D0=95=D0=B3=D0=BE=D1=80=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Mon, 5 Dec 2022 01:32:59 +0400 Subject: [PATCH 2/6] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormMapWithSetHoistingCrane.Designer.cs | 1 - .../FormMapWithSetHoistingCrane.cs | 26 +------------------ 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs index 73f94b7..78ff45b 100644 --- a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs +++ b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs @@ -121,7 +121,6 @@ this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Size = new System.Drawing.Size(200, 28); this.comboBoxSelectorMap.TabIndex = 0; - this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); // // textBoxNewMapName // diff --git a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs index 1485f78..4580210 100644 --- a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs +++ b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs @@ -29,7 +29,6 @@ namespace HoistingCrane /// private readonly MapsCollection _mapsCollection; /// - private MapWithSetHoistingCraneGeneric _mapHoistingCraneCollectionGeneric; public FormMapWithSetHoistingCrane(ILogger logger) { InitializeComponent(); @@ -63,29 +62,6 @@ namespace HoistingCrane listBoxMaps.SelectedIndex = index; } } - private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) - { - AbstractMap map = null; - switch (comboBoxSelectorMap.Text) - { - case "Простая карта": - map = new SimpleMap(); - break; - case "Вторая карта": - map = new SecondMap(); - break; - - } - if (map != null) - { - _mapHoistingCraneCollectionGeneric = new MapWithSetHoistingCraneGeneric( - pictureBox.Width, pictureBox.Height, map); - } - else - { - _mapHoistingCraneCollectionGeneric = null; - } - } /// /// Добавление карты /// @@ -245,7 +221,7 @@ namespace HoistingCrane enums = Direction.Right; break; } - pictureBox.Image = _mapHoistingCraneCollectionGeneric.MoveObject(enums); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(enums); } private void saveToolStripMenuItem_Click(object sender, EventArgs e) { -- 2.25.1 From 9e445d72e983d6767f3645a0d8d2a2428f089484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?10=D0=93=20=D0=95=D0=B3=D0=BE=D1=80=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Sun, 25 Dec 2022 12:32:11 +0400 Subject: [PATCH 3/6] gg --- HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs index 4580210..8b60519 100644 --- a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs +++ b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs @@ -22,7 +22,6 @@ namespace HoistingCrane }; /// /// Объект от коллекции карт - /// /// Логер /// private readonly ILogger _logger; -- 2.25.1 From 3d4df11b52e7b292a1a0ae6939fb9e61b53c69cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?10=D0=93=20=D0=95=D0=B3=D0=BE=D1=80=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Sun, 25 Dec 2022 13:56:36 +0400 Subject: [PATCH 4/6] gg --- .../FormHoistingCraneConfig.Designer.cs | 410 ------------------ 1 file changed, 410 deletions(-) delete mode 100644 HoistingCrane/HoistingCrane/FormHoistingCraneConfig.Designer.cs diff --git a/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.Designer.cs b/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.Designer.cs deleted file mode 100644 index 01eea5d..0000000 --- a/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.Designer.cs +++ /dev/null @@ -1,410 +0,0 @@ -namespace HoistingCrane -{ - partial class FormHoistingCraneConfig - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.groupBoxConfig = new System.Windows.Forms.GroupBox(); - this.labelModifiedObject = new System.Windows.Forms.Label(); - this.labelSimpleObject = new System.Windows.Forms.Label(); - this.groupBoxColors = new System.Windows.Forms.GroupBox(); - this.panelPurple = new System.Windows.Forms.Panel(); - this.panelYellow = new System.Windows.Forms.Panel(); - this.panelBlack = new System.Windows.Forms.Panel(); - this.panelBlue = new System.Windows.Forms.Panel(); - this.panelGray = new System.Windows.Forms.Panel(); - this.panelGreen = new System.Windows.Forms.Panel(); - this.panelWhite = new System.Windows.Forms.Panel(); - this.panelRed = new System.Windows.Forms.Panel(); - this.checkBoxCounterweight = new System.Windows.Forms.CheckBox(); - this.checkBoxCrane = new System.Windows.Forms.CheckBox(); - this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); - this.labelWeight = new System.Windows.Forms.Label(); - this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); - this.labelSpeed = new System.Windows.Forms.Label(); - this.panelObject = new System.Windows.Forms.Panel(); - this.labelDopColor = new System.Windows.Forms.Label(); - this.labelBaseColor = new System.Windows.Forms.Label(); - this.pictureBoxObject = new System.Windows.Forms.PictureBox(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.buttonOk = new System.Windows.Forms.Button(); - this.groupBoxConfig.SuspendLayout(); - this.groupBoxColors.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); - this.panelObject.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); - this.SuspendLayout(); - // - // groupBoxConfig - // - this.groupBoxConfig.Controls.Add(this.labelModifiedObject); - this.groupBoxConfig.Controls.Add(this.labelSimpleObject); - this.groupBoxConfig.Controls.Add(this.groupBoxColors); - this.groupBoxConfig.Controls.Add(this.checkBoxCounterweight); - this.groupBoxConfig.Controls.Add(this.checkBoxCrane); - this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); - this.groupBoxConfig.Controls.Add(this.labelWeight); - this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed); - this.groupBoxConfig.Controls.Add(this.labelSpeed); - this.groupBoxConfig.Location = new System.Drawing.Point(14, 16); - this.groupBoxConfig.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBoxConfig.Name = "groupBoxConfig"; - this.groupBoxConfig.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBoxConfig.Size = new System.Drawing.Size(594, 293); - this.groupBoxConfig.TabIndex = 0; - this.groupBoxConfig.TabStop = false; - this.groupBoxConfig.Text = "Параметры"; - // - // labelModifiedObject - // - this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelModifiedObject.Location = new System.Drawing.Point(450, 216); - this.labelModifiedObject.Name = "labelModifiedObject"; - this.labelModifiedObject.Size = new System.Drawing.Size(111, 50); - this.labelModifiedObject.TabIndex = 16; - this.labelModifiedObject.Text = "Продвинутый"; - this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); - // - // labelSimpleObject - // - this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelSimpleObject.Location = new System.Drawing.Point(322, 216); - this.labelSimpleObject.Name = "labelSimpleObject"; - this.labelSimpleObject.Size = new System.Drawing.Size(111, 50); - this.labelSimpleObject.TabIndex = 15; - this.labelSimpleObject.Text = "Простой"; - this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); - // - // groupBoxColors - // - this.groupBoxColors.Controls.Add(this.panelPurple); - this.groupBoxColors.Controls.Add(this.panelYellow); - this.groupBoxColors.Controls.Add(this.panelBlack); - this.groupBoxColors.Controls.Add(this.panelBlue); - this.groupBoxColors.Controls.Add(this.panelGray); - this.groupBoxColors.Controls.Add(this.panelGreen); - this.groupBoxColors.Controls.Add(this.panelWhite); - this.groupBoxColors.Controls.Add(this.panelRed); - this.groupBoxColors.Location = new System.Drawing.Point(305, 29); - this.groupBoxColors.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBoxColors.Name = "groupBoxColors"; - this.groupBoxColors.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBoxColors.Size = new System.Drawing.Size(275, 169); - this.groupBoxColors.TabIndex = 14; - this.groupBoxColors.TabStop = false; - this.groupBoxColors.Text = "Цвета"; - // - // panelPurple - // - this.panelPurple.BackColor = System.Drawing.Color.Purple; - this.panelPurple.Location = new System.Drawing.Point(210, 97); - this.panelPurple.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelPurple.Name = "panelPurple"; - this.panelPurple.Size = new System.Drawing.Size(46, 53); - this.panelPurple.TabIndex = 3; - this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); - // - // panelYellow - // - this.panelYellow.BackColor = System.Drawing.Color.Yellow; - this.panelYellow.Location = new System.Drawing.Point(210, 29); - this.panelYellow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelYellow.Name = "panelYellow"; - this.panelYellow.Size = new System.Drawing.Size(46, 53); - this.panelYellow.TabIndex = 1; - this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); - // - // panelBlack - // - this.panelBlack.BackColor = System.Drawing.Color.Black; - this.panelBlack.Location = new System.Drawing.Point(145, 97); - this.panelBlack.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelBlack.Name = "panelBlack"; - this.panelBlack.Size = new System.Drawing.Size(46, 53); - this.panelBlack.TabIndex = 4; - this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); - // - // panelBlue - // - this.panelBlue.BackColor = System.Drawing.Color.Blue; - this.panelBlue.Location = new System.Drawing.Point(145, 29); - this.panelBlue.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelBlue.Name = "panelBlue"; - this.panelBlue.Size = new System.Drawing.Size(46, 53); - this.panelBlue.TabIndex = 1; - this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); - // - // panelGray - // - this.panelGray.BackColor = System.Drawing.Color.Gray; - this.panelGray.Location = new System.Drawing.Point(82, 97); - this.panelGray.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelGray.Name = "panelGray"; - this.panelGray.Size = new System.Drawing.Size(46, 53); - this.panelGray.TabIndex = 5; - this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); - // - // panelGreen - // - this.panelGreen.BackColor = System.Drawing.Color.Green; - this.panelGreen.Location = new System.Drawing.Point(82, 29); - this.panelGreen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelGreen.Name = "panelGreen"; - this.panelGreen.Size = new System.Drawing.Size(46, 53); - this.panelGreen.TabIndex = 1; - this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); - // - // panelWhite - // - this.panelWhite.BackColor = System.Drawing.Color.White; - this.panelWhite.Location = new System.Drawing.Point(17, 97); - this.panelWhite.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelWhite.Name = "panelWhite"; - this.panelWhite.Size = new System.Drawing.Size(46, 53); - this.panelWhite.TabIndex = 2; - this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); - // - // panelRed - // - this.panelRed.BackColor = System.Drawing.Color.Red; - this.panelRed.Location = new System.Drawing.Point(17, 29); - this.panelRed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelRed.Name = "panelRed"; - this.panelRed.Size = new System.Drawing.Size(46, 53); - this.panelRed.TabIndex = 0; - this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); - // - // checkBoxCounterweight - // - this.checkBoxCounterweight.AutoSize = true; - this.checkBoxCounterweight.Location = new System.Drawing.Point(25, 247); - this.checkBoxCounterweight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.checkBoxCounterweight.Name = "checkBoxCounterweight"; - this.checkBoxCounterweight.Size = new System.Drawing.Size(248, 24); - this.checkBoxCounterweight.TabIndex = 13; - this.checkBoxCounterweight.Text = "Признак наличия противовеса"; - this.checkBoxCounterweight.UseVisualStyleBackColor = true; - // - // checkBoxCrane - // - this.checkBoxCrane.AutoSize = true; - this.checkBoxCrane.Location = new System.Drawing.Point(25, 199); - this.checkBoxCrane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.checkBoxCrane.Name = "checkBoxCrane"; - this.checkBoxCrane.Size = new System.Drawing.Size(199, 24); - this.checkBoxCrane.TabIndex = 12; - this.checkBoxCrane.Text = "Признак наличия крана"; - this.checkBoxCrane.UseVisualStyleBackColor = true; - // - // numericUpDownWeight - // - this.numericUpDownWeight.Location = new System.Drawing.Point(103, 96); - this.numericUpDownWeight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.numericUpDownWeight.Maximum = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.numericUpDownWeight.Minimum = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.numericUpDownWeight.Name = "numericUpDownWeight"; - this.numericUpDownWeight.Size = new System.Drawing.Size(90, 27); - this.numericUpDownWeight.TabIndex = 10; - this.numericUpDownWeight.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // labelWeight - // - this.labelWeight.AutoSize = true; - this.labelWeight.Location = new System.Drawing.Point(25, 99); - this.labelWeight.Name = "labelWeight"; - this.labelWeight.Size = new System.Drawing.Size(36, 20); - this.labelWeight.TabIndex = 9; - this.labelWeight.Text = "Вес:"; - // - // numericUpDownSpeed - // - this.numericUpDownSpeed.Location = new System.Drawing.Point(103, 40); - this.numericUpDownSpeed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.numericUpDownSpeed.Maximum = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - this.numericUpDownSpeed.Minimum = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.numericUpDownSpeed.Name = "numericUpDownSpeed"; - this.numericUpDownSpeed.Size = new System.Drawing.Size(90, 27); - this.numericUpDownSpeed.TabIndex = 8; - this.numericUpDownSpeed.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - // - // labelSpeed - // - this.labelSpeed.AutoSize = true; - this.labelSpeed.Location = new System.Drawing.Point(25, 43); - this.labelSpeed.Name = "labelSpeed"; - this.labelSpeed.Size = new System.Drawing.Size(76, 20); - this.labelSpeed.TabIndex = 7; - this.labelSpeed.Text = "Скорость:"; - // - // panelObject - // - this.panelObject.AllowDrop = true; - this.panelObject.Controls.Add(this.labelDopColor); - this.panelObject.Controls.Add(this.labelBaseColor); - this.panelObject.Controls.Add(this.pictureBoxObject); - this.panelObject.Location = new System.Drawing.Point(615, 16); - this.panelObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelObject.Name = "panelObject"; - this.panelObject.Size = new System.Drawing.Size(299, 245); - this.panelObject.TabIndex = 2; - this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); - this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); - // - // labelDopColor - // - this.labelDopColor.AllowDrop = true; - this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelDopColor.Location = new System.Drawing.Point(161, 12); - this.labelDopColor.Name = "labelDopColor"; - this.labelDopColor.Size = new System.Drawing.Size(119, 42); - this.labelDopColor.TabIndex = 2; - this.labelDopColor.Text = "Доп. цвет"; - this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); - this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter); - // - // labelBaseColor - // - this.labelBaseColor.AllowDrop = true; - this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelBaseColor.Location = new System.Drawing.Point(23, 12); - this.labelBaseColor.Name = "labelBaseColor"; - this.labelBaseColor.Size = new System.Drawing.Size(119, 42); - this.labelBaseColor.TabIndex = 1; - this.labelBaseColor.Text = "Цвет"; - this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop); - this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter); - // - // pictureBoxObject - // - this.pictureBoxObject.Location = new System.Drawing.Point(23, 59); - this.pictureBoxObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.pictureBoxObject.Name = "pictureBoxObject"; - this.pictureBoxObject.Size = new System.Drawing.Size(257, 167); - this.pictureBoxObject.TabIndex = 0; - this.pictureBoxObject.TabStop = false; - // - // buttonCancel - // - this.buttonCancel.Location = new System.Drawing.Point(776, 269); - this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(119, 40); - this.buttonCancel.TabIndex = 5; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - // - // buttonOk - // - this.buttonOk.Location = new System.Drawing.Point(638, 269); - this.buttonOk.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonOk.Name = "buttonOk"; - this.buttonOk.Size = new System.Drawing.Size(119, 40); - this.buttonOk.TabIndex = 4; - this.buttonOk.Text = "Добавить"; - this.buttonOk.UseVisualStyleBackColor = true; - this.buttonOk.Click += new System.EventHandler(this.ButtonAddObject_Click); - // - // FormHoistingCraneConfig - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(926, 323); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonOk); - this.Controls.Add(this.panelObject); - this.Controls.Add(this.groupBoxConfig); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Name = "FormHoistingCraneConfig"; - this.Text = "Создание объекта"; - this.groupBoxConfig.ResumeLayout(false); - this.groupBoxConfig.PerformLayout(); - this.groupBoxColors.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); - this.panelObject.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private GroupBox groupBoxConfig; - private CheckBox checkBoxCounterweight; - private CheckBox checkBoxCrane; - private NumericUpDown numericUpDownWeight; - private Label labelWeight; - private NumericUpDown numericUpDownSpeed; - private Label labelSpeed; - private Label labelModifiedObject; - private Label labelSimpleObject; - private GroupBox groupBoxColors; - private Panel panelPurple; - private Panel panelYellow; - private Panel panelBlack; - private Panel panelBlue; - private Panel panelGray; - private Panel panelGreen; - private Panel panelWhite; - private Panel panelRed; - private Panel panelObject; - private Label labelDopColor; - private Label labelBaseColor; - private PictureBox pictureBoxObject; - private Button buttonCancel; - private Button buttonOk; - } -} \ No newline at end of file -- 2.25.1 From 14749c6ec2c5906fd61dfaa15f19e2c6c8614748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?10=D0=93=20=D0=95=D0=B3=D0=BE=D1=80=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Sun, 25 Dec 2022 13:38:26 +0400 Subject: [PATCH 5/6] gg --- .../HoistingCrane/FormHoistingCraneConfig.cs | 134 ------------------ 1 file changed, 134 deletions(-) delete mode 100644 HoistingCrane/HoistingCrane/FormHoistingCraneConfig.cs diff --git a/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.cs b/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.cs deleted file mode 100644 index 6566f0e..0000000 --- a/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.cs +++ /dev/null @@ -1,134 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace HoistingCrane -{ - public partial class FormHoistingCraneConfig : Form - { - //переменная-выбранный кран - DrawingHoistingCrane _hoistingCrane = null; - public DrawingHoistingCrane SelectedHoistingCrane { get; private set; } - //событие - private event Action EventAddHoistingCrane; - //конструктор - public FormHoistingCraneConfig() - { - InitializeComponent(); - panelBlack.MouseDown += PanelColor_MouseDown; - panelPurple.MouseDown += PanelColor_MouseDown; - panelGray.MouseDown += PanelColor_MouseDown; - panelGreen.MouseDown += PanelColor_MouseDown; - panelRed.MouseDown += PanelColor_MouseDown; - panelWhite.MouseDown += PanelColor_MouseDown; - panelYellow.MouseDown += PanelColor_MouseDown; - panelBlue.MouseDown += PanelColor_MouseDown; - buttonCancel.Click += (object sender, EventArgs e) => Close(); - } - //отрисовка кран - private void DrawHoistingCrane() - { - Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); - Graphics gr = Graphics.FromImage(bmp); - _hoistingCrane?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); - _hoistingCrane?.DrawTransport(gr); - pictureBoxObject.Image = bmp; - } - //добавление события - public void AddEvent(Action ev) - { - if (EventAddHoistingCrane == null) - { - EventAddHoistingCrane = new Action(ev); - } - else - { - EventAddHoistingCrane += ev; - } - } - private void LabelObject_MouseDown(object sender, MouseEventArgs e) - { - (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); - } - - //проверка получаемой информации (ее типа на соответствие требуемому) - private void PanelObject_DragEnter(object sender, DragEventArgs e) - { - if (e.Data.GetDataPresent(DataFormats.Text)) - { - e.Effect = DragDropEffects.Copy; - } - else - { - e.Effect = DragDropEffects.None; - } - } - //действия при приеме перетаскиваемой информации - private void PanelObject_DragDrop(object sender, DragEventArgs e) - { - switch (e.Data.GetData(DataFormats.Text).ToString()) - { - case "labelSimpleObject": - _hoistingCrane = new DrawingHoistingCrane((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, labelBaseColor.BackColor); - break; - case "labelModifiedObject": - _hoistingCrane = new DrawingAdvancedHoistingCrane((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, labelBaseColor.BackColor, labelDopColor.BackColor, - checkBoxCounterweight.Checked, checkBoxCrane.Checked); - break; - } - - DrawHoistingCrane(); - } - //отправляем цвет с панели - private void PanelColor_MouseDown(object sender, MouseEventArgs e) - { - (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); - } - //проверка получаемой информации (её типа на соответсвие требуемому) - private void LabelColor_DragEnter(object sender, DragEventArgs e) - { - if (e.Data.GetDataPresent(typeof(Color))) - { - e.Effect = DragDropEffects.Copy; - } - else - { - e.Effect = DragDropEffects.None; - } - } - //принимаем основной цвет - private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) - { - //проверка на пустоту объекта - if (_hoistingCrane != null) - { - _hoistingCrane.HoistingCrane.BodyColor = (Color)e.Data.GetData(typeof(Color)); - - DrawHoistingCrane(); - } - } - //принимаем дополнительный цвет - private void LabelDopColor_DragDrop(object sender, DragEventArgs e) - { - //проверка на пустоту объекта и правильную сущноть - if (_hoistingCrane != null && _hoistingCrane.HoistingCrane is EntityAdvancedHoistingCrane entityHoistingCrane) - { - entityHoistingCrane.DopColor = (Color)e.Data.GetData(typeof(Color)); - DrawHoistingCrane(); - } - } - //добавление крана - private void ButtonAddObject_Click(object sender, EventArgs e) - { - EventAddHoistingCrane?.Invoke(_hoistingCrane); - Close(); - } - } -} - -- 2.25.1 From 3b06748624827cbb00259964c81f6f60c0d4f7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?10=D0=93=20=D0=95=D0=B3=D0=BE=D1=80=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Sun, 25 Dec 2022 14:05:39 +0400 Subject: [PATCH 6/6] gg --- .../FormHoistingCraneConfig.Designer.cs | 410 ++++++++++++++++++ .../HoistingCrane/FormHoistingCraneConfig.cs | 134 ++++++ 2 files changed, 544 insertions(+) create mode 100644 HoistingCrane/HoistingCrane/FormHoistingCraneConfig.Designer.cs create mode 100644 HoistingCrane/HoistingCrane/FormHoistingCraneConfig.cs diff --git a/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.Designer.cs b/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.Designer.cs new file mode 100644 index 0000000..01eea5d --- /dev/null +++ b/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.Designer.cs @@ -0,0 +1,410 @@ +namespace HoistingCrane +{ + partial class FormHoistingCraneConfig + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.groupBoxConfig = new System.Windows.Forms.GroupBox(); + this.labelModifiedObject = new System.Windows.Forms.Label(); + this.labelSimpleObject = new System.Windows.Forms.Label(); + this.groupBoxColors = new System.Windows.Forms.GroupBox(); + this.panelPurple = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); + this.panelBlack = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.panelGray = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.panelRed = new System.Windows.Forms.Panel(); + this.checkBoxCounterweight = new System.Windows.Forms.CheckBox(); + this.checkBoxCrane = new System.Windows.Forms.CheckBox(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.labelWeight = new System.Windows.Forms.Label(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.panelObject = new System.Windows.Forms.Panel(); + this.labelDopColor = new System.Windows.Forms.Label(); + this.labelBaseColor = new System.Windows.Forms.Label(); + this.pictureBoxObject = new System.Windows.Forms.PictureBox(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.buttonOk = new System.Windows.Forms.Button(); + this.groupBoxConfig.SuspendLayout(); + this.groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + this.panelObject.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + this.SuspendLayout(); + // + // groupBoxConfig + // + this.groupBoxConfig.Controls.Add(this.labelModifiedObject); + this.groupBoxConfig.Controls.Add(this.labelSimpleObject); + this.groupBoxConfig.Controls.Add(this.groupBoxColors); + this.groupBoxConfig.Controls.Add(this.checkBoxCounterweight); + this.groupBoxConfig.Controls.Add(this.checkBoxCrane); + this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); + this.groupBoxConfig.Controls.Add(this.labelWeight); + this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed); + this.groupBoxConfig.Controls.Add(this.labelSpeed); + this.groupBoxConfig.Location = new System.Drawing.Point(14, 16); + this.groupBoxConfig.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBoxConfig.Name = "groupBoxConfig"; + this.groupBoxConfig.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBoxConfig.Size = new System.Drawing.Size(594, 293); + this.groupBoxConfig.TabIndex = 0; + this.groupBoxConfig.TabStop = false; + this.groupBoxConfig.Text = "Параметры"; + // + // labelModifiedObject + // + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Location = new System.Drawing.Point(450, 216); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(111, 50); + this.labelModifiedObject.TabIndex = 16; + this.labelModifiedObject.Text = "Продвинутый"; + this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // labelSimpleObject + // + this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelSimpleObject.Location = new System.Drawing.Point(322, 216); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(111, 50); + this.labelSimpleObject.TabIndex = 15; + this.labelSimpleObject.Text = "Простой"; + this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // groupBoxColors + // + this.groupBoxColors.Controls.Add(this.panelPurple); + this.groupBoxColors.Controls.Add(this.panelYellow); + this.groupBoxColors.Controls.Add(this.panelBlack); + this.groupBoxColors.Controls.Add(this.panelBlue); + this.groupBoxColors.Controls.Add(this.panelGray); + this.groupBoxColors.Controls.Add(this.panelGreen); + this.groupBoxColors.Controls.Add(this.panelWhite); + this.groupBoxColors.Controls.Add(this.panelRed); + this.groupBoxColors.Location = new System.Drawing.Point(305, 29); + this.groupBoxColors.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBoxColors.Size = new System.Drawing.Size(275, 169); + this.groupBoxColors.TabIndex = 14; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.Purple; + this.panelPurple.Location = new System.Drawing.Point(210, 97); + this.panelPurple.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(46, 53); + this.panelPurple.TabIndex = 3; + this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(210, 29); + this.panelYellow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(46, 53); + this.panelYellow.TabIndex = 1; + this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(145, 97); + this.panelBlack.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(46, 53); + this.panelBlack.TabIndex = 4; + this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(145, 29); + this.panelBlue.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(46, 53); + this.panelBlue.TabIndex = 1; + this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(82, 97); + this.panelGray.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(46, 53); + this.panelGray.TabIndex = 5; + this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(82, 29); + this.panelGreen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(46, 53); + this.panelGreen.TabIndex = 1; + this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(17, 97); + this.panelWhite.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(46, 53); + this.panelWhite.TabIndex = 2; + this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(17, 29); + this.panelRed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(46, 53); + this.panelRed.TabIndex = 0; + this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // checkBoxCounterweight + // + this.checkBoxCounterweight.AutoSize = true; + this.checkBoxCounterweight.Location = new System.Drawing.Point(25, 247); + this.checkBoxCounterweight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.checkBoxCounterweight.Name = "checkBoxCounterweight"; + this.checkBoxCounterweight.Size = new System.Drawing.Size(248, 24); + this.checkBoxCounterweight.TabIndex = 13; + this.checkBoxCounterweight.Text = "Признак наличия противовеса"; + this.checkBoxCounterweight.UseVisualStyleBackColor = true; + // + // checkBoxCrane + // + this.checkBoxCrane.AutoSize = true; + this.checkBoxCrane.Location = new System.Drawing.Point(25, 199); + this.checkBoxCrane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.checkBoxCrane.Name = "checkBoxCrane"; + this.checkBoxCrane.Size = new System.Drawing.Size(199, 24); + this.checkBoxCrane.TabIndex = 12; + this.checkBoxCrane.Text = "Признак наличия крана"; + this.checkBoxCrane.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(103, 96); + this.numericUpDownWeight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.numericUpDownWeight.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownWeight.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(90, 27); + this.numericUpDownWeight.TabIndex = 10; + this.numericUpDownWeight.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(25, 99); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(36, 20); + this.labelWeight.TabIndex = 9; + this.labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(103, 40); + this.numericUpDownSpeed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.numericUpDownSpeed.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownSpeed.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(90, 27); + this.numericUpDownSpeed.TabIndex = 8; + this.numericUpDownSpeed.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(25, 43); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(76, 20); + this.labelSpeed.TabIndex = 7; + this.labelSpeed.Text = "Скорость:"; + // + // panelObject + // + this.panelObject.AllowDrop = true; + this.panelObject.Controls.Add(this.labelDopColor); + this.panelObject.Controls.Add(this.labelBaseColor); + this.panelObject.Controls.Add(this.pictureBoxObject); + this.panelObject.Location = new System.Drawing.Point(615, 16); + this.panelObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(299, 245); + this.panelObject.TabIndex = 2; + this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); + this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); + // + // labelDopColor + // + this.labelDopColor.AllowDrop = true; + this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelDopColor.Location = new System.Drawing.Point(161, 12); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(119, 42); + this.labelDopColor.TabIndex = 2; + this.labelDopColor.Text = "Доп. цвет"; + this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); + this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter); + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(23, 12); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(119, 42); + this.labelBaseColor.TabIndex = 1; + this.labelBaseColor.Text = "Цвет"; + this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop); + this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter); + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(23, 59); + this.pictureBoxObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(257, 167); + this.pictureBoxObject.TabIndex = 0; + this.pictureBoxObject.TabStop = false; + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(776, 269); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(119, 40); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(638, 269); + this.buttonOk.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(119, 40); + this.buttonOk.TabIndex = 4; + this.buttonOk.Text = "Добавить"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.ButtonAddObject_Click); + // + // FormHoistingCraneConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(926, 323); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.groupBoxConfig); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.Name = "FormHoistingCraneConfig"; + this.Text = "Создание объекта"; + this.groupBoxConfig.ResumeLayout(false); + this.groupBoxConfig.PerformLayout(); + this.groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); + this.panelObject.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBoxConfig; + private CheckBox checkBoxCounterweight; + private CheckBox checkBoxCrane; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private Label labelModifiedObject; + private Label labelSimpleObject; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelYellow; + private Panel panelBlack; + private Panel panelBlue; + private Panel panelGray; + private Panel panelGreen; + private Panel panelWhite; + private Panel panelRed; + private Panel panelObject; + private Label labelDopColor; + private Label labelBaseColor; + private PictureBox pictureBoxObject; + private Button buttonCancel; + private Button buttonOk; + } +} \ No newline at end of file diff --git a/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.cs b/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.cs new file mode 100644 index 0000000..6566f0e --- /dev/null +++ b/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.cs @@ -0,0 +1,134 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace HoistingCrane +{ + public partial class FormHoistingCraneConfig : Form + { + //переменная-выбранный кран + DrawingHoistingCrane _hoistingCrane = null; + public DrawingHoistingCrane SelectedHoistingCrane { get; private set; } + //событие + private event Action EventAddHoistingCrane; + //конструктор + public FormHoistingCraneConfig() + { + InitializeComponent(); + panelBlack.MouseDown += PanelColor_MouseDown; + panelPurple.MouseDown += PanelColor_MouseDown; + panelGray.MouseDown += PanelColor_MouseDown; + panelGreen.MouseDown += PanelColor_MouseDown; + panelRed.MouseDown += PanelColor_MouseDown; + panelWhite.MouseDown += PanelColor_MouseDown; + panelYellow.MouseDown += PanelColor_MouseDown; + panelBlue.MouseDown += PanelColor_MouseDown; + buttonCancel.Click += (object sender, EventArgs e) => Close(); + } + //отрисовка кран + private void DrawHoistingCrane() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _hoistingCrane?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _hoistingCrane?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + //добавление события + public void AddEvent(Action ev) + { + if (EventAddHoistingCrane == null) + { + EventAddHoistingCrane = new Action(ev); + } + else + { + EventAddHoistingCrane += ev; + } + } + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); + } + + //проверка получаемой информации (ее типа на соответствие требуемому) + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(DataFormats.Text)) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + //действия при приеме перетаскиваемой информации + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data.GetData(DataFormats.Text).ToString()) + { + case "labelSimpleObject": + _hoistingCrane = new DrawingHoistingCrane((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, labelBaseColor.BackColor); + break; + case "labelModifiedObject": + _hoistingCrane = new DrawingAdvancedHoistingCrane((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, labelBaseColor.BackColor, labelDopColor.BackColor, + checkBoxCounterweight.Checked, checkBoxCrane.Checked); + break; + } + + DrawHoistingCrane(); + } + //отправляем цвет с панели + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + //проверка получаемой информации (её типа на соответсвие требуемому) + private void LabelColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + //принимаем основной цвет + private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) + { + //проверка на пустоту объекта + if (_hoistingCrane != null) + { + _hoistingCrane.HoistingCrane.BodyColor = (Color)e.Data.GetData(typeof(Color)); + + DrawHoistingCrane(); + } + } + //принимаем дополнительный цвет + private void LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + //проверка на пустоту объекта и правильную сущноть + if (_hoistingCrane != null && _hoistingCrane.HoistingCrane is EntityAdvancedHoistingCrane entityHoistingCrane) + { + entityHoistingCrane.DopColor = (Color)e.Data.GetData(typeof(Color)); + DrawHoistingCrane(); + } + } + //добавление крана + private void ButtonAddObject_Click(object sender, EventArgs e) + { + EventAddHoistingCrane?.Invoke(_hoistingCrane); + Close(); + } + } +} + -- 2.25.1