diff --git a/common/bitmap_info.cpp b/common/bitmap_info.cpp index bc9261cd09..e372fc2d1c 100644 --- a/common/bitmap_info.cpp +++ b/common/bitmap_info.cpp @@ -4538,6 +4538,18 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::teardrop_sizes].emplace_back( BITMAPS::teardrop_sizes, wxT( "teardrop_sizes_dark_260.png" ), 260, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::teardrop_rect_sizes].emplace_back( BITMAPS::teardrop_rect_sizes, wxT( "teardrop_rect_sizes_dark_260.png" ), 260, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::teardrop_track_sizes].emplace_back( BITMAPS::teardrop_track_sizes, wxT( "teardrop_track_sizes_dark_260.png" ), 260, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::tune_diff_pair_length_legend].emplace_back( BITMAPS::tune_diff_pair_length_legend, wxT( "tune_diff_pair_length_legend_156.png" ), 156, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::tune_single_track_length_legend].emplace_back( BITMAPS::tune_single_track_length_legend, wxT( "tune_single_track_length_legend_156.png" ), 156, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::tune_diff_pair_length_legend].emplace_back( BITMAPS::tune_diff_pair_length_legend, wxT( "tune_diff_pair_length_legend_dark_156.png" ), 156, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::tune_single_track_length_legend].emplace_back( BITMAPS::tune_single_track_length_legend, wxT( "tune_single_track_length_legend_dark_156.png" ), 156, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::tune_diff_pair_length_legend].emplace_back( BITMAPS::tune_diff_pair_length_legend, wxT( "tune_diff_pair_length_legend_312.png" ), 312, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::tune_single_track_length_legend].emplace_back( BITMAPS::tune_single_track_length_legend, wxT( "tune_single_track_length_legend_312.png" ), 312, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::tune_diff_pair_length_legend].emplace_back( BITMAPS::tune_diff_pair_length_legend, wxT( "tune_diff_pair_length_legend_dark_312.png" ), 312, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::tune_single_track_length_legend].emplace_back( BITMAPS::tune_single_track_length_legend, wxT( "tune_single_track_length_legend_dark_312.png" ), 312, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::tune_diff_pair_skew_legend].emplace_back( BITMAPS::tune_diff_pair_skew_legend, wxT( "tune_diff_pair_skew_legend_110.png" ), 110, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::tune_diff_pair_skew_legend].emplace_back( BITMAPS::tune_diff_pair_skew_legend, wxT( "tune_diff_pair_skew_legend_dark_110.png" ), 110, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::tune_diff_pair_skew_legend].emplace_back( BITMAPS::tune_diff_pair_skew_legend, wxT( "tune_diff_pair_skew_legend_220.png" ), 220, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::tune_diff_pair_skew_legend].emplace_back( BITMAPS::tune_diff_pair_skew_legend, wxT( "tune_diff_pair_skew_legend_dark_220.png" ), 220, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::att_bridge].emplace_back( BITMAPS::att_bridge, wxT( "att_bridge.png" ), -1, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::att_pi].emplace_back( BITMAPS::att_pi, wxT( "att_pi.png" ), -1, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::att_splitter].emplace_back( BITMAPS::att_splitter, wxT( "att_splitter.png" ), -1, wxT( "light" ) ); @@ -4570,9 +4582,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::stroke_dashdotdot].emplace_back( BITMAPS::stroke_dashdotdot, wxT( "stroke_dashdotdot.png" ), -1, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::stroke_dot].emplace_back( BITMAPS::stroke_dot, wxT( "stroke_dot.png" ), -1, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::stroke_solid].emplace_back( BITMAPS::stroke_solid, wxT( "stroke_solid.png" ), -1, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::tune_diff_pair_length_legend].emplace_back( BITMAPS::tune_diff_pair_length_legend, wxT( "tune_diff_pair_length_legend.png" ), -1, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::tune_diff_pair_skew_legend].emplace_back( BITMAPS::tune_diff_pair_skew_legend, wxT( "tune_diff_pair_skew_legend.png" ), -1, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::tune_single_track_length_legend].emplace_back( BITMAPS::tune_single_track_length_legend, wxT( "tune_single_track_length_legend.png" ), -1, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::twistedpair].emplace_back( BITMAPS::twistedpair, wxT( "twistedpair.png" ), -1, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::viacalc].emplace_back( BITMAPS::viacalc, wxT( "viacalc.png" ), -1, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::att_bridge].emplace_back( BITMAPS::att_bridge, wxT( "att_bridge_dark.png" ), -1, wxT( "dark" ) ); @@ -4607,9 +4616,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::stroke_dashdotdot].emplace_back( BITMAPS::stroke_dashdotdot, wxT( "stroke_dashdotdot_dark.png" ), -1, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::stroke_dot].emplace_back( BITMAPS::stroke_dot, wxT( "stroke_dot_dark.png" ), -1, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::stroke_solid].emplace_back( BITMAPS::stroke_solid, wxT( "stroke_solid_dark.png" ), -1, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::tune_diff_pair_length_legend].emplace_back( BITMAPS::tune_diff_pair_length_legend, wxT( "tune_diff_pair_length_legend_dark.png" ), -1, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::tune_diff_pair_skew_legend].emplace_back( BITMAPS::tune_diff_pair_skew_legend, wxT( "tune_diff_pair_skew_legend_dark.png" ), -1, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::tune_single_track_length_legend].emplace_back( BITMAPS::tune_single_track_length_legend, wxT( "tune_single_track_length_legend_dark.png" ), -1, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::twistedpair].emplace_back( BITMAPS::twistedpair, wxT( "twistedpair_dark.png" ), -1, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::viacalc].emplace_back( BITMAPS::viacalc, wxT( "viacalc_dark.png" ), -1, wxT( "dark" ) ); diff --git a/resources/bitmaps_png/CMakeLists.txt b/resources/bitmaps_png/CMakeLists.txt index efed34f4fe..81b28f5314 100644 --- a/resources/bitmaps_png/CMakeLists.txt +++ b/resources/bitmaps_png/CMakeLists.txt @@ -666,6 +666,17 @@ set( BMAPS_256 teardrop_track_sizes ) +# Tuning images (250x156 native size ) + set( BMAPS_TUNING + tune_diff_pair_length_legend + tune_single_track_length_legend + ) + +# Tuning image (250x110 native size ) + set( BMAPS_TUNING_SKEW + tune_diff_pair_skew_legend + ) + # Images in this section are generated at whatever resolution is set in the source SVG file # Use Inkscape Document Properties > Custom Size to set (make sure units are pixels) # These are used for images in the UI that are not-square or very large (infographics, etc) @@ -703,9 +714,6 @@ set( BMAPS_OTHER stroke_dashdotdot stroke_dot stroke_solid - tune_diff_pair_length_legend - tune_diff_pair_skew_legend - tune_single_track_length_legend twistedpair viacalc ) @@ -950,6 +958,12 @@ if( MAINTAIN_PNGS ) bitmap_dir( 550 260 "${BMAPS_TEARDROPS}" ) + bitmap_dir( 250 156 "${BMAPS_TUNING}" ) + bitmap_dir( 500 312 "${BMAPS_TUNING}" ) + + bitmap_dir( 250 110 "${BMAPS_TUNING_SKEW}" ) + bitmap_dir( 500 220 "${BMAPS_TUNING_SKEW}" ) + bitmap_dir( -1 -1 "${BMAPS_OTHER}" ) configure_file( ${BITMAP_INFO_TEMPLATE} ${BITMAP_INFO_FILE} NEWLINE_STYLE UNIX ) diff --git a/resources/bitmaps_png/png/tune_diff_pair_length_legend.png b/resources/bitmaps_png/png/tune_diff_pair_length_legend.png deleted file mode 100644 index 623458d73f..0000000000 Binary files a/resources/bitmaps_png/png/tune_diff_pair_length_legend.png and /dev/null differ diff --git a/resources/bitmaps_png/png/tune_diff_pair_length_legend_156.png b/resources/bitmaps_png/png/tune_diff_pair_length_legend_156.png new file mode 100644 index 0000000000..1cfc09cca7 Binary files /dev/null and b/resources/bitmaps_png/png/tune_diff_pair_length_legend_156.png differ diff --git a/resources/bitmaps_png/png/tune_diff_pair_length_legend_312.png b/resources/bitmaps_png/png/tune_diff_pair_length_legend_312.png new file mode 100644 index 0000000000..3968b25cf2 Binary files /dev/null and b/resources/bitmaps_png/png/tune_diff_pair_length_legend_312.png differ diff --git a/resources/bitmaps_png/png/tune_diff_pair_length_legend_dark.png b/resources/bitmaps_png/png/tune_diff_pair_length_legend_dark.png deleted file mode 100644 index ce21730b8e..0000000000 Binary files a/resources/bitmaps_png/png/tune_diff_pair_length_legend_dark.png and /dev/null differ diff --git a/resources/bitmaps_png/png/tune_diff_pair_length_legend_dark_156.png b/resources/bitmaps_png/png/tune_diff_pair_length_legend_dark_156.png new file mode 100644 index 0000000000..104f87bddc Binary files /dev/null and b/resources/bitmaps_png/png/tune_diff_pair_length_legend_dark_156.png differ diff --git a/resources/bitmaps_png/png/tune_diff_pair_length_legend_dark_312.png b/resources/bitmaps_png/png/tune_diff_pair_length_legend_dark_312.png new file mode 100644 index 0000000000..ae973c1e5d Binary files /dev/null and b/resources/bitmaps_png/png/tune_diff_pair_length_legend_dark_312.png differ diff --git a/resources/bitmaps_png/png/tune_diff_pair_skew_legend.png b/resources/bitmaps_png/png/tune_diff_pair_skew_legend.png deleted file mode 100644 index e8bf473980..0000000000 Binary files a/resources/bitmaps_png/png/tune_diff_pair_skew_legend.png and /dev/null differ diff --git a/resources/bitmaps_png/png/tune_diff_pair_skew_legend_110.png b/resources/bitmaps_png/png/tune_diff_pair_skew_legend_110.png new file mode 100644 index 0000000000..9cb4fc9cee Binary files /dev/null and b/resources/bitmaps_png/png/tune_diff_pair_skew_legend_110.png differ diff --git a/resources/bitmaps_png/png/tune_diff_pair_skew_legend_220.png b/resources/bitmaps_png/png/tune_diff_pair_skew_legend_220.png new file mode 100644 index 0000000000..ecc2369cad Binary files /dev/null and b/resources/bitmaps_png/png/tune_diff_pair_skew_legend_220.png differ diff --git a/resources/bitmaps_png/png/tune_diff_pair_skew_legend_dark.png b/resources/bitmaps_png/png/tune_diff_pair_skew_legend_dark.png deleted file mode 100644 index 437bfc16d0..0000000000 Binary files a/resources/bitmaps_png/png/tune_diff_pair_skew_legend_dark.png and /dev/null differ diff --git a/resources/bitmaps_png/png/tune_diff_pair_skew_legend_dark_110.png b/resources/bitmaps_png/png/tune_diff_pair_skew_legend_dark_110.png new file mode 100644 index 0000000000..41dbcf050c Binary files /dev/null and b/resources/bitmaps_png/png/tune_diff_pair_skew_legend_dark_110.png differ diff --git a/resources/bitmaps_png/png/tune_diff_pair_skew_legend_dark_220.png b/resources/bitmaps_png/png/tune_diff_pair_skew_legend_dark_220.png new file mode 100644 index 0000000000..4fbfd3a06f Binary files /dev/null and b/resources/bitmaps_png/png/tune_diff_pair_skew_legend_dark_220.png differ diff --git a/resources/bitmaps_png/png/tune_single_track_length_legend.png b/resources/bitmaps_png/png/tune_single_track_length_legend.png deleted file mode 100644 index e6e7dc2900..0000000000 Binary files a/resources/bitmaps_png/png/tune_single_track_length_legend.png and /dev/null differ diff --git a/resources/bitmaps_png/png/tune_single_track_length_legend_156.png b/resources/bitmaps_png/png/tune_single_track_length_legend_156.png new file mode 100644 index 0000000000..3cb586c656 Binary files /dev/null and b/resources/bitmaps_png/png/tune_single_track_length_legend_156.png differ diff --git a/resources/bitmaps_png/png/tune_single_track_length_legend_312.png b/resources/bitmaps_png/png/tune_single_track_length_legend_312.png new file mode 100644 index 0000000000..cb8c793f6b Binary files /dev/null and b/resources/bitmaps_png/png/tune_single_track_length_legend_312.png differ diff --git a/resources/bitmaps_png/png/tune_single_track_length_legend_dark.png b/resources/bitmaps_png/png/tune_single_track_length_legend_dark.png deleted file mode 100644 index 2aa58e7a90..0000000000 Binary files a/resources/bitmaps_png/png/tune_single_track_length_legend_dark.png and /dev/null differ diff --git a/resources/bitmaps_png/png/tune_single_track_length_legend_dark_156.png b/resources/bitmaps_png/png/tune_single_track_length_legend_dark_156.png new file mode 100644 index 0000000000..4d7aad4667 Binary files /dev/null and b/resources/bitmaps_png/png/tune_single_track_length_legend_dark_156.png differ diff --git a/resources/bitmaps_png/png/tune_single_track_length_legend_dark_312.png b/resources/bitmaps_png/png/tune_single_track_length_legend_dark_312.png new file mode 100644 index 0000000000..5f7983f7f2 Binary files /dev/null and b/resources/bitmaps_png/png/tune_single_track_length_legend_dark_312.png differ diff --git a/resources/bitmaps_png/sources/dark/tune_diff_pair_length_legend.svg b/resources/bitmaps_png/sources/dark/tune_diff_pair_length_legend.svg index 481eea3031..cf009ec65a 100644 --- a/resources/bitmaps_png/sources/dark/tune_diff_pair_length_legend.svg +++ b/resources/bitmaps_png/sources/dark/tune_diff_pair_length_legend.svg @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg width="250" - height="190" - viewBox="0 0 66.145832 50.270834" + height="156" + viewBox="0 0 66.145831 41.275" version="1.1" id="svg8" - inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="tune_diff_pair_length_legend.svg" shape-rendering="crispEdges" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -28,7 +28,7 @@ <path transform="matrix(-1.1,0,0,-1.1,-1.1,0)" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path4482" /> </marker> <marker @@ -45,21 +45,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path3590" /> </marker> - <marker - inkscape:stockid="Arrow2Lend" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lend" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - id="path871" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> - </marker> <marker inkscape:stockid="Arrow2Lstart" orient="auto" @@ -98,25 +83,10 @@ inkscape:isstock="true"> <path id="path1950" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" transform="matrix(1.1,0,0,1.1,1.1,0)" /> </marker> - <marker - inkscape:isstock="true" - style="overflow:visible" - id="marker1838" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow2Lstart" - inkscape:collect="always"> - <path - transform="matrix(1.1,0,0,1.1,1.1,0)" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - id="path1836" /> - </marker> <marker inkscape:stockid="DotL" orient="auto" @@ -128,7 +98,7 @@ <path id="path911" d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:1pt;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(0.8,0,0,0.8,5.92,0.8)" /> </marker> <marker @@ -215,21 +185,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(-0.8,0,0,-0.8,-10,0)" /> </marker> - <marker - inkscape:stockid="Arrow2Lstart" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lstart" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - id="path868" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(1.1,0,0,1.1,1.1,0)" /> - </marker> <marker inkscape:stockid="Arrow1Lstart" orient="auto" @@ -244,22 +199,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(0.8,0,0,0.8,10,0)" /> </marker> - <marker - inkscape:stockid="Arrow2Lstart" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lstart-8" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - inkscape:connector-curvature="0" - id="path868-4" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(1.1,0,0,1.1,1.1,0)" /> - </marker> <marker inkscape:isstock="true" style="overflow:visible" @@ -272,9 +211,78 @@ inkscape:connector-curvature="0" transform="matrix(-1.1,0,0,-1.1,-1.1,0)" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path4482-0" /> </marker> + <marker + markerWidth="6" + markerHeight="6" + refX="3" + refY="3" + orient="auto" + id="marker6123" + viewBox="0 0 6 6" + preserveAspectRatio="xMidYMid"> + <circle + style="fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273;stroke-linejoin:round" + id="path5603" + cx="3" + cy="3" + r="3" /> + </marker> + <marker + style="overflow:visible" + id="marker2034" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mstart" + inkscape:isstock="true" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304581" + markerHeight="5.1962252" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#42b8eb;fill-opacity:1;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2032" /> + </marker> + <marker + style="overflow:visible" + id="marker2044" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304581" + markerHeight="5.1962252" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#42b8eb;fill-opacity:1;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2042" /> + </marker> + <marker + markerWidth="5.4999971" + markerHeight="5.4999747" + refX="2.7499986" + refY="2.7499874" + orient="auto" + id="marker43482" + viewBox="0 0 5.4999971 5.4999747" + preserveAspectRatio="xMidYMid"> + <ellipse + style="fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + id="path43169" + cx="2.7499986" + cy="2.7499874" + rx="2.7499986" + ry="2.7499874" /> + </marker> </defs> <sodipodi:namedview id="base" @@ -283,17 +291,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8284271" - inkscape:cx="60.45763" - inkscape:cy="69.650019" + inkscape:zoom="4" + inkscape:cx="110.75" + inkscape:cy="83.625001" inkscape:document-units="px" inkscape:current-layer="g9599" showgrid="true" - inkscape:window-width="1920" - inkscape:window-height="1017" - inkscape:window-x="-8" - inkscape:window-y="-8" - inkscape:window-maximized="1" + inkscape:window-width="1671" + inkscape:window-height="981" + inkscape:window-x="1357" + inkscape:window-y="69" + inkscape:window-maximized="0" units="px" showborder="true" inkscape:document-rotation="0" @@ -309,12 +317,24 @@ spacingy="0.13229167" empspacing="2" color="#9696ff" - opacity="0.1254902" /> + opacity="0.1254902" + originx="-0.24214628" + originy="45.284039" /> <sodipodi:guide - position="0,25.135417" + position="-0.24213829,-29.144432" orientation="0,-1" id="guide1263" inkscape:locked="false" /> + <sodipodi:guide + position="0.81619572,-4.0090165" + orientation="0,-1" + id="guide12991" + inkscape:locked="false" /> + <sodipodi:guide + position="-32.389011,20.861817" + orientation="0,-1" + id="guide17976" + inkscape:locked="false" /> </sodipodi:namedview> <metadata id="metadata5"> @@ -324,7 +344,6 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /> </cc:Work> @@ -349,28 +368,16 @@ inkscape:label="Calque 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-246.99373)"> + transform="translate(-0.24213728,-201.7097)"> <g id="g9599" transform="matrix(0.76520188,0,0,0.77883147,11.649057,67.693533)"> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="-9.9487562" - y="285.47281" - id="text1103-0" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-4" - x="-9.9487562" - y="285.47281" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';fill:#e0e0e0;fill-opacity:1;stroke-width:0.34273">A</tspan></text> <g id="g9602" - transform="matrix(0.98527321,0,0,0.98527321,-0.00861432,4.2599054)"> + transform="matrix(0.98527321,0,0,0.98527321,-0.0086144,-59.946718)"> <path - style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:2.08712;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M -0.35199642,258.98686 H 9.8251914 c 9.4753126,0 15.0903136,3.44796 15.4412506,13.79184 v 9.65429 c 0,6.89592 10.407181,6.83552 10.528125,0 v -39.99635 c 0,-15.51582 24.565626,-15.86062 24.565626,0 v 13.10226 c 0,2.41357 1.754688,3.44796 3.860313,3.44796 h 8.071562" + style="fill:none;fill-rule:evenodd;stroke:#f2647e;stroke-width:2.08712;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M -0.35199642,258.98686 H 9.8251914 c 9.4753126,0 15.4412506,3.4478 15.4412506,13.79184 v 4.43925 c 0,6.89592 10.407181,6.83552 10.528125,0 v -28.91978 c 0,-15.51582 24.565626,-15.86062 24.565626,0 v 7.24073 c 0,2.41357 1.754688,3.44796 3.860313,3.44796 h 8.071562" id="path9433" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc" /> @@ -379,84 +386,147 @@ sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" id="path9433-6" - d="m 71.218824,265.54765 h -7.606925 c -6.223848,0 -10.37308,-3.7369 -10.37308,-9.51212 v -12.90929 c 0,-7.47381 -11.756157,-7.47381 -11.756157,0 v 39.40732 c 0,14.26818 -22.820776,14.60789 -22.820776,10e-6 v -9.51211 c -0.345769,-4.75606 -3.803463,-7.4738 -8.9900024,-7.4738 H -0.35542696" + d="m 71.218824,201.34073 h -7.606925 c -6.223848,0 -10.37308,-3.7369 -10.37308,-9.51212 v -7.21901 c 0,-7.47381 -11.756157,-7.47381 -11.756157,0 v 28.49387 c 0,14.26818 -22.820776,14.60789 -22.820776,1e-5 v -4.28894 c 0,-4.75607 -3.803463,-7.4738 -8.9900025,-7.4738 H -0.35542704" style="fill:none;fill-rule:evenodd;stroke:#f2647e;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path842" - d="M -15.223508,294.59357 H 31.801121" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#545454;fill-opacity:1;stroke:none;stroke-width:0.34273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 51.015413,178.89144 0.667431,0.36776 0.679265,0.62563 0.230418,0.22847 -0.475671,1.02232 -0.434012,-0.68741 -0.708185,0.9602 -0.848404,-0.64884 0.731045,-0.87059 -0.866649,-0.27739 z" + id="path25305" + sodipodi:nodetypes="ccccccccccc" /> + <g + id="g19279" + transform="translate(0,6.1149302)"> + <path + style="fill:none;stroke:#42b8eb;stroke-width:0.367813;stroke-dasharray:none;stroke-opacity:1" + d="m 55.313435,174.16326 -4.322117,-4.24648" + id="path708-8" + sodipodi:nodetypes="cc" /> + <g + id="g14305" + transform="translate(75.55644,-42.803254)"> + <path + inkscape:connector-curvature="0" + id="path1736-3" + d="m -27.891809,221.26187 4.882649,-5.99381" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273047;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker43482);marker-end:url(#marker2044)" + sodipodi:nodetypes="cc" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-28.925932" + y="229.74751" + id="text1103-8-9-8" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-5-9" + x="-28.925932" + y="229.74751" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#42b8eb;fill-opacity:1;stroke-width:0.34273">r</tspan></text> + </g> + </g> <path - inkscape:connector-curvature="0" - id="path844" - d="M -15.223508,262.49018 H 9.3453203" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path846" - d="M -15.223508,230.3868 H 47.36074" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path848" - d="m -11.765815,263.16962 c -0.0276,9.81655 -0.02377,26.88934 0,30.91437" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#marker4484)" /> - <path - inkscape:connector-curvature="0" - id="path1736" - d="m 47.584121,242.94212 3.557103,-3.97072" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotL);marker-end:url(#marker1838)" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path1942" - d="m 42.71778,256.56377 c 3.516539,-0.0167 7.137185,0.0308 10.653392,-0.0343" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1952);marker-end:url(#Arrow2Lend)" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path848-1" - d="m -11.765815,230.89638 c -0.0265,10.6238 -0.02282,26.55835 0,30.91437" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.359602;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-8);marker-end:url(#marker4484-0)" /> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="-9.9487562" - y="250.80675" - id="text1103" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101" - x="-9.9487562" - y="250.80675" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';fill:#e0e0e0;fill-opacity:1;stroke-width:0.34273">A</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:0.34273;" - x="45.393745" - y="267.24442" - id="text1103-8" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3" - x="45.393745" - y="267.24442" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273;fill:#e0e0e0;fill-opacity:1;">s</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:0.34273;" - x="60.889706" - y="247.07491" - id="text1103-8-9" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3-5" - x="60.889706" - y="247.07491" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273;fill:#e0e0e0;fill-opacity:1;">r</tspan></text> + style="fill:#545454;fill-opacity:1;stroke:none;stroke-width:0.34273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 36.281232,188.8507 0.01488,0.76991 -0.0034,0.88459 0.0034,0.30442 -1.164833,0.26165 0.293696,-0.75571 -1.206576,0.0282 0.01141,-1.05626 1.147863,0.044 -0.300429,-0.84549 z" + id="path25305-9" + sodipodi:nodetypes="ccccccccccc" /> + <g + id="g13547" + transform="translate(74.994909,-41.431599)"> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path1942-8" + d="m -53.315882,231.20035 c 4.114139,-0.0157 11.662893,0.061 15.776644,0" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273047;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker2034);marker-end:url(#marker2044)" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-47.74231" + y="241.71555" + id="text1103-8-83" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-1" + x="-47.74231" + y="241.71555" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#42b8eb;fill-opacity:1;stroke-width:0.34273">S</tspan></text> + <path + style="fill:none;stroke:#42b8eb;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m -54.071807,228.3247 v 14.32603" + id="path708-6" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#42b8eb;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m -36.783341,228.32475 v 15.00547" + id="path708-8-4" + sodipodi:nodetypes="cc" /> + </g> + <g + id="g14428" + transform="translate(71.091348,-40.252579)"> + <path + style="fill:none;stroke:#545454;stroke-width:1.02819;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" + d="m -52.310952,258.40657 h 2.307132" + id="path25307" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#545454;stroke-width:1.02819;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" + d="m -35.711495,219.34849 h 2.307132" + id="path25307-3" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-5" + d="m -84.931779,258.3927 h 40.109243" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-9" + d="m -84.931779,238.53598 h 19.363084" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-81.625786" + y="233.67569" + id="text1103-8-8" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-57" + x="-81.625786" + y="233.67569" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#42b8eb;fill-opacity:1;stroke-width:0.34273">A</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-81.625786" + y="254.24736" + id="text1103-8-8-3" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-57-8" + x="-81.625786" + y="254.24736" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#42b8eb;fill-opacity:1;stroke-width:0.34273">A</tspan></text> + <path + style="fill:none;fill-opacity:1;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;marker-start:url(#marker2034);marker-end:url(#marker2044);paint-order:fill markers stroke;stroke-opacity:1" + d="m -85.104676,220.53093 v 17.15578" + id="path1043" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-opacity:1;stroke:#42b8eb;stroke-width:0.34273047;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;marker-start:url(#marker2034);marker-end:url(#marker2044);paint-order:fill markers stroke;stroke-opacity:1" + d="m -85.104676,239.3853 v 18.17493" + id="path1043-4" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-8" + d="m -84.931779,219.33774 h 56.014632" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </g> </svg> diff --git a/resources/bitmaps_png/sources/dark/tune_diff_pair_skew_legend.svg b/resources/bitmaps_png/sources/dark/tune_diff_pair_skew_legend.svg index 0b783c9ed0..5039fdcff5 100644 --- a/resources/bitmaps_png/sources/dark/tune_diff_pair_skew_legend.svg +++ b/resources/bitmaps_png/sources/dark/tune_diff_pair_skew_legend.svg @@ -5,7 +5,7 @@ viewBox="0 0 66.145832 29.104167" version="1.1" id="svg8" - inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="tune_diff_pair_skew_legend.svg" shape-rendering="crispEdges" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -18,17 +18,17 @@ <defs id="defs2"> <marker - style="overflow:visible;" + style="overflow:visible" id="marker4010" - refX="0.0" - refY="0.0" + refX="0" + refY="0" orient="auto" inkscape:stockid="Arrow2Mend" inkscape:isstock="true"> <path - transform="scale(0.6) rotate(180) translate(0,0)" - d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " - style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#e0e0e0;stroke-opacity:1;fill:#e0e0e0;fill-opacity:1" + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path2999" /> </marker> <marker @@ -77,15 +77,15 @@ <marker style="overflow:visible" id="DotM" - refX="0.0" - refY="0.0" + refX="0" + refY="0" orient="auto" inkscape:stockid="DotM" inkscape:isstock="true"> <path - transform="scale(0.4) translate(7.4, 1)" - style="fill-rule:evenodd;stroke:#e0e0e0;stroke-width:1pt;stroke-opacity:1;fill:#e0e0e0;fill-opacity:1" - d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z " + transform="matrix(0.4,0,0,0.4,2.96,0.4)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" id="path3036" /> </marker> <marker @@ -145,21 +145,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path3590" /> </marker> - <marker - inkscape:stockid="Arrow2Lend" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lend" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - id="path871" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> - </marker> <marker inkscape:stockid="Arrow2Lstart" orient="auto" @@ -198,7 +183,7 @@ inkscape:isstock="true"> <path id="path1950" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" transform="matrix(1.1,0,0,1.1,1.1,0)" /> </marker> @@ -315,36 +300,107 @@ transform="matrix(0.8,0,0,0.8,10,0)" /> </marker> <marker - inkscape:stockid="Arrow2Lstart" + markerWidth="6" + markerHeight="6" + refX="3" + refY="3" orient="auto" - refY="0" - refX="0" - id="Arrow2Lstart-8" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - inkscape:connector-curvature="0" - id="path868-4" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(1.1,0,0,1.1,1.1,0)" /> + id="marker6123" + viewBox="0 0 6 6" + preserveAspectRatio="xMidYMid"> + <circle + style="fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273;stroke-linejoin:round" + id="path5603" + cx="3" + cy="3" + r="3" /> + </marker> + <marker + markerWidth="5.4999971" + markerHeight="5.4999747" + refX="2.7499986" + refY="2.7499874" + orient="auto" + id="marker43482" + viewBox="0 0 5.4999971 5.4999747" + preserveAspectRatio="xMidYMid"> + <ellipse + style="fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + id="path43169" + cx="2.7499986" + cy="2.7499874" + rx="2.7499986" + ry="2.7499874" /> </marker> <marker - inkscape:isstock="true" style="overflow:visible" - id="marker4484-0" + id="marker2044-6" refX="0" refY="0" orient="auto" - inkscape:stockid="Arrow2Lend" - inkscape:collect="always"> + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304581" + markerHeight="5.1962252" + preserveAspectRatio="xMidYMid"> <path - inkscape:connector-curvature="0" - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" + transform="scale(-0.6)" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - id="path4482-0" /> + style="fill:#42b8eb;fill-opacity:1;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2042-4" /> + </marker> + <marker + style="overflow:visible" + id="marker2034" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mstart" + inkscape:isstock="true" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304581" + markerHeight="5.1962252" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#42b8eb;fill-opacity:1;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2032" /> + </marker> + <marker + style="overflow:visible" + id="marker67363" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304581" + markerHeight="5.1962252" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#42b8eb;fill-opacity:1;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path67361" /> + </marker> + <marker + markerWidth="6" + markerHeight="6" + refX="3" + refY="3" + orient="auto" + id="marker6123-3" + viewBox="0 0 6 6" + preserveAspectRatio="xMidYMid"> + <circle + style="fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273;stroke-linejoin:round" + id="path5603-0" + cx="3" + cy="3" + r="3" /> </marker> </defs> <sodipodi:namedview @@ -354,17 +410,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="6.0697364" - inkscape:cx="137.23825" - inkscape:cy="57.333627" + inkscape:zoom="3.9399599" + inkscape:cx="212.31181" + inkscape:cy="58.376229" inkscape:document-units="px" - inkscape:current-layer="g9599" + inkscape:current-layer="g19279" showgrid="true" - inkscape:window-width="1920" - inkscape:window-height="1017" - inkscape:window-x="-8" - inkscape:window-y="-8" - inkscape:window-maximized="1" + inkscape:window-width="1609" + inkscape:window-height="726" + inkscape:window-x="1855" + inkscape:window-y="920" + inkscape:window-maximized="0" units="px" showborder="true" inkscape:document-rotation="0" @@ -376,8 +432,8 @@ <inkscape:grid type="xygrid" id="grid1261" - spacingx="0.26458333" - spacingy="0.26458333" + spacingx="0.13229167" + spacingy="0.13229167" empspacing="2" color="#9696ff" opacity="0.1254902" /> @@ -386,6 +442,11 @@ orientation="0,-1" id="guide1263" inkscape:locked="false" /> + <sodipodi:guide + position="49.348699,14.122675" + orientation="1,0" + id="guide33707" + inkscape:locked="false" /> </sodipodi:namedview> <metadata id="metadata5"> @@ -395,7 +456,6 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /> </cc:Work> @@ -428,94 +488,112 @@ id="g9602" transform="matrix(0.98527321,0,0,0.98527321,-0.00861432,4.2599054)" style="stroke-width:1.00008;stroke-miterlimit:4;stroke-dasharray:none" /> - <path - inkscape:connector-curvature="0" - id="path844" - d="m -15.223508,259.43272 14.52231115,0" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - inkscape:connector-curvature="0" - id="path846" - d="M -15.223508,244.48511 H 26.960348" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path1942" - d="m 24.885732,237.69074 c 3.516539,-0.0167 21.379184,0.0651 24.895391,0" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1952);marker-end:url(#Arrow2Lend)" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path848-1" - d="m -11.765815,245.16455 c -0.0265,10.6238 -0.02282,9.23271 0,13.58873" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.359602;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-8);marker-end:url(#marker4484-0)" /> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="-13.183272" - y="244.32962" - id="text1103" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101" - x="-13.183272" - y="244.32962" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';fill:#e0e0e0;fill-opacity:1;stroke-width:0.34273">A</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:0.34273;" - x="34.777561" - y="237.95509" - id="text1103-8" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3" - x="34.777561" - y="237.95509" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273;fill:#e0e0e0;fill-opacity:1;">s</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:0.34273;" - x="32.328884" - y="258.08295" - id="text1103-8-9" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3-5" - x="32.328884" - y="258.08295" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273;fill:#e0e0e0;fill-opacity:1;">r</tspan></text> <path style="fill:none;stroke:#f2647e;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M -0.70119629,265.54765 H 71.218825" id="path2570" sodipodi:nodetypes="cc" /> <path - style="fill:none;stroke:#42b8eb;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M -0.70119621,259.43272 H 21.42804 c 2.28572,-0.0317 4.178027,-0.69904 4.161505,-3.41673 -0.01227,-2.01877 -0.01227,-4.05708 0.01466,-6.70988 0.02008,-1.97805 1.515743,-4.01774 4.122298,-4.14156 0,0 11.718053,0.0642 14.477108,0.10083 2.773257,0.0367 4.900602,2.63771 4.96521,4.69577 0.0287,0.91417 -0.229561,5.57345 -0.115045,6.80483 0.209472,2.25306 3.493502,2.66674 3.493502,2.66674 l 18.671549,7e-5" + style="fill:none;stroke:#f2647e;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M -0.70119621,259.43272 H 21.42804 c 2.28572,-0.0317 4.178027,-0.69904 4.161505,-3.41673 -0.01227,-2.01877 -0.01227,-4.05708 0.01466,-6.70988 0.02008,-1.97805 1.515743,-4.01774 4.122298,-4.14156 0,0 11.718053,0.0642 14.477108,0.10083 2.773257,0.0367 4.900602,2.63771 4.96521,4.69577 0.0287,0.91417 -0.01058,5.40178 0,6.63825 0.01687,1.97028 1.933886,2.83331 3.378457,2.83332 l 18.671549,7e-5" id="path2572" - sodipodi:nodetypes="ccsscssscc" /> - <path - inkscape:connector-curvature="0" - id="path1736" - d="m 40.791121,253.31779 6.323257,-6.00903" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.75400704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotM);marker-end:url(#marker4010)" - sodipodi:nodetypes="cc" /> - <path - inkscape:connector-curvature="0" - id="path844-9" - d="m 24.194194,233.61412 v 13.58874" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - inkscape:connector-curvature="0" - id="path844-9-4" - d="m 50.472662,233.61412 v 13.58874" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> + sodipodi:nodetypes="ccsscssssc" /> + <g + id="g19279" + transform="translate(-5.8571414,74.846899)"> + <g + id="g13547" + transform="translate(89.770085,-71.662592)"> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path1942-8" + d="m -57.465114,231.20035 c 4.114139,-0.0157 17.886741,0.061 22.000492,0" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker2034);marker-end:url(#marker67363)" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-48.458897" + y="241.71533" + id="text1103-8-83" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-1" + x="-48.458897" + y="241.71533" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#42b8eb;fill-opacity:1;stroke-width:0.34273">S</tspan></text> + <path + style="fill:none;stroke:#42b8eb;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m -58.165551,228.32475 v 14.32603" + id="path708-6" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#42b8eb;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m -34.993944,228.32475 v 15.00547" + id="path708-8-4" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-9" + d="m -96.756044,256.05434 h 11.756156" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-94.755615" + y="254.40767" + id="text1103-8-8" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-57" + x="-94.755615" + y="254.40767" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#42b8eb;fill-opacity:1;stroke-width:0.34273">A</tspan></text> + <path + style="fill:none;fill-opacity:1;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#marker2034);marker-end:url(#marker67363);paint-order:fill markers stroke" + d="m -96.928944,243.48479 v 11.72028" + id="path1043" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-8" + d="m -96.716065,242.48831 38.726163,0.002" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + <g + id="g81709" + transform="translate(-1.4927768,-1.1536679)"> + <path + style="fill:#545454;fill-opacity:1;stroke:none;stroke-width:0.34273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m -36.446523,244.83704 1.901732,-0.50958 -0.518654,1.69859 -0.466453,-0.54024 -0.401631,0.11687 0.0037,-0.42592 z" + id="path9771-3" + sodipodi:nodetypes="ccccccc" /> + <g + id="g14305-0" + transform="translate(-12.724887,30.017545)"> + <path + inkscape:connector-curvature="0" + id="path1736-3-9" + d="m -25.796252,218.21668 3.284809,-3.22733" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker43482);marker-end:url(#marker67363)" + sodipodi:nodetypes="cc" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-29.839058" + y="226.11093" + id="text1103-8-9-8-2" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-5-9-5" + x="-29.839058" + y="226.11093" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#42b8eb;fill-opacity:1;stroke-width:0.34273">r</tspan></text> + </g> + </g> + </g> + </g> </g> </g> </svg> diff --git a/resources/bitmaps_png/sources/dark/tune_single_track_length_legend.svg b/resources/bitmaps_png/sources/dark/tune_single_track_length_legend.svg index 729e5ad63a..196742ce38 100644 --- a/resources/bitmaps_png/sources/dark/tune_single_track_length_legend.svg +++ b/resources/bitmaps_png/sources/dark/tune_single_track_length_legend.svg @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg width="250" - height="190" - viewBox="0 0 66.145832 50.270834" + height="156" + viewBox="0 0 66.145832 41.275001" version="1.1" id="svg8" - inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="tune_single_track_length_legend.svg" shape-rendering="crispEdges" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -28,24 +28,9 @@ <path transform="matrix(-1.1,0,0,-1.1,-1.1,0)" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path5409" /> </marker> - <marker - inkscape:isstock="true" - style="overflow:visible" - id="marker4484" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow2Lend" - inkscape:collect="always"> - <path - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - id="path4482" /> - </marker> <marker inkscape:isstock="true" style="overflow:visible" @@ -60,21 +45,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path3590" /> </marker> - <marker - inkscape:stockid="Arrow2Lend" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lend" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - id="path871" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> - </marker> <marker inkscape:stockid="Arrow2Lstart" orient="auto" @@ -113,7 +83,7 @@ inkscape:isstock="true"> <path id="path1950" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" transform="matrix(1.1,0,0,1.1,1.1,0)" /> </marker> @@ -128,7 +98,7 @@ <path id="path911" d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:1pt;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(0.8,0,0,0.8,5.92,0.8)" /> </marker> <marker @@ -215,21 +185,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(-0.8,0,0,-0.8,-10,0)" /> </marker> - <marker - inkscape:stockid="Arrow2Lstart" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lstart" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - id="path868" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(1.1,0,0,1.1,1.1,0)" /> - </marker> <marker inkscape:stockid="Arrow1Lstart" orient="auto" @@ -244,22 +199,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(0.8,0,0,0.8,10,0)" /> </marker> - <marker - inkscape:stockid="Arrow2Lstart" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lstart-8" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - inkscape:connector-curvature="0" - id="path868-4" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(1.1,0,0,1.1,1.1,0)" /> - </marker> <marker inkscape:isstock="true" style="overflow:visible" @@ -272,9 +211,96 @@ inkscape:connector-curvature="0" transform="matrix(-1.1,0,0,-1.1,-1.1,0)" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - style="fill:#e0e0e0;fill-opacity:1;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path4482-0" /> </marker> + <marker + markerWidth="6" + markerHeight="6" + refX="3" + refY="3" + orient="auto" + id="marker6123" + viewBox="0 0 6 6" + preserveAspectRatio="xMidYMid"> + <circle + style="fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273;stroke-linejoin:round" + id="path5603" + cx="3" + cy="3" + r="3" /> + </marker> + <marker + style="overflow:visible" + id="marker2034" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mstart" + inkscape:isstock="true" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304581" + markerHeight="5.1962252" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#42b8eb;fill-opacity:1;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2032" /> + </marker> + <marker + style="overflow:visible" + id="marker2044" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304581" + markerHeight="5.1962252" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#42b8eb;fill-opacity:1;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2042" /> + </marker> + <marker + markerWidth="5.4999971" + markerHeight="5.4999747" + refX="2.7499986" + refY="2.7499874" + orient="auto" + id="marker43482" + viewBox="0 0 5.4999971 5.4999747" + preserveAspectRatio="xMidYMid"> + <ellipse + style="fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" + id="path43169" + cx="2.7499986" + cy="2.7499874" + rx="2.7499986" + ry="2.7499874" /> + </marker> + <marker + style="overflow:visible" + id="marker2044-6" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304581" + markerHeight="5.1962252" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#42b8eb;fill-opacity:1;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2042-4" /> + </marker> </defs> <sodipodi:namedview id="base" @@ -284,16 +310,16 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="4" - inkscape:cx="56" - inkscape:cy="152.75" + inkscape:cx="117.875" + inkscape:cy="105.625" inkscape:document-units="px" - inkscape:current-layer="g9599" + inkscape:current-layer="g12160" showgrid="true" - inkscape:window-width="1920" - inkscape:window-height="1017" - inkscape:window-x="-8" - inkscape:window-y="-8" - inkscape:window-maximized="1" + inkscape:window-width="2166" + inkscape:window-height="1223" + inkscape:window-x="373" + inkscape:window-y="580" + inkscape:window-maximized="0" units="px" showborder="true" inkscape:document-rotation="0" @@ -309,12 +335,29 @@ spacingy="0.13229167" empspacing="2" color="#9696ff" - opacity="0.1254902" /> + opacity="0.1254902" + originx="-1.4327723" + originy="20.578484" /> <sodipodi:guide - position="0,25.135417" + position="-16.249439,20.696517" orientation="0,-1" id="guide1263" inkscape:locked="false" /> + <sodipodi:guide + position="27.142229,0.98505779" + orientation="0,-1" + id="guide3688" + inkscape:locked="false" /> + <sodipodi:guide + position="46.721396,44.905893" + orientation="0,-1" + id="guide3792" + inkscape:locked="false" /> + <sodipodi:guide + position="33.889104,40.407976" + orientation="0,-1" + id="guide5311" + inkscape:locked="false" /> </sodipodi:namedview> <metadata id="metadata5"> @@ -324,7 +367,6 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /> </cc:Work> @@ -349,106 +391,133 @@ inkscape:label="Calque 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-246.99373)"> + transform="translate(-1.4327723,-226.41525)"> <g id="g9599" transform="matrix(0.76520188,0,0,0.77883147,11.649057,67.693533)"> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="-9.9487562" - y="285.47281" - id="text1103-0" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-4" - x="-9.9487562" - y="285.47281" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';fill:#e0e0e0;fill-opacity:1;stroke-width:0.34273">A</tspan></text> - <path - sodipodi:nodetypes="cccccccccc" - inkscape:connector-curvature="0" - id="path9433-6" - d="m 71.218824,265.54765 h -7.606925 c -6.223848,0 -10.37308,-3.7369 -10.37308,-9.51212 v -15.96676 c 0,-11.55042 -17.288466,-11.55042 -17.288466,0 l 0,43.82367 c 0,12.9093 -17.288467,12.9093 -17.288467,0 v -14.26817 c -0.345769,-4.75606 -3.803463,-7.13409 -8.9900024,-7.13409 h -9.68154123" - style="fill:none;fill-rule:evenodd;stroke:#f2647e;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path842" - d="M -15.223508,294.59357 H 31.801121" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path844" - d="m -15.223508,262.49018 15.21385037,0" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - inkscape:connector-curvature="0" - id="path846" - d="M -15.223508,230.3868 H 47.36074" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path848" - d="m -11.765815,263.16962 c -0.0276,9.81655 -0.02377,26.88934 0,30.91437" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#marker4484)" /> - <path - inkscape:connector-curvature="0" - id="path1736" - d="m 44.940355,239.38933 5.18654,-6.45464" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.34273047;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotL);marker-end:url(#marker5411)" - sodipodi:nodetypes="cc" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path1942" - d="m 38.024968,255.69582 c 3.516539,-0.0167 9.968797,0.0651 13.485004,0" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1952);marker-end:url(#Arrow2Lend)" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path848-1" - d="m -11.765815,230.89638 c -0.0265,10.6238 -0.02282,26.55835 0,30.91437" - style="fill:none;fill-rule:evenodd;stroke:#e0e0e0;stroke-width:0.359602;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-8);marker-end:url(#marker4484-0)" /> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="-9.9487562" - y="250.80675" - id="text1103" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101" - x="-9.9487562" - y="250.80675" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';fill:#e0e0e0;fill-opacity:1;stroke-width:0.34273">A</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:0.34273;" - x="42.174099" - y="266.42944" - id="text1103-8" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3" - x="42.174099" - y="266.42944" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273;fill:#e0e0e0;fill-opacity:1;">s</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0e0e0;fill-opacity:1;stroke:none;stroke-width:0.34273;" - x="55.016346" - y="242.81801" - id="text1103-8-9" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3-5" - x="55.016346" - y="242.81801" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273;fill:#e0e0e0;fill-opacity:1;">r</tspan></text> + <g + id="g12160" + transform="translate(0.93620443,0.13959422)"> + <path + sodipodi:nodetypes="cccccccccc" + inkscape:connector-curvature="0" + id="path9433-6" + d="m 71.218824,230.23805 h -7.606925 c -6.223848,0 -10.37308,-3.7369 -10.37308,-9.51212 v -7.24024 c 0,-11.55042 -17.288466,-11.55042 -17.288466,0 v 32.31571 c 0,12.9093 -17.288467,12.9093 -17.288467,0 v -8.59441 c -0.345769,-4.75606 -3.803463,-7.13409 -8.9900024,-7.13409 h -9.68154123" + style="fill:none;fill-rule:evenodd;stroke:#f2647e;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842" + d="M -12.35625,255.38637 H 22.912223" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + <path + style="fill:none;stroke:#545454;stroke-width:1.02819;stroke-dasharray:2.57048, 1.54228;stroke-dashoffset:0;stroke-opacity:1" + d="M -0.00951628,230.10233 H 6.8947008" + id="path708-8-5-7" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-9" + d="M -12.198096,230.10146 H 7.1649883" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + <path + style="fill:#545454;fill-opacity:1;stroke:none;stroke-width:0.34273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 48.39805,206.77637 1.812893,-0.55602 -0.08834,1.79188 -0.342086,-0.31977 -0.345161,-0.23665 -0.549806,-0.42142 z" + id="path9771" + sodipodi:nodetypes="ccccccc" /> + <path + inkscape:connector-curvature="0" + id="path1736" + d="m 44.841874,212.82735 4.882649,-5.99381" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273048;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker43482);marker-end:url(#marker2044-6)" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path1942" + d="m 19.417801,222.76583 c 4.114139,-0.0157 11.662893,0.061 15.776644,0" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273048;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker2034);marker-end:url(#marker2044-6)" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="24.352139" + y="233.20624" + id="text1103-8" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3" + x="24.352139" + y="233.20624" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#42b8eb;fill-opacity:1;stroke-width:0.34273">S</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-9.8116446" + y="221.25424" + id="text1103-8-8" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-57" + x="-9.8116446" + y="221.25424" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#42b8eb;fill-opacity:1;stroke-width:0.34273">A</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-9.8116446" + y="250.67172" + id="text1103-8-8-4" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-57-1" + x="-9.8116446" + y="250.67172" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#42b8eb;fill-opacity:1;stroke-width:0.34273">A</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="43.168518" + y="221.2382" + id="text1103-8-9" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-5" + x="43.168518" + y="221.2382" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#42b8eb;fill-opacity:1;stroke-width:0.34273">r</tspan></text> + <path + style="fill:none;stroke:#42b8eb;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m 18.590105,219.8858 v 14.32603" + id="path708" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#545454;stroke-width:1.02819;stroke-dasharray:2.57048, 1.54228;stroke-dashoffset:0;stroke-opacity:1" + d="m 35.878571,219.54895 v 15.00547" + id="path708-8-5" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#42b8eb;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m 35.878571,219.85687 v 15.00547" + id="path708-8" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-opacity:1;stroke:#42b8eb;stroke-width:0.34273048;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;marker-start:url(#marker2034);marker-end:url(#marker2044);paint-order:fill markers stroke;stroke-opacity:1" + d="m -12.457353,205.90245 v 23.48982" + id="path1043" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-opacity:1;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;marker-start:url(#marker2034);marker-end:url(#marker2044-6);paint-order:fill markers stroke;stroke-opacity:1" + d="m -12.457353,231.06623 v 23.48982" + id="path1043-4" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-8" + d="M -12.35625,205.10805 H 38.817612" + style="fill:none;fill-rule:evenodd;stroke:#42b8eb;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </g> </svg> diff --git a/resources/bitmaps_png/sources/light/tune_diff_pair_length_legend.svg b/resources/bitmaps_png/sources/light/tune_diff_pair_length_legend.svg index 7ea7c8f695..0cf4f95d9c 100644 --- a/resources/bitmaps_png/sources/light/tune_diff_pair_length_legend.svg +++ b/resources/bitmaps_png/sources/light/tune_diff_pair_length_legend.svg @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg width="250" - height="190" - viewBox="0 0 66.145832 50.270834" + height="156" + viewBox="0 0 66.145831 41.275" version="1.1" id="svg8" - inkscape:version="1.2.1 (9c6d41e, 2022-07-14)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="tune_diff_pair_length_legend.svg" shape-rendering="crispEdges" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -45,21 +45,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path3590" /> </marker> - <marker - inkscape:stockid="Arrow2Lend" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lend" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - id="path871" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> - </marker> <marker inkscape:stockid="Arrow2Lstart" orient="auto" @@ -102,21 +87,6 @@ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" transform="matrix(1.1,0,0,1.1,1.1,0)" /> </marker> - <marker - inkscape:isstock="true" - style="overflow:visible" - id="marker1838" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow2Lstart" - inkscape:collect="always"> - <path - transform="matrix(1.1,0,0,1.1,1.1,0)" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - id="path1836" /> - </marker> <marker inkscape:stockid="DotL" orient="auto" @@ -215,21 +185,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(-0.8,0,0,-0.8,-10,0)" /> </marker> - <marker - inkscape:stockid="Arrow2Lstart" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lstart" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - id="path868" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(1.1,0,0,1.1,1.1,0)" /> - </marker> <marker inkscape:stockid="Arrow1Lstart" orient="auto" @@ -244,22 +199,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(0.8,0,0,0.8,10,0)" /> </marker> - <marker - inkscape:stockid="Arrow2Lstart" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lstart-8" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - inkscape:connector-curvature="0" - id="path868-4" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(1.1,0,0,1.1,1.1,0)" /> - </marker> <marker inkscape:isstock="true" style="overflow:visible" @@ -275,6 +214,94 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path4482-0" /> </marker> + <marker + style="overflow:visible" + id="marker1675" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mstart" + inkscape:isstock="true" + inkscape:collect="always"> + <path + transform="scale(0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1673" /> + </marker> + <marker + style="overflow:visible" + id="marker2029" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2027" /> + </marker> + <marker + style="overflow:visible" + id="marker1675-5" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mstart" + inkscape:isstock="true" + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1673-4" /> + </marker> + <marker + style="overflow:visible" + id="marker2029-7" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2027-4" /> + </marker> + <marker + markerWidth="6" + markerHeight="6" + refX="3" + refY="3" + orient="auto" + id="marker6123" + viewBox="0 0 6 6" + preserveAspectRatio="xMidYMid"> + <circle + style="fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273;stroke-linejoin:round" + id="path5603" + cx="3" + cy="3" + r="3" /> + </marker> </defs> <sodipodi:namedview id="base" @@ -283,16 +310,16 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8284271" - inkscape:cx="53.916893" - inkscape:cy="74.776543" + inkscape:zoom="2" + inkscape:cx="109.25" + inkscape:cy="68.250001" inkscape:document-units="px" - inkscape:current-layer="g9599" + inkscape:current-layer="g9602" showgrid="true" inkscape:window-width="1671" inkscape:window-height="981" inkscape:window-x="0" - inkscape:window-y="38" + inkscape:window-y="438" inkscape:window-maximized="0" units="px" showborder="true" @@ -309,12 +336,24 @@ spacingy="0.13229167" empspacing="2" color="#9696ff" - opacity="0.1254902" /> + opacity="0.1254902" + originx="-0.24214628" + originy="45.284039" /> <sodipodi:guide - position="0,25.135417" + position="-0.24213829,-29.144432" orientation="0,-1" id="guide1263" inkscape:locked="false" /> + <sodipodi:guide + position="0.81619572,-4.0090165" + orientation="0,-1" + id="guide12991" + inkscape:locked="false" /> + <sodipodi:guide + position="-32.389011,20.861817" + orientation="0,-1" + id="guide17976" + inkscape:locked="false" /> </sodipodi:namedview> <metadata id="metadata5"> @@ -324,7 +363,6 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /> </cc:Work> @@ -349,28 +387,16 @@ inkscape:label="Calque 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-246.99373)"> + transform="translate(-0.24213728,-201.7097)"> <g id="g9599" transform="matrix(0.76520188,0,0,0.77883147,11.649057,67.693533)"> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="-9.9487562" - y="280.67462" - id="text1103-0" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-4" - x="-9.9487562" - y="280.67462" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">A</tspan></text> <g id="g9602" - transform="matrix(0.98527321,0,0,0.98527321,-0.00861432,4.2599054)"> + transform="matrix(0.98527321,0,0,0.98527321,-0.0086144,-59.946718)"> <path - style="fill:none;fill-rule:evenodd;stroke:#4d7fc4;stroke-width:2.08712;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M -0.35199642,258.98686 H 9.8251914 c 9.4753126,0 15.0903136,3.44796 15.4412506,13.79184 v 9.65429 c 0,6.89592 10.407181,6.83552 10.528125,0 v -39.99635 c 0,-15.51582 24.565626,-15.86062 24.565626,0 v 13.10226 c 0,2.41357 1.754688,3.44796 3.860313,3.44796 h 8.071562" + style="fill:none;fill-rule:evenodd;stroke:#bf2641;stroke-width:2.08712;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M -0.35199642,258.98686 H 9.8251914 c 9.4753126,0 15.4412506,3.4478 15.4412506,13.79184 v 4.43925 c 0,6.89592 10.407181,6.83552 10.528125,0 v -28.91978 c 0,-15.51582 24.565626,-15.86062 24.565626,0 v 7.24073 c 0,2.41357 1.754688,3.44796 3.860313,3.44796 h 8.071562" id="path9433" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccc" /> @@ -379,97 +405,147 @@ sodipodi:nodetypes="cccccccccc" inkscape:connector-curvature="0" id="path9433-6" - d="m 71.218824,265.54765 h -7.606925 c -6.223848,0 -10.37308,-3.7369 -10.37308,-9.51212 v -12.90929 c 0,-7.47381 -11.756157,-7.47381 -11.756157,0 v 39.40732 c 0,14.26818 -22.820776,14.60789 -22.820776,10e-6 v -9.51211 c -0.345769,-4.75606 -3.803463,-7.4738 -8.9900024,-7.4738 H -0.35542696" + d="m 71.218824,201.34073 h -7.606925 c -6.223848,0 -10.37308,-3.7369 -10.37308,-9.51212 v -7.21901 c 0,-7.47381 -11.756157,-7.47381 -11.756157,0 v 28.49387 c 0,14.26818 -22.820776,14.60789 -22.820776,1e-5 v -4.28894 c 0,-4.75607 -3.803463,-7.4738 -8.9900025,-7.4738 H -0.35542704" style="fill:none;fill-rule:evenodd;stroke:#bf2641;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path842" - d="M -15.223508,287.56154 H 31.801119" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 51.015413,178.89144 0.667431,0.36776 0.679265,0.62563 0.230418,0.22847 -0.475671,1.02232 -0.434012,-0.68741 -0.708185,0.9602 -0.848404,-0.64884 0.731045,-0.87059 -0.866649,-0.27739 z" + id="path25305" + sodipodi:nodetypes="ccccccccccc" /> + <g + id="g19279" + transform="translate(0,6.1149302)"> + <path + style="fill:none;stroke:#1a81c4;stroke-width:0.367813;stroke-dasharray:none;stroke-opacity:1" + d="m 55.313435,174.16326 -4.322117,-4.24648" + id="path708-8" + sodipodi:nodetypes="cc" /> + <g + id="g14305" + transform="translate(75.55644,-42.803254)"> + <path + inkscape:connector-curvature="0" + id="path1736-3" + d="m -27.891809,221.26187 4.882649,-5.99381" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker6123);marker-end:url(#marker2029)" + sodipodi:nodetypes="cc" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-28.925932" + y="229.74751" + id="text1103-8-9-8" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-5-9" + x="-28.925932" + y="229.74751" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#1a81c4;fill-opacity:1;stroke-width:0.34273">r</tspan></text> + </g> + </g> <path - inkscape:connector-curvature="0" - id="path844" - d="M -15.223508,262.49018 H 9.3453203" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path846" - d="M -15.223508,237.48699 H 47.360739" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path848" - d="m -11.763966,263.18714 c -0.03068,7.5552 -0.02642,20.69509 0,23.79291" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.326286;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#marker4484)" /> - <path - inkscape:connector-curvature="0" - id="path1736" - d="m 47.635094,242.84415 6.486249,-6.71642" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.369181;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotL);marker-end:url(#marker1838)" - sodipodi:nodetypes="cc" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path1942" - d="m 39.20741,252.48828 c 5.339184,-0.0139 10.836435,0.0258 16.175115,-0.0286" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.397499;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1952);marker-end:url(#Arrow2Lend)" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path848-1" - d="m -11.764132,238.12011 c -0.0295,8.13543 -0.0254,20.33769 0,23.67341" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.332007;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-8);marker-end:url(#marker4484-0)" /> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="-9.9487562" - y="254.91948" - id="text1103" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101" - x="-9.9487562" - y="254.91948" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">A</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="44.708286" - y="265.8735" - id="text1103-8" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3" - x="44.708286" - y="265.8735" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">s</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="60.889706" - y="239.5349" - id="text1103-8-9" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3-5" - x="60.889706" - y="239.5349" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">r</tspan></text> - <path - style="fill:none;stroke:#000000;stroke-width:0.35266966;stroke-dasharray:none;stroke-opacity:1" - d="m 38.358246,249.24117 v 16.57498" - id="path708" /> - <path - style="fill:none;stroke:#000000;stroke-width:0.35267;stroke-dasharray:none;stroke-opacity:1" - d="m 56.316848,249.24117 v 16.69509" - id="path708-1" /> - <path - style="fill:none;stroke:#000000;stroke-width:0.367813;stroke-dasharray:none;stroke-opacity:1" - d="m 56.231062,239.44 -5.359424,-5.26563" - id="path708-8" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 36.266192,188.82432 0.123939,0.74191 -0.07378,0.91189 -0.03795,0.31947 -1.109929,0.27267 0.275947,-0.76214 -1.205599,0.0554 -0.01329,-1.05624 1.148589,0.0181 -0.320122,-0.83848 z" + id="path25305-3" + sodipodi:nodetypes="ccccccccccc" /> + <g + id="g13547" + transform="translate(74.994909,-41.431599)"> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path1942-8" + d="m -53.315882,231.20035 c 4.114139,-0.0157 11.662893,0.061 15.776644,0" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1675-5);marker-end:url(#marker2029-7)" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-47.74231" + y="241.71555" + id="text1103-8-83" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-1" + x="-47.74231" + y="241.71555" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#1a81c4;fill-opacity:1;stroke-width:0.34273">S</tspan></text> + <path + style="fill:none;stroke:#1a81c4;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m -54.071807,228.3247 v 14.32603" + id="path708-6" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#1a81c4;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m -36.783341,228.32475 v 15.00547" + id="path708-8-4" + sodipodi:nodetypes="cc" /> + </g> + <g + id="g14428" + transform="translate(71.091348,-40.252579)"> + <path + style="fill:none;stroke:#ffffff;stroke-width:1.02819;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" + d="m -52.310952,258.40657 h 2.307132" + id="path25307" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#ffffff;stroke-width:1.02819;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" + d="m -35.711495,219.34849 h 2.307132" + id="path25307-3" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-5" + d="m -84.931779,258.3927 h 40.109243" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-9" + d="m -84.931779,238.53598 h 19.363084" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-81.625786" + y="233.67569" + id="text1103-8-8" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-57" + x="-81.625786" + y="233.67569" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#1a81c4;fill-opacity:1;stroke-width:0.34273">A</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-81.625786" + y="254.24736" + id="text1103-8-8-3" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-57-8" + x="-81.625786" + y="254.24736" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#1a81c4;fill-opacity:1;stroke-width:0.34273">A</tspan></text> + <path + style="fill:none;fill-opacity:1;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;marker-start:url(#marker1675);marker-end:url(#marker2029);paint-order:fill markers stroke" + d="m -85.104676,220.53093 v 17.15578" + id="path1043" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-opacity:1;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;marker-start:url(#marker1675-5);marker-end:url(#marker2029-7);paint-order:fill markers stroke" + d="m -85.104676,239.3853 v 18.17493" + id="path1043-4" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-8" + d="m -84.931779,219.33774 h 56.014632" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </g> </svg> diff --git a/resources/bitmaps_png/sources/light/tune_diff_pair_skew_legend.svg b/resources/bitmaps_png/sources/light/tune_diff_pair_skew_legend.svg index d03620c941..1e3aeacbef 100644 --- a/resources/bitmaps_png/sources/light/tune_diff_pair_skew_legend.svg +++ b/resources/bitmaps_png/sources/light/tune_diff_pair_skew_legend.svg @@ -5,7 +5,7 @@ viewBox="0 0 66.145832 29.104167" version="1.1" id="svg8" - inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="tune_diff_pair_skew_legend.svg" shape-rendering="crispEdges" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -18,17 +18,17 @@ <defs id="defs2"> <marker - style="overflow:visible;" + style="overflow:visible" id="marker4010" - refX="0.0" - refY="0.0" + refX="0" + refY="0" orient="auto" inkscape:stockid="Arrow2Mend" inkscape:isstock="true"> <path - transform="scale(0.6) rotate(180) translate(0,0)" - d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " - style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1" + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path2999" /> </marker> <marker @@ -77,15 +77,15 @@ <marker style="overflow:visible" id="DotM" - refX="0.0" - refY="0.0" + refX="0" + refY="0" orient="auto" inkscape:stockid="DotM" inkscape:isstock="true"> <path - transform="scale(0.4) translate(7.4, 1)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1" - d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z " + transform="matrix(0.4,0,0,0.4,2.96,0.4)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" + d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z" id="path3036" /> </marker> <marker @@ -145,21 +145,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path3590" /> </marker> - <marker - inkscape:stockid="Arrow2Lend" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lend" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - id="path871" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> - </marker> <marker inkscape:stockid="Arrow2Lstart" orient="auto" @@ -315,36 +300,111 @@ transform="matrix(0.8,0,0,0.8,10,0)" /> </marker> <marker - inkscape:stockid="Arrow2Lstart" + markerWidth="6" + markerHeight="6" + refX="3" + refY="3" orient="auto" - refY="0" - refX="0" - id="Arrow2Lstart-8" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - inkscape:connector-curvature="0" - id="path868-4" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(1.1,0,0,1.1,1.1,0)" /> + id="marker6123" + viewBox="0 0 6 6" + preserveAspectRatio="xMidYMid"> + <circle + style="fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273;stroke-linejoin:round" + id="path5603" + cx="3" + cy="3" + r="3" /> </marker> <marker - inkscape:isstock="true" style="overflow:visible" - id="marker4484-0" + id="marker2029" refX="0" refY="0" orient="auto" - inkscape:stockid="Arrow2Lend" + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2027" /> + </marker> + <marker + style="overflow:visible" + id="marker1675-5" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mstart" + inkscape:isstock="true" + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1673-4" /> + </marker> + <marker + style="overflow:visible" + id="marker2029-7" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2027-4" /> + </marker> + <marker + style="overflow:visible" + id="marker1675" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mstart" + inkscape:isstock="true" inkscape:collect="always"> <path - inkscape:connector-curvature="0" - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" + transform="scale(0.6)" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - id="path4482-0" /> + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1673" /> + </marker> + <marker + style="overflow:visible" + id="marker2029-4" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2027-8" /> </marker> </defs> <sodipodi:namedview @@ -354,13 +414,13 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="3.9399599" - inkscape:cx="124.74746" - inkscape:cy="54.442178" + inkscape:zoom="63.03936" + inkscape:cx="180.49834" + inkscape:cy="47.795536" inkscape:document-units="px" - inkscape:current-layer="g9599" + inkscape:current-layer="g19279" showgrid="true" - inkscape:window-width="1419" + inkscape:window-width="1609" inkscape:window-height="726" inkscape:window-x="302" inkscape:window-y="29" @@ -376,8 +436,8 @@ <inkscape:grid type="xygrid" id="grid1261" - spacingx="0.26458333" - spacingy="0.26458333" + spacingx="0.13229167" + spacingy="0.13229167" empspacing="2" color="#9696ff" opacity="0.1254902" /> @@ -386,6 +446,11 @@ orientation="0,-1" id="guide1263" inkscape:locked="false" /> + <sodipodi:guide + position="49.348699,14.122675" + orientation="1,0" + id="guide33707" + inkscape:locked="false" /> </sodipodi:namedview> <metadata id="metadata5"> @@ -395,7 +460,6 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /> </cc:Work> @@ -428,94 +492,108 @@ id="g9602" transform="matrix(0.98527321,0,0,0.98527321,-0.00861432,4.2599054)" style="stroke-width:1.00008;stroke-miterlimit:4;stroke-dasharray:none" /> - <path - inkscape:connector-curvature="0" - id="path844" - d="m -15.223508,259.43272 14.52231115,0" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - inkscape:connector-curvature="0" - id="path846" - d="M -15.223508,244.48511 H 26.960348" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path1942" - d="m 24.885732,237.69074 c 3.516539,-0.0167 21.379184,0.0651 24.895391,0" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1952);marker-end:url(#Arrow2Lend)" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path848-1" - d="m -11.765815,245.16455 c -0.0265,10.6238 -0.02282,9.23271 0,13.58873" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.359602;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-8);marker-end:url(#marker4484-0)" /> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="-13.183272" - y="244.32962" - id="text1103" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101" - x="-13.183272" - y="244.32962" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">A</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="34.777561" - y="237.95509" - id="text1103-8" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3" - x="34.777561" - y="237.95509" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">s</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="32.328884" - y="258.08295" - id="text1103-8-9" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3-5" - x="32.328884" - y="258.08295" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">r</tspan></text> <path style="fill:none;stroke:#bf2641;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M -0.70119629,265.54765 H 71.218825" id="path2570" sodipodi:nodetypes="cc" /> <path - style="fill:none;stroke:#4d7fc4;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M -0.70119621,259.43272 H 21.42804 c 2.28572,-0.0317 4.178027,-0.69904 4.161505,-3.41673 -0.01227,-2.01877 -0.01227,-4.05708 0.01466,-6.70988 0.02008,-1.97805 1.515743,-4.01774 4.122298,-4.14156 0,0 11.718053,0.0642 14.477108,0.10083 2.773257,0.0367 4.900602,2.63771 4.96521,4.69577 0.0287,0.91417 -0.229561,5.57345 -0.115045,6.80483 0.209472,2.25306 3.493502,2.66674 3.493502,2.66674 l 18.671549,7e-5" + style="fill:none;stroke:#bf2641;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M -0.70119621,259.43272 H 21.42804 c 2.28572,-0.0317 4.178027,-0.69904 4.161505,-3.41673 -0.01227,-2.01877 -0.01227,-4.05708 0.01466,-6.70988 0.02008,-1.97805 1.515743,-4.01774 4.122298,-4.14156 0,0 11.718053,0.0642 14.477108,0.10083 2.773257,0.0367 4.900602,2.63771 4.96521,4.69577 0.0287,0.91417 -0.01058,5.40178 0,6.63825 0.01687,1.97028 1.933886,2.83331 3.378457,2.83332 l 18.671549,7e-5" id="path2572" - sodipodi:nodetypes="ccsscssscc" /> - <path - inkscape:connector-curvature="0" - id="path1736" - d="m 40.791121,253.31779 6.323257,-6.00903" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.75400704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotM);marker-end:url(#marker4010)" - sodipodi:nodetypes="cc" /> - <path - inkscape:connector-curvature="0" - id="path844-9" - d="m 24.194194,233.61412 v 13.58874" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - inkscape:connector-curvature="0" - id="path844-9-4" - d="m 50.472662,233.61412 v 13.58874" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> + sodipodi:nodetypes="ccsscssssc" /> + <g + id="g19279" + transform="translate(-5.8571414,74.846899)"> + <path + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 51.834804,172.01624 1.901732,-0.50958 -0.518654,1.69859 -0.466453,-0.54024 -0.401631,0.11687 0.0037,-0.42592 z" + id="path9771" + sodipodi:nodetypes="ccccccc" /> + <g + id="g14305" + transform="translate(75.55644,-42.803254)"> + <path + inkscape:connector-curvature="0" + id="path1736-3" + d="m -25.796252,218.21668 3.284809,-3.22733" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker6123);marker-end:url(#marker2029)" + sodipodi:nodetypes="cc" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-29.839058" + y="226.11093" + id="text1103-8-9-8" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-5-9" + x="-29.839058" + y="226.11093" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#1a81c4;fill-opacity:1;stroke-width:0.34273">r</tspan></text> + </g> + <g + id="g13547" + transform="translate(89.770085,-71.662592)"> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path1942-8" + d="m -57.465114,231.20035 c 4.114139,-0.0157 17.886741,0.061 22.000492,0" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1675-5);marker-end:url(#marker2029-7)" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-48.458897" + y="241.71533" + id="text1103-8-83" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-1" + x="-48.458897" + y="241.71533" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#1a81c4;fill-opacity:1;stroke-width:0.34273">S</tspan></text> + <path + style="fill:none;stroke:#1a81c4;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m -58.165551,228.32475 v 14.32603" + id="path708-6" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#1a81c4;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m -34.993944,228.32475 v 15.00547" + id="path708-8-4" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-9" + d="m -96.756044,256.05434 h 11.756156" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-94.755615" + y="254.40767" + id="text1103-8-8" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-57" + x="-94.755615" + y="254.40767" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#1a81c4;fill-opacity:1;stroke-width:0.34273">A</tspan></text> + <path + style="fill:none;fill-opacity:1;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;marker-start:url(#marker1675);marker-end:url(#marker2029-4);paint-order:fill markers stroke" + d="m -96.928944,243.48479 v 11.72028" + id="path1043" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-8" + d="m -96.716066,242.48982 38.55328,0" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + </g> </g> </g> </svg> diff --git a/resources/bitmaps_png/sources/light/tune_single_track_length_legend.svg b/resources/bitmaps_png/sources/light/tune_single_track_length_legend.svg index b0d6f4311f..dcb89178ed 100644 --- a/resources/bitmaps_png/sources/light/tune_single_track_length_legend.svg +++ b/resources/bitmaps_png/sources/light/tune_single_track_length_legend.svg @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg width="250" - height="190" - viewBox="0 0 66.145832 50.270834" + height="156" + viewBox="0 0 66.145832 41.275001" version="1.1" id="svg8" - inkscape:version="1.2.1 (9c6d41e, 2022-07-14)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="tune_single_track_length_legend.svg" shape-rendering="crispEdges" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -31,21 +31,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path5409" /> </marker> - <marker - inkscape:isstock="true" - style="overflow:visible" - id="marker4484" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow2Lend" - inkscape:collect="always"> - <path - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - id="path4482" /> - </marker> <marker inkscape:isstock="true" style="overflow:visible" @@ -60,21 +45,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path3590" /> </marker> - <marker - inkscape:stockid="Arrow2Lend" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lend" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - id="path871" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> - </marker> <marker inkscape:stockid="Arrow2Lstart" orient="auto" @@ -215,21 +185,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(-0.8,0,0,-0.8,-10,0)" /> </marker> - <marker - inkscape:stockid="Arrow2Lstart" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lstart" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - id="path868" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(1.1,0,0,1.1,1.1,0)" /> - </marker> <marker inkscape:stockid="Arrow1Lstart" orient="auto" @@ -244,22 +199,6 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(0.8,0,0,0.8,10,0)" /> </marker> - <marker - inkscape:stockid="Arrow2Lstart" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lstart-8" - style="overflow:visible" - inkscape:isstock="true" - inkscape:collect="always"> - <path - inkscape:connector-curvature="0" - id="path868-4" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" - d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" - transform="matrix(1.1,0,0,1.1,1.1,0)" /> - </marker> <marker inkscape:isstock="true" style="overflow:visible" @@ -275,6 +214,94 @@ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" id="path4482-0" /> </marker> + <marker + style="overflow:visible" + id="marker1675" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mstart" + inkscape:isstock="true" + inkscape:collect="always"> + <path + transform="scale(0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1673" /> + </marker> + <marker + style="overflow:visible" + id="marker2029" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2027" /> + </marker> + <marker + style="overflow:visible" + id="marker1675-5" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mstart" + inkscape:isstock="true" + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1673-4" /> + </marker> + <marker + style="overflow:visible" + id="marker2029-7" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Mend" + inkscape:isstock="true" + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.6)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#1a81c4;fill-opacity:1;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path2027-4" /> + </marker> + <marker + markerWidth="6" + markerHeight="6" + refX="3" + refY="3" + orient="auto" + id="marker6123" + viewBox="0 0 6 6" + preserveAspectRatio="xMidYMid"> + <circle + style="fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273;stroke-linejoin:round" + id="path5603" + cx="3" + cy="3" + r="3" /> + </marker> </defs> <sodipodi:namedview id="base" @@ -284,15 +311,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="4" - inkscape:cx="103.25" - inkscape:cy="92.375" + inkscape:cx="106.375" + inkscape:cy="107.375" inkscape:document-units="px" - inkscape:current-layer="g9599" + inkscape:current-layer="g12160" showgrid="true" - inkscape:window-width="1728" - inkscape:window-height="927" - inkscape:window-x="0" - inkscape:window-y="38" + inkscape:window-width="2166" + inkscape:window-height="1223" + inkscape:window-x="875" + inkscape:window-y="291" inkscape:window-maximized="0" units="px" showborder="true" @@ -309,12 +336,29 @@ spacingy="0.13229167" empspacing="2" color="#9696ff" - opacity="0.1254902" /> + opacity="0.1254902" + originx="-1.4327723" + originy="20.578484" /> <sodipodi:guide - position="0,25.135417" + position="-16.249439,20.696517" orientation="0,-1" id="guide1263" inkscape:locked="false" /> + <sodipodi:guide + position="27.142229,0.98505779" + orientation="0,-1" + id="guide3688" + inkscape:locked="false" /> + <sodipodi:guide + position="46.721396,44.905893" + orientation="0,-1" + id="guide3792" + inkscape:locked="false" /> + <sodipodi:guide + position="33.889104,40.407976" + orientation="0,-1" + id="guide5311" + inkscape:locked="false" /> </sodipodi:namedview> <metadata id="metadata5"> @@ -324,7 +368,6 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /> </cc:Work> @@ -349,114 +392,133 @@ inkscape:label="Calque 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-246.99373)"> + transform="translate(-1.4327723,-226.41525)"> <g id="g9599" transform="matrix(0.76520188,0,0,0.77883147,11.649057,67.693533)"> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="-9.9487562" - y="283.41644" - id="text1103-0" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-4" - x="-9.9487562" - y="283.41644" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">A</tspan></text> - <path - sodipodi:nodetypes="cccccccccc" - inkscape:connector-curvature="0" - id="path9433-6" - d="m 71.218824,265.54765 h -7.606925 c -6.223848,0 -10.37308,-3.7369 -10.37308,-9.51212 v -15.96676 c 0,-11.55042 -17.288466,-11.55042 -17.288466,0 l 0,43.82367 c 0,12.9093 -17.288467,12.9093 -17.288467,0 v -14.26817 c -0.345769,-4.75606 -3.803463,-7.13409 -8.9900024,-7.13409 h -9.68154123" - style="fill:none;fill-rule:evenodd;stroke:#bf2641;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path842" - d="M -15.223508,293.54058 H 31.801121" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path844" - d="M -15.223508,262.49018 H 6.7328441" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.423801;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - inkscape:connector-curvature="0" - id="path846" - d="M -15.223508,231.44 H 47.36074" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.352778;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - sodipodi:nodetypes="cc" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path848" - d="m -11.765519,263.17397 c -0.0281,9.40926 -0.0242,25.77369 0,29.63172" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.348474;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-end:url(#marker4484)" /> - <path - inkscape:connector-curvature="0" - id="path1736" - d="m 44.841874,239.49535 4.882649,-5.99381" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.320448;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotL);marker-end:url(#marker5411)" - sodipodi:nodetypes="cc" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path1942" - d="m 36.706276,255.01796 c 4.114139,-0.0157 11.662893,0.061 15.776644,0" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.369374;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1952);marker-end:url(#Arrow2Lend)" /> - <path - sodipodi:nodetypes="cc" - inkscape:connector-curvature="0" - id="path848-1" - d="m -11.765566,232.08956 c -0.02694,10.21233 -0.0232,25.52971 0,29.71702" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.355513;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-8);marker-end:url(#marker4484-0)" /> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="-9.9487562" - y="252.17766" - id="text1103" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101" - x="-9.9487562" - y="252.17766" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">A</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="41.48864" - y="265.74399" - id="text1103-8" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3" - x="41.48864" - y="265.74399" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">s</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:9.13948px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34273" - x="54.330887" - y="239.39073" - id="text1103-8-9" - transform="scale(1.0088666,0.99121133)"><tspan - sodipodi:role="line" - id="tspan1101-3-5" - x="54.330887" - y="239.39073" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.13948px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';stroke-width:0.34273">r</tspan></text> - <path - style="fill:none;stroke:#000000;stroke-width:0.3632943;stroke-dasharray:none;stroke-opacity:1" - d="m 35.950351,252.14231 v 12.28772" - id="path708" /> - <path - style="fill:none;stroke:#000000;stroke-width:0.363294;stroke-dasharray:none;stroke-opacity:1" - d="m 53.238817,252.14236 v 12.28772" - id="path708-8" /> + <g + id="g12160" + transform="translate(0.93620443,0.13959422)"> + <path + sodipodi:nodetypes="cccccccccc" + inkscape:connector-curvature="0" + id="path9433-6" + d="m 71.218824,230.23805 h -7.606925 c -6.223848,0 -10.37308,-3.7369 -10.37308,-9.51212 v -7.24024 c 0,-11.55042 -17.288466,-11.55042 -17.288466,0 v 32.31571 c 0,12.9093 -17.288467,12.9093 -17.288467,0 v -8.59441 c -0.345769,-4.75606 -3.803463,-7.13409 -8.9900024,-7.13409 h -9.68154123" + style="fill:none;fill-rule:evenodd;stroke:#bf2641;stroke-width:2.05638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842" + d="M -12.35625,255.38637 H 22.912223" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + <path + style="fill:none;stroke:#ffffff;stroke-width:1.02819;stroke-dasharray:2.57048, 1.54228;stroke-dashoffset:0;stroke-opacity:1" + d="M -0.00951628,230.10233 H 6.8947008" + id="path708-8-5-7" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-9" + d="M -12.198096,230.10146 H 7.1649883" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + <path + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34273px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 48.39805,206.77637 1.812893,-0.55602 -0.08834,1.79188 -0.342086,-0.31977 -0.345161,-0.23665 -0.549806,-0.42142 z" + id="path9771" + sodipodi:nodetypes="ccccccc" /> + <path + inkscape:connector-curvature="0" + id="path1736" + d="m 44.841874,212.82735 4.882649,-5.99381" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker6123);marker-end:url(#marker2029)" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path1942" + d="m 19.417801,222.76583 c 4.114139,-0.0157 11.662893,0.061 15.776644,0" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1675-5);marker-end:url(#marker2029-7)" /> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="24.352139" + y="233.20624" + id="text1103-8" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3" + x="24.352139" + y="233.20624" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#1a81c4;fill-opacity:1;stroke-width:0.34273">S</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-9.8116446" + y="221.25424" + id="text1103-8-8" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-57" + x="-9.8116446" + y="221.25424" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#1a81c4;fill-opacity:1;stroke-width:0.34273">A</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="-9.8116446" + y="250.67172" + id="text1103-8-8-4" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-57-1" + x="-9.8116446" + y="250.67172" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#1a81c4;fill-opacity:1;stroke-width:0.34273">A</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-weight:normal;font-size:7.31158px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.34273" + x="43.168518" + y="221.2382" + id="text1103-8-9" + transform="scale(1.0088666,0.99121133)"><tspan + sodipodi:role="line" + id="tspan1101-3-5" + x="43.168518" + y="221.2382" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.31158px;font-family:'Noto Sans CJK SC';-inkscape-font-specification:'Noto Sans CJK SC Bold';fill:#1a81c4;fill-opacity:1;stroke-width:0.34273">r</tspan></text> + <path + style="fill:none;stroke:#1a81c4;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m 18.590105,219.8858 v 14.32603" + id="path708" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#ffffff;stroke-width:1.02819;stroke-dasharray:2.57048, 1.54228;stroke-dashoffset:0;stroke-opacity:1" + d="m 35.878571,219.54895 v 15.00547" + id="path708-8-5" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#1a81c4;stroke-width:0.34273;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" + d="m 35.878571,219.85687 v 15.00547" + id="path708-8" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-opacity:1;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;marker-start:url(#marker1675);marker-end:url(#marker2029);paint-order:fill markers stroke" + d="m -12.457353,205.90245 v 23.48982" + id="path1043" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-opacity:1;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;marker-start:url(#marker1675-5);marker-end:url(#marker2029-7);paint-order:fill markers stroke" + d="m -12.457353,231.06623 v 23.48982" + id="path1043-4" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path842-8" + d="M -12.35625,205.10805 H 38.817612" + style="fill:none;fill-rule:evenodd;stroke:#1a81c4;stroke-width:0.34273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.05638;stroke-dashoffset:0;stroke-opacity:1" /> + </g> </g> </g> </svg>