diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.Designer.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.Designer.cs index 3181f18..f3a34f6 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.Designer.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.Designer.cs @@ -28,24 +28,24 @@ /// private void InitializeComponent() { - pictureBoxAirplaneWithRadar = new PictureBox(); + pictureBoxAirplanesCollection = new PictureBox(); groupBoxAirplaneWithRadar = new GroupBox(); buttonUpdateCollection = new Button(); buttonDeleteAirplane = new Button(); buttonAddAirplane = new Button(); maskedTextBoxNumber = new MaskedTextBox(); - ((System.ComponentModel.ISupportInitialize)pictureBoxAirplaneWithRadar).BeginInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxAirplanesCollection).BeginInit(); groupBoxAirplaneWithRadar.SuspendLayout(); SuspendLayout(); // - // pictureBoxAirplaneWithRadar + // pictureBoxAirplanesCollection // - pictureBoxAirplaneWithRadar.Location = new Point(-9, 0); - pictureBoxAirplaneWithRadar.Name = "pictureBoxAirplaneWithRadar"; - pictureBoxAirplaneWithRadar.Size = new Size(650, 454); - pictureBoxAirplaneWithRadar.SizeMode = PictureBoxSizeMode.AutoSize; - pictureBoxAirplaneWithRadar.TabIndex = 0; - pictureBoxAirplaneWithRadar.TabStop = false; + pictureBoxAirplanesCollection.Location = new Point(-9, 0); + pictureBoxAirplanesCollection.Name = "pictureBoxAirplanesCollection"; + pictureBoxAirplanesCollection.Size = new Size(650, 454); + pictureBoxAirplanesCollection.SizeMode = PictureBoxSizeMode.AutoSize; + pictureBoxAirplanesCollection.TabIndex = 0; + pictureBoxAirplanesCollection.TabStop = false; // // groupBoxAirplaneWithRadar // @@ -104,10 +104,10 @@ AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(887, 454); Controls.Add(groupBoxAirplaneWithRadar); - Controls.Add(pictureBoxAirplaneWithRadar); + Controls.Add(pictureBoxAirplanesCollection); Name = "FormAirplanesCollection"; Text = "FormAirplaneWithRadar"; - ((System.ComponentModel.ISupportInitialize)pictureBoxAirplaneWithRadar).EndInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxAirplanesCollection).EndInit(); groupBoxAirplaneWithRadar.ResumeLayout(false); groupBoxAirplaneWithRadar.PerformLayout(); ResumeLayout(false); @@ -116,7 +116,7 @@ #endregion - private PictureBox pictureBoxAirplaneWithRadar; + private PictureBox pictureBoxAirplanesCollection; private GroupBox groupBoxAirplaneWithRadar; private Button buttonDeleteAirplane; private Button buttonAddAirplane; diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.cs index aa94f82..0664ae6 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.cs @@ -11,7 +11,7 @@ namespace ProjectAirplaneWithRadar { InitializeComponent(); _Airplanes = new AirplanesGenericCollection(pictureBoxAirplaneWithRadar.Width, pictureBoxAirplaneWithRadar.Height); + DrawningObjectAirplane>(pictureBoxAirplanesCollection.Width, pictureBoxAirplanesCollection.Height); } private void buttonAddAirplane_Click(object sender, EventArgs e) { @@ -21,7 +21,7 @@ namespace ProjectAirplaneWithRadar if (_Airplanes + form.SelectedAirplane != null) { MessageBox.Show("Объект добавлен"); - pictureBoxAirplaneWithRadar.Image = _Airplanes.ShowAirplanes(); + pictureBoxAirplanesCollection.Image = _Airplanes.ShowAirplanes(); } else { @@ -39,7 +39,7 @@ namespace ProjectAirplaneWithRadar if (_Airplanes - pos != null) { MessageBox.Show("Объект удален"); - pictureBoxAirplaneWithRadar.Image = _Airplanes.ShowAirplanes(); + pictureBoxAirplanesCollection.Image = _Airplanes.ShowAirplanes(); } else { @@ -49,7 +49,7 @@ namespace ProjectAirplaneWithRadar } private void buttonUpdateCollection_Click(object sender, EventArgs e) { - pictureBoxAirplaneWithRadar.Image = _Airplanes.ShowAirplanes(); + pictureBoxAirplanesCollection.Image = _Airplanes.ShowAirplanes(); } } } \ No newline at end of file