diff --git a/ContainerShip/ContainerShip/EntityContainerShip.cs b/ContainerShip/ContainerShip/EntityContainerShip.cs index 816351d..dcc9c4c 100644 --- a/ContainerShip/ContainerShip/EntityContainerShip.cs +++ b/ContainerShip/ContainerShip/EntityContainerShip.cs @@ -28,5 +28,10 @@ namespace ContainerShip Crane = crane; Containers = containers; } + + public void setDopColor(Color newDopColor) + { + DopColor = newDopColor; + } } } diff --git a/ContainerShip/ContainerShip/EntityShip.cs b/ContainerShip/ContainerShip/EntityShip.cs index 05fb955..fe410f4 100644 --- a/ContainerShip/ContainerShip/EntityShip.cs +++ b/ContainerShip/ContainerShip/EntityShip.cs @@ -38,5 +38,9 @@ namespace ContainerShip Weight = weight <= 0 ? rnd.Next(40, 70) : weight; BodyColor = bodyColor; } + public void setColor (Color newColor) + { + BodyColor = newColor; + } } } diff --git a/ContainerShip/ContainerShip/FormMapWithSetShips.cs b/ContainerShip/ContainerShip/FormMapWithSetShips.cs index e04780f..52785df 100644 --- a/ContainerShip/ContainerShip/FormMapWithSetShips.cs +++ b/ContainerShip/ContainerShip/FormMapWithSetShips.cs @@ -18,7 +18,8 @@ namespace ContainerShip /// private readonly Dictionary _mapsDict = new() { - { "Простая карта", new SimpleMap() } + { "Простая карта", new SimpleMap() }, + { "Модифицированная карта", new ModifyMap()} }; /// /// Объект от класса карты с набором объектов @@ -45,9 +46,9 @@ namespace ContainerShip int index = listBoxMaps.SelectedIndex; listBoxMaps.Items.Clear(); - for (int i = 0; i < _mapsCollection.Keys.Count; i++) + foreach (string key in _mapsCollection.Keys) { - listBoxMaps.Items.Add(_mapsCollection.Keys[i]); + listBoxMaps.Items.Add(key); } if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count)) @@ -70,20 +71,11 @@ namespace ContainerShip { return; } - FormShip form = new(); - if (form.ShowDialog() == DialogResult.OK) - { - DrawingObjectShip ship = new(form.SelectedShip); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + ship != -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } - } + var formAirBomberConfig = new FormShipConfig(); + formAirBomberConfig.AddEvent(new Action(ship => { + _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].add(new DrawingObjectShip(ship)); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();})); + formAirBomberConfig.Show(); } /// /// Удаление объекта diff --git a/ContainerShip/ContainerShip/FormShipConfig.Designer.cs b/ContainerShip/ContainerShip/FormShipConfig.Designer.cs new file mode 100644 index 0000000..f2544ba --- /dev/null +++ b/ContainerShip/ContainerShip/FormShipConfig.Designer.cs @@ -0,0 +1,407 @@ +namespace ContainerShip +{ + partial class FormShipConfig + { + /// + /// 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.buttonCancel = new System.Windows.Forms.Button(); + this.buttonOk = new System.Windows.Forms.Button(); + 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.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.checkBoxContainers = 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.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + this.groupBoxConfig.SuspendLayout(); + this.groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + this.SuspendLayout(); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(966, 321); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(149, 50); + this.buttonCancel.TabIndex = 9; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(793, 321); + this.buttonOk.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(149, 50); + this.buttonOk.TabIndex = 8; + this.buttonOk.Text = "Добавить"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click); + // + // 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(765, 4); + this.panelObject.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(374, 307); + this.panelObject.TabIndex = 7; + 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(201, 15); + this.labelDopColor.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(148, 52); + 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(29, 15); + this.labelBaseColor.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(148, 52); + 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(29, 73); + this.pictureBoxObject.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(321, 208); + this.pictureBoxObject.TabIndex = 0; + this.pictureBoxObject.TabStop = false; + // + // groupBoxConfig + // + this.groupBoxConfig.Controls.Add(this.labelModifiedObject); + this.groupBoxConfig.Controls.Add(this.labelSimpleObject); + this.groupBoxConfig.Controls.Add(this.groupBoxColors); + this.groupBoxConfig.Controls.Add(this.checkBoxContainers); + 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(13, 4); + this.groupBoxConfig.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxConfig.Name = "groupBoxConfig"; + this.groupBoxConfig.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxConfig.Size = new System.Drawing.Size(743, 367); + this.groupBoxConfig.TabIndex = 6; + this.groupBoxConfig.TabStop = false; + this.groupBoxConfig.Text = "Параметры"; + // + // labelModifiedObject + // + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Location = new System.Drawing.Point(563, 270); + this.labelModifiedObject.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(138, 62); + 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(403, 270); + this.labelSimpleObject.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(138, 62); + 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(381, 37); + this.groupBoxColors.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxColors.Size = new System.Drawing.Size(344, 212); + 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(263, 122); + this.panelPurple.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(57, 67); + this.panelPurple.TabIndex = 3; + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(263, 37); + this.panelYellow.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(57, 67); + this.panelYellow.TabIndex = 1; + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(181, 122); + this.panelBlack.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(57, 67); + this.panelBlack.TabIndex = 4; + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(181, 37); + this.panelBlue.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(57, 67); + this.panelBlue.TabIndex = 1; + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(103, 122); + this.panelGray.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(57, 67); + this.panelGray.TabIndex = 5; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(103, 37); + this.panelGreen.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(57, 67); + this.panelGreen.TabIndex = 1; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(21, 122); + this.panelWhite.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(57, 67); + this.panelWhite.TabIndex = 2; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(21, 37); + this.panelRed.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(57, 67); + this.panelRed.TabIndex = 0; + // + // checkBoxContainers + // + this.checkBoxContainers.AutoSize = true; + this.checkBoxContainers.Location = new System.Drawing.Point(32, 233); + this.checkBoxContainers.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxContainers.Name = "checkBoxContainers"; + this.checkBoxContainers.Size = new System.Drawing.Size(280, 29); + this.checkBoxContainers.TabIndex = 12; + this.checkBoxContainers.Text = "Признак наличия контейнера"; + this.checkBoxContainers.UseVisualStyleBackColor = true; + // + // checkBoxCrane + // + this.checkBoxCrane.AutoSize = true; + this.checkBoxCrane.Location = new System.Drawing.Point(32, 194); + this.checkBoxCrane.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxCrane.Name = "checkBoxCrane"; + this.checkBoxCrane.Size = new System.Drawing.Size(233, 29); + this.checkBoxCrane.TabIndex = 11; + this.checkBoxCrane.Text = "Признак наличия крана"; + this.checkBoxCrane.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(129, 120); + this.numericUpDownWeight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + 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(113, 31); + 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(32, 125); + this.labelWeight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(43, 25); + this.labelWeight.TabIndex = 9; + this.labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(129, 50); + this.numericUpDownSpeed.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + 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(113, 31); + 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(32, 55); + this.labelSpeed.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(93, 25); + this.labelSpeed.TabIndex = 7; + this.labelSpeed.Text = "Скорость:"; + // + // FormShipConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1157, 386); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.groupBoxConfig); + this.Name = "FormShipConfig"; + this.Text = "Создание объекта"; + this.panelObject.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.groupBoxConfig.ResumeLayout(false); + this.groupBoxConfig.PerformLayout(); + this.groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private Button buttonCancel; + private Button buttonOk; + private Panel panelObject; + private Label labelDopColor; + private Label labelBaseColor; + private PictureBox pictureBoxObject; + private GroupBox groupBoxConfig; + 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 CheckBox checkBoxContainers; + private CheckBox checkBoxCrane; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + } +} \ No newline at end of file diff --git a/ContainerShip/ContainerShip/FormShipConfig.cs b/ContainerShip/ContainerShip/FormShipConfig.cs new file mode 100644 index 0000000..21b6cbc --- /dev/null +++ b/ContainerShip/ContainerShip/FormShipConfig.cs @@ -0,0 +1,112 @@ +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 ContainerShip +{ + public partial class FormShipConfig : Form + { + DrawingShip _ship = null; + private event Action EventAddShip; + public FormShipConfig() + { + 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 DrawShip() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _ship?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _ship?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + 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; + } + } + public void AddEvent(Action ev) + { + if (EventAddShip == null) + { + EventAddShip = ev; + } + else + { + EventAddShip += ev; + } + } + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data.GetData(DataFormats.Text).ToString()) + { + case "labelSimpleObject": + _ship = new DrawingShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _ship = new DrawingContainerShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, + checkBoxCrane.Checked, checkBoxContainers.Checked); + break; + } + DrawShip(); + } + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor.Name, DragDropEffects.Move | DragDropEffects.Copy); + } + private void LabelColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(String))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) + { + _ship?.Ship?.setColor(Color.FromName(e.Data.GetData(DataFormats.Text).ToString())); + DrawShip(); + } + private void LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + if (_ship.Ship is EntityContainerShip ContainerShip) + { + ContainerShip.setDopColor(Color.FromName(e.Data.GetData(DataFormats.Text).ToString())); + DrawShip(); + } + } + private void ButtonOk_Click(object sender, EventArgs e) + { + EventAddShip?.Invoke(_ship); + Close(); + } + } +} diff --git a/ContainerShip/ContainerShip/FormShipConfig.resx b/ContainerShip/ContainerShip/FormShipConfig.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/ContainerShip/ContainerShip/FormShipConfig.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/MapWithSetShipsGeneric.cs b/ContainerShip/ContainerShip/MapWithSetShipsGeneric.cs index 56c9a2d..10db820 100644 --- a/ContainerShip/ContainerShip/MapWithSetShipsGeneric.cs +++ b/ContainerShip/ContainerShip/MapWithSetShipsGeneric.cs @@ -167,5 +167,9 @@ namespace ContainerShip { return map._setShips.Remove(position); } + public int add(T ship) + { + return _setShips.Insert(ship); + } } }