diff --git a/HoistingCrane/HoistingCrane/AbstractMap.cs b/HoistingCrane/HoistingCrane/AbstractMap.cs index bf5f15c..43db729 100644 --- a/HoistingCrane/HoistingCrane/AbstractMap.cs +++ b/HoistingCrane/HoistingCrane/AbstractMap.cs @@ -103,7 +103,6 @@ namespace HoistingCrane else _drawingObject.MoveObject(SetOppositDirection(direction)); return DrawMapWithObject(); } - private Direction SetOppositDirection(Direction dir) { switch (dir) diff --git a/HoistingCrane/HoistingCrane/DrawingHoistingCrane.cs b/HoistingCrane/HoistingCrane/DrawingHoistingCrane.cs index abe97e9..375fe3c 100644 --- a/HoistingCrane/HoistingCrane/DrawingHoistingCrane.cs +++ b/HoistingCrane/HoistingCrane/DrawingHoistingCrane.cs @@ -9,14 +9,12 @@ namespace HoistingCrane public class DrawingHoistingCrane { public EntityHoistingCrane HoistingCrane { get; protected set; } - protected float _startPosX; protected float _startPosY; private int? _pictureWidth = null; private int? _pictureHeight = null; private readonly int _hoistingCraneWidth = 80; private readonly int _hoistingCraneHeight = 50; - protected DrawingHoistingCrane(int speed, float weight, Color bodyColor, int hoistingCraneWidth, int hoistingCraneHeigth) : this(speed, weight, bodyColor) { @@ -27,7 +25,6 @@ namespace HoistingCrane { HoistingCrane = new EntityHoistingCrane(speed, weight, bodyColor); } - public void SetPosition(int x, int y, int width, int height) { // TODO checks @@ -36,7 +33,6 @@ namespace HoistingCrane _pictureWidth = width; _pictureHeight = height; } - public void MoveTransport(Direction direction) { if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) @@ -122,7 +118,6 @@ namespace HoistingCrane g.FillRectangle(brBlack, _startPosX + 30, _startPosY + 45, 4, 6); g.FillRectangle(brBlack, _startPosX + 45, _startPosY + 45, 4, 6); } - public void ChangeBorders(int width, int height) { _pictureWidth = width; diff --git a/HoistingCrane/HoistingCrane/EntityAdvancedHoistingCrane.cs b/HoistingCrane/HoistingCrane/EntityAdvancedHoistingCrane.cs index 0011652..bfd2506 100644 --- a/HoistingCrane/HoistingCrane/EntityAdvancedHoistingCrane.cs +++ b/HoistingCrane/HoistingCrane/EntityAdvancedHoistingCrane.cs @@ -13,7 +13,6 @@ namespace HoistingCrane // наличие противовеса public bool Сounterweight { get; private set; } public Color DopColor { get; private set; } - public EntityAdvancedHoistingCrane(int speed, float weight, Color bodyColor, Color dopColor, bool crane, bool counterweight) : base(speed, weight, bodyColor) { diff --git a/HoistingCrane/HoistingCrane/EntityHoistingCrane.cs b/HoistingCrane/HoistingCrane/EntityHoistingCrane.cs index b8b5b05..23c7ca4 100644 --- a/HoistingCrane/HoistingCrane/EntityHoistingCrane.cs +++ b/HoistingCrane/HoistingCrane/EntityHoistingCrane.cs @@ -9,13 +9,9 @@ namespace HoistingCrane public class EntityHoistingCrane { public int Speed { get; private set; } - public float Weight { get; private set; } - public Color BodyColor { get; private set; } - public float Step => Speed * 100 / Weight; - public EntityHoistingCrane(int speed, float weight, Color bodyColor) { Random rnd = new(); diff --git a/HoistingCrane/HoistingCrane/FormHoistingCrane.Designer.cs b/HoistingCrane/HoistingCrane/FormHoistingCrane.Designer.cs index 3a48eba..f79395f 100644 --- a/HoistingCrane/HoistingCrane/FormHoistingCrane.Designer.cs +++ b/HoistingCrane/HoistingCrane/FormHoistingCrane.Designer.cs @@ -150,7 +150,6 @@ this.pictureBoxHoistingCrane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.pictureBoxHoistingCrane.TabIndex = 6; this.pictureBoxHoistingCrane.TabStop = false; - this.pictureBoxHoistingCrane.Click += new System.EventHandler(this.pictureBoxHoistingCrane_Click); this.pictureBoxHoistingCrane.Resize += new System.EventHandler(this.PictureBoxHoistingCrane_Resize); // // buttonCreateModify diff --git a/HoistingCrane/HoistingCrane/FormHoistingCrane.cs b/HoistingCrane/HoistingCrane/FormHoistingCrane.cs index a31b615..104f5b3 100644 --- a/HoistingCrane/HoistingCrane/FormHoistingCrane.cs +++ b/HoistingCrane/HoistingCrane/FormHoistingCrane.cs @@ -8,7 +8,6 @@ { InitializeComponent(); } - private void Draw() { Bitmap bmp = new(pictureBoxHoistingCrane.Width, pictureBoxHoistingCrane.Height); @@ -16,7 +15,6 @@ _HoistingCrane?.DrawTransport(gr); pictureBoxHoistingCrane.Image = bmp; } - private void SetData() { Random rnd = new(); @@ -25,7 +23,6 @@ toolStripStatusLabelWeight.Text = $"Вес: {_HoistingCrane.HoistingCrane.Weight}"; toolStripStatusLabelBodyColor.Text = $"Цвет:{_HoistingCrane.HoistingCrane.BodyColor.Name}"; } - private void ButtonCreate_Click(object sender, EventArgs e) { Random rnd = new(); @@ -40,7 +37,6 @@ SetData(); Draw(); } - private void ButtonMove_Click(object sender, EventArgs e) { string name = ((Button)sender)?.Name ?? string.Empty; @@ -61,13 +57,11 @@ } Draw(); } - private void PictureBoxHoistingCrane_Resize(object sender, EventArgs e) { _HoistingCrane?.ChangeBorders(pictureBoxHoistingCrane.Width, pictureBoxHoistingCrane.Height); Draw(); } - private void ButtonCreateModify_Click(object sender, EventArgs e) { Random rnd = new(); @@ -90,11 +84,6 @@ SetData(); Draw(); } - - private void pictureBoxHoistingCrane_Click(object sender, EventArgs e) - { - - } private void ButtonSelect_Click(object sender, EventArgs e) { SelectedHoistingCrane = _HoistingCrane; diff --git a/HoistingCrane/HoistingCrane/FormMap.Designer.cs b/HoistingCrane/HoistingCrane/FormMap.Designer.cs deleted file mode 100644 index ba07c1c..0000000 --- a/HoistingCrane/HoistingCrane/FormMap.Designer.cs +++ /dev/null @@ -1,208 +0,0 @@ -namespace HoistingCrane -{ - partial class FormMap - { - /// - /// 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.buttonUp = new System.Windows.Forms.Button(); - this.buttonLeft = new System.Windows.Forms.Button(); - this.buttonRight = new System.Windows.Forms.Button(); - this.buttonDown = new System.Windows.Forms.Button(); - this.buttonCreate = new System.Windows.Forms.Button(); - this.statusStrip = new System.Windows.Forms.StatusStrip(); - this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); - this.pictureBoxHoistingCrane = new System.Windows.Forms.PictureBox(); - this.buttonCreateModify = new System.Windows.Forms.Button(); - this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox(); - this.statusStrip.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxHoistingCrane)).BeginInit(); - this.SuspendLayout(); - // - // buttonUp - // - this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonUp.BackgroundImage = global::HoistingCrane.Properties.Resources.up; - this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonUp.Location = new System.Drawing.Point(722, 353); - this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(30, 30); - this.buttonUp.TabIndex = 0; - this.buttonUp.UseVisualStyleBackColor = true; - this.buttonUp.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::HoistingCrane.Properties.Resources.left; - this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonLeft.Location = new System.Drawing.Point(686, 389); - this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(30, 30); - this.buttonLeft.TabIndex = 1; - this.buttonLeft.UseVisualStyleBackColor = true; - this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); - // - // buttonRight - // - this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonRight.BackgroundImage = global::HoistingCrane.Properties.Resources.right; - this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonRight.Location = new System.Drawing.Point(758, 389); - this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(30, 30); - this.buttonRight.TabIndex = 2; - 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::HoistingCrane.Properties.Resources.down; - this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonDown.Location = new System.Drawing.Point(722, 389); - this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(30, 30); - this.buttonDown.TabIndex = 3; - this.buttonDown.UseVisualStyleBackColor = true; - this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); - // - // buttonCreate - // - this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreate.Location = new System.Drawing.Point(12, 393); - this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(75, 23); - this.buttonCreate.TabIndex = 4; - this.buttonCreate.Text = "Создать"; - this.buttonCreate.UseVisualStyleBackColor = true; - this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); - // - // statusStrip - // - this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripStatusLabelSpeed, - this.toolStripStatusLabelWeight, - this.toolStripStatusLabelBodyColor}); - this.statusStrip.Location = new System.Drawing.Point(0, 428); - this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(800, 22); - this.statusStrip.TabIndex = 5; - this.statusStrip.Text = "statusStrip"; - // - // toolStripStatusLabelSpeed - // - this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; - this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17); - this.toolStripStatusLabelSpeed.Text = "Скорость:"; - // - // toolStripStatusLabelWeight - // - this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; - this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(29, 17); - this.toolStripStatusLabelWeight.Text = "Вес:"; - // - // toolStripStatusLabelBodyColor - // - this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; - this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17); - this.toolStripStatusLabelBodyColor.Text = "Цвет:"; - // - // pictureBoxBulldozer - // - this.pictureBoxHoistingCrane.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBoxHoistingCrane.Location = new System.Drawing.Point(0, 0); - this.pictureBoxHoistingCrane.Name = "pictureBoxHoistingCrane"; - this.pictureBoxHoistingCrane.Size = new System.Drawing.Size(800, 428); - this.pictureBoxHoistingCrane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBoxHoistingCrane.TabIndex = 6; - this.pictureBoxHoistingCrane.TabStop = false; - this.pictureBoxHoistingCrane.Click += new System.EventHandler(this.pictureBoxHoistingCrane_Click); - // - // buttonCreateModify - // - this.buttonCreateModify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonCreateModify.Location = new System.Drawing.Point(93, 393); - this.buttonCreateModify.Name = "buttonCreateModify"; - this.buttonCreateModify.Size = new System.Drawing.Size(100, 23); - this.buttonCreateModify.TabIndex = 7; - this.buttonCreateModify.Text = "Модификация"; - this.buttonCreateModify.UseVisualStyleBackColor = true; - this.buttonCreateModify.Click += new System.EventHandler(this.ButtonCreateModify_Click); - // - // comboBoxSelectorMap - // - this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxSelectorMap.FormattingEnabled = true; - this.comboBoxSelectorMap.Items.AddRange(new object[] { - "Простая карта", - "Вторая карта"}); - this.comboBoxSelectorMap.Location = new System.Drawing.Point(12, 12); - this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; - this.comboBoxSelectorMap.Size = new System.Drawing.Size(121, 23); - this.comboBoxSelectorMap.TabIndex = 8; - this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged); - // - // FormMap - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.comboBoxSelectorMap); - this.Controls.Add(this.buttonCreateModify); - this.Controls.Add(this.buttonCreate); - this.Controls.Add(this.buttonDown); - this.Controls.Add(this.buttonRight); - this.Controls.Add(this.buttonLeft); - this.Controls.Add(this.buttonUp); - this.Controls.Add(this.pictureBoxHoistingCrane); - this.Controls.Add(this.statusStrip); - this.Name = "FormMap"; - this.Text = "FormMap"; - this.statusStrip.ResumeLayout(false); - this.statusStrip.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxHoistingCrane)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - private Button buttonUp; - private Button buttonLeft; - private Button buttonRight; - private Button buttonDown; - private Button buttonCreate; - private StatusStrip statusStrip; - private ToolStripStatusLabel toolStripStatusLabelSpeed; - private ToolStripStatusLabel toolStripStatusLabelWeight; - private ToolStripStatusLabel toolStripStatusLabelBodyColor; - private PictureBox pictureBoxHoistingCrane; - private Button buttonCreateModify; - private ComboBox comboBoxSelectorMap; - } -} \ No newline at end of file diff --git a/HoistingCrane/HoistingCrane/FormMap.cs b/HoistingCrane/HoistingCrane/FormMap.cs deleted file mode 100644 index 35f3052..0000000 --- a/HoistingCrane/HoistingCrane/FormMap.cs +++ /dev/null @@ -1,88 +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 FormMap : Form - { - private AbstractMap _abstractMap; - public FormMap() - { - InitializeComponent(); - _abstractMap = new SimpleMap(); - _abstractMap = new SecondMap(); - } - - private void SetData(DrawingHoistingCrane hoistingCrane) - { - toolStripStatusLabelSpeed.Text = $"Скорость: {hoistingCrane.HoistingCrane.Speed}"; - toolStripStatusLabelWeight.Text = $"Вес: {hoistingCrane.HoistingCrane.Weight}"; - toolStripStatusLabelBodyColor.Text = $"Цвет:{hoistingCrane.HoistingCrane.BodyColor.Name}"; - pictureBoxHoistingCrane.Image = _abstractMap.CreateMap(pictureBoxHoistingCrane.Width, - pictureBoxHoistingCrane.Height, new DrawingObjectHoistingCrane(hoistingCrane)); - } - - private void ButtonCreate_Click(object sender, EventArgs e) - { - Random rnd = new(); - var bulldozer = new DrawingHoistingCrane(rnd.Next(30, 100), rnd.Next(300, 500), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); - SetData(bulldozer); - } - - private void ButtonMove_Click(object sender, EventArgs e) - { - string name = ((Button)sender)?.Name ?? string.Empty; - Direction dir = Direction.None; - switch (name) - { - case "buttonUp": - dir = Direction.Up; - break; - case "buttonDown": - dir = Direction.Down; - break; - case "buttonLeft": - dir = Direction.Left; - break; - case "buttonRight": - dir = Direction.Right; - break; - } - pictureBoxHoistingCrane.Image = _abstractMap.MoveObject(dir); - } - private void ButtonCreateModify_Click(object sender, EventArgs e) - { - Random rnd = new(); - var hoistingCrane = new DrawingAdvancedHoistingCrane(rnd.Next(30, 100), rnd.Next(300, 500), - Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Color.FromArgb(rnd.Next(0, 256), - rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2))); - SetData(hoistingCrane); - } - - private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e) - { - switch (comboBoxSelectorMap.Text) - { - case "Простая карта": - _abstractMap = new SimpleMap(); - break; - case "Вторая карта": - _abstractMap = new SecondMap(); - break; - } - } - - private void pictureBoxHoistingCrane_Click(object sender, EventArgs e) - { - - } - } -} diff --git a/HoistingCrane/HoistingCrane/FormMap.resx b/HoistingCrane/HoistingCrane/FormMap.resx deleted file mode 100644 index f298a7b..0000000 --- a/HoistingCrane/HoistingCrane/FormMap.resx +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs index 11ed709..68c04ff 100644 --- a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs +++ b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs @@ -9,7 +9,6 @@ /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// /// Clean up any resources being used. /// @@ -262,7 +261,6 @@ this.pictureBox.Size = new System.Drawing.Size(927, 782); this.pictureBox.TabIndex = 1; this.pictureBox.TabStop = false; - this.pictureBox.Click += new System.EventHandler(this.pictureBox_Click); // // FormMapWithSetHoistingCrane // @@ -280,7 +278,6 @@ this.groupBoxTools.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); this.ResumeLayout(false); - } #endregion diff --git a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs index 9c150c9..892c54e 100644 --- a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs +++ b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs @@ -24,9 +24,7 @@ namespace HoistingCrane /// private readonly MapsCollection _mapsCollection; /// - private MapWithSetHoistingCraneGeneric _mapHoistingCraneCollectionGeneric; - public FormMapWithSetHoistingCrane() { InitializeComponent(); @@ -102,7 +100,6 @@ namespace HoistingCrane _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(); @@ -125,7 +122,6 @@ namespace HoistingCrane ReloadMaps(); } } - private void ButtonAddHoistingCrane_Click(object sender, EventArgs e) { if (listBoxMaps.SelectedIndex == -1) @@ -169,7 +165,6 @@ namespace HoistingCrane MessageBox.Show("Не удалось удалить объект"); } } - private void ButtonShowStorage_Click(object sender, EventArgs e) { if (listBoxMaps.SelectedIndex == -1) @@ -178,7 +173,6 @@ namespace HoistingCrane } pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); } - private void ButtonShowOnMap_Click(object sender, EventArgs e) { if (listBoxMaps.SelectedIndex == -1) @@ -213,10 +207,5 @@ namespace HoistingCrane } pictureBox.Image = _mapHoistingCraneCollectionGeneric.MoveObject(enums); } - - private void pictureBox_Click(object sender, EventArgs e) - { - - } } } diff --git a/HoistingCrane/HoistingCrane/MapWithSetHoistingCraneGeneric.cs b/HoistingCrane/HoistingCrane/MapWithSetHoistingCraneGeneric.cs index 4b1fb1d..0a7396e 100644 --- a/HoistingCrane/HoistingCrane/MapWithSetHoistingCraneGeneric.cs +++ b/HoistingCrane/HoistingCrane/MapWithSetHoistingCraneGeneric.cs @@ -16,7 +16,6 @@ namespace HoistingCrane private readonly int _placeSizeHeight = 120; private readonly SetHoistingCraneGeneric _setHoistingCrane; private readonly U _map; - public MapWithSetHoistingCraneGeneric(int picWidth, int picHeight, U map) { int width = picWidth / _placeSizeWidth; @@ -26,17 +25,14 @@ namespace HoistingCrane _pictureHeight = picHeight; _map = map; } - public static int operator +(MapWithSetHoistingCraneGeneric map, T bulldozer) { return map._setHoistingCrane.Insert(bulldozer); } - public static T operator -(MapWithSetHoistingCraneGeneric map, int position) { return map._setHoistingCrane.Remove(position); } - public Bitmap ShowSet() { Bitmap bmp = new(_pictureWidth, _pictureWidth); @@ -45,7 +41,6 @@ namespace HoistingCrane DrawBulldozers(gr); return bmp; } - public Bitmap ShowOnMap() { Shaking(); @@ -55,7 +50,6 @@ namespace HoistingCrane } return new(_pictureWidth, _pictureHeight); } - public Bitmap MoveObject(Direction direction) { if (_map != null) @@ -64,7 +58,6 @@ namespace HoistingCrane } return new(_pictureWidth, _pictureHeight); } - public void Shaking() { int j = _setHoistingCrane.Count - 1; @@ -89,7 +82,6 @@ namespace HoistingCrane } } } - private void DrawBackground(Graphics gr) { Pen pen = new(Color.Black, 3); diff --git a/HoistingCrane/HoistingCrane/SetHoistingCraneGeneric.cs b/HoistingCrane/HoistingCrane/SetHoistingCraneGeneric.cs index d44591d..2bdf534 100644 --- a/HoistingCrane/HoistingCrane/SetHoistingCraneGeneric.cs +++ b/HoistingCrane/HoistingCrane/SetHoistingCraneGeneric.cs @@ -10,22 +10,17 @@ namespace HoistingCrane where T : class { private readonly List _places; - public int Count => _places.Count; - private readonly int _maxCount; - public SetHoistingCraneGeneric(int count) { _maxCount = count; _places = new List(); } - public int Insert(T hoistingCrane) { return Insert(hoistingCrane, 0); } - public int Insert(T hoistingCrane, int position) { if (position < 0 || position > Count || _maxCount == Count) @@ -35,7 +30,6 @@ namespace HoistingCrane _places.Insert(position, hoistingCrane); return position; } - public T Remove(int position) { if (position < Count && position >= 0 && _places[position] != null) @@ -47,7 +41,6 @@ namespace HoistingCrane return null; } - public T this[int position] { get