diff --git a/Catamaran/BoatDelegate.cs b/Catamaran/BoatDelegate.cs new file mode 100644 index 0000000..520aa98 --- /dev/null +++ b/Catamaran/BoatDelegate.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Catamaran +{ + + /// + /// Делегат для передачи объекта-лодки + /// + /// + public delegate void BoatDelegate(DrawingBoat boat); +} diff --git a/Catamaran/Catamaran.csproj b/Catamaran/Catamaran.csproj index b0275f4..3d367cc 100644 --- a/Catamaran/Catamaran.csproj +++ b/Catamaran/Catamaran.csproj @@ -47,6 +47,7 @@ + @@ -59,6 +60,12 @@ FormBoat.cs + + Form + + + FormBoatConfig.cs + Form @@ -76,6 +83,9 @@ FormBoat.cs + + FormBoatConfig.cs + FormMapWithSetBoats.cs diff --git a/Catamaran/DrawingBoat.cs b/Catamaran/DrawingBoat.cs index bf31551..c437349 100644 --- a/Catamaran/DrawingBoat.cs +++ b/Catamaran/DrawingBoat.cs @@ -48,6 +48,11 @@ namespace Catamaran Catamaran = new EntityBoat(speed, weight, bodyColor); } + public DrawingBoat Copy(int? speed = null, float? weight = null, Color? bodyColor = null) + { + return new DrawingBoat(speed ?? Catamaran.Speed, weight ?? Catamaran.Weight, bodyColor ?? Catamaran.BodyColor); + } + /// /// Получение текущей позиции объекта /// diff --git a/Catamaran/DrawingCatamaran.cs b/Catamaran/DrawingCatamaran.cs index 534143f..4c99094 100644 --- a/Catamaran/DrawingCatamaran.cs +++ b/Catamaran/DrawingCatamaran.cs @@ -25,6 +25,11 @@ namespace Catamaran Catamaran = new EntityCatamaran(speed, weight, bodyColor, dopColor, Floats, Sail); } + public DrawingCatamaran Copy(int? speed = null, float? weight = null, Color? bodyColor = null, Color? dopColor = null, bool? Floats = null, bool? Sail = null) + { + var b = (EntityCatamaran)Catamaran; + return new DrawingCatamaran(speed ?? b.Speed, weight ?? b.Weight, bodyColor ?? b.BodyColor, dopColor ?? b.DopColor, Floats ?? b.Floats, Sail ?? b.Sail); + } public override void DrawTransport(Graphics g) { if (!(Catamaran is EntityCatamaran catamaranPro)) diff --git a/Catamaran/FormBoatConfig.Designer.cs b/Catamaran/FormBoatConfig.Designer.cs new file mode 100644 index 0000000..d5def03 --- /dev/null +++ b/Catamaran/FormBoatConfig.Designer.cs @@ -0,0 +1,406 @@ +using System.Windows.Forms; + +namespace Catamaran +{ + partial class FormBoatConfig + { + /// + /// 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.checkBoxFloats = new System.Windows.Forms.CheckBox(); + this.checkBoxSail = 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.checkBoxFloats); + this.groupBoxConfig.Controls.Add(this.checkBoxSail); + 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(15, 16); + this.groupBoxConfig.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxConfig.Name = "groupBoxConfig"; + this.groupBoxConfig.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxConfig.Size = new System.Drawing.Size(669, 293); + this.groupBoxConfig.TabIndex = 0; + this.groupBoxConfig.TabStop = false; + this.groupBoxConfig.Text = "Config"; + // + // labelModifiedObject + // + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Location = new System.Drawing.Point(507, 216); + this.labelModifiedObject.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(124, 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(363, 216); + this.labelSimpleObject.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(124, 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(343, 29); + this.groupBoxColors.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxColors.Size = new System.Drawing.Size(310, 169); + this.groupBoxColors.TabIndex = 14; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Colors"; + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.Purple; + this.panelPurple.Location = new System.Drawing.Point(237, 97); + this.panelPurple.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(51, 53); + this.panelPurple.TabIndex = 3; + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(237, 29); + this.panelYellow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(51, 53); + this.panelYellow.TabIndex = 1; + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(163, 97); + this.panelBlack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(51, 53); + this.panelBlack.TabIndex = 4; + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(163, 29); + this.panelBlue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(51, 53); + this.panelBlue.TabIndex = 1; + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(93, 97); + this.panelGray.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(51, 53); + this.panelGray.TabIndex = 5; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(93, 29); + this.panelGreen.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(51, 53); + this.panelGreen.TabIndex = 1; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(19, 97); + this.panelWhite.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(51, 53); + this.panelWhite.TabIndex = 2; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(19, 29); + this.panelRed.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(51, 53); + this.panelRed.TabIndex = 0; + // + // checkBoxFloats + // + this.checkBoxFloats.AutoSize = true; + this.checkBoxFloats.Location = new System.Drawing.Point(28, 247); + this.checkBoxFloats.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.checkBoxFloats.Name = "checkBoxFloats"; + this.checkBoxFloats.Size = new System.Drawing.Size(139, 24); + this.checkBoxFloats.TabIndex = 13; + this.checkBoxFloats.Text = "Are floats exist"; + this.checkBoxFloats.UseVisualStyleBackColor = true; + // + // checkBoxSail + // + this.checkBoxSail.AutoSize = true; + this.checkBoxSail.Location = new System.Drawing.Point(28, 199); + this.checkBoxSail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.checkBoxSail.Name = "checkBoxSail"; + this.checkBoxSail.Size = new System.Drawing.Size(119, 24); + this.checkBoxSail.TabIndex = 12; + this.checkBoxSail.Text = "Is sail exists"; + this.checkBoxSail.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(116, 96); + this.numericUpDownWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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(102, 26); + 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(28, 99); + this.labelWeight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(63, 20); + this.labelWeight.TabIndex = 9; + this.labelWeight.Text = "Weight:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(116, 40); + this.numericUpDownSpeed.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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(102, 26); + 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(28, 43); + this.labelSpeed.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(60, 20); + this.labelSpeed.TabIndex = 7; + this.labelSpeed.Text = "Speed:"; + // + // 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(692, 16); + this.panelObject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(337, 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(181, 12); + this.labelDopColor.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(133, 42); + this.labelDopColor.TabIndex = 2; + this.labelDopColor.Text = "Add color"; + this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(26, 12); + this.labelBaseColor.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(133, 42); + this.labelBaseColor.TabIndex = 1; + this.labelBaseColor.Text = "Color"; + this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(26, 59); + this.pictureBoxObject.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(289, 167); + this.pictureBoxObject.TabIndex = 0; + this.pictureBoxObject.TabStop = false; + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(873, 269); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(134, 40); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(717, 269); + this.buttonOk.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(134, 40); + this.buttonOk.TabIndex = 4; + this.buttonOk.Text = "OK"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click); + // + // FormBoatConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1041, 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(4, 4, 4, 4); + this.Name = "FormBoatConfig"; + this.Text = "Creating object"; + 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 checkBoxFloats; + private CheckBox checkBoxSail; + 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/Catamaran/FormBoatConfig.cs b/Catamaran/FormBoatConfig.cs new file mode 100644 index 0000000..4ca855b --- /dev/null +++ b/Catamaran/FormBoatConfig.cs @@ -0,0 +1,197 @@ +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 Catamaran +{ + /// + /// Форма создания объекта + /// + public partial class FormBoatConfig : Form + { + /// + /// Переменная-выбранная машина + /// + DrawingBoat _boat = null; + /// + /// Событие + /// + private event BoatDelegate EventAddBoat; + /// + /// Конструктор + /// + public FormBoatConfig() + { + 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 += (s, e) => Close(); + + // TODO buttonCancel.Click with lambda + } + /// + /// Отрисовать машину + /// + private void DrawCar() + { + Bitmap bmp = new Bitmap(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _boat?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _boat?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + /// + /// Добавление события + /// + /// + public void AddEvent(BoatDelegate ev) + { + if (EventAddBoat == null) + { + EventAddBoat = new BoatDelegate(ev); + } + else + { + EventAddBoat += 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": + _boat = new DrawingBoat((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _boat = new DrawingCatamaran((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, + checkBoxFloats.Checked, checkBoxSail.Checked); + break; + } + DrawCar(); + } + /// + /// Отправляем цвет с панели + /// + /// + /// + 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 LabelDopColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color)) && _boat is DrawingCatamaran) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + /// + /// Принимаем основной цвет + /// + /// + /// + private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) + { + var color = (Color)e.Data.GetData(typeof(Color)); + if (_boat is DrawingCatamaran) + { + _boat = ((DrawingCatamaran)_boat).Copy(bodyColor: color); + } + + else if (_boat is DrawingBoat) + { + _boat = _boat.Copy(bodyColor: color); + } + // TODO Call method from object _boat and set color + } + /// + /// Принимаем дополнительный цвет + /// + /// + /// + private void LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + var color = (Color)e.Data.GetData(typeof(Color)); + if (_boat is DrawingCatamaran) + { + _boat = ((DrawingCatamaran)_boat).Copy(dopColor: color); + } + // TODO Call method from object _boat if _boat is DrawningSportCar and set dop color + } + /// + /// Добавление машины + /// + /// + /// + private void ButtonOk_Click(object sender, EventArgs e) + { + EventAddBoat?.Invoke(_boat); + Close(); + } + + + } +} diff --git a/Catamaran/FormBoatConfig.resx b/Catamaran/FormBoatConfig.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Catamaran/FormBoatConfig.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/Catamaran/FormMapWithSetBoats.cs b/Catamaran/FormMapWithSetBoats.cs index 0e1f398..25029c5 100644 --- a/Catamaran/FormMapWithSetBoats.cs +++ b/Catamaran/FormMapWithSetBoats.cs @@ -211,26 +211,27 @@ namespace Catamaran /// /// private void buttonAddBoat_Click_1(object sender, EventArgs e) + { + var formBoatConfig = new FormBoatConfig(); + formBoatConfig.AddEvent(new BoatDelegate(AddBoat)); + // TODO Call method AddEvent from formCarConfig + formBoatConfig.Show(); + } + + private void AddBoat(DrawingBoat boat) { if (listBoxMaps.SelectedIndex == -1) { - return; + MessageBox.Show("Перед добавлением объекта необходимо создать карту"); } - FormBoat form = new FormBoat(); - if (form.ShowDialog() == DialogResult.OK) + else if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawingObjectBoat(boat) != -1) { - DrawingObjectBoat boat = new DrawingObjectBoat(form.SelectedBoat); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + boat != null) - { - 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("Не удалось добавить объект"); } } }