RomanovEgor/PIbd-22-Romanov-E.V.-Hoistingcrane._Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

исправления

Browse Source
This commit is contained in:
10Г Егор Романов 2022-12-04 17:37:55 +04:00
parent ad4adeb262
commit 1dd50a48f4
15 changed files with 2 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HoistingCrane/HoistingCrane/AbstractMap.cs
View File

@ -103,7 +103,6 @@ namespace HoistingCrane
else _drawingObject.MoveObject(SetOppositDirection(direction));
return DrawMapWithObject();
}
private Direction SetOppositDirection(Direction dir)
{
switch (dir)

4
HoistingCrane/HoistingCrane/DrawingHoistingCrane.cs
View File

@ -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)

4
HoistingCrane/HoistingCrane/EntityHoistingCrane.cs
View File

@ -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; set; }
public float Step => Speed * 100 / Weight;
public EntityHoistingCrane(int speed, float weight, Color bodyColor)
{
Random rnd = new();

2
HoistingCrane/HoistingCrane/FormHoistingCrane.Designer.cs generated
View File

@ -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
@ -163,7 +162,6 @@
this.buttonCreateModify.TabIndex = 7;
this.buttonCreateModify.Text = "Модификация";
this.buttonCreateModify.UseVisualStyleBackColor = true;
this.buttonCreateModify.Click += new System.EventHandler(this.ButtonCreateModify_Click);
//
// buttonSelect
//

13
HoistingCrane/HoistingCrane/FormHoistingCrane.cs
View File

@ -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();
}
/// <summary>
/// Èçìåíåíèå ðàçìåðîâ ôîðìû
/// </summary>
@ -75,14 +69,9 @@
/// <param name="e"></param>
private void pictureBoxHoistingCrane_Resize(object sender, EventArgs e)
{
_hoistingCrane?.ChangeBorders(pictureBoxHoistingCrane.Width, pictureBoxHoistingCrane.Height);
_HoistingCrane?.ChangeBorders(pictureBoxHoistingCrane.Width, pictureBoxHoistingCrane.Height);
Draw();
}
private void pictureBoxHoistingCrane_Click(object sender, EventArgs e)
{
}
private void ButtonSelect_Click(object sender, EventArgs e)
{
SelectedHoistingCrane = _HoistingCrane;

1
HoistingCrane/HoistingCrane/FormHoistingCraneConfig.Designer.cs generated
View File

@ -369,7 +369,6 @@
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "FormHoistingCraneConfig";
this.Text = "Создание объекта";
this.Load += new System.EventHandler(this.FormHoistingCraneConfig_Load);
this.groupBoxConfig.ResumeLayout(false);
this.groupBoxConfig.PerformLayout();
this.groupBoxColors.ResumeLayout(false);

16
HoistingCrane/HoistingCrane/FormHoistingCraneConfig.cs
View File

@ -15,10 +15,8 @@ namespace HoistingCrane
//переменная-выбранный кран
DrawingHoistingCrane _hoistingCrane = null;
public DrawingHoistingCrane SelectedHoistingCrane { get; private set; }
//событие
private event HoistingCraneDelegate EventAddHoistingCrane;
//конструктор
public FormHoistingCraneConfig()
{
@ -33,7 +31,6 @@ namespace HoistingCrane
panelBlue.MouseDown += PanelColor_MouseDown;
buttonCancel.Click += (object sender, EventArgs e) => Close();
}
//отрисовка кран
private void DrawHoistingCrane()
{
@ -43,7 +40,6 @@ namespace HoistingCrane
_hoistingCrane?.DrawTransport(gr);
pictureBoxObject.Image = bmp;
}
//добавление события
public void AddEvent(HoistingCraneDelegate ev)
{
@ -56,7 +52,6 @@ namespace HoistingCrane
EventAddHoistingCrane += ev;
}
}
private void LabelObject_MouseDown(object sender, MouseEventArgs e)
{
(sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
@ -74,7 +69,6 @@ namespace HoistingCrane
e.Effect = DragDropEffects.None;
}
}
//действия при приеме перетаскиваемой информации
private void PanelObject_DragDrop(object sender, DragEventArgs e)
{
@ -91,13 +85,11 @@ namespace HoistingCrane
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)
{
@ -110,7 +102,6 @@ namespace HoistingCrane
e.Effect = DragDropEffects.None;
}
}
//принимаем основной цвет
private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
{
@ -122,7 +113,6 @@ namespace HoistingCrane
DrawHoistingCrane();
}
}
//принимаем дополнительный цвет
private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
{
@ -133,18 +123,12 @@ namespace HoistingCrane
DrawHoistingCrane();
}
}
//добавление крана
private void ButtonAddObject_Click(object sender, EventArgs e)
{
EventAddHoistingCrane?.Invoke(_hoistingCrane);
Close();
}
private void FormHoistingCraneConfig_Load(object sender, EventArgs e)
{
}
}
}

208
HoistingCrane/HoistingCrane/FormMap.Designer.cs generated
View File

@ -1,208 +0,0 @@
namespace HoistingCrane
{
partial class FormMap
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
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;
}
}

88
HoistingCrane/HoistingCrane/FormMap.cs
View File

@ -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)
{
}
}
}

60
HoistingCrane/HoistingCrane/FormMap.resx
View File

@ -1,60 +0,0 @@
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

1
HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs generated
View File

@ -262,7 +262,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
//

14
HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs
View File

@ -24,9 +24,7 @@ namespace HoistingCrane
/// </summary>
private readonly MapsCollection _mapsCollection;
/// <summary>
private MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap> _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();
@ -118,14 +115,12 @@ namespace HoistingCrane
{
return;
}
if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
_mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
ReloadMaps();
}
}
private void ButtonAddHoistingCrane_Click(object sender, EventArgs e)
{
if (listBoxMaps.SelectedIndex == -1)
@ -135,7 +130,6 @@ namespace HoistingCrane
var formHoistingCraneConfig = new FormHoistingCraneConfig();
formHoistingCraneConfig.AddEvent(AddHoistingCrane);
formHoistingCraneConfig.Show();
}
private void AddHoistingCrane(DrawingHoistingCrane drawingHoistingCrane)
{
@ -171,7 +165,6 @@ namespace HoistingCrane
MessageBox.Show("Не удалось удалить объект");
}
}
private void ButtonShowStorage_Click(object sender, EventArgs e)
{
if (listBoxMaps.SelectedIndex == -1)
@ -180,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)
@ -189,7 +181,6 @@ namespace HoistingCrane
}
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
}
private void ButtonMove_Click(object sender, EventArgs e)
{
if (listBoxMaps.SelectedIndex == -1)
@ -215,10 +206,5 @@ namespace HoistingCrane
}
pictureBox.Image = _mapHoistingCraneCollectionGeneric.MoveObject(enums);
}
private void pictureBox_Click(object sender, EventArgs e)
{
}
}
}

2
HoistingCrane/HoistingCrane/HoistingCraneDelegate.cs
View File

@ -2,7 +2,7 @@
namespace HoistingCrane
{
/// <summary>
/// Делегат для передачи объекта-корабля
/// Делегат для передачи объекта
/// </summary>
/// <param name="hoistingCrane"></param>
public delegate void HoistingCraneDelegate(DrawingHoistingCrane hoistingCrane);

9
HoistingCrane/HoistingCrane/MapWithSetHoistingCraneGeneric.cs
View File

@ -16,7 +16,6 @@ namespace HoistingCrane
private readonly int _placeSizeHeight = 120;
private readonly SetHoistingCraneGeneric<T> _setHoistingCranes;
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<T, U> map, T hoistingcrane)
{
return map._setHoistingCranes.Insert(hoistingcrane);
}
public static T operator -(MapWithSetHoistingCraneGeneric<T, U> map, int position)
{
return map._setHoistingCranes.Remove(position);
}
public Bitmap ShowSet()
{
Bitmap bmp = new(_pictureWidth, _pictureWidth);
@ -45,7 +41,6 @@ namespace HoistingCrane
DrawHoistingCranes(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 = _setHoistingCranes.Count - 1;
@ -89,7 +82,6 @@ namespace HoistingCrane
}
}
}
private void DrawBackground(Graphics gr)
{
Pen pen = new(Color.Black, 3);
@ -102,7 +94,6 @@ namespace HoistingCrane
gr.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
}
}
private void DrawHoistingCranes(Graphics gr)
{
int heightEl = _pictureHeight / _placeSizeHeight;

7
HoistingCrane/HoistingCrane/SetHoistingCraneGeneric.cs
View File

@ -10,22 +10,17 @@ namespace HoistingCrane
where T : class
{
private readonly List<T> _places;
public int Count => _places.Count;
private readonly int _maxCount;
public SetHoistingCraneGeneric(int count)
{
_maxCount = count;
_places = new List<T>();
}
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