diff --git a/examples/ex15.gv b/examples/ex15.gv index 402948e..09e6848 100644 --- a/examples/ex15.gv +++ b/examples/ex15.gv @@ -5,10 +5,10 @@ graph { node [fillcolor="#FFFFFF" fontname=arial height=0 margin=0 shape=none style=filled width=0] edge [fontname=arial style=bold] edge [color="#FF66CC" headclip=false style="solid,bold" tailclip=false] - X1:p1j:c -- X1:p5j:c [addPTS=.18 colorPTS="#FF66CC" straight=straight] - X1:p5j:c -- X1:p7j:c [addPTS=.18 colorPTS="#FF66CC" straight=straight] + X1:p1j:c -- X1:p5j:c [addPTS=.18 straight=straight] + X1:p5j:c -- X1:p7j:c [addPTS=.18 straight=straight] edge [color="#FF0000" headclip=false style="solid,bold" tailclip=false] - X1:p2j:c -- X1:p6j:c [addPTS=.18 colorPTS="#FF0000" straight=straight] + X1:p2j:c -- X1:p6j:c [addPTS=.18 straight=straight] edge [headclip=true style=bold tailclip=true] X1 [label=< @@ -94,10 +94,10 @@ graph {
> fillcolor="#FFFFFF" shape=box style=filled] edge [color="#000000" headclip=false style="solid,bold" tailclip=false] - X2:p1j:c -- X2:p5j:c [addPTS=.18 colorPTS="#000000" straight=straight] - X2:p5j:c -- X2:p7j:c [addPTS=.18 colorPTS="#000000" straight=straight] + X2:p1j:c -- X2:p5j:c [addPTS=.18 straight=straight] + X2:p5j:c -- X2:p7j:c [addPTS=.18 straight=straight] edge [color="#000000" headclip=false style="solid,bold" tailclip=false] - X2:p2j:c -- X2:p6j:c [addPTS=.18 colorPTS="#000000" straight=straight] + X2:p2j:c -- X2:p6j:c [addPTS=.18 straight=straight] edge [headclip=true style=bold tailclip=true] X2 [label=< diff --git a/examples/ex15.html b/examples/ex15.html index 00c976c..06cd991 100644 --- a/examples/ex15.html +++ b/examples/ex15.html @@ -323,66 +323,6 @@ X2:c--X2:c - - -__CIRCLE__1 - - - - -__CIRCLE__2 - - - - -__CIRCLE__3 - - - - -__CIRCLE__4 - - - - -__CIRCLE__5 - - - - -__CIRCLE__6 - - - - -__CIRCLE__7 - - - - -__CIRCLE__8 - - - - -__CIRCLE__9 - - - - -__CIRCLE__10 - - - - -__CIRCLE__11 - - - - -__CIRCLE__12 - - diff --git a/examples/ex15.png b/examples/ex15.png index 9ec5ee9..e09849f 100644 Binary files a/examples/ex15.png and b/examples/ex15.png differ diff --git a/examples/ex15.svg b/examples/ex15.svg index 6b18f9f..96a063f 100644 --- a/examples/ex15.svg +++ b/examples/ex15.svg @@ -294,65 +294,5 @@ X2:c--X2:c - - -__CIRCLE__1 - - - - -__CIRCLE__2 - - - - -__CIRCLE__3 - - - - -__CIRCLE__4 - - - - -__CIRCLE__5 - - - - -__CIRCLE__6 - - - - -__CIRCLE__7 - - - - -__CIRCLE__8 - - - - -__CIRCLE__9 - - - - -__CIRCLE__10 - - - - -__CIRCLE__11 - - - - -__CIRCLE__12 - - diff --git a/src/wireviz/Harness.py b/src/wireviz/Harness.py index 5c77cbc..583599e 100644 --- a/src/wireviz/Harness.py +++ b/src/wireviz/Harness.py @@ -281,24 +281,7 @@ class Harness: if shortComp != None and shortComp.color != None: shColor = shortComp.color - if pinindex+1 in shortPins: - # path = os.getcwd().replace('\\', '/') - # blackCircle = Image(src=f"{path}/images/circle_5mm_96dpi.png") # , width = 5, height = 5, fixedsize = True circle_5mm_96dpi.png - - # from cairosvg import svg2png - - # svg_code = """ - # - # - # - # - # - # """ - - # svg2png(bytestring=svg_code,write_to= f'{path}/output.png') - - # pinhtml.append(f' ') - + if pinindex+1 in shortPins: pinhtml.append(f' ') # pinhtml.append(f' ') @@ -333,8 +316,8 @@ class Harness: f"{connector.name}:p{shortPins[i - 1]}j:c", f"{connector.name}:p{shortPins[i]}j:c", straight="straight", - addPTS=".18", - colorPTS=str(wv_colors.translate_color(shColor, "HEX")), + addPTS=".18", # Size of the point at the end of the straight line/edge, it also enables the drawing of it + colorPTS=str(wv_colors.translate_color(shColor, "HEX")), # the color of the point at the end of the line, it is requered that the circle is drawin ) dot.attr("edge", headclip="true", tailclip="true", style="bold") diff --git a/src/wireviz/images/circle_5mm.svg b/src/wireviz/images/circle_5mm.svg deleted file mode 100644 index 84abaa5..0000000 --- a/src/wireviz/images/circle_5mm.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - diff --git a/src/wireviz/images/circle_5mm_96dpi.png b/src/wireviz/images/circle_5mm_96dpi.png deleted file mode 100644 index cf8305e..0000000 Binary files a/src/wireviz/images/circle_5mm_96dpi.png and /dev/null differ diff --git a/src/wireviz/pin2pin.gvpr b/src/wireviz/pin2pin.gvpr index f42d511..4c4e287 100644 --- a/src/wireviz/pin2pin.gvpr +++ b/src/wireviz/pin2pin.gvpr @@ -35,7 +35,7 @@ E[straight] { $.label=""; // remove pesky label $.lp=""; // remove peskier label pos - if (hasAttr($, "addPTS") && $.addPTS!=""){ + if (hasAttr($, "addPTS") && $.addPTS!="" && $.colorPTS!=""){ // now we place point nodes at the edge ends pt[1] = tok[0]; pt[2] = tok[cnt-1];
{html_image(blackCircle).replace("", "")}⬤