#119 refactored

ea81304c · Egli Adrian (IT-SCI-API-PFI) · d80386a8 · ea81304c · ea81304c
Commit ea81304c authored 5 years ago by Egli Adrian (IT-SCI-API-PFI)
--- a/flatland/utils/rendertools.py
+++ b/flatland/utils/rendertools.py
@@ -293,7 +293,8 @@ class RenderTool(object):
            for visited_cell in prediction_dict[agent]:
                cell_coord = array(visited_cell[:2])
                cell_coord_trans = np.matmul(cell_coord, rt.row_col_to_xy) + rt.x_y_half
-                self._draw_square(cell_coord_trans, 1 / (agent + 1.1), color, layer=1, opacity=100)  # TODO : Track highlighting (Adrian)
+                self._draw_square(cell_coord_trans, 1 / (agent + 1.1), color, layer=1, opacity=100)
+                # TODO : Track highlighting (Adrian)
    def render_rail(self, spacing=False, rail_color="gray", curves=True, arrows=False):

--- a/notebooks/Scene_Editor.ipynb
+++ b/notebooks/Scene_Editor.ipynb
@@ -9,22 +9,9 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
   "metadata": {},
-   "outputs": [
+   "outputs": [],
-    {
-     "data": {
-      "text/html": [
-       "<style>.container { width:95% !important; }</style>"
-      ],
-      "text/plain": [
-       "<IPython.core.display.HTML object>"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
   "source": [
    "from IPython.core.display import display, HTML\n",
    "display(HTML(\"<style>.container { width:95% !important; }</style>\"))"
@@ -32,12 +19,12 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
   "metadata": {},
   "outputs": [],
   "source": [
    "from flatland.utils.editor import EditorMVC\n",
-    "mvc = EditorMVC(sGL=\"PIL\" ) "
+    "mvc = EditorMVC(sGL=\"PILSVG\" ) "
   ]
  },
  {
@@ -62,26 +49,11 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": null,
   "metadata": {
    "scrolled": false
   },
-   "outputs": [
+   "outputs": [],
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "2e206d6a7c254d7e816cd6e3694ba147",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "HBox(children=(Canvas(), VBox(children=(Text(value='temp.pkl', description='Filename'), Button(description='Re…"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
   "source": [
    "mvc.view.display()"
   ]

 %% Cell type:markdown id: tags:
 # Railway Scene Editor
 %% Cell type:code id: tags:
 ``` python
 from IPython.core.display import display, HTML
 display(HTML("<style>.container { width:95% !important; }</style>"))
 ```
-%% Output
 %% Cell type:code id: tags:
 ``` python
 from flatland.utils.editor import EditorMVC
-mvc = EditorMVC(sGL="PIL" )
+mvc = EditorMVC(sGL="PILSVG" )
 ```
 %% Cell type:markdown id: tags:
 ## Instructions
 - Drag to draw (improved dead-ends)
 - ctrl-click to add agent or select agent
  - if agent is selected:
    - ctrl-click to move agent position
    - use rotate agent to rotate 90°
    - ctrl-shift-click to set target for selected agent
      - target can be moved by repeating
 - to Resize the env (cannot preserve work):
  - select "Regen" tab, set regen size slider, click regenerate.
 - alt-click remove all rails from cell
 Demo Scene: complex_scene.pkl
 %% Cell type:code id: tags:
 ``` python
 mvc.view.display()
 ```
-%% Output
 %% Cell type:code id: tags:
 ``` python
 ```