Skip to content
Snippets Groups Projects
Commit 3c28b2d5 authored by u214892's avatar u214892
Browse files

Merge branch master of gitlab.aicrowd.com:flatland/flatland into cleanup-continuous-integration

parent 67362db3
No related branches found
No related tags found
No related merge requests found
...@@ -193,7 +193,7 @@ class PILGL(GraphicsLayer): ...@@ -193,7 +193,7 @@ class PILGL(GraphicsLayer):
img = Image.new("RGBA", (self.widthPx, self.heightPx), (255, 255, 255, opacity)) img = Image.new("RGBA", (self.widthPx, self.heightPx), (255, 255, 255, opacity))
return img return img
def clear_layer(self,iLayer=0, opacity = None): def clear_layer(self, iLayer=0, opacity=None):
if opacity is None: if opacity is None:
opacity = 0 if iLayer > 0 else 255 opacity = 0 if iLayer > 0 else 255
self.layers[iLayer] = img = self.create_image(opacity) self.layers[iLayer] = img = self.create_image(opacity)
...@@ -216,11 +216,11 @@ class PILGL(GraphicsLayer): ...@@ -216,11 +216,11 @@ class PILGL(GraphicsLayer):
if clear: if clear:
self.clear_layer(iLayer) self.clear_layer(iLayer)
def create_layers(self, clear=True): def create_layers(self, clear=True):
self.create_layer(0, clear=clear) # rail / background (scene) self.create_layer(0, clear=clear) # rail / background (scene)
self.create_layer(1, clear=clear) # agents self.create_layer(1, clear=clear) # agents
self.create_layer(2, clear=clear) # drawing layer for selected agent self.create_layer(2, clear=clear) # drawing layer for selected agent
self.create_layer(3, clear=clear) # drawing layer for selected agent's target self.create_layer(3, clear=clear) # drawing layer for selected agent's target
class PILSVG(PILGL): class PILSVG(PILGL):
...@@ -379,7 +379,7 @@ class PILSVG(PILGL): ...@@ -379,7 +379,7 @@ class PILSVG(PILGL):
return dPil return dPil
def setRailAt(self, row, col, binTrans, iTarget=None,isSelected=False): def setRailAt(self, row, col, binTrans, iTarget=None, isSelected=False):
if iTarget is None: if iTarget is None:
if binTrans in self.dPilRail: if binTrans in self.dPilRail:
pilTrack = self.dPilRail[binTrans] pilTrack = self.dPilRail[binTrans]
...@@ -395,9 +395,8 @@ class PILSVG(PILGL): ...@@ -395,9 +395,8 @@ class PILSVG(PILGL):
if isSelected: if isSelected:
svgBG = self.pilFromSvgFile("./svg/Selected_Agent.svg") svgBG = self.pilFromSvgFile("./svg/Selected_Agent.svg")
self.clear_layer(3,0) self.clear_layer(3, 0)
self.drawImageRC(svgBG,(row,col),layer=3) self.drawImageRC(svgBG, (row, col), layer=3)
def recolorImage(self, pil, a3BaseColor, ltColors): def recolorImage(self, pil, a3BaseColor, ltColors):
rgbaImg = array(pil) rgbaImg = array(pil)
...@@ -447,7 +446,7 @@ class PILSVG(PILGL): ...@@ -447,7 +446,7 @@ class PILSVG(PILGL):
for iColor, pilZug3 in enumerate(lPils): for iColor, pilZug3 in enumerate(lPils):
self.dPilZug[(iDirIn2, iDirOut2, iColor)] = lPils[iColor] self.dPilZug[(iDirIn2, iDirOut2, iColor)] = lPils[iColor]
def setAgentAt(self, iAgent, row, col, iDirIn, iDirOut,isSelected): def setAgentAt(self, iAgent, row, col, iDirIn, iDirOut, isSelected):
delta_dir = (iDirOut - iDirIn) % 4 delta_dir = (iDirOut - iDirIn) % 4
iColor = iAgent % self.nAgentColors iColor = iAgent % self.nAgentColors
# when flipping direction at a dead end, use the "iDirOut" direction. # when flipping direction at a dead end, use the "iDirOut" direction.
...@@ -458,8 +457,8 @@ class PILSVG(PILGL): ...@@ -458,8 +457,8 @@ class PILSVG(PILGL):
if isSelected: if isSelected:
svgBG = self.pilFromSvgFile("./svg/Selected_Agent.svg") svgBG = self.pilFromSvgFile("./svg/Selected_Agent.svg")
self.clear_layer(2,0) self.clear_layer(2, 0)
self.drawImageRC(svgBG,(row,col),layer=2) self.drawImageRC(svgBG, (row, col), layer=2)
def main2(): def main2():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment