F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-13_Ladyagin_P.D. LabWork07 Simple #9

Closed
F1rsTTeaM wants to merge 2 commits from LabWork07.2 into LabWork06.1
pull from: LabWork07.2
merge into: F1rsTTeaM:LabWork06.1
Conversation 0 Commits 2 Files Changed 13 +11 -12
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 99c2285250 - Show all commits

2
AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/AbstractCompany.cs
View File

@ -36,7 +36,7 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects
/// <summary>
/// Вычисление максимального количества элементов, который можно разместить в окне
/// </summary>
private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
private int GetMaxCount => _pictureWidth / _placeSizeWidth * (_pictureHeight / _placeSizeHeight);
/// <summary>
/// Конструктор

2
AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/MassiveGenericObjects.cs
View File

@ -74,7 +74,7 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects
public int Insert(T obj, int position)
{
if (position < 0 || position >= Count)
if (position >= Count || position < 0)
throw new PositionOutOfCollectionException(position);
if (_collection[position] == null)

1
AirplaneWithRadar/ProjectAirplaneWithRadar/CollectionGenericObjects/PlaneSharingService.cs
View File

@ -58,7 +58,6 @@ namespace ProjectAirplaneWithRadar.CollectionGenericObjects
{
break;
}
}
}
}

12
AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.Designer.cs generated
View File

@ -66,9 +66,9 @@
groupBoxTools.Controls.Add(panelStorage);
groupBoxTools.Controls.Add(comboBoxSelectorCompany);
groupBoxTools.Dock = DockStyle.Right;
groupBoxTools.Location = new Point(883, 24);
groupBoxTools.Location = new Point(445, 24);
groupBoxTools.Name = "groupBoxTools";
groupBoxTools.Size = new Size(206, 583);
groupBoxTools.Size = new Size(206, 523);
groupBoxTools.TabIndex = 0;
groupBoxTools.TabStop = false;
groupBoxTools.Text = "Инструменты";
@ -82,7 +82,7 @@
panelCompanyTools.Controls.Add(buttonGoToCheck);
panelCompanyTools.Dock = DockStyle.Bottom;
panelCompanyTools.Enabled = false;
panelCompanyTools.Location = new Point(3, 393);
panelCompanyTools.Location = new Point(3, 333);
panelCompanyTools.Name = "panelCompanyTools";
panelCompanyTools.Size = new Size(200, 187);
panelCompanyTools.TabIndex = 8;
@ -249,7 +249,7 @@
pictureBox.Dock = DockStyle.Fill;
pictureBox.Location = new Point(0, 24);
pictureBox.Name = "pictureBox";
pictureBox.Size = new Size(883, 583);
pictureBox.Size = new Size(445, 523);
pictureBox.TabIndex = 1;
pictureBox.TabStop = false;
//
@ -258,7 +258,7 @@
menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem });
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
menuStrip.Size = new Size(1089, 24);
menuStrip.Size = new Size(651, 24);
menuStrip.TabIndex = 2;
menuStrip.Text = "menuStrip";
//
@ -297,7 +297,7 @@
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1089, 607);
ClientSize = new Size(651, 547);
Controls.Add(pictureBox);
Controls.Add(groupBoxTools);
Controls.Add(menuStrip);

6
AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.cs
View File

@ -78,10 +78,10 @@ namespace ProjectAirplaneWithRadar
_logger.LogInformation("Добавлен объект: {0}", airplane.GetDataForSave());
}
}
catch
catch (CollectionOverflowException ex)
{
MessageBox.Show("Не удалось добавить объект");
_logger.LogError("Ошибка: В коллекции превышено допустимое количество");
MessageBox.Show(ex.Message);
_logger.LogError("Ошибка: {Message}", ex.Message);
}
}