ProkudinI_ISEbd-12/ISEbd-12_Prokudin_I.A._Locomotive_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ProkudinI_ISEbd-12:c5073fef9593dd006e7d033b5a87dc06b10dc09a
Branches Tags
ProkudinI_ISEbd-12:main
ProkudinI_ISEbd-12:Lab_6
ProkudinI_ISEbd-12:Lab_5
ProkudinI_ISEbd-12:Lab_7
ProkudinI_ISEbd-12:Lab_8
ProkudinI_ISEbd-12:Lab_4
ProkudinI_ISEbd-12:Lab_1
ProkudinI_ISEbd-12:Lab_3
ProkudinI_ISEbd-12:Lab_2
..
compare: ProkudinI_ISEbd-12:acd1b0cce2dd175e7d74cea15881543caf9903ea
Branches Tags
ProkudinI_ISEbd-12:Lab_6
ProkudinI_ISEbd-12:Lab_5
ProkudinI_ISEbd-12:Lab_7
ProkudinI_ISEbd-12:Lab_8
ProkudinI_ISEbd-12:Lab_4
ProkudinI_ISEbd-12:Lab_1
ProkudinI_ISEbd-12:Lab_3
ProkudinI_ISEbd-12:Lab_2
ProkudinI_ISEbd-12:main

No commits in common. "c5073fef9593dd006e7d033b5a87dc06b10dc09a" and "acd1b0cce2dd175e7d74cea15881543caf9903ea" have entirely different histories.
c5073fef95 ... acd1b0cce2

3 changed files with 9 additions and 10 deletions
Show Stats Expand all files Collapse all files

6
ProjectLocomotive/ProjectLocomotive/CollectionGenericObjects/AbstractCompany.cs
View File

@ -57,11 +57,11 @@ namespace ProjectLocomotive.CollectionGenericObjects
/// Перегрузка оператора сложения для класса /// Перегрузка оператора сложения для класса
/// </summary> /// </summary>
/// <param name="company">Компания</param> /// <param name="company">Компания</param>
/// <param name="locomotive">Добавляемый объект</param> /// <param name="сruiser">Добавляемый объект</param>
/// <returns></returns> /// <returns></returns>
public static int operator +(AbstractCompany company, DrawningLocomotive locomotive) public static int operator +(AbstractCompany company, DrawningLocomotive сruiser)
{ {
return company._collection.Insert(locomotive); return company._collection.Insert(сruiser);
} }
/// <summary> /// <summary>

4
ProjectLocomotive/ProjectLocomotive/CollectionGenericObjects/LocomotiveDockingService.cs
View File

@ -40,7 +40,7 @@ namespace ProjectLocomotive.CollectionGenericObjects
int curWidth = 2; int curWidth = 2;
int curHeight = 0; int curHeight = 0;
for (int i = 0; i > (_collection?.Count ?? 0); i++) for (int i = 0; i < (_collection?.Count ?? 0); i++)
{ {
try try
@ -52,7 +52,7 @@ namespace ProjectLocomotive.CollectionGenericObjects
catch (PositionOutOfCollectionException e) { } catch (PositionOutOfCollectionException e) { }
if (curWidth > width - 3) if (curWidth > width - 2)
curWidth--; curWidth--;
else else
{ {

9
ProjectLocomotive/ProjectLocomotive/Drawnings/DrawningTLocomotive.cs
View File

@ -55,11 +55,10 @@ namespace ProjectLocomotive.Drawnings
if (entityTLocomotive.Pipe)
{ Point[] points4 = { new Point(_startPosX.Value + 20, _startPosY.Value), new Point(_startPosX.Value + 30, _startPosY.Value), new Point(_startPosX.Value + 30, _startPosY.Value - 7), new Point(_startPosX.Value + 32, _startPosY.Value - 9), new Point(_startPosX.Value + 30, _startPosY.Value - 11), new Point(_startPosX.Value + 20, _startPosY.Value - 11), new Point(_startPosX.Value + 18, _startPosY.Value - 9), new Point(_startPosX.Value + 20, _startPosY.Value - 7), new Point(_startPosX.Value + 20, _startPosY.Value) };
Point[] points4 = { new Point(_startPosX.Value + 20, _startPosY.Value), new Point(_startPosX.Value + 30, _startPosY.Value), new Point(_startPosX.Value + 30, _startPosY.Value - 7), new Point(_startPosX.Value + 32, _startPosY.Value - 9), new Point(_startPosX.Value + 30, _startPosY.Value - 11), new Point(_startPosX.Value + 20, _startPosY.Value - 11), new Point(_startPosX.Value + 18, _startPosY.Value - 9), new Point(_startPosX.Value + 20, _startPosY.Value - 7), new Point(_startPosX.Value + 20, _startPosY.Value) }; g.FillPolygon(wheelBrush, points4);
g.FillPolygon(wheelBrush, points4);
}
if (entityTLocomotive.Fueltank) if (entityTLocomotive.Fueltank)
{ {