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..0298512 100644 --- a/HoistingCrane/HoistingCrane/EntityAdvancedHoistingCrane.cs +++ b/HoistingCrane/HoistingCrane/EntityAdvancedHoistingCrane.cs @@ -12,8 +12,7 @@ namespace HoistingCrane public bool Crane { get; private set; } // наличие противовеса public bool Сounterweight { get; private set; } - public Color DopColor { get; private set; } - + public Color DopColor { get; 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..cb0bd99 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 Color BodyColor { get; 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/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..bb58a8a --- /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 HoistingCraneDelegate 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(HoistingCraneDelegate ev) + { + if (EventAddHoistingCrane == null) + { + EventAddHoistingCrane = new HoistingCraneDelegate(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(); + } + } +} + diff --git a/HoistingCrane/HoistingCrane/FormMap.resx b/HoistingCrane/HoistingCrane/FormHoistingCraneConfig.resx similarity index 100% rename from HoistingCrane/HoistingCrane/FormMap.resx rename to HoistingCrane/HoistingCrane/FormHoistingCraneConfig.resx 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/FormMapWithSetHoistingCrane.Designer.cs b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs index 11ed709..0409949 100644 --- a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs +++ b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.Designer.cs @@ -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 // diff --git a/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs b/HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs index 53c2d44..124aab0 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(); @@ -69,8 +67,7 @@ namespace HoistingCrane break; case "Вторая карта": map = new SecondMap(); - break; - + break; } if (map != null) { @@ -102,7 +99,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,29 +121,29 @@ namespace HoistingCrane ReloadMaps(); } } - private void ButtonAddHoistingCrane_Click(object sender, EventArgs e) { if (listBoxMaps.SelectedIndex == -1) { return; } - FormHoistingCrane form = new(); - if (form.ShowDialog() == DialogResult.OK) + var formHoistingCraneConfig = new FormHoistingCraneConfig(); + formHoistingCraneConfig.AddEvent(AddHoistingCrane); + formHoistingCraneConfig.Show(); + } + private void AddHoistingCrane(DrawingHoistingCrane drawingHoistingCrane) + { + DrawingObjectHoistingCrane hoistingCrane = new DrawingObjectHoistingCrane(drawingHoistingCrane); + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + hoistingCrane != -1) { - DrawingObjectHoistingCrane roadtrain = new(form.SelectedHoistingCrane); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + roadtrain != -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); } } - private void ButtonRemoveHoistingCrane_Click(object sender, EventArgs e) { if (listBoxMaps.SelectedIndex == -1) @@ -169,16 +165,14 @@ namespace HoistingCrane MessageBox.Show("Не удалось удалить объект"); } } - private void ButtonShowStorage_Click(object sender, EventArgs e) { if (listBoxMaps.SelectedIndex == -1) { return; } - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap(); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); } - private void ButtonShowOnMap_Click(object sender, EventArgs e) { if (listBoxMaps.SelectedIndex == -1) @@ -187,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) @@ -213,10 +206,5 @@ namespace HoistingCrane } pictureBox.Image = _mapHoistingCraneCollectionGeneric.MoveObject(enums); } - - private void pictureBox_Click(object sender, EventArgs e) - { - - } } } diff --git a/HoistingCrane/HoistingCrane/HoistingCraneDelegate.cs b/HoistingCrane/HoistingCrane/HoistingCraneDelegate.cs new file mode 100644 index 0000000..8f2107d --- /dev/null +++ b/HoistingCrane/HoistingCrane/HoistingCraneDelegate.cs @@ -0,0 +1,9 @@ + +namespace HoistingCrane +{ + /// + /// Делегат для передачи объекта + /// + /// + public delegate void HoistingCraneDelegate(DrawingHoistingCrane hoistingCrane); +} diff --git a/HoistingCrane/HoistingCrane/MapWithSetHoistingCraneGeneric.cs b/HoistingCrane/HoistingCrane/MapWithSetHoistingCraneGeneric.cs index 4b1fb1d..5611db8 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,7 +25,6 @@ namespace HoistingCrane _pictureHeight = picHeight; _map = map; } - public static int operator +(MapWithSetHoistingCraneGeneric map, T bulldozer) { return map._setHoistingCrane.Insert(bulldozer); @@ -36,16 +34,14 @@ namespace HoistingCrane { return map._setHoistingCrane.Remove(position); } - public Bitmap ShowSet() { Bitmap bmp = new(_pictureWidth, _pictureWidth); Graphics gr = Graphics.FromImage(bmp); DrawBackground(gr); - DrawBulldozers(gr); + DrawHoistingCranes(gr); return bmp; } - public Bitmap ShowOnMap() { Shaking(); @@ -55,7 +51,6 @@ namespace HoistingCrane } return new(_pictureWidth, _pictureHeight); } - public Bitmap MoveObject(Direction direction) { if (_map != null) @@ -64,7 +59,6 @@ namespace HoistingCrane } return new(_pictureWidth, _pictureHeight); } - public void Shaking() { int j = _setHoistingCrane.Count - 1; @@ -89,7 +83,6 @@ namespace HoistingCrane } } } - private void DrawBackground(Graphics gr) { Pen pen = new(Color.Black, 3); @@ -102,14 +95,12 @@ namespace HoistingCrane gr.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight); } } - - private void DrawBulldozers(Graphics gr) + private void DrawHoistingCranes(Graphics gr) { int heightEl = _pictureHeight / _placeSizeHeight; int widthEl = _pictureWidth / _placeSizeWidth; int curWidth = 3; int curHeight = 3; - for (int i = 0; i < _setHoistingCrane.Count; i++) { if (curHeight < 0) 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