remove spaces on line ends, brace expr tcl expression when possible, resize rectangle in intuitive interface made easier at far zoom levels
This commit is contained in:
parent
688f5fd128
commit
7d8ce2f9ad
|
|
@ -1929,7 +1929,7 @@ static int edit_rect_point(int state)
|
||||||
rect_c = xctx->sel_array[0].col;
|
rect_c = xctx->sel_array[0].col;
|
||||||
/* rectangle point: Check is user is clicking a control point of a rectangle */
|
/* rectangle point: Check is user is clicking a control point of a rectangle */
|
||||||
if(rect_n >= 0) {
|
if(rect_n >= 0) {
|
||||||
double ds = xctx->cadhalfdotsize * 2;
|
double ds = xctx->cadhalfdotsize * 2 * xctx->zoom;
|
||||||
xRect *p = &xctx->rect[rect_c][rect_n];
|
xRect *p = &xctx->rect[rect_c][rect_n];
|
||||||
|
|
||||||
xctx->need_reb_sel_arr=1;
|
xctx->need_reb_sel_arr=1;
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,8 @@
|
||||||
### INUTILE integration (spice stimuli generator from a higher level description language)
|
### INUTILE integration (spice stimuli generator from a higher level description language)
|
||||||
proc inutile_line {txtlabel} {
|
proc inutile_line {txtlabel} {
|
||||||
toplevel .inutile_line -class Dialog
|
toplevel .inutile_line -class Dialog
|
||||||
set X [expr [winfo pointerx .inutile_line] - 60]
|
set X [expr {[winfo pointerx .inutile_line] - 60}]
|
||||||
set Y [expr [winfo pointery .inutile_line] - 35]
|
set Y [expr {[winfo pointery .inutile_line] - 35}]
|
||||||
wm geometry .inutile_line "+$X+$Y"
|
wm geometry .inutile_line "+$X+$Y"
|
||||||
wm transient .inutile_line [xschem get topwindow]
|
wm transient .inutile_line [xschem get topwindow]
|
||||||
label .inutile_line.l1 -text $txtlabel
|
label .inutile_line.l1 -text $txtlabel
|
||||||
|
|
@ -8352,7 +8352,7 @@ proc balloon_show {w arg pos} {
|
||||||
set wmx [winfo rootx $w]
|
set wmx [winfo rootx $w]
|
||||||
set wmy [expr {[winfo rooty $w]+[winfo height $w]}]
|
set wmy [expr {[winfo rooty $w]+[winfo height $w]}]
|
||||||
} else {
|
} else {
|
||||||
set wmx [expr [winfo pointerx $w] + 20]
|
set wmx [expr {[winfo pointerx $w] + 20}]
|
||||||
set wmy [winfo pointery $w]
|
set wmy [winfo pointery $w]
|
||||||
}
|
}
|
||||||
wm geometry $top [winfo reqwidth $top.txt]x[winfo reqheight $top.txt]+$wmx+$wmy
|
wm geometry $top [winfo reqwidth $top.txt]x[winfo reqheight $top.txt]+$wmx+$wmy
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,8 @@ E {}
|
||||||
L 3 860 -680 910 -660 {}
|
L 3 860 -680 910 -660 {}
|
||||||
L 3 830 -800 1150 -800 {}
|
L 3 830 -800 1150 -800 {}
|
||||||
L 3 1190 -800 1510 -800 {}
|
L 3 1190 -800 1510 -800 {}
|
||||||
L 8 850 -660 900 -680 {}
|
L 8 850 -660 900 -680 {bus=8}
|
||||||
L 11 850 -670 900 -650 {dash=4}
|
L 11 850 -670 900 -650 {dash=4 bus=3}
|
||||||
L 16 860 -650 910 -670 {}
|
L 16 860 -650 910 -670 {}
|
||||||
B 2 1200 -780 1489 -574 {flags=image
|
B 2 1200 -780 1489 -574 {flags=image
|
||||||
alpha=0.9
|
alpha=0.9
|
||||||
|
|
@ -60,13 +60,13 @@ B 4 890 -630 910 -570 {}
|
||||||
B 6 810 -630 830 -570 {ellipse=0,360}
|
B 6 810 -630 830 -570 {ellipse=0,360}
|
||||||
B 7 850 -610 920 -590 {dash=4}
|
B 7 850 -610 920 -590 {dash=4}
|
||||||
B 7 850 -580 920 -560 {dash=4 fill=full}
|
B 7 850 -580 920 -560 {dash=4 fill=full}
|
||||||
B 8 860 -630 880 -570 {}
|
B 8 860 -630 880 -570 {bus=6}
|
||||||
A 4 875 -215 35.35533905932738 8.13010235415598 360 {}
|
A 4 875 -215 35.35533905932738 8.13010235415598 360 {}
|
||||||
A 6 940 -270 70.71067811865476 188.130102354156 89.99999999999997 {}
|
A 6 940 -270 70.71067811865476 188.130102354156 89.99999999999997 {}
|
||||||
A 7 884.1666666666666 -210 39.58991173406564 210.3432488842396 198.9246444160511 {}
|
A 7 884.1666666666666 -210 39.58991173406564 210.3432488842396 198.9246444160511 {bus=4}
|
||||||
P 1 10 880 -480 870 -540 950 -520 910 -500 940 -470 920 -470 910 -450 890 -490 880 -470 880 -480 {dash=3}
|
P 1 10 880 -480 870 -540 950 -520 910 -500 940 -470 920 -470 910 -450 890 -490 880 -470 880 -480 {dash=3}
|
||||||
P 4 6 830 -460 830 -550 820 -500 780 -560 770 -520 810 -480 {bezier=1}
|
P 4 6 830 -460 830 -550 820 -500 780 -560 770 -520 810 -480 {bezier=1}
|
||||||
P 15 11 870 -510 880 -550 900 -520 910 -540 920 -510 940 -520 920 -480 890 -490 860 -470 840 -520 870 -510 {fill=true}
|
P 15 11 870 -510 880 -550 900 -520 910 -540 920 -510 940 -520 920 -480 890 -490 860 -470 840 -520 870 -510 {fill=true bus=5}
|
||||||
T {Welcome to XSCHEM!} 90 -1180 0 0 1 1 {layer=5}
|
T {Welcome to XSCHEM!} 90 -1180 0 0 1 1 {layer=5}
|
||||||
T {This is a test schematic window
|
T {This is a test schematic window
|
||||||
|
|
||||||
|
|
@ -84,7 +84,7 @@ T {XSCHEM OBJECTS} 860 -840 0 0 0.6 0.6 {layer=7}
|
||||||
T {Components} 960 -330 0 0 0.6 0.6 {layer=4}
|
T {Components} 960 -330 0 0 0.6 0.6 {layer=4}
|
||||||
T {TEXT} 840 -740 0 0 0.5 0.5 {layer=8}
|
T {TEXT} 840 -740 0 0 0.5 0.5 {layer=8}
|
||||||
T {TEXT} 840 -790 1 0 0.7 0.7 {layer=6 font=Monospace}
|
T {TEXT} 840 -790 1 0 0.7 0.7 {layer=6 font=Monospace}
|
||||||
T {Text} 850 -780 0 0 0.5 0.5 {layer=7 font="serif"}
|
T {Text} 850 -780 0 0 0.5 0.5 {layer=7 font="serif" slant=oblique}
|
||||||
T {TEXT} 940 -780 1 0 0.5 0.5 {weight=bold}
|
T {TEXT} 940 -780 1 0 0.5 0.5 {weight=bold}
|
||||||
T {Text} 960 -770 0 0 0.6 0.6 {layer=4}
|
T {Text} 960 -770 0 0 0.6 0.6 {layer=4}
|
||||||
T {Arcs/Circles} 960 -240 0 0 0.6 0.6 {layer=4}
|
T {Arcs/Circles} 960 -240 0 0 0.6 0.6 {layer=4}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue