Skip to content
Snippets Groups Projects
Commit 20c34d5b authored by Egli Adrian (IT-SCI-API-PFI)'s avatar Egli Adrian (IT-SCI-API-PFI)
Browse files

missing topology elements fixed

parent 3504530f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
env_data/railway/basic_elements_test.pkl
+ 0
− 0
View file @ 20c34d5b
No preview for this file type
flatland/utils/graphics_pil.py
+ 2
− 1
View file @ 20c34d5b
...@@ -393,7 +393,8 @@ class PILSVG(PILGL): ...@@ -393,7 +393,8 @@ class PILSVG(PILGL):
"NN SS SE WN": "Weiche_vertikal_oben_rechts.svg", "NN SS SE WN": "Weiche_vertikal_oben_rechts.svg",
"NN SS NW ES": "Weiche_vertikal_unten_links.svg", "NN SS NW ES": "Weiche_vertikal_unten_links.svg",
"NN SS NE WS": "Weiche_vertikal_unten_rechts.svg", "NN SS NE WS": "Weiche_vertikal_unten_rechts.svg",
"NE NW ES WS SS NN WW EE": "Weiche_Symetrical_gerade.svg" "NE NW ES WS SS NN": "Weiche_Symetrical_gerade.svg",
"NE EN SW WS": "Gleis_Kurve_oben_links_unten_rechts.svg"
} }
dTargetFiles = { dTargetFiles = {
......
notebooks/Scene_Editor.ipynb
+ 15
− 2
View file @ 20c34d5b
%% Cell type:markdown id: tags: %% Cell type:markdown id: tags:
# Railway Scene Editor # Railway Scene Editor
%% Cell type:code id: tags: %% Cell type:code id: tags:
``` python ``` python
from IPython.core.display import display, HTML from IPython.core.display import display, HTML
display(HTML("<style>.container { width:95% !important; }</style>")) display(HTML("<style>.container { width:95% !important; }</style>"))
``` ```
%% Output
%% Cell type:code id: tags: %% Cell type:code id: tags:
``` python ``` python
from flatland.utils.editor import EditorMVC from flatland.utils.editor import EditorMVC
mvc = EditorMVC(sGL="PILSVG" ) mvc = EditorMVC(sGL="PILSVG" )
``` ```
%% Cell type:markdown id: tags: %% Cell type:markdown id: tags:
## Instructions ## Instructions
- Drag to draw (improved dead-ends) - Drag to draw (improved dead-ends)
- ctrl-click to add agent or select agent - ctrl-click to add agent or select agent
- if agent is selected: - if agent is selected:
- ctrl-click to move agent position - ctrl-click to move agent position
- use rotate agent to rotate 90° - use rotate agent to rotate 90°
- ctrl-shift-click to set target for selected agent - ctrl-shift-click to set target for selected agent
- target can be moved by repeating - target can be moved by repeating
- to Resize the env (cannot preserve work): - to Resize the env (cannot preserve work):
- select "Regen" tab, set regen size slider, click regenerate. - select "Regen" tab, set regen size slider, click regenerate.
- alt-click remove all rails from cell - alt-click remove all rails from cell
Demo Scene: complex_scene.pkl Demo Scene: complex_scene.pkl
%% Cell type:code id: tags: %% Cell type:code id: tags:
``` python ``` python
mvc.view.display() mvc.view.display()
``` ```
%% Output %% Output
%% Cell type:code id: tags: %% Cell type:code id: tags:
``` python ``` python
``` ```
......
notebooks/basic_elements_test.pkl
+ 0
− 0
View file @ 20c34d5b
No preview for this file type
svg/Gleis_Kurve_oben_links_unten_rechts.svg 0 → 100644
+ 130
− 0
View file @ 20c34d5b
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
x="0px"
y="0px"
viewBox="0 0 240 240"
style="enable-background:new 0 0 240 240;"
xml:space="preserve"
id="svg24"
sodipodi:docname="Gleis_Kurve_oben_links_unten_rechts.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
id="metadata30"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs28" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1017"
id="namedview26"
showgrid="false"
inkscape:zoom="0.98333333"
inkscape:cx="120"
inkscape:cy="120"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg24" />
<style
type="text/css"
id="style2">
.st0{fill:#978679;}
.st1{fill:#3D3D3D;}
.st2{fill:none;}
</style>
<g
id="Ebene_1">
<g
id="g10">
<rect
x="70.5"
y="9.5"
class="st0"
width="100"
height="20"
id="rect4" />
<rect
x="10"
y="70"
class="st0"
width="20"
height="100"
id="rect6" />
<polygon
class="st0"
points="158.66,58.76 152.55,77.8 62.46,48.88 131.98,108.43 118.97,123.62 49.43,64.06 87.96,147.26 69.81,155.67 27.79,64.92 44.01,57.41 56.03,43.38 58.03,45.09 63.45,28.2 "
id="polygon8" />
</g>
<g
id="g16">
<path
class="st1"
d="M89,0.5C89,49.3,49.3,89,0.5,89c-0.17,0-0.33-0.01-0.5-0.01l0-10.01c0.17,0,0.33,0.01,0.5,0.01 C43.79,79,79,43.79,79,0.5c0-0.17-0.01-0.33-0.01-0.5l10.01,0C88.99,0.17,89,0.33,89,0.5z"
id="path12" />
<path
class="st1"
d="M0,161l0-10c83.26,0,151-67.74,151-151l10,0C161,88.78,88.78,161,0,161z"
id="path14" />
</g>
</g>
<g
id="HG">
<g
id="g21">
<rect
x="0"
class="st2"
width="240"
height="240"
id="rect19" />
</g>
</g>
<g
transform="translate(-0.06,1.24)"
id="Ebene_1-4"><g
id="g10-7"><rect
x="69.5"
y="210.5"
class="st0"
width="100"
height="20"
id="rect4-4"
style="fill:#978679" /><rect
x="210"
y="70"
class="st0"
width="20"
height="100"
id="rect6-9"
style="fill:#978679" /><polygon
class="st0"
points="181.97,194.91 176.55,211.8 81.34,181.24 87.45,162.2 177.54,191.12 108.02,131.57 121.03,116.38 190.57,175.94 152.04,92.74 170.19,84.33 212.21,175.08 195.99,182.59 183.97,196.62 "
id="polygon8-6"
style="fill:#978679" /></g><g
id="g16-7"><path
inkscape:connector-curvature="0"
class="st1"
d="m 151,239.5 c 0,-48.8 39.7,-88.5 88.5,-88.5 0.17,0 0.33,0.01 0.5,0.01 v 10.01 c -0.17,0 -0.33,-0.01 -0.5,-0.01 -43.29,0 -78.5,35.21 -78.5,78.5 0,0.17 0.01,0.33 0.01,0.5 H 151 c 0.01,-0.18 0,-0.34 0,-0.51 z"
id="path12-7"
style="fill:#3d3d3d" /><path
inkscape:connector-curvature="0"
class="st1"
d="M 240,79 V 89 C 156.74,89 89,156.74 89,240 H 79 C 79,151.22 151.22,79 240,79 Z"
id="path14-3"
style="fill:#3d3d3d" /></g></g></svg>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment