don't assume what an "OFF_STATE" might be, use the supplied default instead
This commit is contained in:
parent
393e846926
commit
55a12f7dc8
@ -3,7 +3,6 @@ from .coordinate import Coordinate
|
|||||||
from enum import Enum
|
from enum import Enum
|
||||||
from typing import Union, Any
|
from typing import Union, Any
|
||||||
|
|
||||||
OFF_STATES = [False, 0, None]
|
|
||||||
OFF = False
|
OFF = False
|
||||||
ON = True
|
ON = True
|
||||||
|
|
||||||
@ -51,9 +50,9 @@ class Grid:
|
|||||||
if pos.z is not None:
|
if pos.z is not None:
|
||||||
self.mode3D = True
|
self.mode3D = True
|
||||||
|
|
||||||
if (value == self.__default or value in OFF_STATES) and pos in self.__grid:
|
if (value == self.__default) and pos in self.__grid:
|
||||||
del self.__grid[pos]
|
del self.__grid[pos]
|
||||||
elif value != self.__default and value not in OFF_STATES:
|
elif value != self.__default:
|
||||||
self.__trackBoundaries(pos)
|
self.__trackBoundaries(pos)
|
||||||
self.__grid[pos] = value
|
self.__grid[pos] = value
|
||||||
|
|
||||||
@ -63,12 +62,6 @@ class Grid:
|
|||||||
else:
|
else:
|
||||||
return self.__default
|
return self.__default
|
||||||
|
|
||||||
def getState(self, pos: Coordinate) -> bool:
|
|
||||||
if pos not in self.__grid:
|
|
||||||
return False
|
|
||||||
else:
|
|
||||||
return self.__grid[pos] not in OFF_STATES
|
|
||||||
|
|
||||||
def getOnCount(self):
|
def getOnCount(self):
|
||||||
return len(self.__grid)
|
return len(self.__grid)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user