luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better image bbox calculation for svg and ps

This commit is contained in:
stefan schippers 2023-01-20 13:25:23 +01:00
parent 90bc0fa572
commit c8a60b4ee4
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/draw.c
View File

@ -3299,8 +3299,8 @@ void svg_embedded_graph(FILE *fd, xRect *r, double rx1, double ry1, double rx2,
rwi = (int) (rw * scale + 1.0); rwi = (int) (rw * scale + 1.0);
rhi = (int) (rh * scale + 1.0); rhi = (int) (rh * scale + 1.0);
save_restore_zoom(1); save_restore_zoom(1);
set_viewport_size(rwi, rhi, 1.0); set_viewport_size(rwi, rhi, xctx->lw);
zoom_box(rx1, ry1, rx2, ry2, 1.0); zoom_box(rx1 - xctx->lw, ry1 - xctx->lw, rx2 + xctx->lw, ry2 + xctx->lw, 1.0);
resetwin(1, 1, 1, rwi, rhi); resetwin(1, 1, 1, rwi, rhi);
save_draw_grid = tclgetboolvar("draw_grid"); save_draw_grid = tclgetboolvar("draw_grid");
tclsetvar("draw_grid", "0"); tclsetvar("draw_grid", "0");

4
src/psprint.c
View File

@ -288,8 +288,8 @@ void ps_embedded_graph(xRect* r, double rx1, double ry1, double rx2, double ry2)
rwi = (int)(rw * scale + 1.0); rwi = (int)(rw * scale + 1.0);
rhi = (int)(rh * scale + 1.0); rhi = (int)(rh * scale + 1.0);
save_restore_zoom(1); save_restore_zoom(1);
set_viewport_size(rwi, rhi, 1.0); set_viewport_size(rwi, rhi, xctx->lw);
zoom_box(rx1-2, ry1-2, rx2+2, ry2+2, 1.0); zoom_box(rx1 - xctx->lw, ry1 - xctx->lw, rx2 + xctx->lw, ry2 + xctx->lw, 1.0);
resetwin(1, 1, 1, rwi, rhi); resetwin(1, 1, 1, rwi, rhi);
save_draw_grid = tclgetboolvar("draw_grid"); save_draw_grid = tclgetboolvar("draw_grid");
tclsetvar("draw_grid", "0"); tclsetvar("draw_grid", "0");

15
xschem_library/ngspice/solar_panel.sch
View File

@ -64,7 +64,8 @@ x2=0.001
divx=8 divx=8
node="panel node="panel
led" unitx=m led" unitx=m
color="7 4"} color="7 4"
jpeg_quality=20}
B 2 1260 -390 1680 -220 {flags=graph B 2 1260 -390 1680 -220 {flags=graph
y1 = 0 y1 = 0
y2 = 6.7 y2 = 6.7
@ -77,7 +78,8 @@ divx=8
color="7 4 6" color="7 4 6"
node="i(vpanel) node="i(vpanel)
i(vled) i(vled)
\\"R.Avg. I(vpanel); i(vpanel) 20u ravg()\\""} \\"R.Avg. I(vpanel); i(vpanel) 20u ravg()\\""
jpeg_quality=20}
B 2 1260 -750 1680 -560 {flags=graph B 2 1260 -750 1680 -560 {flags=graph
y1 = -8.9e-05 y1 = -8.9e-05
y2 = 100 y2 = 100
@ -93,7 +95,8 @@ node="\\"Panel power; i(vpanel) v(panel) *\\"
\\"Led power; i(vled) v(led) *\\" \\"Led power; i(vled) v(led) *\\"
\\"Avg.Pan. Pwr; i(vpanel) v(panel) * 20u ravg()\\" \\"Avg.Pan. Pwr; i(vpanel) v(panel) * 20u ravg()\\"
\\"SUN %; sun 100 *\\"" \\"SUN %; sun 100 *\\""
hilight_wave=-1} hilight_wave=-1
jpeg_quality=20}
B 2 1260 -940 1680 -750 {flags=graph B 2 1260 -940 1680 -750 {flags=graph
y1 = 0 y1 = 0
y2 = 1 y2 = 1
@ -110,7 +113,8 @@ level"
hilight_wave=-1 hilight_wave=-1
digital=0 digital=0
ypos1=0.00261891 ypos1=0.00261891
ypos2=0.51596} ypos2=0.51596
jpeg_quality=20}
B 2 1260 -1140 1680 -950 {flags=graph B 2 1260 -1140 1680 -950 {flags=graph
y1 = 0 y1 = 0
y2 = 1 y2 = 1
@ -128,7 +132,8 @@ digital=0
ypos1=0.00261891 ypos1=0.00261891
ypos2=0.51596 ypos2=0.51596
color=8 color=8
node="\\"CTRL1 Duty cycle; ctrl1 20u ravg()\\""} node="\\"CTRL1 Duty cycle; ctrl1 20u ravg()\\""
jpeg_quality=20}
B 18 85 -840 340 -655 {} B 18 85 -840 340 -655 {}
A 5 340 -840 5.590169943749475 243.434948822922 360 {fill=true} A 5 340 -840 5.590169943749475 243.434948822922 360 {fill=true}
P 7 6 415 -655 360 -811.25 355 -825 342.5 -840 330 -845 85 -855 {} P 7 6 415 -655 360 -811.25 355 -825 342.5 -840 330 -845 85 -855 {}