From 20c34d5be02b3cab1c12390377de20b47748d9db Mon Sep 17 00:00:00 2001
From: "Egli Adrian (IT-SCI-API-PFI)" <adrian.egli@sbb.ch>
Date: Tue, 25 Jun 2019 16:16:40 +0200
Subject: [PATCH] missing topology elements fixed
---
env_data/railway/basic_elements_test.pkl | Bin 1342 -> 1370 bytes
flatland/utils/graphics_pil.py | 3 +-
notebooks/Scene_Editor.ipynb | 17 ++-
notebooks/basic_elements_test.pkl | Bin 1342 -> 1356 bytes
svg/Gleis_Kurve_oben_links_unten_rechts.svg | 130 ++++++++++++++++++++
5 files changed, 147 insertions(+), 3 deletions(-)
create mode 100644 svg/Gleis_Kurve_oben_links_unten_rechts.svg
diff --git a/env_data/railway/basic_elements_test.pkl b/env_data/railway/basic_elements_test.pkl
index 4258a74434473bf4decda53b3db9324ed0d2d039..e14658a74af3eb765a4b76bac84b0668845fcfe6 100644
GIT binary patch
delta 110
zcmdnTb&G3*J~LBC#biU~ZYDXw$@`cigw853FfbqpAak+;i>3_ASs{<Jj0|wfLkP%&
iawmtfsED3vU|@h@Fyjt`GQ;Et%;FQpc_*)9nE(KYn;y{s
delta 49
zcmV-10M7r~3cd=kF9QOeF_SR^ivrdolfDC3kr)k=D+DHy77mkd1R{|a4UxSMlj{Qv
Hlf49;l#LK%
diff --git a/flatland/utils/graphics_pil.py b/flatland/utils/graphics_pil.py
index f8e81313..dd145a43 100644
--- a/flatland/utils/graphics_pil.py
+++ b/flatland/utils/graphics_pil.py
@@ -393,7 +393,8 @@ class PILSVG(PILGL):
"NN SS SE WN": "Weiche_vertikal_oben_rechts.svg",
"NN SS NW ES": "Weiche_vertikal_unten_links.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 = {
diff --git a/notebooks/Scene_Editor.ipynb b/notebooks/Scene_Editor.ipynb
index ef9d990c..3957024b 100644
--- a/notebooks/Scene_Editor.ipynb
+++ b/notebooks/Scene_Editor.ipynb
@@ -11,7 +11,20 @@
"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>\"))"
@@ -57,7 +70,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "673971f56fe14e99ad7beb834e18710a",
+ "model_id": "f920b83f45a94834b913b756157467d2",
"version_major": 2,
"version_minor": 0
},
diff --git a/notebooks/basic_elements_test.pkl b/notebooks/basic_elements_test.pkl
index 4258a74434473bf4decda53b3db9324ed0d2d039..1f26817fb28e6d57a087ae13f938107716808a8c 100644
GIT binary patch
delta 55
zcmV-70LcHo3d{<yF9QOIc#|;$ivk`IlfDC6lZgWolP3fv4Ft^+NX-EN1kFei%>k29
N1S^wQ0}zvn1hm+k5Ul_J
delta 49
zcmV-10M7r+3cd=kF9QOeF_SR^ivrdolfDC6ksAt=Cj=>x84HtR1SOFg3X#1Jlj{Qv
HldlAwkysEx
diff --git a/svg/Gleis_Kurve_oben_links_unten_rechts.svg b/svg/Gleis_Kurve_oben_links_unten_rechts.svg
new file mode 100644
index 00000000..1c5ddc50
--- /dev/null
+++ b/svg/Gleis_Kurve_oben_links_unten_rechts.svg
@@ -0,0 +1,130 @@
+<?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
--
GitLab