diff --git a/Ship/Ship/FormShipConfig.Designer.cs b/Ship/Ship/FormShipConfig.Designer.cs
new file mode 100644
index 0000000..51dc113
--- /dev/null
+++ b/Ship/Ship/FormShipConfig.Designer.cs
@@ -0,0 +1,361 @@
+namespace Ship
+{
+ 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.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.panelBlack = new System.Windows.Forms.Panel();
+ this.panelGray = new System.Windows.Forms.Panel();
+ this.panelWhite = new System.Windows.Forms.Panel();
+ this.panelYellow = new System.Windows.Forms.Panel();
+ this.panelBlue = new System.Windows.Forms.Panel();
+ this.panelGreen = new System.Windows.Forms.Panel();
+ this.panelRed = new System.Windows.Forms.Panel();
+ this.checkBoxFuelTank = new System.Windows.Forms.CheckBox();
+ this.checkBoxPipes = new System.Windows.Forms.CheckBox();
+ this.labelWeight = new System.Windows.Forms.Label();
+ this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
+ this.labelSpeed = new System.Windows.Forms.Label();
+ this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
+ this.pictureBoxObject = new System.Windows.Forms.PictureBox();
+ this.panelObject = new System.Windows.Forms.Panel();
+ this.labelDopColor = new System.Windows.Forms.Label();
+ this.labelBaseColor = new System.Windows.Forms.Label();
+ this.buttonOk = new System.Windows.Forms.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.groupBoxConfig.SuspendLayout();
+ this.groupBoxColors.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+ this.panelObject.SuspendLayout();
+ 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.checkBoxFuelTank);
+ this.groupBoxConfig.Controls.Add(this.checkBoxPipes);
+ this.groupBoxConfig.Controls.Add(this.labelWeight);
+ this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
+ this.groupBoxConfig.Controls.Add(this.labelSpeed);
+ this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
+ this.groupBoxConfig.Location = new System.Drawing.Point(12, 12);
+ this.groupBoxConfig.Name = "groupBoxConfig";
+ this.groupBoxConfig.Size = new System.Drawing.Size(548, 204);
+ 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(423, 149);
+ this.labelModifiedObject.Name = "labelModifiedObject";
+ this.labelModifiedObject.Size = new System.Drawing.Size(100, 43);
+ this.labelModifiedObject.TabIndex = 8;
+ 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(317, 149);
+ this.labelSimpleObject.Name = "labelSimpleObject";
+ this.labelSimpleObject.Size = new System.Drawing.Size(100, 43);
+ this.labelSimpleObject.TabIndex = 7;
+ 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.panelBlack);
+ this.groupBoxColors.Controls.Add(this.panelGray);
+ this.groupBoxColors.Controls.Add(this.panelWhite);
+ this.groupBoxColors.Controls.Add(this.panelYellow);
+ this.groupBoxColors.Controls.Add(this.panelBlue);
+ this.groupBoxColors.Controls.Add(this.panelGreen);
+ this.groupBoxColors.Controls.Add(this.panelRed);
+ this.groupBoxColors.Location = new System.Drawing.Point(311, 21);
+ this.groupBoxColors.Name = "groupBoxColors";
+ this.groupBoxColors.Size = new System.Drawing.Size(221, 125);
+ this.groupBoxColors.TabIndex = 6;
+ this.groupBoxColors.TabStop = false;
+ this.groupBoxColors.Text = "Цвета";
+ //
+ // panelPurple
+ //
+ this.panelPurple.BackColor = System.Drawing.Color.Purple;
+ this.panelPurple.Location = new System.Drawing.Point(165, 70);
+ this.panelPurple.Name = "panelPurple";
+ this.panelPurple.Size = new System.Drawing.Size(47, 46);
+ this.panelPurple.TabIndex = 4;
+ //
+ // panelBlack
+ //
+ this.panelBlack.BackColor = System.Drawing.Color.Black;
+ this.panelBlack.Location = new System.Drawing.Point(112, 70);
+ this.panelBlack.Name = "panelBlack";
+ this.panelBlack.Size = new System.Drawing.Size(47, 46);
+ this.panelBlack.TabIndex = 3;
+ //
+ // panelGray
+ //
+ this.panelGray.BackColor = System.Drawing.Color.Gray;
+ this.panelGray.Location = new System.Drawing.Point(59, 70);
+ this.panelGray.Name = "panelGray";
+ this.panelGray.Size = new System.Drawing.Size(47, 46);
+ this.panelGray.TabIndex = 2;
+ //
+ // panelWhite
+ //
+ this.panelWhite.BackColor = System.Drawing.Color.White;
+ this.panelWhite.Location = new System.Drawing.Point(6, 70);
+ this.panelWhite.Name = "panelWhite";
+ this.panelWhite.Size = new System.Drawing.Size(47, 46);
+ this.panelWhite.TabIndex = 1;
+ //
+ // panelYellow
+ //
+ this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+ this.panelYellow.Location = new System.Drawing.Point(165, 18);
+ this.panelYellow.Name = "panelYellow";
+ this.panelYellow.Size = new System.Drawing.Size(47, 46);
+ this.panelYellow.TabIndex = 3;
+ //
+ // panelBlue
+ //
+ this.panelBlue.BackColor = System.Drawing.Color.Blue;
+ this.panelBlue.Location = new System.Drawing.Point(112, 18);
+ this.panelBlue.Name = "panelBlue";
+ this.panelBlue.Size = new System.Drawing.Size(47, 46);
+ this.panelBlue.TabIndex = 2;
+ //
+ // panelGreen
+ //
+ this.panelGreen.BackColor = System.Drawing.Color.Green;
+ this.panelGreen.Location = new System.Drawing.Point(59, 18);
+ this.panelGreen.Name = "panelGreen";
+ this.panelGreen.Size = new System.Drawing.Size(47, 46);
+ this.panelGreen.TabIndex = 1;
+ //
+ // panelRed
+ //
+ this.panelRed.BackColor = System.Drawing.Color.Red;
+ this.panelRed.Location = new System.Drawing.Point(6, 18);
+ this.panelRed.Name = "panelRed";
+ this.panelRed.Size = new System.Drawing.Size(47, 46);
+ this.panelRed.TabIndex = 0;
+ //
+ // checkBoxFuelTank
+ //
+ this.checkBoxFuelTank.AutoSize = true;
+ this.checkBoxFuelTank.Location = new System.Drawing.Point(19, 137);
+ this.checkBoxFuelTank.Name = "checkBoxFuelTank";
+ this.checkBoxFuelTank.Size = new System.Drawing.Size(219, 19);
+ this.checkBoxFuelTank.TabIndex = 5;
+ this.checkBoxFuelTank.Text = "Признак наличия топливного бака";
+ this.checkBoxFuelTank.UseVisualStyleBackColor = true;
+ //
+ // checkBoxPipes
+ //
+ this.checkBoxPipes.AutoSize = true;
+ this.checkBoxPipes.Location = new System.Drawing.Point(19, 112);
+ this.checkBoxPipes.Name = "checkBoxPipes";
+ this.checkBoxPipes.Size = new System.Drawing.Size(151, 19);
+ this.checkBoxPipes.TabIndex = 4;
+ this.checkBoxPipes.Text = "Признак наличия труб";
+ this.checkBoxPipes.UseVisualStyleBackColor = true;
+ //
+ // labelWeight
+ //
+ this.labelWeight.AutoSize = true;
+ this.labelWeight.Location = new System.Drawing.Point(19, 70);
+ this.labelWeight.Name = "labelWeight";
+ this.labelWeight.Size = new System.Drawing.Size(29, 15);
+ this.labelWeight.TabIndex = 3;
+ this.labelWeight.Text = "Вес:";
+ //
+ // numericUpDownWeight
+ //
+ this.numericUpDownWeight.Location = new System.Drawing.Point(87, 68);
+ this.numericUpDownWeight.Name = "numericUpDownWeight";
+ this.numericUpDownWeight.Size = new System.Drawing.Size(62, 23);
+ this.numericUpDownWeight.TabIndex = 2;
+ this.numericUpDownWeight.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ //
+ // labelSpeed
+ //
+ this.labelSpeed.AutoSize = true;
+ this.labelSpeed.Location = new System.Drawing.Point(19, 41);
+ this.labelSpeed.Name = "labelSpeed";
+ this.labelSpeed.Size = new System.Drawing.Size(62, 15);
+ this.labelSpeed.TabIndex = 1;
+ this.labelSpeed.Text = "Скорость:";
+ //
+ // numericUpDownSpeed
+ //
+ this.numericUpDownSpeed.Location = new System.Drawing.Point(87, 39);
+ this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+ this.numericUpDownSpeed.Size = new System.Drawing.Size(62, 23);
+ this.numericUpDownSpeed.TabIndex = 0;
+ this.numericUpDownSpeed.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
+ //
+ // pictureBoxObject
+ //
+ this.pictureBoxObject.Location = new System.Drawing.Point(26, 32);
+ this.pictureBoxObject.Name = "pictureBoxObject";
+ this.pictureBoxObject.Size = new System.Drawing.Size(275, 115);
+ this.pictureBoxObject.TabIndex = 1;
+ this.pictureBoxObject.TabStop = false;
+ //
+ // 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(583, 21);
+ this.panelObject.Name = "panelObject";
+ this.panelObject.Size = new System.Drawing.Size(327, 162);
+ 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(183, 12);
+ this.labelDopColor.Name = "labelDopColor";
+ this.labelDopColor.Size = new System.Drawing.Size(118, 17);
+ this.labelDopColor.TabIndex = 3;
+ 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.LabelBaseColor_DragEnter);
+ //
+ // labelBaseColor
+ //
+ this.labelBaseColor.AllowDrop = true;
+ this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.labelBaseColor.Location = new System.Drawing.Point(26, 12);
+ this.labelBaseColor.Name = "labelBaseColor";
+ this.labelBaseColor.Size = new System.Drawing.Size(115, 17);
+ this.labelBaseColor.TabIndex = 2;
+ 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.LabelBaseColor_DragEnter);
+ //
+ // buttonOk
+ //
+ this.buttonOk.Location = new System.Drawing.Point(609, 186);
+ this.buttonOk.Name = "buttonOk";
+ this.buttonOk.Size = new System.Drawing.Size(104, 30);
+ this.buttonOk.TabIndex = 5;
+ this.buttonOk.Text = "Добавить";
+ this.buttonOk.UseVisualStyleBackColor = true;
+ //
+ // buttonCancel
+ //
+ this.buttonCancel.Location = new System.Drawing.Point(780, 189);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(104, 30);
+ this.buttonCancel.TabIndex = 6;
+ this.buttonCancel.Text = "Отмена";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ //
+ // FormShipConfig
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(922, 223);
+ 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.Load += new System.EventHandler(this.FormShipConfig_Load);
+ this.groupBoxConfig.ResumeLayout(false);
+ this.groupBoxConfig.PerformLayout();
+ this.groupBoxColors.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
+ this.panelObject.ResumeLayout(false);
+ this.ResumeLayout(false);
+ }
+
+ #endregion
+
+
+ private GroupBox groupBoxConfig;
+ private Label labelModifiedObject;
+ private Label labelSimpleObject;
+ private GroupBox groupBoxColors;
+ private Panel panelPurple;
+ private Panel panelBlack;
+ private Panel panelGray;
+ private Panel panelWhite;
+ private Panel panelYellow;
+ private Panel panelBlue;
+ private Panel panelGreen;
+ private Panel panelRed;
+ private CheckBox checkBoxFuelTank;
+ private CheckBox checkBoxPipes;
+ private Label labelWeight;
+ private NumericUpDown numericUpDownWeight;
+ private Label labelSpeed;
+ private NumericUpDown numericUpDownSpeed;
+ private PictureBox pictureBoxObject;
+ private Panel panelObject;
+ private Label labelDopColor;
+ private Label labelBaseColor;
+ private Button buttonOk;
+ private Button buttonCancel;
+ }
+}
\ No newline at end of file
diff --git a/Ship/Ship/FormShipConfig.cs b/Ship/Ship/FormShipConfig.cs
new file mode 100644
index 0000000..9f8dcad
--- /dev/null
+++ b/Ship/Ship/FormShipConfig.cs
@@ -0,0 +1,168 @@
+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 Ship
+{
+ public partial class FormShipConfig : Form
+ {
+ ///
+ /// Переменная-выбранная машина
+ ///
+ DrawingShip _ship = null;
+ ///
+ /// Событие
+ ///
+ private event ShipDelegate 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;
+
+ // TODO buttonCancel.Click with lambda
+ }
+ ///
+ /// Отрисовать машину
+ ///
+ 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;
+ }
+ ///
+ /// Добавление события
+ ///
+ ///
+ public void AddEvent(ShipDelegate ev)
+ {
+ if (EventAddShip == null)
+ {
+ EventAddShip = new ShipDelegate(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))
+ {
+ 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 DrawingShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
+ break;
+ case "labelModifiedObject":
+ _ship = new DrawingMotorShip((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
+ checkBoxPipes.Checked, checkBoxFuelTank.Checked);
+ break;
+ }
+ DrawShip();
+ }
+ ///
+ /// Отправляем цвет с панели
+ ///
+ ///
+ ///
+ private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+ {
+ (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+ }
+ ///
+ /// Проверка получаемой информации (ее типа на соответствие требуемому)
+ ///
+ ///
+ ///
+ private void LabelBaseColor_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)
+ {
+ }
+ ///
+ /// Принимаем дополнительный цвет
+ ///
+ ///
+ ///
+ private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
+ {
+ // TODO Call method from object _car if _car is DrawningSportCar and set dop color
+ }
+ ///
+ /// Добавление машины
+ ///
+ ///
+ ///
+ private void ButtonOk_Click(object sender, EventArgs e)
+ {
+ EventAddShip?.Invoke(_ship);
+ Close();
+ }
+
+ private void FormShipConfig_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
diff --git a/Ship/Ship/FormShipConfig.resx b/Ship/Ship/FormShipConfig.resx
new file mode 100644
index 0000000..f298a7b
--- /dev/null
+++ b/Ship/Ship/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/Ship/Ship/ShipDelegate.cs b/Ship/Ship/ShipDelegate.cs
new file mode 100644
index 0000000..29fd76e
--- /dev/null
+++ b/Ship/Ship/ShipDelegate.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ship
+{
+ public delegate void ShipDelegate(DrawingShip ship);
+}
\ No newline at end of file