diff --git a/GasolineTanker/GasolineTanker/DrawingGasolineTanker.cs b/GasolineTanker/GasolineTanker/DrawingGasolineTanker.cs index 76f7b42..46bc452 100644 --- a/GasolineTanker/GasolineTanker/DrawingGasolineTanker.cs +++ b/GasolineTanker/GasolineTanker/DrawingGasolineTanker.cs @@ -15,7 +15,10 @@ namespace GasolineTanker private int? _pictureHeight = null; private readonly int _gasolineTankerWidth = 160; private readonly int _gasolineTankerHeight = 55; - + public DrawingGasolineTanker Copy(int? speed = null, float? weight = null, Color? bodyColor = null) + { + return new DrawingGasolineTanker(speed ?? GasolineTanker.Speed, weight ?? GasolineTanker.Weight, bodyColor ?? GasolineTanker.BodyColor); + } public DrawingGasolineTanker(int speed, float weight, Color bodyColor) { GasolineTanker = new EnityGasolineTanker(speed, weight, bodyColor); diff --git a/GasolineTanker/GasolineTanker/DrawingImprovedGasolineTanker.cs b/GasolineTanker/GasolineTanker/DrawingImprovedGasolineTanker.cs index e76d523..1961290 100644 --- a/GasolineTanker/GasolineTanker/DrawingImprovedGasolineTanker.cs +++ b/GasolineTanker/GasolineTanker/DrawingImprovedGasolineTanker.cs @@ -13,6 +13,11 @@ namespace GasolineTanker { GasolineTanker = new EntityImprovedGasolineTanker(speed, weight, bodyColor, dopColor, bodyKit, ornamentWheels); } + public DrawingImprovedGasolineTanker Copy(int? speed = null, float? weight = null, Color? bodyColor = null, Color? dopColor = null, bool? hasBombs = null, bool? hasFuelTanks = null) + { + var e = (EntityImprovedGasolineTanker)GasolineTanker; + return new DrawingImprovedGasolineTanker(speed ?? e.Speed, weight ?? e.Weight, bodyColor ?? e.BodyColor, dopColor ?? e.DopColor, hasBombs ?? e.BodyKit, hasFuelTanks ?? e.OrnamentWheels); + } public override void DrawTransport(Graphics g) { if (GasolineTanker is not EntityImprovedGasolineTanker improvedGasolineTanker) diff --git a/GasolineTanker/GasolineTanker/FormGasolineTankerConfig.Designer.cs b/GasolineTanker/GasolineTanker/FormGasolineTankerConfig.Designer.cs new file mode 100644 index 0000000..7851f5a --- /dev/null +++ b/GasolineTanker/GasolineTanker/FormGasolineTankerConfig.Designer.cs @@ -0,0 +1,381 @@ +namespace GasolineTanker +{ + partial class FormGasolineTankerConfig + { + /// + /// 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.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.labelImrovedObject = new System.Windows.Forms.Label(); + this.labelSimpleObject = new System.Windows.Forms.Label(); + this.groupBoxColor = new System.Windows.Forms.GroupBox(); + this.panelPurple = new System.Windows.Forms.Panel(); + this.panelRed = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelBlack = new System.Windows.Forms.Panel(); + this.panelGray = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.checkBoxOrnamentWheel = new System.Windows.Forms.CheckBox(); + this.checkBoxBodyKit = new System.Windows.Forms.CheckBox(); + this.labelWeight = new System.Windows.Forms.Label(); + this.labelSpeed = new System.Windows.Forms.Label(); + 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.buttonCancel = new System.Windows.Forms.Button(); + this.buttonOk = new System.Windows.Forms.Button(); + this.groupBoxConfig.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + this.groupBoxColor.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + this.panelObject.SuspendLayout(); + this.SuspendLayout(); + // + // groupBoxConfig + // + this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); + this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed); + this.groupBoxConfig.Controls.Add(this.labelImrovedObject); + this.groupBoxConfig.Controls.Add(this.labelSimpleObject); + this.groupBoxConfig.Controls.Add(this.groupBoxColor); + this.groupBoxConfig.Controls.Add(this.checkBoxOrnamentWheel); + this.groupBoxConfig.Controls.Add(this.checkBoxBodyKit); + this.groupBoxConfig.Controls.Add(this.labelWeight); + this.groupBoxConfig.Controls.Add(this.labelSpeed); + this.groupBoxConfig.Location = new System.Drawing.Point(12, 12); + this.groupBoxConfig.Name = "groupBoxConfig"; + this.groupBoxConfig.Size = new System.Drawing.Size(451, 197); + this.groupBoxConfig.TabIndex = 0; + this.groupBoxConfig.TabStop = false; + this.groupBoxConfig.Text = "Options"; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(80, 70); + 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(79, 23); + this.numericUpDownWeight.TabIndex = 12; + this.numericUpDownWeight.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(80, 28); + 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(79, 23); + this.numericUpDownSpeed.TabIndex = 11; + this.numericUpDownSpeed.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelImrovedObject + // + this.labelImrovedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelImrovedObject.Location = new System.Drawing.Point(321, 149); + this.labelImrovedObject.Name = "labelImrovedObject"; + this.labelImrovedObject.Size = new System.Drawing.Size(97, 36); + this.labelImrovedObject.TabIndex = 8; + this.labelImrovedObject.Text = "Improved"; + this.labelImrovedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelImrovedObject.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(209, 149); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(96, 36); + this.labelSimpleObject.TabIndex = 7; + this.labelSimpleObject.Text = "Simple"; + this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // groupBoxColor + // + this.groupBoxColor.Controls.Add(this.panelPurple); + this.groupBoxColor.Controls.Add(this.panelRed); + this.groupBoxColor.Controls.Add(this.panelYellow); + this.groupBoxColor.Controls.Add(this.panelWhite); + this.groupBoxColor.Controls.Add(this.panelGreen); + this.groupBoxColor.Controls.Add(this.panelBlack); + this.groupBoxColor.Controls.Add(this.panelGray); + this.groupBoxColor.Controls.Add(this.panelBlue); + this.groupBoxColor.Location = new System.Drawing.Point(203, 12); + this.groupBoxColor.Name = "groupBoxColor"; + this.groupBoxColor.Size = new System.Drawing.Size(232, 134); + this.groupBoxColor.TabIndex = 6; + this.groupBoxColor.TabStop = false; + this.groupBoxColor.Text = "Color"; + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.Purple; + this.panelPurple.Location = new System.Drawing.Point(175, 80); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(40, 40); + this.panelPurple.TabIndex = 11; + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(6, 29); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(40, 40); + this.panelRed.TabIndex = 6; + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(175, 29); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(40, 40); + this.panelYellow.TabIndex = 7; + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(6, 80); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(40, 40); + this.panelWhite.TabIndex = 10; + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(63, 29); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(40, 40); + this.panelGreen.TabIndex = 9; + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(118, 80); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(40, 40); + this.panelBlack.TabIndex = 12; + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(63, 80); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(40, 40); + this.panelGray.TabIndex = 13; + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(118, 29); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(40, 40); + this.panelBlue.TabIndex = 8; + // + // checkBoxOrnamentWheel + // + this.checkBoxOrnamentWheel.AutoSize = true; + this.checkBoxOrnamentWheel.Location = new System.Drawing.Point(21, 149); + this.checkBoxOrnamentWheel.Name = "checkBoxOrnamentWheel"; + this.checkBoxOrnamentWheel.Size = new System.Drawing.Size(180, 19); + this.checkBoxOrnamentWheel.TabIndex = 5; + this.checkBoxOrnamentWheel.Text = "The presence of an ornament"; + this.checkBoxOrnamentWheel.UseVisualStyleBackColor = true; + // + // checkBoxBodyKit + // + this.checkBoxBodyKit.AutoSize = true; + this.checkBoxBodyKit.Location = new System.Drawing.Point(21, 114); + this.checkBoxBodyKit.Name = "checkBoxBodyKit"; + this.checkBoxBodyKit.Size = new System.Drawing.Size(151, 19); + this.checkBoxBodyKit.TabIndex = 4; + this.checkBoxBodyKit.Text = "The presence of a barrel"; + this.checkBoxBodyKit.UseVisualStyleBackColor = true; + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(21, 72); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(45, 15); + this.labelWeight.TabIndex = 1; + this.labelWeight.Text = "Weight"; + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(21, 30); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(39, 15); + this.labelSpeed.TabIndex = 0; + this.labelSpeed.Text = "Speed"; + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(20, 44); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(225, 125); + this.pictureBoxObject.TabIndex = 0; + 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(489, 12); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(262, 184); + this.panelObject.TabIndex = 9; + 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(141, 9); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(104, 32); + this.labelDopColor.TabIndex = 2; + this.labelDopColor.Text = "Dop.color"; + 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.LabelDopColor_DragEnter); + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(20, 9); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(104, 32); + this.labelBaseColor.TabIndex = 1; + this.labelBaseColor.Text = "Color"; + 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); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(630, 202); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(104, 30); + this.buttonCancel.TabIndex = 11; + this.buttonCancel.Text = "Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(509, 202); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(104, 30); + this.buttonOk.TabIndex = 10; + this.buttonOk.Text = "Add"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click); + // + // FormGasolineTankerConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(793, 244); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.groupBoxConfig); + this.Controls.Add(this.buttonOk); + this.Name = "FormGasolineTankerConfig"; + this.Text = "Create object"; + this.groupBoxConfig.ResumeLayout(false); + this.groupBoxConfig.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); + this.groupBoxColor.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.panelObject.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBoxConfig; + private CheckBox checkBoxOrnamentWheel; + private CheckBox checkBoxBodyKit; + private Label labelWeight; + private Label labelSpeed; + private Label labelImrovedObject; + private Label labelSimpleObject; + private GroupBox groupBoxColor; + private Panel panelPurple; + private Panel panelRed; + private Panel panelYellow; + private Panel panelWhite; + private Panel panelGreen; + private Panel panelBlack; + private Panel panelGray; + private Panel panelBlue; + private PictureBox pictureBoxObject; + private Panel panelObject; + private Label labelDopColor; + private Label labelBaseColor; + private Button buttonCancel; + private Button buttonOk; + private NumericUpDown numericUpDownWeight; + private NumericUpDown numericUpDownSpeed; + } +} \ No newline at end of file diff --git a/GasolineTanker/GasolineTanker/FormGasolineTankerConfig.cs b/GasolineTanker/GasolineTanker/FormGasolineTankerConfig.cs new file mode 100644 index 0000000..73c6a11 --- /dev/null +++ b/GasolineTanker/GasolineTanker/FormGasolineTankerConfig.cs @@ -0,0 +1,129 @@ +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 GasolineTanker +{ + public partial class FormGasolineTankerConfig : Form + { + DrawingGasolineTanker _gasolineTanker = null; + private event GasolineTankerDelegate EventAddGasolineTanker; + public FormGasolineTankerConfig() + { + 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(); + } + + public void AddEvent(GasolineTankerDelegate ev) + { + if (EventAddGasolineTanker == null) + { + EventAddGasolineTanker = new GasolineTankerDelegate(ev); + } + else + { + EventAddGasolineTanker += ev; + } + } + private void setDragEffect(DragEventArgs e, Type needTypeData, bool condition) + { + if (e.Data.GetDataPresent(needTypeData) && condition) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void LabelBaseColor_DragEnter(object sender, DragEventArgs e) => setDragEffect(e, typeof(Color), _gasolineTanker != null); + private void LabelDopColor_DragEnter(object sender, DragEventArgs e) => setDragEffect(e, typeof(Color), _gasolineTanker != null && _gasolineTanker is DrawingImprovedGasolineTanker); + private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) + { + var color = (Color)e.Data.GetData(typeof(Color)); + if (_gasolineTanker is DrawingImprovedGasolineTanker) + { + _gasolineTanker = ((DrawingImprovedGasolineTanker)_gasolineTanker).Copy(bodyColor: color); + } + else if (_gasolineTanker is DrawingGasolineTanker) + { + _gasolineTanker = _gasolineTanker.Copy(bodyColor: color); + } + DrawGasolineTanker(); + } + private void LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + var color = (Color)e.Data.GetData(typeof(Color)); + var gasolineTanker = _gasolineTanker as DrawingImprovedGasolineTanker; + if (gasolineTanker != null) + { + _gasolineTanker = gasolineTanker.Copy(dopColor: color); + } + DrawGasolineTanker(); + } + private void ButtonOk_Click(object sender, EventArgs e) + { + EventAddGasolineTanker?.Invoke(_gasolineTanker); + Close(); + } + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); + } + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor, 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 DrawGasolineTanker() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _gasolineTanker?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _gasolineTanker?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data.GetData(DataFormats.Text).ToString()) + { + case "labelSimpleObject": + _gasolineTanker = new DrawingGasolineTanker((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); + break; + case "labelImrovedObject": + _gasolineTanker = new DrawingImprovedGasolineTanker((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, + checkBoxBodyKit.Checked, checkBoxOrnamentWheel.Checked); + break; + } + DrawGasolineTanker(); + } + } +} diff --git a/GasolineTanker/GasolineTanker/FormGasolineTankerConfig.resx b/GasolineTanker/GasolineTanker/FormGasolineTankerConfig.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/GasolineTanker/GasolineTanker/FormGasolineTankerConfig.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/GasolineTanker/GasolineTanker/FormMapWithSetGasolineTanker.cs b/GasolineTanker/GasolineTanker/FormMapWithSetGasolineTanker.cs index 6df5df9..4dc139a 100644 --- a/GasolineTanker/GasolineTanker/FormMapWithSetGasolineTanker.cs +++ b/GasolineTanker/GasolineTanker/FormMapWithSetGasolineTanker.cs @@ -62,27 +62,33 @@ namespace GasolineTanker } } private void ButtonAddGasolineTanker_Click(object sender, EventArgs e) + { + { + var formGasolineTankerConfig = new FormGasolineTankerConfig(); + formGasolineTankerConfig.AddEvent(AddGasolineTankerOnMap); + formGasolineTankerConfig.Show(); + } + } + private void AddGasolineTankerOnMap(DrawingGasolineTanker drawingGasolineTanker) { if (listBoxMaps.SelectedIndex == -1) { return; } - FormGasolineTanker form = new(); - if (form.ShowDialog() == DialogResult.OK) + DrawingObjectGasolineTanker gasolineTanker = new(drawingGasolineTanker); + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + gasolineTanker != -1) { - DrawingObjectGasolineTanker antiAircraftGun = new(form.SelectedGasolineTanker); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + antiAircraftGun >= 0) - { - MessageBox.Show("Object added"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } - else - { - MessageBox.Show("Failed to add object"); - } + MessageBox.Show("Object added"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + else + { + MessageBox.Show("Failed to add object"); } } + + private void ButtonShowStorage_Click(object sender, EventArgs e) { if (listBoxMaps.SelectedIndex == -1) diff --git a/GasolineTanker/GasolineTanker/GasolineTankerDelegate.cs b/GasolineTanker/GasolineTanker/GasolineTankerDelegate.cs new file mode 100644 index 0000000..2d7adf8 --- /dev/null +++ b/GasolineTanker/GasolineTanker/GasolineTankerDelegate.cs @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GasolineTanker +{ + public delegate void GasolineTankerDelegate(DrawingGasolineTanker gasolineTanker); +}