From f275c6e39310e343dfa63d8056ee171552ee942d Mon Sep 17 00:00:00 2001
From: "Egli Adrian (IT-SCI-API-PFI)" <adrian.egli@sbb.ch>
Date: Thu, 27 Jun 2019 14:58:29 +0200
Subject: [PATCH] .
---
flatland/utils/editor.py | 10 ++++++++++
flatland/utils/graphics_pil.py | 2 +-
notebooks/Scene_Editor.ipynb | 2 +-
notebooks/basic_elements_test.pkl | Bin 69 -> 1997 bytes
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/flatland/utils/editor.py b/flatland/utils/editor.py
index d9ad153f..dd0c4d4b 100644
--- a/flatland/utils/editor.py
+++ b/flatland/utils/editor.py
@@ -119,6 +119,7 @@ class View(object):
tip="Regenerate the rails using the method selected below"),
dict(name="Load", method=self.controller.load),
dict(name="Save", method=self.controller.save),
+ dict(name="Save as image", method=self.controller.saveImage)
]
self.lwButtons = []
@@ -364,6 +365,9 @@ class Controller(object):
def save(self, event):
self.model.save()
+ def saveImage(self, event):
+ self.model.saveImage()
+
def step(self, event):
self.model.step()
@@ -397,6 +401,7 @@ class EditorModel(object):
self.iSelectedAgent = None
self.init_agents_static = None
self.thread = None
+ self.saveImageCnt = 0
def set_env(self, env):
"""
@@ -645,6 +650,11 @@ class EditorModel(object):
# reset agents current (current position)
self.env.agents = temp_store
+ def saveImage(self):
+ self.view.oRT.gl.saveImage('frame_{:04d}.bmp'.format(self.saveImageCnt))
+ self.saveImageCnt += 1
+ self.view.redraw()
+
def regenerate(self, method=None, nAgents=0, env=None):
self.log("Regenerate size",
self.regen_size_width,
diff --git a/flatland/utils/graphics_pil.py b/flatland/utils/graphics_pil.py
index fcf6b70d..5548d6f1 100644
--- a/flatland/utils/graphics_pil.py
+++ b/flatland/utils/graphics_pil.py
@@ -483,7 +483,7 @@ class PILSVG(PILGL):
pilTrack = Image.alpha_composite(pilTrack, self.ltStationColors[iTarget % len(self.ltStationColors)])
if binTrans == 0:
- if self.background_grid[col][row] < 4:
+ if self.background_grid[col][row] <= 4:
a = int(self.background_grid[col][row])
a = a % len(self.dBuildings)
if (col + row + col * row) % 13 > 11:
diff --git a/notebooks/Scene_Editor.ipynb b/notebooks/Scene_Editor.ipynb
index e6929391..abfe6220 100644
--- a/notebooks/Scene_Editor.ipynb
+++ b/notebooks/Scene_Editor.ipynb
@@ -70,7 +70,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "3cab2ff9e7fc4b4297783b504ffc37b5",
+ "model_id": "4153480c3fbe4fd9864a4d52b416477c",
"version_major": 2,
"version_minor": 0
},
diff --git a/notebooks/basic_elements_test.pkl b/notebooks/basic_elements_test.pkl
index b5c85217e5c3465252c04e81d81527b1e5f58378..1e5377f6840b4504b64eb0ad768056f10dcca31a 100644
GIT binary patch
literal 1997
zcmcJNKTZNc6vk&^AS4)qn2=~;P%fbH08&t(c2;(Tz>1p?Ag~4HCRkWlm`xxaK<z9%
zfQf}2Ok>R<Jc94f&aw+46zc?bX5M`Bz2D5d;Zw6`HD+RWCW>NxLzPt0_}`x)HmBK)
zc|(;dfRH}it5QrEaNwLDoG+6laViJ4(MNzbm7O|5Oq~ks#0GW{yn>lFh9K=@9cugx
zAmN-8+{;3zO6Q&vO#J&tDtHD?!O3)LkWC$_E)gA5aQov%=OPb`Kz-WKY(5E(80_`{
za!N%Vrj=@JQDl0;s8Zb@Q((->&mwPN742KN8axdD!A}nZJ;~=Rm~}<-5WQ5`QCr#@
z4lLqG<rd&kJ`VMP_!Xr3!iZFN18vOt=o!4%pnRI0v-?NF>0&Of7~+9d?th^Rg@E7)
zw9bu(L3JtB{x;E-FT!*=tWu~xU93SI1P#vD;DI>I%lZYlE#{DCnuCg;DJnS~<g4>;
zlsa^msvIZWye@o<2Jds}0)vYv_8Tev*{Z>7t!cLHezkAcY^(k_a*deb8U-<Y>vsB<
zZFSn!>t3yngNgQd?srYIF**I_z`Nb6wLL8>tFWtXwp!-Evc<?vCxn}hMQWJ=%S^PE
lS+LATYq<lKJJDL^!7?AMWhxPOQ_)%`fifAT<qMbT!w<01*^~eP
literal 69
zcmZo(l3tXVGIc5g!&wCe1_lt_0AygH&onSFtW8W$%_}L6FD^+e$xNQG48olN0PsN<
ADgXcg
--
GitLab