Skip to content

Commit f68ac30

Browse files
committed
remove 'None' flag from AirportMovementNode, Cargo and TrackExtra viewmodels
1 parent c7843c1 commit f68ac30

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

Definitions/ObjectModels/Objects/Airport/AirportMovementNodeFlags.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace Definitions.ObjectModels.Objects.Airport;
33
[Flags]
44
public enum AirportMovementNodeFlags : uint16_t
55
{
6-
None = 0,
6+
//None = 0,
77
Terminal = 1 << 0,
88
TakeoffEnd = 1 << 1,
99
Flag2 = 1 << 2,

Gui/ViewModels/LocoTypes/Objects/CargoViewModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Definitions.ObjectModels.Objects.Cargo;
2+
using PropertyModels.ComponentModel.DataAnnotations;
23

34
namespace Gui.ViewModels;
45

@@ -17,6 +18,7 @@ public CargoCategory CargoCategory
1718
set => Model.CargoCategory = value;
1819
}
1920

21+
[EnumProhibitValues<CargoObjectFlags>(CargoObjectFlags.None)]
2022
public CargoObjectFlags Flags
2123
{
2224
get => Model.Flags;

Gui/ViewModels/LocoTypes/Objects/TrackExtraViewModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using Definitions.ObjectModels.Objects.Track;
22
using Definitions.ObjectModels.Objects.TrackExtra;
3+
using PropertyModels.ComponentModel.DataAnnotations;
34

45
namespace Gui.ViewModels;
56

67
public class TrackExtraViewModel(TrackExtraObject model)
78
: LocoObjectViewModel<TrackExtraObject>(model)
89
{
10+
[EnumProhibitValues<TrackTraitFlags>(TrackTraitFlags.None)]
911
public TrackTraitFlags TrackPieces
1012
{
1113
get => Model.TrackPieces;

Gui/ViewModels/Pos3ViewModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ public class Pos3ViewModel : MiniReactiveObject
99

1010
public coord_t X
1111
{
12-
get => Pos.X;
12+
get => Pos?.X ?? 0;
1313
set => Pos.X = value;
1414
}
1515

1616
public coord_t Y
1717
{
18-
get => Pos.Y;
18+
get => Pos?.Y ?? 0;
1919
set => Pos.Y = value;
2020
}
2121

2222
public coord_t Z
2323
{
24-
get => Pos.Z;
24+
get => Pos?.Z ?? 0;
2525
set => Pos.Z = value;
2626
}
2727
}

0 commit comments

Comments
 (0)