From b5eb8777c5f54025235a3ff19af4e212909167ff Mon Sep 17 00:00:00 2001 From: Stefan Frederik Date: Tue, 15 Feb 2022 17:59:45 +0100 Subject: [PATCH] check for incomplete/missing/wrong attributes when drawing images --- src/editprop.c | 6 ++++-- xschem_library/examples/classD_amp.sch | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/editprop.c b/src/editprop.c index 8730b446..4593a8ce 100644 --- a/src/editprop.c +++ b/src/editprop.c @@ -563,8 +563,10 @@ static void edit_rect_property(int x) bbox(START,0.0,0.0,0.0,0.0); drw = 1; } - draw_image(0, &xctx->rect[c][n], - &xctx->rect[c][n].x1, &xctx->rect[c][n].y1, &xctx->rect[c][n].x2, &xctx->rect[c][n].y2, 0, 0); + if( xctx->rect[c][n].flags & 1024) { + draw_image(0, &xctx->rect[c][n], &xctx->rect[c][n].x1, &xctx->rect[c][n].y1, + &xctx->rect[c][n].x2, &xctx->rect[c][n].y2, 0, 0); + } bbox(ADD, xctx->rect[c][n].x1, xctx->rect[c][n].y1, xctx->rect[c][n].x2, xctx->rect[c][n].y2); } } diff --git a/xschem_library/examples/classD_amp.sch b/xschem_library/examples/classD_amp.sch index 8ea2d69a..95cd3d51 100644 --- a/xschem_library/examples/classD_amp.sch +++ b/xschem_library/examples/classD_amp.sch @@ -63,8 +63,8 @@ ypos2=36.4765 divy=5 subdivy=1 unity=1 -x1=0.00124125 -x2=0.00150969 +x1=0.00125174 +x2=0.00189302 divx=5 subdivx=1 node="out @@ -82,8 +82,8 @@ ypos2=6.80536 divy=5 subdivy=1 unity=1 -x1=0.00124125 -x2=0.00150969 +x1=0.00125174 +x2=0.00189302 divx=5 subdivx=1 @@ -104,8 +104,8 @@ ypos2=14.7089 divy=5 subdivy=1 unity=1 -x1=0.00124125 -x2=0.00150969 +x1=0.00125174 +x2=0.00189302 divx=5 subdivx=1 @@ -117,6 +117,12 @@ digital=0 color="6 7" node="ref in"} +B 2 610 -650 1006 -505 {image=/home/schippes/sda7/1.png +flags=image,unscaled + +alpha=0.6 +filter="convert png:- -transparent black png:-" +image_data=iVBORw0KGgoAAAANSUhEUgAAAYwAAACRAQMAAADqyB34AAAABlBMVEUAAAD///+l2Z/dAAAE9ElEQVRYheXYXWgcRRwA8NmbdLPKcrcNPpylXtbWBAOBnOLDYVNubQsNTVHpUx9KOOODCEHyIpSeeJtLsAqCCgn1UdDTVwt9PVirDz6KPvhQlQsKRQi5goYkeObc+Z7Z7O7NtjH48YfL7tzOL7M7M//Z4QD4d0YhqPYyEstzh/6TpJydXM1OZg6FfJ2dvHsoZOUfSoz7IHqz7UGJeSgkd4Ck0RfR0SOedO7KBGYn4H5I0sDokIjVI8pN6pAj3Rf0CLQ5mbgQS6wDIIbFyVQ9mTQ6cQRYIJEoVx6MqKFP+JvAY/UGkkr4KfjVHeBVKKWkShOhR4iUmpPhZxS9f71JlbCWhoDxYXh4WJCT4cdBo+CNJxHwfngYEeRxnxF0FkZjJ5acEE/u1hhxA9IKiCVncOEyJmVOyknkXnho4sLbmNicFJNIja8ZhJickH70PEYqlQpgmUjWDAO/nVzICSSkxsjCxgYnJiG44IKAEQN3mXeVkeXmW5zYCqkxQlc/1snGkgE5KWICcfK7oMgJniPBG4xAw+CkjEnODCdXeNXmBCesxwiEy0s+IzXSYzlgBeFVEzgoBz2XTD1vgZK9XNPv9ykJKLGtcMUG5KkRwV3mXWSPbzYDYBBi+JRYuJWwyyjBZ57NyW1OIGBkGD0LzTJEagrJiVZMSqCFr4AiJ+is0RPEZ8SmxCgSYnJiK60YkJEwaSlxcF/uQE6gQnCdCEF54Bb26ERxAe68VAI+R1dKJfzUZIUJBhFU1a3kSJdhUsaPmkJQoFy0OSlqkUXaZZiYWqSGvmcERojR76/EEjJRcB0/0gpIaIVMFJf2SIQMk7SLEpRbAa4Tdkah30HlTjoRrZR1bmyRDHrijcWPC0ktVMfwdXosHH0xlNFOjh+XcI4VObG1SGFPmpZ6EwbukOTHZHHQTAbkikixwZOfEpHIiSnWixCxXCAslgtB+AqDrqN5IRYlO4lAQfBUCjhBOO7G+GqJH9eVFtjI0icRtiZTQvcNHsXxpKYQmxPc2+diSVkhZU4K6KmuxJKiQmqcHPfC45uxxJaJEXCy0JDflQoxZQIBJ1+hVq6AOAJlYnICh1GDFxXC3pVGUyJFTgiOJ+C2RMqcEHwunsxLJOAkcaeE4mlB6MYNpO3HUBwTZJyd8l1fL5bkBZnkJHlvicIUROyTp1OJMmEYSdwnqxGIU4+d7NuN/39JzO8WacRH5AktAmRyJBN579b05s9321KVgeSdP1ub62On/SykNzb+0thTWW6sP3M6bKWtgtF+fy+ZxA6Pw95gB0diwrFMQZQfVZJJUSJVPXJcInrhPJLPTJ55KDMZz05OPKoSH/3ZP3llMu8si1LJIL8dppOzMnGAh1px08lzZYk89urmVje/vb1V91PIF+6XolTYnVmbsFY/XasnC+AsfXRWlCAhn6zNJwvg+B2JlD54bW0q//utrWsp5KgfvKx+M3CYjoLgpFz2wfAgEnZrhAwMJ3InvgGsAb9rqiS/ff2z9nT11E/6pLS60hp78tlrc2kkXGH6ojSCybELl9NvTY7Sjevt9sapeuqN7Q8XKMuhJmH7s/jwsv2/USczGZJacTTJb+1fn3/94931bv3HP37QI9+3JuZeubu7PjV751u9oRhabU1cOv/LzaXJ2ZFLL+qRG63u3JnzN9e7s9/d+UaLAED31DXd6ig60t+/J/4C5RW7SnWot40AAAAASUVORK5CYII=} T {PWM Modulator} 470 -480 0 0 0.6 0.6 {} T {Driver} 230 -930 0 0 0.6 0.6 {} T {LP