Merge branch 'adrian' into 'master'

Adrian See merge request flatland/flatland!82

Merge branch 'adrian' into 'master'
Adrian See merge request flatland/flatland!82
33c181da · adrian_egli · 6dd53c06 · 9a14a281 · 33c181da · 33c181da
Commit 33c181da authored 5 years ago by adrian_egli
--- a/flatland/utils/graphics_pil.py
+++ b/flatland/utils/graphics_pil.py
@@ -69,15 +69,11 @@ class PILGL(GraphicsLayer):
        self.tColRail = (0, 0, 0)  # black rails
        self.tColGrid = (230,) * 3  # light grey for grid
-        sColors = "d50000#c51162#aa00ff#6200ea#304ffe#2962ff#0091ea#00b8d4#00bfa5#00c853" + \
+        sColors = "ff0000#ff00FF#0000ff#00ff00#00FFFF#FFFF00#808080#000000" + \
+                  "#d50000#c51162#aa00ff#6200ea#304ffe#2962ff#0091ea#00b8d4#00bfa5#00c853" + \
                  "#64dd17#aeea00#ffd600#ffab00#ff6d00#ff3d00#5d4037#455a64"
        self.ltAgentColors = [self.rgb_s2i(sColor) for sColor in sColors.split("#")]
-        permute = np.random.permutation(len(self.ltAgentColors))
-        tmp = []
-        for p in permute:
-            tmp.append(self.ltAgentColors[p])
-        self.ltAgentColors = tmp
        self.nAgentColors = len(self.ltAgentColors)
        self.window_root = None

--- a/notebooks/Scene_Editor.ipynb
+++ b/notebooks/Scene_Editor.ipynb
@@ -11,20 +11,7 @@
   "cell_type": "code",
   "execution_count": 1,
   "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>\"))"
@@ -70,7 +57,7 @@
    {
     "data": {
      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "a84c3835ae974991a7b05a3757e1f13e",
+       "model_id": "e192c536c0c3472395dbacdf722234c7",
       "version_major": 2,
       "version_minor": 0
      },

 %% 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="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
 ```

--- a/svg/Bahnhof_#d50000_target.svg
+++ b/svg/Bahnhof_#d50000_target.svg