diff --git a/ContainerShip/ContainerShip/AbstractStrategy.cs b/ContainerShip/ContainerShip/AbstractStrategy.cs index 927a3b5..503523a 100644 --- a/ContainerShip/ContainerShip/AbstractStrategy.cs +++ b/ContainerShip/ContainerShip/AbstractStrategy.cs @@ -7,9 +7,10 @@ using static ProjectContainerShip.Direction; using static System.Windows.Forms.VisualStyles.VisualStyleElement; namespace ProjectContainerShip.MovementStrategy -{/// - /// Класс-стратегия перемещения объекта - /// +{ + /// + /// Класс-стратегия перемещения объекта + /// public abstract class AbstractStrategy { /// diff --git a/ContainerShip/ContainerShip/DrawingContainerShip.cs b/ContainerShip/ContainerShip/DrawingContainerShip.cs index 44b9cbf..56de59e 100644 --- a/ContainerShip/ContainerShip/DrawingContainerShip.cs +++ b/ContainerShip/ContainerShip/DrawingContainerShip.cs @@ -38,16 +38,24 @@ namespace ProjectContainerShip.DrawningObjects return; } Brush additionalBrush = new SolidBrush(containerShip.AdditionalColor); - // Контейнер - g.FillRectangle(additionalBrush, _startPosX + 55, _startPosY + 7, 35, 5); + if (containerShip.Container) + { + g.FillRectangle(additionalBrush, _startPosX + 55, _startPosY + 7, 35, 5); + } //кран - Brush brBl = new SolidBrush(Color.Black); - g.FillRectangle(brBl, _startPosX + 110, _startPosY + 0, 3, 12); - g.FillRectangle(brBl, _startPosX + 105, _startPosY + 1, 20, 2); + if (containerShip.Crane) + { + Brush brBl = new SolidBrush(Color.Black); + g.FillRectangle(brBl, _startPosX + 110, _startPosY + 0, 3, 12); + g.FillRectangle(brBl, _startPosX + 105, _startPosY + 1, 20, 2); + } // несколько контенеров - g.FillRectangle(additionalBrush, _startPosX + 55, _startPosY + 2, 35, 5); - g.FillRectangle(additionalBrush, _startPosX + 135, _startPosY + 7, 35, 5); - g.FillRectangle(additionalBrush, _startPosX + 135, _startPosY + 2, 35, 5); + if (containerShip.Container) + { + g.FillRectangle(additionalBrush, _startPosX + 55, _startPosY + 2, 35, 5); + g.FillRectangle(additionalBrush, _startPosX + 135, _startPosY + 7, 35, 5); + g.FillRectangle(additionalBrush, _startPosX + 135, _startPosY + 2, 35, 5); + } base.DrawTransport(g); } } diff --git a/ContainerShip/ContainerShip/DrawningShip.cs b/ContainerShip/ContainerShip/DrawningShip.cs index 3784b27..d3e7487 100644 --- a/ContainerShip/ContainerShip/DrawningShip.cs +++ b/ContainerShip/ContainerShip/DrawningShip.cs @@ -97,6 +97,7 @@ namespace ProjectContainerShip.DrawningObjects else _startPosX = 0; if ((y > 0) && (y < _pictureHeight)) _startPosY = y; + else _startPosY = 0; _startPosX = x; _startPosY = y; @@ -176,12 +177,12 @@ namespace ProjectContainerShip.DrawningObjects /// /// public virtual void DrawTransport(Graphics g) - { + { if (EntityShip == null) { return; } - Brush bodyBrush = new SolidBrush(EntityShip.BodyColor); + Brush bodyColor = new SolidBrush(EntityShip.BodyColor); //границы корабля Brush brRd = new SolidBrush(Color.Red); Point point1 = new Point(_startPosX, _startPosY + 12); @@ -189,10 +190,10 @@ namespace ProjectContainerShip.DrawningObjects Point point3 = new Point(_startPosX + 175, _startPosY + 35); Point point4 = new Point(_startPosX + 200, _startPosY + 12); Point[] curvePoints1 = { point1, point2, point3, point4 }; - g.FillPolygon(brRd, curvePoints1); + g.FillPolygon(bodyColor, curvePoints1); //граница палубы Brush brBlue = new SolidBrush(Color.Blue); - g.FillRectangle(bodyBrush, _startPosX + 35, _startPosY + 0, 16, 12); + g.FillRectangle(bodyColor, _startPosX + 35, _startPosY + 0, 16, 12); } } } diff --git a/ContainerShip/ContainerShip/EntityContainerShip.cs b/ContainerShip/ContainerShip/EntityContainerShip.cs index c29793c..58d8842 100644 --- a/ContainerShip/ContainerShip/EntityContainerShip.cs +++ b/ContainerShip/ContainerShip/EntityContainerShip.cs @@ -12,7 +12,7 @@ namespace ProjectContainerShip.Entities /// /// Дополнительный цвет (для опциональных элементов) /// - public Color AdditionalColor { get; private set; } + public Color AdditionalColor { get; set; } /// /// Признак (опция) наличия крана /// @@ -21,6 +21,7 @@ namespace ProjectContainerShip.Entities /// Признак (опция) наличия дополнительных контейнеров /// public bool Container { get; private set; } + /// /// Инициализация полей объекта-класса контейнеровоза /// @@ -28,8 +29,8 @@ namespace ProjectContainerShip.Entities /// Вес /// Основной цвет /// Дополнительный цвет - /// Признак наличия труб - /// Признак наличия топлива + /// Признак наличия труб + /// Признак наличия топлива public EntityContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(speed, weight, bodyColor) { AdditionalColor = additionalColor; diff --git a/ContainerShip/ContainerShip/EntityShip.cs b/ContainerShip/ContainerShip/EntityShip.cs index 4009d33..1879d1b 100644 --- a/ContainerShip/ContainerShip/EntityShip.cs +++ b/ContainerShip/ContainerShip/EntityShip.cs @@ -19,7 +19,7 @@ namespace ProjectContainerShip /// /// Основной цвет /// - public Color BodyColor { get; private set; } + public Color BodyColor { get; set; } /// /// Шаг перемещения корабля /// diff --git a/ContainerShip/ContainerShip/FormContainerCollection.cs b/ContainerShip/ContainerShip/FormContainerCollection.cs index 2c61240..e79668f 100644 --- a/ContainerShip/ContainerShip/FormContainerCollection.cs +++ b/ContainerShip/ContainerShip/FormContainerCollection.cs @@ -114,10 +114,11 @@ namespace ProjectContainerShip { return; } - FormContainerShip form = new(); - if (form.ShowDialog() == DialogResult.OK) + var form = new FormContainerConfig(); + form.AddEvent(deleg => { - if (obj + form.SelectedShip) + bool SelectedShip = (obj + deleg); + if (SelectedShip) { MessageBox.Show("Объект добавлен"); pictureBoxCollection.Image = obj.ShowContainer(); @@ -126,7 +127,8 @@ namespace ProjectContainerShip { MessageBox.Show("Не удалось добавить объект"); } - } + }); + form.Show(); } /// /// Удаление объекта из набора diff --git a/ContainerShip/ContainerShip/FormContainerConfig.Designer.cs b/ContainerShip/ContainerShip/FormContainerConfig.Designer.cs new file mode 100644 index 0000000..ea90887 --- /dev/null +++ b/ContainerShip/ContainerShip/FormContainerConfig.Designer.cs @@ -0,0 +1,392 @@ +namespace ProjectContainerShip +{ + partial class FormContainerConfig + { + /// + /// 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() + { + groupBox1 = new GroupBox(); + labelModifiedObject = new Label(); + labelSimpleObject = new Label(); + groupBox2 = new GroupBox(); + panelPurple = new Panel(); + panelYellow = new Panel(); + panelBlack = new Panel(); + panelBlue = new Panel(); + panelGray = new Panel(); + panelGreen = new Panel(); + panelWhite = new Panel(); + panelRed = new Panel(); + checkBoxContainer = new CheckBox(); + checkBoxCrane = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + numericUpDownSpeed = new NumericUpDown(); + label2 = new Label(); + label1 = new Label(); + panelColor = new Panel(); + labelDopColor = new Label(); + labelBaseColor = new Label(); + pictureBoxObject = new PictureBox(); + ButtonOk = new Button(); + buttonCancel = new Button(); + groupBox1.SuspendLayout(); + groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + panelColor.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + SuspendLayout(); + // + // groupBox1 + // + groupBox1.Controls.Add(labelModifiedObject); + groupBox1.Controls.Add(labelSimpleObject); + groupBox1.Controls.Add(groupBox2); + groupBox1.Controls.Add(checkBoxContainer); + groupBox1.Controls.Add(checkBoxCrane); + groupBox1.Controls.Add(numericUpDownWeight); + groupBox1.Controls.Add(numericUpDownSpeed); + groupBox1.Controls.Add(label2); + groupBox1.Controls.Add(label1); + groupBox1.Location = new Point(14, 16); + groupBox1.Margin = new Padding(3, 4, 3, 4); + groupBox1.Name = "groupBox1"; + groupBox1.Padding = new Padding(3, 4, 3, 4); + groupBox1.Size = new Size(519, 304); + groupBox1.TabIndex = 0; + groupBox1.TabStop = false; + groupBox1.Text = "Параметры"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(358, 195); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(110, 35); + labelModifiedObject.TabIndex = 8; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.Click += labelModifiedObject_Click; + labelModifiedObject.MouseDown += LabelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(246, 195); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(99, 35); + labelSimpleObject.TabIndex = 7; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += LabelObject_MouseDown; + // + // groupBox2 + // + groupBox2.Controls.Add(panelPurple); + groupBox2.Controls.Add(panelYellow); + groupBox2.Controls.Add(panelBlack); + groupBox2.Controls.Add(panelBlue); + groupBox2.Controls.Add(panelGray); + groupBox2.Controls.Add(panelGreen); + groupBox2.Controls.Add(panelWhite); + groupBox2.Controls.Add(panelRed); + groupBox2.Location = new Point(246, 43); + groupBox2.Margin = new Padding(3, 4, 3, 4); + groupBox2.Name = "groupBox2"; + groupBox2.Padding = new Padding(3, 4, 3, 4); + groupBox2.Size = new Size(211, 141); + groupBox2.TabIndex = 6; + groupBox2.TabStop = false; + groupBox2.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.FromArgb(192, 0, 192); + panelPurple.Location = new Point(159, 84); + panelPurple.Margin = new Padding(3, 4, 3, 4); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(40, 40); + panelPurple.TabIndex = 7; + panelPurple.MouseDown += panelColor_MouseDown; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(159, 29); + panelYellow.Margin = new Padding(3, 4, 3, 4); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(40, 40); + panelYellow.TabIndex = 3; + panelYellow.MouseDown += panelColor_MouseDown; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(112, 84); + panelBlack.Margin = new Padding(3, 4, 3, 4); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(40, 40); + panelBlack.TabIndex = 6; + panelBlack.MouseDown += panelColor_MouseDown; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(112, 29); + panelBlue.Margin = new Padding(3, 4, 3, 4); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(40, 40); + panelBlue.TabIndex = 2; + panelBlue.MouseDown += panelColor_MouseDown; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(65, 84); + panelGray.Margin = new Padding(3, 4, 3, 4); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(40, 40); + panelGray.TabIndex = 5; + panelGray.MouseDown += panelColor_MouseDown; + // + // panelGreen + // + panelGreen.BackColor = Color.FromArgb(0, 192, 0); + panelGreen.Location = new Point(65, 29); + panelGreen.Margin = new Padding(3, 4, 3, 4); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(40, 40); + panelGreen.TabIndex = 1; + panelGreen.MouseDown += panelColor_MouseDown; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(18, 84); + panelWhite.Margin = new Padding(3, 4, 3, 4); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(40, 40); + panelWhite.TabIndex = 4; + panelWhite.MouseDown += panelColor_MouseDown; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(18, 29); + panelRed.Margin = new Padding(3, 4, 3, 4); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(40, 40); + panelRed.TabIndex = 0; + panelRed.MouseDown += panelColor_MouseDown; + // + // checkBoxContainer + // + checkBoxContainer.AutoSize = true; + checkBoxContainer.Location = new Point(11, 229); + checkBoxContainer.Margin = new Padding(3, 4, 3, 4); + checkBoxContainer.Name = "checkBoxContainer"; + checkBoxContainer.Size = new Size(199, 24); + checkBoxContainer.TabIndex = 5; + checkBoxContainer.Text = "Признак наличия крана"; + checkBoxContainer.UseVisualStyleBackColor = true; + checkBoxContainer.CheckedChanged += checkBoxBodyKit_CheckedChanged; + // + // checkBoxCrane + // + checkBoxCrane.AutoSize = true; + checkBoxCrane.Location = new Point(11, 261); + checkBoxCrane.Margin = new Padding(3, 4, 3, 4); + checkBoxCrane.Name = "checkBoxCrane"; + checkBoxCrane.Size = new Size(249, 24); + checkBoxCrane.TabIndex = 4; + checkBoxCrane.Text = "Признак наличия котнейнеров"; + checkBoxCrane.UseVisualStyleBackColor = true; + checkBoxCrane.CheckedChanged += checkBoxCrane_CheckedChanged; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(87, 80); + numericUpDownWeight.Margin = new Padding(3, 4, 3, 4); + numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownWeight.Name = "numericUpDownWeight"; + numericUpDownWeight.Size = new Size(83, 27); + numericUpDownWeight.TabIndex = 3; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownWeight.ValueChanged += numericUpDownWeight_ValueChanged; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(87, 41); + numericUpDownSpeed.Margin = new Padding(3, 4, 3, 4); + numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownSpeed.Name = "numericUpDownSpeed"; + numericUpDownSpeed.Size = new Size(83, 27); + numericUpDownSpeed.TabIndex = 2; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownSpeed.ValueChanged += numericUpDownSpeed_ValueChanged; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(11, 83); + label2.Name = "label2"; + label2.Size = new Size(36, 20); + label2.TabIndex = 1; + label2.Text = "Вес:"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(11, 44); + label1.Name = "label1"; + label1.Size = new Size(76, 20); + label1.TabIndex = 0; + label1.Text = "Скорость:"; + // + // panelColor + // + panelColor.AllowDrop = true; + panelColor.Controls.Add(labelDopColor); + panelColor.Controls.Add(labelBaseColor); + panelColor.Controls.Add(pictureBoxObject); + panelColor.Location = new Point(539, 16); + panelColor.Margin = new Padding(3, 4, 3, 4); + panelColor.Name = "panelColor"; + panelColor.Size = new Size(315, 245); + panelColor.TabIndex = 1; + panelColor.DragDrop += PanelObject_DragDrop; + panelColor.DragEnter += PanelObject_DragEnter; + // + // labelDopColor + // + labelDopColor.AllowDrop = true; + labelDopColor.BorderStyle = BorderStyle.FixedSingle; + labelDopColor.Location = new Point(187, 13); + labelDopColor.Name = "labelDopColor"; + labelDopColor.Size = new Size(114, 38); + labelDopColor.TabIndex = 2; + labelDopColor.Text = "Доп. цвет"; + labelDopColor.TextAlign = ContentAlignment.MiddleCenter; + labelDopColor.DragDrop += LabelDopColor_DragDrop; + labelDopColor.DragEnter += LabelColor_DragEnter; + labelDopColor.MouseDown += LabelObject_MouseDown; + // + // labelBaseColor + // + labelBaseColor.AllowDrop = true; + labelBaseColor.BorderStyle = BorderStyle.FixedSingle; + labelBaseColor.Location = new Point(14, 13); + labelBaseColor.Name = "labelBaseColor"; + labelBaseColor.Size = new Size(114, 38); + labelBaseColor.TabIndex = 2; + labelBaseColor.Text = "Цвет"; + labelBaseColor.TextAlign = ContentAlignment.MiddleCenter; + labelBaseColor.DragDrop += LabelBaseColor_DragDrop; + labelBaseColor.DragEnter += LabelColor_DragEnter; + labelBaseColor.MouseDown += LabelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(14, 61); + pictureBoxObject.Margin = new Padding(3, 4, 3, 4); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(288, 169); + pictureBoxObject.TabIndex = 0; + pictureBoxObject.TabStop = false; + // + // ButtonOk + // + ButtonOk.Location = new Point(553, 277); + ButtonOk.Margin = new Padding(3, 4, 3, 4); + ButtonOk.Name = "ButtonOk"; + ButtonOk.Size = new Size(114, 43); + ButtonOk.TabIndex = 2; + ButtonOk.Text = "Добавить"; + ButtonOk.UseVisualStyleBackColor = true; + ButtonOk.Click += ButtonOk_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(727, 277); + buttonCancel.Margin = new Padding(3, 4, 3, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(114, 43); + buttonCancel.TabIndex = 3; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // FormContainerConfig + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(914, 336); + Controls.Add(buttonCancel); + Controls.Add(ButtonOk); + Controls.Add(panelColor); + Controls.Add(groupBox1); + Margin = new Padding(3, 4, 3, 4); + Name = "FormContainerConfig"; + Text = "FormSelfPropelledArtilleryUnitConfig"; + groupBox1.ResumeLayout(false); + groupBox1.PerformLayout(); + groupBox2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + panelColor.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBox1; + private NumericUpDown numericUpDownWeight; + private NumericUpDown numericUpDownSpeed; + private Label label2; + private Label label1; + private GroupBox groupBox2; + private CheckBox checkBoxContainer; + private CheckBox checkBoxCrane; + 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 Label labelSimpleObject; + private Label labelModifiedObject; + private Panel panelColor; + private PictureBox pictureBoxObject; + private Label labelDopColor; + private Label labelBaseColor; + private Button ButtonOk; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/ContainerShip/ContainerShip/FormContainerConfig.cs b/ContainerShip/ContainerShip/FormContainerConfig.cs new file mode 100644 index 0000000..cf611f1 --- /dev/null +++ b/ContainerShip/ContainerShip/FormContainerConfig.cs @@ -0,0 +1,191 @@ +using ProjectContainerShip.DrawningObjects; +using ProjectContainerShip.Entities; +using ProjectContainerShip; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.TrackBar; + +namespace ProjectContainerShip +{ + /// + /// Форма создания объекта + /// + public partial class FormContainerConfig : Form + { + /// + /// Переменная-выбранный корабль + /// + DrawningShip? _ship = null; + /// + /// Событие + /// + private event Action EventAddShip; + /// + /// Конструктор + /// + public FormContainerConfig() + { + 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 += (sender, e) => Close(); + } + /// + /// Отрисовать контейнеровоз + /// + private void DrawShip() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _ship?.SetPosition(5, 5); + _ship?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + /// + /// Добавление события + /// + /// Привязанный метод + public void AddEvent(Action ev) + { + if (EventAddShip == null) + { + EventAddShip = new Action(ev); + } + else + { + EventAddShip += ev; + } + } + /// + /// Передаем информацию при нажатии на Label + /// + /// + /// + 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) ?? false) + { + 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": + _ship = new DrawningShip((int)numericUpDownSpeed.Value, + (int)numericUpDownWeight.Value, Color.White, pictureBoxObject.Width, + pictureBoxObject.Height); + break; + case "labelModifiedObject": + _ship = new DrawningContainerShip((int)numericUpDownSpeed.Value, + (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxContainer.Checked, + checkBoxCrane.Checked, pictureBoxObject.Width, pictureBoxObject.Height); + break; + } + DrawShip(); + } + /// + /// Отправляем цвет с панели + /// + /// + /// + private void panelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) + { + if (_ship != null) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + _ship.EntityShip.BodyColor = (Color)e.Data.GetData(typeof(Color)); + + } + DrawShip(); + } + } + private void LabelColor_DragEnter(object sender, DragEventArgs e) + { + if (_ship != null && _ship.EntityShip is EntityContainerShip entityustabat) + { + labelDopColor.AllowDrop = true; + } + else + labelDopColor.AllowDrop = false; + + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + private void LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + if (_ship != null && _ship.EntityShip is EntityContainerShip entityContainerShip) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + entityContainerShip.AdditionalColor = (Color)e.Data.GetData(typeof(Color)); + } + DrawShip(); + } + } + /// + /// Добавление корабля + /// + /// + /// + private void ButtonOk_Click(object sender, EventArgs e) + { + EventAddShip?.Invoke(_ship); + Close(); + } + private void checkBoxBodyKit_CheckedChanged(object sender, EventArgs e) + { + + } + private void labelModifiedObject_Click(object sender, EventArgs e) + { + + } + private void numericUpDownSpeed_ValueChanged(object sender, EventArgs e) + { + + } + private void numericUpDownWeight_ValueChanged(object sender, EventArgs e) + { + + } + private void checkBoxCrane_CheckedChanged(object sender, EventArgs e) + { + + } + } +} diff --git a/ContainerShip/ContainerShip/FormContainerConfig.resx b/ContainerShip/ContainerShip/FormContainerConfig.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ContainerShip/ContainerShip/FormContainerConfig.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ContainerShip/ContainerShip/FormContainerShip.cs b/ContainerShip/ContainerShip/FormContainerShip.cs index a46428f..c31782f 100644 --- a/ContainerShip/ContainerShip/FormContainerShip.cs +++ b/ContainerShip/ContainerShip/FormContainerShip.cs @@ -103,16 +103,16 @@ namespace ProjectContainerShip { case "buttonUp": _drawingContainerShip.MoveTransport(DirectionType.Up); - break; + break; case "buttonDown": _drawingContainerShip.MoveTransport(DirectionType.Down); - break; + break; case "buttonLeft": _drawingContainerShip.MoveTransport(DirectionType.Left); - break; + break; case "buttonRight": _drawingContainerShip.MoveTransport(DirectionType.Right); - break; + break; } Draw(); } diff --git a/ContainerShip/ContainerShip/MoveToCenter.cs b/ContainerShip/ContainerShip/MoveToCenter.cs index e61f5e5..2d0c83f 100644 --- a/ContainerShip/ContainerShip/MoveToCenter.cs +++ b/ContainerShip/ContainerShip/MoveToCenter.cs @@ -59,3 +59,4 @@ namespace ProjectContainerShip.MovementStrategy } +