sqdselo/pibd-12_Tangatarov.I.A._Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Разрешены конфликты

Browse Source
This commit is contained in:
sqdselo 2024-05-05 13:23:10 +04:00
commit 8d7324d52e
6 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HoistingCrane/HoistingCrane/CollectionGenericObjects/AbstractCompany.cs
View File

@ -1,5 +1,4 @@
using HoistingCrane.Drawning; using HoistingCrane.Drawning;
using System;
namespace HoistingCrane.CollectionGenericObjects namespace HoistingCrane.CollectionGenericObjects
{ {
public abstract class AbstractCompany public abstract class AbstractCompany
@ -31,7 +30,7 @@ namespace HoistingCrane.CollectionGenericObjects
{ {
get get
{ {
return (pictureWidth * pictureHeight) / (_placeSizeHeight * _placeSizeWidth); return (pictureWidth * pictureHeight) / (_placeSizeHeight * _placeSizeWidth)-3;
} }
} }
public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTrackedVehicle> array) public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTrackedVehicle> array)
@ -75,7 +74,6 @@ namespace HoistingCrane.CollectionGenericObjects
} }
return bitmap; return bitmap;
} }
/// <summary> /// <summary>
/// Вывод заднего фона /// Вывод заднего фона
/// </summary> /// </summary>

6
HoistingCrane/HoistingCrane/CollectionGenericObjects/Garage.cs
View File

@ -1,7 +1,4 @@
using HoistingCrane.Drawning; using HoistingCrane.Drawning;
using System;
using System.Collections.Specialized;
namespace HoistingCrane.CollectionGenericObjects namespace HoistingCrane.CollectionGenericObjects
{ {
public class Garage : AbstractCompany public class Garage : AbstractCompany
@ -38,7 +35,7 @@ namespace HoistingCrane.CollectionGenericObjects
arr?.Get(i)?.SetPictureSize(pictureWidth, pictureHeight); arr?.Get(i)?.SetPictureSize(pictureWidth, pictureHeight);
arr?.Get(i)?.SetPosition(_placeSizeWidth * currentPosWidth + 25, _placeSizeHeight * currentPosHeight + 15); arr?.Get(i)?.SetPosition(_placeSizeWidth * currentPosWidth + 25, _placeSizeHeight * currentPosHeight + 15);
} }
if (currentPosWidth > 0) if (currentPosWidth > 0)
currentPosWidth--; currentPosWidth--;
else else
@ -53,5 +50,6 @@ namespace HoistingCrane.CollectionGenericObjects
} }
} }
} }
} }

3
HoistingCrane/HoistingCrane/CollectionGenericObjects/ICollectionGenericObjects.cs
View File

@ -1,5 +1,4 @@
using System; namespace HoistingCrane.CollectionGenericObjects
namespace HoistingCrane.CollectionGenericObjects
{ {
public interface ICollectionGenericObjects<T> public interface ICollectionGenericObjects<T>
where T: class where T: class

6
HoistingCrane/HoistingCrane/CollectionGenericObjects/MassivGenericObjects.cs
View File

@ -8,7 +8,7 @@ namespace HoistingCrane.CollectionGenericObjects
{ {
arr = Array.Empty<T?>(); arr = Array.Empty<T?>();
} }
public int Count public int Count
{ {
get { return arr.Length; } get { return arr.Length; }
} }
@ -31,11 +31,11 @@ namespace HoistingCrane.CollectionGenericObjects
} }
public T? Get(int position) public T? Get(int position)
{ {
if(position >= 0 && position < arr.Length) if (position >= 0 && position < arr.Length)
{ {
return arr[position]; return arr[position];
} }
return null; return null;
} }
public int Insert(T obj) public int Insert(T obj)

2
HoistingCrane/HoistingCrane/MovementStrategy/AbstractStrategy.cs
View File

@ -47,7 +47,6 @@
FieldWidth = width; FieldWidth = width;
FieldHeight = height; FieldHeight = height;
} }
/// <summary> /// <summary>
/// Шаг перемещения /// Шаг перемещения
/// </summary> /// </summary>
@ -119,7 +118,6 @@
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
protected abstract bool IsTargetDestination(); protected abstract bool IsTargetDestination();
/// <summary> /// <summary>
/// Попытка перемещения в требуемом направлении /// Попытка перемещения в требуемом направлении
/// </summary> /// </summary>

5
HoistingCrane/HoistingCrane/MovementStrategy/MoveToBorder.cs
View File

@ -1,4 +1,6 @@
namespace HoistingCrane.MovementStrategy using System.Configuration;
namespace HoistingCrane.MovementStrategy
{ {
public class MoveToBorder : AbstractStrategy public class MoveToBorder : AbstractStrategy
{ {
@ -12,7 +14,6 @@
return objParams.RightBorder + GetStep() >= FieldWidth && objParams.DownBorder + GetStep() >= FieldHeight; return objParams.RightBorder + GetStep() >= FieldWidth && objParams.DownBorder + GetStep() >= FieldHeight;
} }
protected override void MoveToTarget() protected override void MoveToTarget()
{ {
ObjectParameters? objParams = GetObjectParameters; ObjectParameters? objParams = GetObjectParameters;