diff --git a/Bus/Bus/AbstractMap.cs b/Bus/Bus/AbstractMap.cs index 3e4ceb3..ea93877 100644 --- a/Bus/Bus/AbstractMap.cs +++ b/Bus/Bus/AbstractMap.cs @@ -64,11 +64,6 @@ namespace Bus _drawingObject.MoveObject(MoveObjectBack(direction)); } return DrawMapWithObject(); - - - - - } @@ -126,7 +121,6 @@ namespace Bus } _drawingObject.DrawingObject(gr); return bmp; - } diff --git a/Bus/Bus/BusDelegate.cs b/Bus/Bus/BusDelegate.cs new file mode 100644 index 0000000..6c88a52 --- /dev/null +++ b/Bus/Bus/BusDelegate.cs @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Bus +{ + public delegate void BusDelegate(DrawingBus bus); +} diff --git a/Bus/Bus/DrawingSportBus.cs b/Bus/Bus/DrawingSportBus.cs index aca2b36..423e41c 100644 --- a/Bus/Bus/DrawingSportBus.cs +++ b/Bus/Bus/DrawingSportBus.cs @@ -8,6 +8,11 @@ namespace Bus { internal class DrawingSportBus : DrawingBus { + public void SetDopColor(Color color) + { + ((EntitySportBus)Bus).DopColor1 = color; + } + public DrawingSportBus(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : base(speed, weight, bodyColor) { diff --git a/Bus/Bus/EntityBus.cs b/Bus/Bus/EntityBus.cs index b1789d9..fc2606f 100644 --- a/Bus/Bus/EntityBus.cs +++ b/Bus/Bus/EntityBus.cs @@ -10,7 +10,7 @@ namespace Bus { public int Speed { get; private set; } public float Weight { get; private set; } - public Color BodyColor { get; private set; } + public Color BodyColor { get; set; } public float Step => Speed * 100 / Weight; public EntityBus (int speed, float weight, Color bodyColor) diff --git a/Bus/Bus/EntitySportBus.cs b/Bus/Bus/EntitySportBus.cs index 21b2b44..9c813b3 100644 --- a/Bus/Bus/EntitySportBus.cs +++ b/Bus/Bus/EntitySportBus.cs @@ -8,8 +8,8 @@ namespace Bus { internal class EntitySportBus : EntityBus { - public Color DopColor { get; private set; } - public Color DopColor1 { get; private set; } + public Color DopColor { get; set; } + public Color DopColor1 { get; set; } public bool BodyKit { get; private set; } public bool Wing { get; private set; } public bool Sportline { get; private set; } @@ -19,9 +19,9 @@ namespace Bus { DopColor = dopColor; DopColor1 = bodyColor; - BodyKit = bodyKit = true; - Wing = wing = true; - Sportline = sportline = true; + BodyKit = bodyKit; + Wing = wing; + Sportline = sportline; } } } diff --git a/Bus/Bus/FormBusConfig.Designer.cs b/Bus/Bus/FormBusConfig.Designer.cs new file mode 100644 index 0000000..fa76aea --- /dev/null +++ b/Bus/Bus/FormBusConfig.Designer.cs @@ -0,0 +1,372 @@ +namespace Bus +{ + partial class FormBusConfig + { + /// + /// 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.panelBlue = 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.panelRed = new System.Windows.Forms.Panel(); + this.checkBoxBodyKit = new System.Windows.Forms.CheckBox(); + this.checkBoxWing = new System.Windows.Forms.CheckBox(); + this.checkBoxSportline = new System.Windows.Forms.CheckBox(); + this.labelWeight = new System.Windows.Forms.Label(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + 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.labelColor = 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.checkBoxBodyKit); + this.groupBoxConfig.Controls.Add(this.checkBoxWing); + this.groupBoxConfig.Controls.Add(this.checkBoxSportline); + this.groupBoxConfig.Controls.Add(this.labelWeight); + this.groupBoxConfig.Controls.Add(this.labelSpeed); + this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); + 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(427, 226); + 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(221, 182); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(188, 25); + this.labelModifiedObject.TabIndex = 9; + 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(220, 148); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(188, 25); + this.labelSimpleObject.TabIndex = 8; + 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.panelBlue); + this.groupBoxColors.Controls.Add(this.panelYellow); + this.groupBoxColors.Controls.Add(this.panelWhite); + this.groupBoxColors.Controls.Add(this.panelGreen); + this.groupBoxColors.Controls.Add(this.panelRed); + this.groupBoxColors.Location = new System.Drawing.Point(221, 17); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Size = new System.Drawing.Size(188, 118); + this.groupBoxColors.TabIndex = 7; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Цвета:"; + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.Purple; + this.panelPurple.Location = new System.Drawing.Point(139, 67); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(35, 35); + this.panelPurple.TabIndex = 1; + this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(98, 67); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(35, 35); + this.panelBlack.TabIndex = 1; + this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(57, 67); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(35, 35); + this.panelGray.TabIndex = 1; + this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(98, 26); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(35, 35); + this.panelBlue.TabIndex = 1; + this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(139, 26); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(35, 35); + this.panelYellow.TabIndex = 1; + this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(16, 67); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(35, 35); + this.panelWhite.TabIndex = 1; + this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(57, 26); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(35, 35); + this.panelGreen.TabIndex = 1; + this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(16, 26); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(35, 35); + this.panelRed.TabIndex = 0; + this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // checkBoxBodyKit + // + this.checkBoxBodyKit.AutoSize = true; + this.checkBoxBodyKit.Location = new System.Drawing.Point(5, 158); + this.checkBoxBodyKit.Name = "checkBoxBodyKit"; + this.checkBoxBodyKit.Size = new System.Drawing.Size(97, 24); + this.checkBoxBodyKit.TabIndex = 6; + this.checkBoxBodyKit.Text = "Лестница"; + this.checkBoxBodyKit.UseVisualStyleBackColor = true; + // + // checkBoxWing + // + this.checkBoxWing.AutoSize = true; + this.checkBoxWing.Location = new System.Drawing.Point(5, 128); + this.checkBoxWing.Name = "checkBoxWing"; + this.checkBoxWing.Size = new System.Drawing.Size(66, 24); + this.checkBoxWing.TabIndex = 5; + this.checkBoxWing.Text = "Окна"; + this.checkBoxWing.UseVisualStyleBackColor = true; + // + // checkBoxSportline + // + this.checkBoxSportline.AutoSize = true; + this.checkBoxSportline.Location = new System.Drawing.Point(5, 98); + this.checkBoxSportline.Name = "checkBoxSportline"; + this.checkBoxSportline.Size = new System.Drawing.Size(118, 24); + this.checkBoxSportline.TabIndex = 4; + this.checkBoxSportline.Text = "Второй этаж"; + this.checkBoxSportline.UseVisualStyleBackColor = true; + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(5, 67); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(36, 20); + this.labelWeight.TabIndex = 3; + this.labelWeight.Text = "Вес:"; + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(5, 36); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(76, 20); + this.labelSpeed.TabIndex = 2; + this.labelSpeed.Text = "Скорость:"; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(87, 65); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(91, 27); + this.numericUpDownWeight.TabIndex = 1; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(87, 34); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(90, 27); + this.numericUpDownSpeed.TabIndex = 0; + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(12, 49); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(226, 124); + this.pictureBoxObject.TabIndex = 1; + this.pictureBoxObject.TabStop = false; + // + // panelObject + // + this.panelObject.AllowDrop = true; + this.panelObject.Controls.Add(this.labelDopColor); + this.panelObject.Controls.Add(this.labelColor); + this.panelObject.Controls.Add(this.pictureBoxObject); + this.panelObject.Location = new System.Drawing.Point(459, 12); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(250, 182); + 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(117, 7); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(121, 39); + this.labelDopColor.TabIndex = 10; + 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); + // + // labelColor + // + this.labelColor.AllowDrop = true; + this.labelColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelColor.Location = new System.Drawing.Point(12, 7); + this.labelColor.Name = "labelColor"; + this.labelColor.Size = new System.Drawing.Size(99, 39); + this.labelColor.TabIndex = 9; + this.labelColor.Text = "Цвет"; + this.labelColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragDrop); + this.labelColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter); + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(460, 200); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(118, 37); + this.buttonOk.TabIndex = 3; + this.buttonOk.Text = "Добавить"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(584, 200); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(126, 38); + this.buttonCancel.TabIndex = 4; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // FormBusConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(722, 249); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.groupBoxConfig); + this.Name = "FormBusConfig"; + this.Text = "Свойства объекта"; + 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 labelWeight; + private Label labelSpeed; + private NumericUpDown numericUpDownWeight; + private NumericUpDown numericUpDownSpeed; + private CheckBox checkBoxBodyKit; + private CheckBox checkBoxWing; + private CheckBox checkBoxSportline; + private Label labelSimpleObject; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelBlue; + private Panel panelYellow; + private Panel panelWhite; + private Panel panelGreen; + private Panel panelRed; + private Label labelModifiedObject; + private PictureBox pictureBoxObject; + private Panel panelObject; + private Label labelDopColor; + private Label labelColor; + private Button buttonOk; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/Bus/Bus/FormBusConfig.cs b/Bus/Bus/FormBusConfig.cs new file mode 100644 index 0000000..020267c --- /dev/null +++ b/Bus/Bus/FormBusConfig.cs @@ -0,0 +1,146 @@ +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 Bus +{ + public partial class FormBusConfig : Form + { + + DrawingBus _bus = null; + private event BusDelegate EventAddBus; + + public FormBusConfig() + { + 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 a) => Close(); + } + + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); + } + + private void DrawBus() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _bus?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _bus?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + public void AddEvent(BusDelegate ev) + { + if (EventAddBus == null) + { + EventAddBus = new BusDelegate(ev); + } + else + { + EventAddBus += ev; + } + + } + + 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": + _bus = new DrawingBus((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, labelColor.BackColor); + break; + case "labelModifiedObject": + _bus = new DrawingSportBus((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, labelColor.BackColor, labelDopColor.BackColor, + checkBoxSportline.Checked, checkBoxBodyKit.Checked, checkBoxWing.Checked); + break; + } + DrawBus(); + } + + private void LabelColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void LabelColor_DragDrop(object sender, DragEventArgs e) + { + var color = e.Data.GetData(typeof(Color)); + if (color != null) + { + (sender as Label).BackColor = (Color)color; + } + if (_bus != null) + { + _bus.Bus.BodyColor = (Color)color; + DrawBus(); + } + } + + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + private void LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + if (_bus != null && _bus.Bus is EntitySportBus entityAirbus) + { + entityAirbus.DopColor = (Color)e.Data.GetData(typeof(Color)); + + DrawBus(); + } + } + + private void LabelDopColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void buttonOk_Click(object sender, EventArgs e) + { + EventAddBus?.Invoke(_bus); + Close(); + } + } +} diff --git a/Bus/Bus/FormBusConfig.resx b/Bus/Bus/FormBusConfig.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/Bus/Bus/FormBusConfig.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/Bus/Bus/FormMapWithSetDoubleDeckerBus.cs b/Bus/Bus/FormMapWithSetDoubleDeckerBus.cs index 0150735..d744239 100644 --- a/Bus/Bus/FormMapWithSetDoubleDeckerBus.cs +++ b/Bus/Bus/FormMapWithSetDoubleDeckerBus.cs @@ -29,7 +29,7 @@ namespace Bus comboBoxSelectorMap.Items.Clear(); foreach (var item in _mapsDict) { - comboBoxSelectorMap.Items.Add(item.Key); + comboBoxSelectorMap.Items.Add(item.Key);// } } @@ -80,34 +80,32 @@ namespace Bus private void ButtonAddBus_Click(object sender, EventArgs e) { - if (_mapBusCollectionGeneric == null) + var formBusConfig = new FormBusConfig(); + // TODO Call method AddEvent from fromBusConfig + formBusConfig.AddEvent(AddBus); + formBusConfig.Show(); + } + + private void AddBus(DrawingBus bus) + { + if (listBoxMaps.SelectedIndex == -1) { return; } - FormBus form = new(); - if (form.ShowDialog() == DialogResult.OK) + DrawingObjectBus boat = new(bus); + if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + boat >= 0) { - if (form.SelectedBus == null) - { - MessageBox.Show("Сначала создайте объект"); - return; - } - - DrawingObjectBus bus = new(form.SelectedBus); - - if (_mapBusCollectionGeneric + bus != -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapBusCollectionGeneric.ShowSet(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); } } - private void ButtonRemoveBus_Click(object sender, EventArgs e) + + private void ButtonRemoveBus_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBoxPosition.Text)) { diff --git a/Bus/Bus/MapsCollection.cs b/Bus/Bus/MapsCollection.cs index a28b8e5..f569911 100644 --- a/Bus/Bus/MapsCollection.cs +++ b/Bus/Bus/MapsCollection.cs @@ -25,7 +25,7 @@ namespace Bus public void AddMap(string name, AbstractMap map) { - if (_mapStorages.ContainsKey(name)) return; //уникальное имя + if (_mapStorages.ContainsKey(name)) return; else { _mapStorages.Add(name, new MapWithSetDoubleDeckerBusGeneric(_pictureWidth, _pictureHeight, map)); @@ -34,19 +34,18 @@ namespace Bus public void DelMap(string name) { - // TODO Прописать логику для удаления + // TODO проверяет наличие элемента с определенным ключом if (_mapStorages.ContainsKey(name)) { _mapStorages.Remove(name); - } - + } } - public MapWithSetDoubleDeckerBusGeneric this[string ind] + public MapWithSetDoubleDeckerBusGeneric this[string ind] // инициализация индексатора { get { - // TODO Продумать логику получения объекта + // TODO получает из словаря элемент по ключу _mapStorages.TryGetValue(ind, out var MapWithSetDoubleDeckerBusGeneric); return MapWithSetDoubleDeckerBusGeneric; }