Корректировки
This commit is contained in:
parent
d4b8f8a0b4
commit
fef1c1fb67
@ -8,7 +8,7 @@ namespace DoubleDeckerBus
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public DrawningBus SelectedCar { get; private set; }
|
||||
public DrawningBus SelectedBus { get; private set; }
|
||||
private void Draw()
|
||||
{
|
||||
Bitmap bmp = new(pictureBoxBus.Width, pictureBoxBus.Height);
|
||||
@ -102,7 +102,7 @@ namespace DoubleDeckerBus
|
||||
|
||||
private void ButtonSelectBus_Click(object sender, EventArgs e)
|
||||
{
|
||||
SelectedCar = _bus;
|
||||
SelectedBus = _bus;
|
||||
DialogResult = DialogResult.OK;
|
||||
}
|
||||
|
||||
|
@ -28,7 +28,7 @@
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.groupBox1 = new System.Windows.Forms.GroupBox();
|
||||
this.groupBoxInstruments = new System.Windows.Forms.GroupBox();
|
||||
this.buttonLeft = new System.Windows.Forms.Button();
|
||||
this.buttonUp = new System.Windows.Forms.Button();
|
||||
this.buttonRight = new System.Windows.Forms.Button();
|
||||
@ -40,29 +40,29 @@
|
||||
this.buttonAddBus = new System.Windows.Forms.Button();
|
||||
this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
|
||||
this.pictureBox = new System.Windows.Forms.PictureBox();
|
||||
this.groupBox1.SuspendLayout();
|
||||
this.groupBoxInstruments.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// groupBox1
|
||||
// groupBoxInstruments
|
||||
//
|
||||
this.groupBox1.Controls.Add(this.buttonLeft);
|
||||
this.groupBox1.Controls.Add(this.buttonUp);
|
||||
this.groupBox1.Controls.Add(this.buttonRight);
|
||||
this.groupBox1.Controls.Add(this.buttonDown);
|
||||
this.groupBox1.Controls.Add(this.buttonShowOnMap);
|
||||
this.groupBox1.Controls.Add(this.buttonShowStorage);
|
||||
this.groupBox1.Controls.Add(this.buttonRemoveBus);
|
||||
this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
|
||||
this.groupBox1.Controls.Add(this.buttonAddBus);
|
||||
this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
|
||||
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.groupBox1.Location = new System.Drawing.Point(600, 0);
|
||||
this.groupBox1.Name = "groupBox1";
|
||||
this.groupBox1.Size = new System.Drawing.Size(200, 450);
|
||||
this.groupBox1.TabIndex = 0;
|
||||
this.groupBox1.TabStop = false;
|
||||
this.groupBox1.Text = "Инструменты";
|
||||
this.groupBoxInstruments.Controls.Add(this.buttonLeft);
|
||||
this.groupBoxInstruments.Controls.Add(this.buttonUp);
|
||||
this.groupBoxInstruments.Controls.Add(this.buttonRight);
|
||||
this.groupBoxInstruments.Controls.Add(this.buttonDown);
|
||||
this.groupBoxInstruments.Controls.Add(this.buttonShowOnMap);
|
||||
this.groupBoxInstruments.Controls.Add(this.buttonShowStorage);
|
||||
this.groupBoxInstruments.Controls.Add(this.buttonRemoveBus);
|
||||
this.groupBoxInstruments.Controls.Add(this.maskedTextBoxPosition);
|
||||
this.groupBoxInstruments.Controls.Add(this.buttonAddBus);
|
||||
this.groupBoxInstruments.Controls.Add(this.comboBoxSelectorMap);
|
||||
this.groupBoxInstruments.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.groupBoxInstruments.Location = new System.Drawing.Point(600, 0);
|
||||
this.groupBoxInstruments.Name = "groupBoxInstruments";
|
||||
this.groupBoxInstruments.Size = new System.Drawing.Size(200, 450);
|
||||
this.groupBoxInstruments.TabIndex = 0;
|
||||
this.groupBoxInstruments.TabStop = false;
|
||||
this.groupBoxInstruments.Text = "Инструменты";
|
||||
//
|
||||
// buttonLeft
|
||||
//
|
||||
@ -187,11 +187,11 @@
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(800, 450);
|
||||
this.Controls.Add(this.pictureBox);
|
||||
this.Controls.Add(this.groupBox1);
|
||||
this.Controls.Add(this.groupBoxInstruments);
|
||||
this.Name = "FormMapWithSetBuses";
|
||||
this.Text = "Карта с набором объектов";
|
||||
this.groupBox1.ResumeLayout(false);
|
||||
this.groupBox1.PerformLayout();
|
||||
this.groupBoxInstruments.ResumeLayout(false);
|
||||
this.groupBoxInstruments.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
@ -199,7 +199,7 @@
|
||||
|
||||
#endregion
|
||||
|
||||
private GroupBox groupBox1;
|
||||
private GroupBox groupBoxInstruments;
|
||||
private PictureBox pictureBox;
|
||||
private ComboBox comboBoxSelectorMap;
|
||||
private Button buttonAddBus;
|
||||
|
@ -65,7 +65,7 @@ namespace DoubleDeckerBus
|
||||
FormBus form = new();
|
||||
if (form.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
DrawningObjectBus bus = new(form.SelectedCar);
|
||||
DrawningObjectBus bus = new(form.SelectedBus);
|
||||
if (_mapBusesCollectionGeneric + bus !=-1)
|
||||
{
|
||||
MessageBox.Show("Объект добавлен");
|
||||
|
Loading…
Reference in New Issue
Block a user