Netlist browser: net icons for connections.

This commit is contained in:
Matthias Koefferlein 2019-05-01 22:26:05 +02:00
parent 086ddeace7
commit 71d1f4567c
12 changed files with 472 additions and 14 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 456 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 590 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 913 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 687 B

View File

@ -25,9 +25,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.8"
inkscape:cx="560.64642"
inkscape:cy="920.20375"
inkscape:zoom="1.4142136"
inkscape:cx="346.93569"
inkscape:cy="970.66949"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@ -35,7 +35,7 @@
inkscape:snap-bbox="true"
inkscape:bbox-nodes="true"
inkscape:snap-nodes="true"
inkscape:window-width="1622"
inkscape:window-width="1857"
inkscape:window-height="991"
inkscape:window-x="34"
inkscape:window-y="51"
@ -2009,5 +2009,397 @@
sodipodi:type="arc"
id="path4389"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Book';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="294.85001"
y="367.19971"
id="text4367"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4369"
x="294.85001"
y="367.19971"
style="font-size:5px">icon_conn_48.png</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Book';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="359.685"
y="356.12219"
id="text4371"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4373"
x="359.685"
y="356.12219"
style="font-size:5px">icon_conn_32.png</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Book';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="401.88165"
y="346.12219"
id="text4375"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4377"
x="401.88165"
y="346.12219"
style="font-size:5px">icon_conn_24.png</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Book';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="446.88165"
y="336.12219"
id="text4379"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4381"
x="446.88165"
y="336.12219"
style="font-size:5px">icon_conn_16.png</tspan></text>
<rect
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4383"
width="48"
height="48"
x="307.36221"
y="-343"
inkscape:export-filename="icon_conn_48.png" />
<rect
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
y="-341"
x="331.36218"
height="44.000008"
width="2"
id="rect4385"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:export-filename="icon_conn_48.png" />
<rect
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4390"
width="32"
height="32"
x="307.36221"
y="-387"
inkscape:export-filename="icon_conn_32.png" />
<rect
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
y="-385"
x="323.36221"
height="28.999992"
width="1"
id="rect4392"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:export-filename="icon_conn_32.png" />
<rect
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4396"
width="24"
height="24"
x="307.36221"
y="-429"
inkscape:export-filename="icon_conn_24.png" />
<rect
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
y="-427"
x="319.36218"
height="21"
width="1"
id="rect4398"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:export-filename="icon_conn_24.png" />
<rect
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4402"
width="16"
height="16"
x="307.36221"
y="-461"
inkscape:export-filename="icon_conn_16.png" />
<rect
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
y="-459"
x="315.36218"
height="12.999993"
width="1"
id="rect4404"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5a5a5a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:export-filename="icon_conn_16.png" />
<path
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
d="m 327.99999,332.36218 a 8.9999943,8.9999895 0 0 1 -8.9972,8.99999 8.9999943,8.9999895 0 0 1 -9.00278,-8.99441 8.9999943,8.9999895 0 0 1 8.99163,-9.00556 8.9999943,8.9999895 0 0 1 9.00835,8.98884"
sodipodi:end="6.2819467"
sodipodi:start="0"
sodipodi:ry="8.9999895"
sodipodi:rx="8.9999943"
sodipodi:cy="332.36218"
sodipodi:cx="319"
sodipodi:type="arc"
id="path4408"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#5a5a5a;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
sodipodi:open="true"
inkscape:export-filename="icon_conn_48.png" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#5a5a5a;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="path5635-8-3"
sodipodi:type="arc"
sodipodi:cx="370.5"
sodipodi:cy="323.86221"
sodipodi:rx="5.9999957"
sodipodi:ry="5.9999938"
sodipodi:start="0"
sodipodi:end="6.2829036"
d="m 376.5,323.86221 a 5.9999957,5.9999938 0 0 1 -5.99958,6 5.9999957,5.9999938 0 0 1 -6.00042,-5.99915 5.9999957,5.9999938 0 0 1 5.99873,-6.00084 5.9999957,5.9999938 0 0 1 6.00127,5.9983"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
sodipodi:open="true"
inkscape:export-filename="icon_conn_32.png" />
<path
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="icon_conn_24.png"
d="m 420.5,319.86221 a 3.9999979,3.9999967 0 0 1 -3.99887,4 3.9999979,3.9999967 0 0 1 -4.00113,-3.99774 3.9999979,3.9999967 0 0 1 3.99662,-4.00225 3.9999979,3.9999967 0 0 1 4.00338,3.99548"
sodipodi:open="true"
sodipodi:end="6.2820578"
sodipodi:start="0"
sodipodi:ry="3.9999967"
sodipodi:rx="3.9999979"
sodipodi:cy="319.86221"
sodipodi:cx="416.5"
sodipodi:type="arc"
id="path4425"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#5a5a5a;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
d="m 455.5,315.86221 a 2.9999986,2.999999 0 0 1 -2.99744,3 2.9999986,2.999999 0 0 1 -3.00255,-2.99487 2.9999986,2.999999 0 0 1 2.9923,-3.00512 2.9999986,2.999999 0 0 1 3.00767,2.98974"
sodipodi:open="true"
sodipodi:end="6.2797665"
sodipodi:start="0"
sodipodi:ry="2.999999"
sodipodi:rx="2.9999986"
sodipodi:cy="315.86221"
sodipodi:cx="452.5"
sodipodi:type="arc"
id="path4427"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#5a5a5a;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:export-filename="icon_conn_16.png" />
<text
sodipodi:linespacing="125%"
id="text4429"
y="367.19971"
x="544.84998"
style="font-style:normal;font-variant:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Book';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:5px"
y="367.19971"
x="544.84998"
id="tspan4431"
sodipodi:role="line">icon_conn_light_48.png</tspan></text>
<text
sodipodi:linespacing="125%"
id="text4433"
y="356.12219"
x="609.685"
style="font-style:normal;font-variant:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Book';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:5px"
y="356.12219"
x="609.685"
id="tspan4435"
sodipodi:role="line">icon_conn_light_32.png</tspan></text>
<text
sodipodi:linespacing="125%"
id="text4437"
y="346.12219"
x="651.88165"
style="font-style:normal;font-variant:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Book';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:5px"
y="346.12219"
x="651.88165"
id="tspan4439"
sodipodi:role="line">icon_conn_light_24.png</tspan></text>
<text
sodipodi:linespacing="125%"
id="text4441"
y="336.12219"
x="696.88165"
style="font-style:normal;font-variant:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:'URW Gothic L';-inkscape-font-specification:'URW Gothic L Book';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:5px"
y="336.12219"
x="696.88165"
id="tspan4443"
sodipodi:role="line">icon_conn_light_16.png</tspan></text>
<rect
y="-593"
x="307.36221"
height="48"
width="48"
id="rect4445"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-filename="icon_conn_light_48.png" />
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4447"
width="2"
height="44.000008"
x="331.36218"
y="-591"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-filename="icon_conn_light_48.png" />
<rect
y="-637"
x="307.36221"
height="32"
width="32"
id="rect4449"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-filename="icon_conn_light_32.png" />
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4451"
width="1"
height="28.999992"
x="323.36221"
y="-635"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-filename="icon_conn_light_32.png" />
<rect
inkscape:export-filename="icon_conn_light_24.png"
y="-679"
x="307.36221"
height="24"
width="24"
id="rect4453"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
transform="matrix(0,1,-1,0,0,0)" />
<rect
inkscape:export-filename="icon_conn_light_24.png"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4455"
width="1"
height="21"
x="319.36218"
y="-677"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
transform="matrix(0,1,-1,0,0,0)" />
<rect
y="-711"
x="307.36221"
height="16"
width="16"
id="rect4457"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-filename="icon_conn_light_16.png" />
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4459"
width="1"
height="12.999993"
x="315.36218"
y="-709"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
transform="matrix(0,1,-1,0,0,0)"
inkscape:export-filename="icon_conn_light_16.png" />
<path
sodipodi:open="true"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#f0f0f0;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="path4461"
sodipodi:type="arc"
sodipodi:cx="569"
sodipodi:cy="332.36218"
sodipodi:rx="8.9999943"
sodipodi:ry="8.9999895"
sodipodi:start="0"
sodipodi:end="6.2819467"
d="m 577.99999,332.36218 a 8.9999943,8.9999895 0 0 1 -8.9972,8.99999 8.9999943,8.9999895 0 0 1 -9.00278,-8.99441 8.9999943,8.9999895 0 0 1 8.99163,-9.00556 8.9999943,8.9999895 0 0 1 9.00835,8.98884"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
inkscape:export-filename="icon_conn_light_48.png" />
<path
sodipodi:open="true"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
d="m 626.5,323.86221 a 5.9999957,5.9999938 0 0 1 -5.99958,6 5.9999957,5.9999938 0 0 1 -6.00042,-5.99915 5.9999957,5.9999938 0 0 1 5.99873,-6.00084 5.9999957,5.9999938 0 0 1 6.00127,5.9983"
sodipodi:end="6.2829036"
sodipodi:start="0"
sodipodi:ry="5.9999938"
sodipodi:rx="5.9999957"
sodipodi:cy="323.86221"
sodipodi:cx="620.5"
sodipodi:type="arc"
id="path4463"
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#f0f0f0;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
inkscape:export-filename="icon_conn_light_32.png" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#f0f0f0;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="path4465"
sodipodi:type="arc"
sodipodi:cx="666.5"
sodipodi:cy="319.86221"
sodipodi:rx="3.9999979"
sodipodi:ry="3.9999967"
sodipodi:start="0"
sodipodi:end="6.2820578"
sodipodi:open="true"
d="m 670.5,319.86221 a 3.9999979,3.9999967 0 0 1 -3.99887,4 3.9999979,3.9999967 0 0 1 -4.00113,-3.99774 3.9999979,3.9999967 0 0 1 3.99662,-4.00225 3.9999979,3.9999967 0 0 1 4.00338,3.99548"
inkscape:export-filename="icon_conn_light_24.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#f0f0f0;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="path4467"
sodipodi:type="arc"
sodipodi:cx="702.5"
sodipodi:cy="315.86221"
sodipodi:rx="2.9999986"
sodipodi:ry="2.999999"
sodipodi:start="0"
sodipodi:end="6.2797665"
sodipodi:open="true"
d="m 705.5,315.86221 a 2.9999986,2.999999 0 0 1 -2.99744,3 2.9999986,2.999999 0 0 1 -3.00255,-2.99487 2.9999986,2.999999 0 0 1 2.9923,-3.00512 2.9999986,2.999999 0 0 1 3.00767,2.98974"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
inkscape:export-filename="icon_conn_light_16.png" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 170 KiB

View File

@ -114,7 +114,7 @@ NetColorizer::configure (const QColor &marker_color, const lay::ColorPalette *au
bool
NetColorizer::has_color_for_net (const db::Net *net)
{
return m_auto_colors_enabled || m_custom_color.find (net) != m_custom_color.end ();
return net != 0 && (m_auto_colors_enabled || m_custom_color.find (net) != m_custom_color.end ());
}
void
@ -1024,6 +1024,26 @@ static QIcon light_icon_for_net ()
return icon;
}
static QIcon icon_for_connection ()
{
QIcon icon;
icon.addPixmap (QPixmap (QString::fromUtf8 (":/images/icon_conn_48.png")));
icon.addPixmap (QPixmap (QString::fromUtf8 (":/images/icon_conn_32.png")));
icon.addPixmap (QPixmap (QString::fromUtf8 (":/images/icon_conn_24.png")));
icon.addPixmap (QPixmap (QString::fromUtf8 (":/images/icon_conn_16.png")));
return icon;
}
static QIcon light_icon_for_connection ()
{
QIcon icon;
icon.addPixmap (QPixmap (QString::fromUtf8 (":/images/icon_conn_light_48.png")));
icon.addPixmap (QPixmap (QString::fromUtf8 (":/images/icon_conn_light_32.png")));
icon.addPixmap (QPixmap (QString::fromUtf8 (":/images/icon_conn_light_24.png")));
icon.addPixmap (QPixmap (QString::fromUtf8 (":/images/icon_conn_light_16.png")));
return icon;
}
static QIcon icon_for_pin ()
{
QIcon icon;
@ -1067,14 +1087,13 @@ static QIcon icon_for_circuit ()
return icon;
}
static QIcon net_icon_with_color (const QColor &color)
static QIcon colored_icon (const QColor &color, const QIcon &original_icon)
{
if (! color.isValid ()) {
return icon_for_net ();
}
QIcon colored_icon;
QIcon original_icon = light_icon_for_net ();
QList<QSize> sizes = original_icon.availableSizes ();
for (QList<QSize>::const_iterator i = sizes.begin (); i != sizes.end (); ++i) {
@ -1087,8 +1106,10 @@ static QIcon net_icon_with_color (const QColor &color)
for (int x = 0; x < i->width (); ++x) {
for (int y = 0; y < i->height (); ++y) {
QRgb pixel = image.pixel (x, y);
pixel = (pixel & ~RGB_MASK) | (color.rgb () & RGB_MASK);
image.setPixel (x, y, pixel);
if (pixel != 0xffffffff) {
pixel = (pixel & ~RGB_MASK) | (color.rgb () & RGB_MASK);
image.setPixel (x, y, pixel);
}
}
}
@ -1100,6 +1121,16 @@ static QIcon net_icon_with_color (const QColor &color)
return colored_icon;
}
static QIcon net_icon_with_color (const QColor &color)
{
return colored_icon (color, light_icon_for_net ());
}
static QIcon connection_icon_with_color (const QColor &color)
{
return colored_icon (color, light_icon_for_connection ());
}
QIcon
NetlistBrowserModel::icon_for_net (const db::Net *net) const
{
@ -1120,20 +1151,40 @@ NetlistBrowserModel::icon_for_net (const db::Net *net) const
}
}
QIcon
NetlistBrowserModel::icon_for_connection (const db::Net *net) const
{
if (mp_colorizer && mp_colorizer->has_color_for_net (net)) {
QColor color = mp_colorizer->color_of_net (net);
lay::color_t rgb = lay::color_t (color.rgb ());
std::map<lay::color_t, QIcon>::const_iterator c = m_connection_icon_per_color.find (rgb);
if (c == m_connection_icon_per_color.end ()) {
c = m_connection_icon_per_color.insert (std::make_pair (rgb, connection_icon_with_color (color))).first;
}
return c->second;
} else {
return lay::icon_for_connection ();
}
}
QIcon
NetlistBrowserModel::icon (const QModelIndex &index) const
{
void *id = index.internalPointer ();
const db::Net *net = net_from_index (index);
if (net) {
return icon_for_net (net);
}
if (is_id_circuit (id)) {
return icon_for_circuit ();
} else if (is_id_circuit_pin (id)) {
return icon_for_pin ();
} else if (is_id_circuit_net (id)) {
const db::Net *net = net_from_index (index);
return icon_for_net (net);
} else if (is_id_circuit_device (id)) {
const db::Device *device = device_from_id (id);
@ -1141,6 +1192,11 @@ NetlistBrowserModel::icon (const QModelIndex &index) const
return icon_for_device (device->device_class ());
}
} else if (is_id_circuit_net_device_terminal_others (id) || is_id_circuit_net_subcircuit_pin_others (id)) {
const db::Net *net = net_from_index (index);
return icon_for_connection (net);
} else if (is_id_circuit_subcircuit (id)) {
return icon_for_circuit ();
} else if (is_id_circuit_net_pin (id) || is_id_circuit_net_subcircuit_pin_others (id)) {

View File

@ -194,6 +194,7 @@ private:
}
QIcon icon_for_net (const db::Net *net) const;
QIcon icon_for_connection (const db::Net *net) const;
db::LayoutToNetlist *mp_l2ndb;
NetColorizer *mp_colorizer;
@ -210,6 +211,7 @@ private:
mutable std::map<const db::Pin *, size_t> m_pin_index_by_object;
mutable std::map<const db::SubCircuit *, size_t> m_subcircuit_index_by_object;
mutable std::map<lay::color_t, QIcon> m_net_icon_per_color;
mutable std::map<lay::color_t, QIcon> m_connection_icon_per_color;
};
/**

View File

@ -28,5 +28,13 @@
<file>images/icon_net_light_24.png</file>
<file>images/icon_net_light_32.png</file>
<file>images/icon_net_light_48.png</file>
<file>images/icon_conn_16.png</file>
<file>images/icon_conn_24.png</file>
<file>images/icon_conn_32.png</file>
<file>images/icon_conn_48.png</file>
<file>images/icon_conn_light_16.png</file>
<file>images/icon_conn_light_24.png</file>
<file>images/icon_conn_light_32.png</file>
<file>images/icon_conn_light_48.png</file>
</qresource>
</RCC>