From ea178f03f396005a8aca4a5062625fc0b759352d Mon Sep 17 00:00:00 2001 From: RozhVan Date: Mon, 25 Mar 2024 09:43:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCompany.cs | 60 ++++++ .../ICollectionGenericObjects.cs | 19 ++ .../CollectionGenericObjects/Marina.cs | 57 ++++++ .../MassiveGenericObjects.cs | 96 ++++++++++ .../ProjectPlane/Entities/EntityShip.cs | 2 +- .../ProjectPlane/FormContainer.Designer.cs | 28 --- ProjectPlane/ProjectPlane/FormContainer.cs | 41 ++--- .../FormShipCollection.Designer.cs | 173 ++++++++++++++++++ .../ProjectPlane/FormShipCollection.cs | 141 ++++++++++++++ .../ProjectPlane/FormShipCollection.resx | 120 ++++++++++++ ProjectPlane/ProjectPlane/Program.cs | 2 +- 11 files changed, 680 insertions(+), 59 deletions(-) create mode 100644 ProjectPlane/ProjectPlane/CollectionGenericObjects/AbstractCompany.cs create mode 100644 ProjectPlane/ProjectPlane/CollectionGenericObjects/ICollectionGenericObjects.cs create mode 100644 ProjectPlane/ProjectPlane/CollectionGenericObjects/Marina.cs create mode 100644 ProjectPlane/ProjectPlane/CollectionGenericObjects/MassiveGenericObjects.cs create mode 100644 ProjectPlane/ProjectPlane/FormShipCollection.Designer.cs create mode 100644 ProjectPlane/ProjectPlane/FormShipCollection.cs create mode 100644 ProjectPlane/ProjectPlane/FormShipCollection.resx diff --git a/ProjectPlane/ProjectPlane/CollectionGenericObjects/AbstractCompany.cs b/ProjectPlane/ProjectPlane/CollectionGenericObjects/AbstractCompany.cs new file mode 100644 index 0000000..1bf1bd0 --- /dev/null +++ b/ProjectPlane/ProjectPlane/CollectionGenericObjects/AbstractCompany.cs @@ -0,0 +1,60 @@ +using ProjectPlane.Drawnings; + +namespace ProjectPlane.CollectionGenericObjects; + +public abstract class AbstractCompany +{ + protected readonly int _placeSizeWidth = 320; + + protected readonly int _placeSizeHeight = 120; + + protected readonly int _pictureWidth; + + protected readonly int _pictureHeight; + + protected ICollectionGenericObjects? _collection = null; + + private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight); + + public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects collection) + { + _pictureWidth = picWidth; + _pictureHeight = picHeight; + _collection = collection; + _collection.SetMaxCount = GetMaxCount; + } + + public static int operator +(AbstractCompany company, DrawningShip ship) + { + return company._collection.Insert(ship); + } + + public static DrawningShip? operator -(AbstractCompany company, int position) + { + return company._collection?.Remove(position); + } + + public DrawningShip? GetRandomObject() + { + Random rnd = new(); + return _collection?.Get(rnd.Next(GetMaxCount)); + } + + public Bitmap? Show() + { + Bitmap bitmap = new(_pictureWidth, _pictureHeight); + Graphics graphics = Graphics.FromImage(bitmap); + DrawBackgound(graphics); + SetObjectsPosition(); + for (int i = 0; i < (_collection?.Count ?? 0); ++i) + { + DrawningShip? obj = _collection?.Get(i); + obj?.DrawTransport(graphics); + } + return bitmap; + } + + protected abstract void DrawBackgound(Graphics g); + + protected abstract void SetObjectsPosition(); +} diff --git a/ProjectPlane/ProjectPlane/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectPlane/ProjectPlane/CollectionGenericObjects/ICollectionGenericObjects.cs new file mode 100644 index 0000000..4a6e5b7 --- /dev/null +++ b/ProjectPlane/ProjectPlane/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -0,0 +1,19 @@ + +namespace ProjectPlane.CollectionGenericObjects; + +public interface ICollectionGenericObjects + where T : class +{ + int Count { get; } + + int SetMaxCount { set; } + + int Insert(T obj); + + int Insert(T obj, int position); + + T? Remove(int position); + + T? Get(int position); +} + diff --git a/ProjectPlane/ProjectPlane/CollectionGenericObjects/Marina.cs b/ProjectPlane/ProjectPlane/CollectionGenericObjects/Marina.cs new file mode 100644 index 0000000..28b3ab4 --- /dev/null +++ b/ProjectPlane/ProjectPlane/CollectionGenericObjects/Marina.cs @@ -0,0 +1,57 @@ +using ProjectPlane.Drawnings; + +namespace ProjectPlane.CollectionGenericObjects; + +public class Marina : AbstractCompany +{ + public Marina(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection) + { + } + + protected override void DrawBackgound(Graphics g) + { + Pen pen = new(Color.Black, 2); + + for (int i = 0; i < _pictureHeight / _placeSizeHeight; i++) + { + int y = _placeSizeHeight; + y *= i; + + for (int j = 0; j <= _pictureWidth / _placeSizeWidth; j++) + { + int x = _placeSizeWidth; + x *= j; + + g.DrawLine(pen, x, y, x + _placeSizeWidth / 2, y); + g.DrawLine(pen, x, y + _placeSizeHeight - 10, x + _placeSizeWidth / 2, y + _placeSizeHeight - 10); + } + + } + } + + protected override void SetObjectsPosition() + { + int n = _pictureWidth / _placeSizeWidth; + int m = 0; + + for (int i = 0; i < (_collection?.Count ?? 0); i++) + { + if (_collection?.Get(i) != null) + { + int x = _placeSizeWidth * n; + int y = (10 + _placeSizeHeight * (_pictureHeight / _placeSizeHeight - 1)) - _placeSizeHeight * m; + + _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight); + _collection?.Get(i)?.SetPosition(x, y); + } + + if (n > 0) + n--; + else + { + n = _pictureWidth / _placeSizeWidth; + m++; + } + } + } +} diff --git a/ProjectPlane/ProjectPlane/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectPlane/ProjectPlane/CollectionGenericObjects/MassiveGenericObjects.cs new file mode 100644 index 0000000..5419199 --- /dev/null +++ b/ProjectPlane/ProjectPlane/CollectionGenericObjects/MassiveGenericObjects.cs @@ -0,0 +1,96 @@ +namespace ProjectPlane.CollectionGenericObjects; + +public class MassiveGenericObjects : ICollectionGenericObjects + where T : class +{ + private T?[] _collection; + public int Count => _collection.Length; + public int SetMaxCount + { + set + { + if (value > 0) + { + if (_collection.Length > 0) + { + Array.Resize(ref _collection, value); + } + else + { + _collection = new T?[value]; + } + } + } + } + + public MassiveGenericObjects() + { + _collection = Array.Empty(); + } + public T? Get(int position) + { + if (position < 0 || position > Count) + { + return null; + } + return _collection[position]; + } + + public int Insert(T obj) + { + for (int i = 0; i < Count; i++) + { + if (_collection[i] == null) + { + _collection[i] = obj; + return i; + } + } + return -1; + } + public int Insert(T obj, int position) + { + if (position < 0 || position > Count) + { + return -1; + } + + if (_collection[position] == null) + { + _collection[position] = obj; + return position; + } + + for (int i = position + 1; i < Count; i++) + { + if (_collection[i] == null) + { + _collection[i] = obj; + return position; + } + } + + for (int i = position - 1; i >= 0; i--) + { + if (_collection[i] == null) + { + _collection[i] = obj; + return position; + } + } + + return -1; + } + public T? Remove(int position) + { + if (position < 0 || position > Count || _collection[position] == null) + { + return null; + } + + T? obj = _collection[position]; + _collection[position] = null; + return obj; + } + +} diff --git a/ProjectPlane/ProjectPlane/Entities/EntityShip.cs b/ProjectPlane/ProjectPlane/Entities/EntityShip.cs index f2a8815..5024a95 100644 --- a/ProjectPlane/ProjectPlane/Entities/EntityShip.cs +++ b/ProjectPlane/ProjectPlane/Entities/EntityShip.cs @@ -13,7 +13,7 @@ public class EntityShip /// public Color ShipColor { get; private set; } - public double Step => Speed * 10 / Weight; + public double Step => Speed * 100 / Weight; public EntityShip(int speed, double weight, Color shipColor) { diff --git a/ProjectPlane/ProjectPlane/FormContainer.Designer.cs b/ProjectPlane/ProjectPlane/FormContainer.Designer.cs index d1a821d..e0cc31b 100644 --- a/ProjectPlane/ProjectPlane/FormContainer.Designer.cs +++ b/ProjectPlane/ProjectPlane/FormContainer.Designer.cs @@ -29,12 +29,10 @@ private void InitializeComponent() { pictureBoxCont = new PictureBox(); - buttonCreate = new Button(); buttonLeft = new Button(); buttonRight = new Button(); buttonUp = new Button(); buttonDown = new Button(); - buttonCreateShip = new Button(); comboBoxStrategy = new ComboBox(); buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxCont).BeginInit(); @@ -49,17 +47,6 @@ pictureBoxCont.TabIndex = 0; pictureBoxCont.TabStop = false; // - // buttonCreate - // - buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreate.Location = new Point(12, 519); - buttonCreate.Name = "buttonCreate"; - buttonCreate.Size = new Size(167, 23); - buttonCreate.TabIndex = 1; - buttonCreate.Text = "Создать контейнеровоз"; - buttonCreate.UseVisualStyleBackColor = true; - buttonCreate.Click += ButtonCreate_Click; - // // buttonLeft // buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; @@ -108,17 +95,6 @@ buttonDown.UseVisualStyleBackColor = true; buttonDown.Click += ButtonMove_Click; // - // buttonCreateShip - // - buttonCreateShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateShip.Location = new Point(185, 519); - buttonCreateShip.Name = "buttonCreateShip"; - buttonCreateShip.Size = new Size(167, 23); - buttonCreateShip.TabIndex = 6; - buttonCreateShip.Text = "Создать корабль"; - buttonCreateShip.UseVisualStyleBackColor = true; - buttonCreateShip.Click += ButtonCreateShip_Click; - // // comboBoxStrategy // comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; @@ -146,12 +122,10 @@ ClientSize = new Size(898, 554); Controls.Add(buttonStrategyStep); Controls.Add(comboBoxStrategy); - Controls.Add(buttonCreateShip); Controls.Add(buttonDown); Controls.Add(buttonUp); Controls.Add(buttonRight); Controls.Add(buttonLeft); - Controls.Add(buttonCreate); Controls.Add(pictureBoxCont); Name = "FormContainer"; Text = "Контейнеровоз"; @@ -162,12 +136,10 @@ #endregion private PictureBox pictureBoxCont; - private Button buttonCreate; private Button buttonLeft; private Button buttonRight; private Button buttonUp; private Button buttonDown; - private Button buttonCreateShip; private ComboBox comboBoxStrategy; private Button buttonStrategyStep; } diff --git a/ProjectPlane/ProjectPlane/FormContainer.cs b/ProjectPlane/ProjectPlane/FormContainer.cs index a1bb4b5..1f1ebda 100644 --- a/ProjectPlane/ProjectPlane/FormContainer.cs +++ b/ProjectPlane/ProjectPlane/FormContainer.cs @@ -10,6 +10,18 @@ public partial class FormContainer : Form private AbstractStrategy? _strategy; + public DrawningShip SetShip + { + set + { + _drawShip = value; + _drawShip.SetPictureSize(pictureBoxCont.Width, pictureBoxCont.Height); + comboBoxStrategy.Enabled = true; + _strategy = null; + Draw(); + } + } + public FormContainer() { InitializeComponent(); @@ -29,35 +41,6 @@ public partial class FormContainer : Form pictureBoxCont.Image = bmp; } - private void CreateObject(string type) - { - Random random = new Random(); - switch (type) - { - case nameof(DrawningShip): - _drawShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); - break; - case nameof(DrawCont): - _drawShip = new DrawCont(random.Next(100, 300), random.Next(1000, 3000), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - _drawShip.SetPictureSize(pictureBoxCont.Width, pictureBoxCont.Height); - _drawShip.SetPosition(random.Next(10, 100), random.Next(10, 100)); - _strategy = null; - comboBoxStrategy.Enabled = true; - Draw(); - } - - private void ButtonCreate_Click(object sender, EventArgs e) => CreateObject(nameof(DrawCont)); - - private void ButtonCreateShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip)); - private void ButtonMove_Click(object sender, EventArgs e) { if (_drawShip == null) diff --git a/ProjectPlane/ProjectPlane/FormShipCollection.Designer.cs b/ProjectPlane/ProjectPlane/FormShipCollection.Designer.cs new file mode 100644 index 0000000..fdc3efc --- /dev/null +++ b/ProjectPlane/ProjectPlane/FormShipCollection.Designer.cs @@ -0,0 +1,173 @@ +namespace ProjectPlane +{ + partial class FormShipCollection + { + /// + /// 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() + { + groupBoxTools = new GroupBox(); + ButtonRefresh = new Button(); + ButtonGoToCheck = new Button(); + ButtonDel = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + ButtonAddCont = new Button(); + ButtonAddShip = new Button(); + ComboBoxSelectorCompany = new ComboBox(); + pictureBox = new PictureBox(); + groupBoxTools.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + SuspendLayout(); + // + // groupBoxTools + // + groupBoxTools.Controls.Add(ButtonRefresh); + groupBoxTools.Controls.Add(ButtonGoToCheck); + groupBoxTools.Controls.Add(ButtonDel); + groupBoxTools.Controls.Add(maskedTextBoxPosition); + groupBoxTools.Controls.Add(ButtonAddCont); + groupBoxTools.Controls.Add(ButtonAddShip); + groupBoxTools.Controls.Add(ComboBoxSelectorCompany); + groupBoxTools.Dock = DockStyle.Right; + groupBoxTools.Location = new Point(785, 0); + groupBoxTools.Name = "groupBoxTools"; + groupBoxTools.Size = new Size(200, 678); + groupBoxTools.TabIndex = 0; + groupBoxTools.TabStop = false; + groupBoxTools.Text = "Инструменты"; + // + // ButtonRefresh + // + ButtonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + ButtonRefresh.Location = new Point(6, 425); + ButtonRefresh.Name = "ButtonRefresh"; + ButtonRefresh.Size = new Size(188, 39); + ButtonRefresh.TabIndex = 6; + ButtonRefresh.Text = "Обновить"; + ButtonRefresh.UseVisualStyleBackColor = true; + ButtonRefresh.Click += ButtonRefresh_Click; + // + // ButtonGoToCheck + // + ButtonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + ButtonGoToCheck.Location = new Point(6, 320); + ButtonGoToCheck.Name = "ButtonGoToCheck"; + ButtonGoToCheck.Size = new Size(188, 39); + ButtonGoToCheck.TabIndex = 5; + ButtonGoToCheck.Text = "Передать на тесты"; + ButtonGoToCheck.UseVisualStyleBackColor = true; + ButtonGoToCheck.Click += ButtonGoToCheck_Click; + // + // ButtonDel + // + ButtonDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + ButtonDel.Location = new Point(6, 237); + ButtonDel.Name = "ButtonDel"; + ButtonDel.Size = new Size(188, 39); + ButtonDel.TabIndex = 4; + ButtonDel.Text = "Удплить контейнеровоз"; + ButtonDel.UseVisualStyleBackColor = true; + ButtonDel.Click += ButtonDel_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(6, 198); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(188, 23); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // ButtonAddCont + // + ButtonAddCont.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + ButtonAddCont.Location = new Point(6, 138); + ButtonAddCont.Name = "ButtonAddCont"; + ButtonAddCont.Size = new Size(188, 39); + ButtonAddCont.TabIndex = 2; + ButtonAddCont.Text = "Добавление контейнеровоза"; + ButtonAddCont.UseVisualStyleBackColor = true; + ButtonAddCont.Click += ButtonAddCont_Click; + // + // ButtonAddShip + // + ButtonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + ButtonAddShip.Location = new Point(6, 81); + ButtonAddShip.Name = "ButtonAddShip"; + ButtonAddShip.Size = new Size(188, 40); + ButtonAddShip.TabIndex = 1; + ButtonAddShip.Text = "Добавление корабля"; + ButtonAddShip.UseVisualStyleBackColor = true; + ButtonAddShip.Click += ButtonAddShip_Click; + // + // ComboBoxSelectorCompany + // + ComboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + ComboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; + ComboBoxSelectorCompany.FormattingEnabled = true; + ComboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); + ComboBoxSelectorCompany.Location = new Point(6, 22); + ComboBoxSelectorCompany.Name = "ComboBoxSelectorCompany"; + ComboBoxSelectorCompany.Size = new Size(188, 23); + ComboBoxSelectorCompany.TabIndex = 0; + ComboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged; + // + // pictureBox + // + pictureBox.Dock = DockStyle.Fill; + pictureBox.Location = new Point(0, 0); + pictureBox.Name = "pictureBox"; + pictureBox.Size = new Size(785, 678); + pictureBox.TabIndex = 1; + pictureBox.TabStop = false; + // + // FormShipCollection + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(985, 678); + Controls.Add(pictureBox); + Controls.Add(groupBoxTools); + Name = "FormShipCollection"; + Text = "Коллекция кораблей"; + groupBoxTools.ResumeLayout(false); + groupBoxTools.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxTools; + private ComboBox ComboBoxSelectorCompany; + private Button ButtonAddCont; + private Button ButtonAddShip; + private PictureBox pictureBox; + private MaskedTextBox maskedTextBoxPosition; + private Button ButtonDel; + private Button ButtonGoToCheck; + private Button ButtonRefresh; + } +} \ No newline at end of file diff --git a/ProjectPlane/ProjectPlane/FormShipCollection.cs b/ProjectPlane/ProjectPlane/FormShipCollection.cs new file mode 100644 index 0000000..c29fbd4 --- /dev/null +++ b/ProjectPlane/ProjectPlane/FormShipCollection.cs @@ -0,0 +1,141 @@ + +using ProjectPlane.CollectionGenericObjects; +using ProjectPlane.Drawnings; + +namespace ProjectPlane; + +public partial class FormShipCollection : Form +{ + private AbstractCompany? _company = null; + + public FormShipCollection() + { + InitializeComponent(); + } + + private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) + { + switch (ComboBoxSelectorCompany.Text) + { + case "Хранилище": + _company = new Marina(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects()); + break; + } + } + + private void CreateObject(string type) + { + if (_company == null) + { + return; + } + + + Random random = new Random(); + DrawningShip drawShip; + switch (type) + { + case nameof(DrawningShip): + drawShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); + break; + case nameof(DrawCont): + drawShip = new DrawCont(random.Next(100, 300), random.Next(1000, 3000), + GetColor(random), GetColor(random), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + break; + default: + return; + } + + if (_company + drawShip != -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _company.Show(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } + + private static Color GetColor(Random random) + { + Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)); + ColorDialog dialog = new(); + if (dialog.ShowDialog() == DialogResult.OK) + { + color = dialog.Color; + } + return color; + } + + private void ButtonAddShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip)); + + private void ButtonAddCont_Click(object sender, EventArgs e) => CreateObject(nameof(DrawCont)); + + private void ButtonDel_Click(object sender, EventArgs e) + { + + if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null) + { + return; + } + + if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) + { + return; + } + + int pos = Convert.ToInt32(maskedTextBoxPosition.Text); + if (_company - pos != null) + { + MessageBox.Show("Объект удалён"); + pictureBox.Image = _company.Show(); + } + else + { + MessageBox.Show("Не удалось удалить объект"); + } + } + + private void ButtonGoToCheck_Click(object sender, EventArgs e) + { + if (_company == null) + { + return; + } + + DrawningShip? ship = null; + int counter = 100; + while (ship == null) + { + ship = _company.GetRandomObject(); + counter--; + if (counter <= 0) + { + break; + } + } + + if (ship == null) + { + return; + } + + FormContainer form = new() + { + SetShip = ship + }; + form.ShowDialog(); + + } + + private void ButtonRefresh_Click(object sender, EventArgs e) + { + if (_company == null) + { + return; + } + + pictureBox.Image = _company.Show(); + } +} diff --git a/ProjectPlane/ProjectPlane/FormShipCollection.resx b/ProjectPlane/ProjectPlane/FormShipCollection.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectPlane/ProjectPlane/FormShipCollection.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProjectPlane/ProjectPlane/Program.cs b/ProjectPlane/ProjectPlane/Program.cs index 8be6434..30a1b73 100644 --- a/ProjectPlane/ProjectPlane/Program.cs +++ b/ProjectPlane/ProjectPlane/Program.cs @@ -11,7 +11,7 @@ namespace ProjectPlane // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormContainer()); + Application.Run(new FormShipCollection()); } } } \ No newline at end of file