diff --git a/ProjectLiner/ProjectLiner/Entities/EntityLiner.cs b/ProjectLiner/ProjectLiner/Entities/EntityLiner.cs
index facc940..5b7698f 100644
--- a/ProjectLiner/ProjectLiner/Entities/EntityLiner.cs
+++ b/ProjectLiner/ProjectLiner/Entities/EntityLiner.cs
@@ -35,4 +35,8 @@ public class EntityLiner : EntityShip
SecondDeck = secondDeck;
Pool = pool;
}
+ public void SetAdditionalColor(Color color)
+ {
+ AdditionalColor = color;
+ }
}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/Entities/EntityShip.cs b/ProjectLiner/ProjectLiner/Entities/EntityShip.cs
index 9504427..ba30327 100644
--- a/ProjectLiner/ProjectLiner/Entities/EntityShip.cs
+++ b/ProjectLiner/ProjectLiner/Entities/EntityShip.cs
@@ -37,4 +37,9 @@ public class EntityShip
Weight = weight;
BodyColor = bodyColor;
}
+
+ public void SetBodyColor(Color bodyColor)
+ {
+ BodyColor = bodyColor;
+ }
}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormShipCollection.Designer.cs b/ProjectLiner/ProjectLiner/FormShipCollection.Designer.cs
index 643059e..b6c1351 100644
--- a/ProjectLiner/ProjectLiner/FormShipCollection.Designer.cs
+++ b/ProjectLiner/ProjectLiner/FormShipCollection.Designer.cs
@@ -35,7 +35,6 @@ namespace ProjectLiner
groupBoxTools = new GroupBox();
panelCompanyTools = new Panel();
buttonAddShip = new Button();
- buttonAddLiner = new Button();
buttonRefresh = new Button();
maskedTextBoxPosition = new MaskedTextBox();
buttonGoToCheck = new Button();
@@ -74,7 +73,6 @@ namespace ProjectLiner
// panelCompanyTools
//
panelCompanyTools.Controls.Add(buttonAddShip);
- panelCompanyTools.Controls.Add(buttonAddLiner);
panelCompanyTools.Controls.Add(buttonRefresh);
panelCompanyTools.Controls.Add(maskedTextBoxPosition);
panelCompanyTools.Controls.Add(buttonGoToCheck);
@@ -86,16 +84,6 @@ namespace ProjectLiner
panelCompanyTools.Size = new Size(138, 247);
panelCompanyTools.TabIndex = 10;
//
- // buttonAddLiner
- //
- buttonAddLiner.Location = new Point(3, 51);
- buttonAddLiner.Name = "buttonAddLiner";
- buttonAddLiner.Size = new Size(126, 44);
- buttonAddLiner.TabIndex = 2;
- buttonAddLiner.Text = "Добавление лайнера";
- buttonAddLiner.UseVisualStyleBackColor = true;
- buttonAddLiner.Click += ButtonAddLiner_Click;
- //
// buttonAddShip
//
buttonAddShip.Location = new Point(4, 3);
@@ -268,7 +256,7 @@ namespace ProjectLiner
Controls.Add(pictureBox);
Controls.Add(groupBoxTools);
Name = "FormShipCollection";
- Text = "Коллекция самолётов";
+ Text = "Коллекция кораблей";
groupBoxTools.ResumeLayout(false);
panelCompanyTools.ResumeLayout(false);
panelCompanyTools.PerformLayout();
@@ -283,7 +271,6 @@ namespace ProjectLiner
private GroupBox groupBoxTools;
private ComboBox comboBoxSelectorCompany;
private Button buttonAddShip;
- private Button buttonAddLiner;
private Button buttonRemoveShip;
private MaskedTextBox maskedTextBoxPosition;
private PictureBox pictureBox;
diff --git a/ProjectLiner/ProjectLiner/FormShipCollection.cs b/ProjectLiner/ProjectLiner/FormShipCollection.cs
index 10beb6a..3ac25c9 100644
--- a/ProjectLiner/ProjectLiner/FormShipCollection.cs
+++ b/ProjectLiner/ProjectLiner/FormShipCollection.cs
@@ -42,43 +42,24 @@ public partial class FormShipCollection : Form
///
///
///
- private void ButtonAddShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip));
-
- ///
- /// Добавление лайнера
- ///
- ///
- ///
- private void ButtonAddLiner_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningLiner));
-
- ///
- /// Создание объекта класса-перемещения
- ///
- /// Тип создаваемого объекта
- private void CreateObject(string type)
+ private void ButtonAddShip_Click(object sender, EventArgs e)
{
- if (_company == null)
+ FormShipConfig form = new();
+ form.Show();
+ form.AddEvent(SetShip);
+ }
+
+ ///
+ /// Добавление корабля в коллекцию
+ ///
+ ///
+ private void SetShip(DrawningShip? ship)
+ {
+ if (_company == null || ship == null)
{
return;
}
- Random random = new();
- DrawningShip drawningShip;
- switch (type)
- {
- case nameof(DrawningShip):
- drawningShip = new DrawningShip(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
- break;
- case nameof(DrawningLiner):
- drawningShip = new DrawningLiner(random.Next(100, 300), random.Next(1000, 3000),
- GetColor(random),
- GetColor(random),
- Convert.ToBoolean(random.Next(0, 2)),
- Convert.ToBoolean(random.Next(0, 2)));
- break;
- default:
- return;
- }
- if (_company + drawningShip != -1)
+ if (_company + ship != -1)
{
MessageBox.Show("Объект добавлен");
pictureBox.Image = _company.Show();
@@ -89,22 +70,6 @@ public partial class FormShipCollection : Form
}
}
- ///
- /// Получение цвета
- ///
- /// Генератор случайных чисел
- ///
- private static Color GetColor(Random random)
- {
- Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
- ColorDialog dialog = new();
- if (dialog.ShowDialog() == DialogResult.OK)
- {
- color = dialog.Color;
- }
- return color;
- }
-
///
/// Удаление объекта
///
@@ -177,6 +142,7 @@ public partial class FormShipCollection : Form
}
pictureBox.Image = _company.Show();
}
+
///
/// Добавление коллекции
///
diff --git a/ProjectLiner/ProjectLiner/FormShipConfig.Designer.cs b/ProjectLiner/ProjectLiner/FormShipConfig.Designer.cs
new file mode 100644
index 0000000..59eed7a
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/FormShipConfig.Designer.cs
@@ -0,0 +1,357 @@
+namespace ProjectLiner
+{
+ 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()
+ {
+ groupBoxConfig = new GroupBox();
+ groupBoxColors = new GroupBox();
+ panelPurple = new Panel();
+ panelBlack = new Panel();
+ panelGray = new Panel();
+ panelWhite = new Panel();
+ panelYellow = new Panel();
+ panelBlue = new Panel();
+ panelGreen = new Panel();
+ panelRed = new Panel();
+ checkBoxPool = new CheckBox();
+ checkBoxSecondDeck = new CheckBox();
+ numericUpDownWeight = new NumericUpDown();
+ labelWeight = new Label();
+ numericUpDownSpeed = new NumericUpDown();
+ labelSpeed = new Label();
+ labelModifiedObject = new Label();
+ labelSimpleObject = new Label();
+ pictureBoxObject = new PictureBox();
+ buttonAdd = new Button();
+ buttonCancel = new Button();
+ panelObject = new Panel();
+ labelAdditionalColor = new Label();
+ labelBodyColor = new Label();
+ groupBoxConfig.SuspendLayout();
+ groupBoxColors.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+ panelObject.SuspendLayout();
+ SuspendLayout();
+ //
+ // groupBoxConfig
+ //
+ groupBoxConfig.Controls.Add(groupBoxColors);
+ groupBoxConfig.Controls.Add(checkBoxPool);
+ groupBoxConfig.Controls.Add(checkBoxSecondDeck);
+ groupBoxConfig.Controls.Add(numericUpDownWeight);
+ groupBoxConfig.Controls.Add(labelWeight);
+ groupBoxConfig.Controls.Add(numericUpDownSpeed);
+ groupBoxConfig.Controls.Add(labelSpeed);
+ groupBoxConfig.Controls.Add(labelModifiedObject);
+ groupBoxConfig.Controls.Add(labelSimpleObject);
+ groupBoxConfig.Dock = DockStyle.Left;
+ groupBoxConfig.Location = new Point(0, 0);
+ groupBoxConfig.Name = "groupBoxConfig";
+ groupBoxConfig.Size = new Size(406, 158);
+ groupBoxConfig.TabIndex = 0;
+ groupBoxConfig.TabStop = false;
+ groupBoxConfig.Text = "Параметры";
+ //
+ // groupBoxColors
+ //
+ groupBoxColors.Controls.Add(panelPurple);
+ groupBoxColors.Controls.Add(panelBlack);
+ groupBoxColors.Controls.Add(panelGray);
+ groupBoxColors.Controls.Add(panelWhite);
+ groupBoxColors.Controls.Add(panelYellow);
+ groupBoxColors.Controls.Add(panelBlue);
+ groupBoxColors.Controls.Add(panelGreen);
+ groupBoxColors.Controls.Add(panelRed);
+ groupBoxColors.Location = new Point(173, 22);
+ groupBoxColors.Name = "groupBoxColors";
+ groupBoxColors.Size = new Size(223, 100);
+ groupBoxColors.TabIndex = 8;
+ groupBoxColors.TabStop = false;
+ groupBoxColors.Text = "Цвета";
+ //
+ // panelPurple
+ //
+ panelPurple.BackColor = Color.Purple;
+ panelPurple.Location = new Point(185, 58);
+ panelPurple.Name = "panelPurple";
+ panelPurple.Size = new Size(30, 30);
+ panelPurple.TabIndex = 5;
+ //
+ // panelBlack
+ //
+ panelBlack.BackColor = Color.Black;
+ panelBlack.Location = new Point(127, 58);
+ panelBlack.Name = "panelBlack";
+ panelBlack.Size = new Size(30, 30);
+ panelBlack.TabIndex = 4;
+ //
+ // panelGray
+ //
+ panelGray.BackColor = Color.Gray;
+ panelGray.Location = new Point(69, 58);
+ panelGray.Name = "panelGray";
+ panelGray.Size = new Size(30, 30);
+ panelGray.TabIndex = 3;
+ //
+ // panelWhite
+ //
+ panelWhite.BackColor = Color.White;
+ panelWhite.Location = new Point(11, 58);
+ panelWhite.Name = "panelWhite";
+ panelWhite.Size = new Size(30, 30);
+ panelWhite.TabIndex = 2;
+ //
+ // panelYellow
+ //
+ panelYellow.BackColor = Color.Yellow;
+ panelYellow.Location = new Point(185, 22);
+ panelYellow.Name = "panelYellow";
+ panelYellow.Size = new Size(30, 30);
+ panelYellow.TabIndex = 1;
+ //
+ // panelBlue
+ //
+ panelBlue.BackColor = Color.Blue;
+ panelBlue.Location = new Point(127, 22);
+ panelBlue.Name = "panelBlue";
+ panelBlue.Size = new Size(30, 30);
+ panelBlue.TabIndex = 1;
+ //
+ // panelGreen
+ //
+ panelGreen.BackColor = Color.Green;
+ panelGreen.Location = new Point(69, 22);
+ panelGreen.Name = "panelGreen";
+ panelGreen.Size = new Size(30, 30);
+ panelGreen.TabIndex = 1;
+ //
+ // panelRed
+ //
+ panelRed.BackColor = Color.Red;
+ panelRed.Location = new Point(11, 22);
+ panelRed.Name = "panelRed";
+ panelRed.Size = new Size(30, 30);
+ panelRed.TabIndex = 0;
+ //
+ // checkBoxPool
+ //
+ checkBoxPool.AutoSize = true;
+ checkBoxPool.Location = new Point(6, 103);
+ checkBoxPool.Name = "checkBoxPool";
+ checkBoxPool.Size = new Size(129, 19);
+ checkBoxPool.TabIndex = 7;
+ checkBoxPool.Text = "Наличие бассейна";
+ checkBoxPool.UseVisualStyleBackColor = true;
+ //
+ // checkBoxSecondDeck
+ //
+ checkBoxSecondDeck.AutoSize = true;
+ checkBoxSecondDeck.Location = new Point(6, 80);
+ checkBoxSecondDeck.Name = "checkBoxSecondDeck";
+ checkBoxSecondDeck.Size = new Size(162, 19);
+ checkBoxSecondDeck.TabIndex = 6;
+ checkBoxSecondDeck.Text = "Наличие второй палубы";
+ checkBoxSecondDeck.UseVisualStyleBackColor = true;
+ //
+ // numericUpDownWeight
+ //
+ numericUpDownWeight.Location = new Point(74, 51);
+ 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(54, 23);
+ numericUpDownWeight.TabIndex = 5;
+ numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+ //
+ // labelWeight
+ //
+ labelWeight.AutoSize = true;
+ labelWeight.Location = new Point(6, 51);
+ labelWeight.Name = "labelWeight";
+ labelWeight.Size = new Size(29, 15);
+ labelWeight.TabIndex = 4;
+ labelWeight.Text = "Вес:";
+ //
+ // numericUpDownSpeed
+ //
+ numericUpDownSpeed.Location = new Point(74, 25);
+ 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(54, 23);
+ numericUpDownSpeed.TabIndex = 3;
+ numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+ //
+ // labelSpeed
+ //
+ labelSpeed.AutoSize = true;
+ labelSpeed.Location = new Point(6, 25);
+ labelSpeed.Name = "labelSpeed";
+ labelSpeed.Size = new Size(62, 15);
+ labelSpeed.TabIndex = 2;
+ labelSpeed.Text = "Скорость:";
+ //
+ // labelModifiedObject
+ //
+ labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+ labelModifiedObject.Location = new Point(296, 128);
+ labelModifiedObject.Name = "labelModifiedObject";
+ labelModifiedObject.Size = new Size(100, 23);
+ labelModifiedObject.TabIndex = 1;
+ labelModifiedObject.Text = "Продвинутый";
+ labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+ labelModifiedObject.MouseDown += LabelObject_MouseDown;
+ //
+ // labelSimpleObject
+ //
+ labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+ labelSimpleObject.Location = new Point(173, 128);
+ labelSimpleObject.Name = "labelSimpleObject";
+ labelSimpleObject.Size = new Size(100, 23);
+ labelSimpleObject.TabIndex = 0;
+ labelSimpleObject.Text = "Простой";
+ labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+ labelSimpleObject.MouseDown += LabelObject_MouseDown;
+ //
+ // pictureBoxObject
+ //
+ pictureBoxObject.Location = new Point(0, 44);
+ pictureBoxObject.Name = "pictureBoxObject";
+ pictureBoxObject.Size = new Size(150, 65);
+ pictureBoxObject.TabIndex = 1;
+ pictureBoxObject.TabStop = false;
+ //
+ // buttonAdd
+ //
+ buttonAdd.Location = new Point(412, 128);
+ buttonAdd.Name = "buttonAdd";
+ buttonAdd.Size = new Size(69, 23);
+ buttonAdd.TabIndex = 2;
+ buttonAdd.Text = "Добавить";
+ buttonAdd.UseVisualStyleBackColor = true;
+ buttonAdd.Click += ButtonAdd_Click;
+ //
+ // buttonCancel
+ //
+ buttonCancel.Location = new Point(487, 128);
+ buttonCancel.Name = "buttonCancel";
+ buttonCancel.Size = new Size(75, 23);
+ buttonCancel.TabIndex = 3;
+ buttonCancel.Text = "Отмена";
+ buttonCancel.UseVisualStyleBackColor = true;
+ //
+ // panelObject
+ //
+ panelObject.AllowDrop = true;
+ panelObject.Controls.Add(labelAdditionalColor);
+ panelObject.Controls.Add(labelBodyColor);
+ panelObject.Controls.Add(pictureBoxObject);
+ panelObject.Location = new Point(412, 0);
+ panelObject.Name = "panelObject";
+ panelObject.Size = new Size(150, 122);
+ panelObject.TabIndex = 4;
+ panelObject.DragDrop += PanelObject_DragDrop;
+ panelObject.DragEnter += PanelObject_DragEnter;
+ //
+ // labelAdditionalColor
+ //
+ labelAdditionalColor.AllowDrop = true;
+ labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+ labelAdditionalColor.Location = new Point(84, 9);
+ labelAdditionalColor.Name = "labelAdditionalColor";
+ labelAdditionalColor.Size = new Size(66, 23);
+ labelAdditionalColor.TabIndex = 10;
+ labelAdditionalColor.Text = "Доп цвет";
+ labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+ labelAdditionalColor.DragDrop += LabelColors_DragDrop;
+ labelAdditionalColor.DragEnter += LabelColors_DragEnter;
+ //
+ // labelBodyColor
+ //
+ labelBodyColor.AllowDrop = true;
+ labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+ labelBodyColor.Location = new Point(0, 9);
+ labelBodyColor.Name = "labelBodyColor";
+ labelBodyColor.Size = new Size(66, 23);
+ labelBodyColor.TabIndex = 9;
+ labelBodyColor.Text = "Цвет";
+ labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+ labelBodyColor.DragDrop += LabelColors_DragDrop;
+ labelBodyColor.DragEnter += LabelColors_DragEnter;
+ //
+ // FormShipConfig
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(570, 158);
+ Controls.Add(panelObject);
+ Controls.Add(buttonCancel);
+ Controls.Add(buttonAdd);
+ Controls.Add(groupBoxConfig);
+ Name = "FormShipConfig";
+ Text = "Создание объекта";
+ groupBoxConfig.ResumeLayout(false);
+ groupBoxConfig.PerformLayout();
+ groupBoxColors.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+ ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+ panelObject.ResumeLayout(false);
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private GroupBox groupBoxConfig;
+ private Label labelModifiedObject;
+ private Label labelSimpleObject;
+ private NumericUpDown numericUpDownWeight;
+ private Label labelWeight;
+ private NumericUpDown numericUpDownSpeed;
+ private Label labelSpeed;
+ private CheckBox checkBoxSecondDeck;
+ private CheckBox checkBoxPool;
+ private GroupBox groupBoxColors;
+ private Panel panelRed;
+ private Panel panelPurple;
+ private Panel panelBlack;
+ private Panel panelGray;
+ private Panel panelWhite;
+ private Panel panelYellow;
+ private Panel panelBlue;
+ private Panel panelGreen;
+ private PictureBox pictureBoxObject;
+ private Button buttonAdd;
+ private Button buttonCancel;
+ private Panel panelObject;
+ private Label labelBodyColor;
+ private Label labelAdditionalColor;
+ }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormShipConfig.cs b/ProjectLiner/ProjectLiner/FormShipConfig.cs
new file mode 100644
index 0000000..fe9058a
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/FormShipConfig.cs
@@ -0,0 +1,155 @@
+using ProjectLiner.Drawnings;
+using ProjectLiner.Entities;
+namespace ProjectLiner;
+
+///
+/// Форма конфигурации объекта
+///
+public partial class FormShipConfig : Form
+{
+ ///
+ /// Объект - прорисовка корабля
+ ///
+ private DrawningShip? _ship = null;
+
+ ///
+ /// Событие для передачи объекта
+ ///
+ private event Action? _shipDelegate;
+
+ ///
+ /// Конструктор
+ ///
+ public FormShipConfig()
+ {
+ InitializeComponent();
+
+ panelRed.MouseDown += Panel_MouseDown;
+ panelGreen.MouseDown += Panel_MouseDown;
+ panelBlue.MouseDown += Panel_MouseDown;
+ panelYellow.MouseDown += Panel_MouseDown;
+ panelWhite.MouseDown += Panel_MouseDown;
+ panelGray.MouseDown += Panel_MouseDown;
+ panelBlack.MouseDown += Panel_MouseDown;
+ panelPurple.MouseDown += Panel_MouseDown;
+ buttonCancel.Click += (sender, e) => Close();
+
+ }
+
+ ///
+ /// Привязка внешнего метода к событию
+ ///
+ ///
+ public void AddEvent(Action shipDelegate)
+ {
+ _shipDelegate += shipDelegate;
+ }
+
+ ///
+ /// Прорисовка объекта
+ ///
+ private void DrawObject()
+ {
+ Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+ Graphics gr = Graphics.FromImage(bmp);
+ _ship?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+ _ship?.SetPosition(15, 15);
+ _ship?.DrawTransport(gr);
+ pictureBoxObject.Image = bmp;
+ }
+
+ ///
+ /// Передаем информацию при нажатии на Label
+ ///
+ ///
+ ///
+ private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+ {
+ (sender as Label)?.DoDragDrop((sender as Label)?.Name ??
+ string.Empty, DragDropEffects.Move | DragDropEffects.Copy);
+ }
+
+ ///
+ /// Проверка получаемой информации (ее типа на соответствие требуемому)
+ ///
+ ///
+ ///
+ private void PanelObject_DragEnter(object sender, DragEventArgs e)
+ {
+ e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : 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, (double)numericUpDownWeight.Value, Color.White);
+ break;
+ case "labelModifiedObject":
+ _ship = new DrawningLiner((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value,
+ Color.White, Color.Black, checkBoxSecondDeck.Checked, checkBoxPool.Checked);
+ break;
+ }
+ DrawObject();
+ }
+
+ ///
+ /// Передаем информацию при нажатии на Panel
+ ///
+ ///
+ ///
+ private void Panel_MouseDown(object? sender, MouseEventArgs e)
+ {
+ (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor ?? Color.White, DragDropEffects.Move | DragDropEffects.Copy);
+ }
+ private void LabelColors_DragEnter(object? sender, DragEventArgs e)
+ {
+ e.Effect = e.Data?.GetDataPresent(typeof(Color)) ?? false ? DragDropEffects.Copy : DragDropEffects.None;
+ }
+
+ private void LabelColors_DragDrop(object? sender, DragEventArgs e)
+ {
+ if (_ship == null || sender == null || _ship.EntityShip == null)
+ {
+ return;
+ }
+
+ Label label = (Label)sender;
+ Color newColor = (Color)e.Data?.GetData(typeof(Color));
+
+ switch (label.Name)
+ {
+ case "labelBodyColor":
+ _ship.EntityShip.SetBodyColor(newColor);
+ DrawObject();
+ break;
+ case "labelAdditionalColor":
+ if (_ship is DrawningLiner)
+ {
+ (_ship.EntityShip as EntityLiner)?.SetAdditionalColor(newColor);
+ DrawObject();
+ }
+ break;
+ }
+ }
+
+ ///
+ /// Передача объекта
+ ///
+ ///
+ ///
+ private void ButtonAdd_Click(object sender, EventArgs e)
+ {
+ if (_ship != null)
+ {
+ _shipDelegate?.Invoke(_ship);
+ Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/ProjectLiner/ProjectLiner/FormShipConfig.resx b/ProjectLiner/ProjectLiner/FormShipConfig.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/ProjectLiner/ProjectLiner/FormShipConfig.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