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

Merge branch 'StefanSchippers:master' into master

This commit is contained in:
Chayan Deb 2025-03-16 08:11:29 +00:00 committed by GitHub
parent 05b673cb2e a0a5d9876f
commit 20bdd67a08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 66 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/callback.c
View File

@ -166,7 +166,7 @@ void abort_operation(void)
return; return;
} }
xctx->last_command=0; xctx->last_command=0;
xctx->manhattan_lines = 0; /* xctx->manhattan_lines = 0; */
if(xctx->ui_state & STARTMOVE) if(xctx->ui_state & STARTMOVE)
{ {
move_objects(ABORT,0,0,0); move_objects(ABORT,0,0,0);
@ -226,7 +226,7 @@ void start_line(double mx, double my)
if(xctx->constr_mv == 1) my = xctx->my_double_save; if(xctx->constr_mv == 1) my = xctx->my_double_save;
if(xctx->constr_mv == 2) mx = xctx->mx_double_save; if(xctx->constr_mv == 2) mx = xctx->mx_double_save;
} else { } else {
xctx->manhattan_lines = 0; /* xctx->manhattan_lines = 0; */
xctx->mx_double_save=mx; xctx->mx_double_save=mx;
xctx->my_double_save=my; xctx->my_double_save=my;
} }
@ -253,6 +253,7 @@ void start_wire(double mx, double my)
if(xctx->constr_mv == 1) my = xctx->my_double_save; if(xctx->constr_mv == 1) my = xctx->my_double_save;
if(xctx->constr_mv == 2) mx = xctx->mx_double_save; if(xctx->constr_mv == 2) mx = xctx->mx_double_save;
} else { } else {
/* xctx->manhattan_lines = 1; */
xctx->mx_double_save=mx; xctx->mx_double_save=mx;
xctx->my_double_save=my; xctx->my_double_save=my;
} }
@ -1672,7 +1673,7 @@ static void snapped_wire(double c_snap)
find_closest_net_or_symbol_pin(xctx->mousex, xctx->mousey, &x, &y); find_closest_net_or_symbol_pin(xctx->mousex, xctx->mousey, &x, &y);
xctx->mx_double_save = my_round(x / c_snap) * c_snap; xctx->mx_double_save = my_round(x / c_snap) * c_snap;
xctx->my_double_save = my_round(y / c_snap) * c_snap; xctx->my_double_save = my_round(y / c_snap) * c_snap;
xctx->manhattan_lines = 1; /* xctx->manhattan_lines = 1; */
new_wire(PLACE, x, y); new_wire(PLACE, x, y);
new_wire(RUBBER, xctx->mousex_snap,xctx->mousey_snap); new_wire(RUBBER, xctx->mousex_snap,xctx->mousey_snap);
} }

41
src/draw.c
View File

@ -1377,6 +1377,7 @@ void drawtempline(GC gc, int what, double linex1,double liney1,double linex2,dou
void drawtemp_manhattanline(GC gc, int what, double x1, double y1, double x2, double y2) void drawtemp_manhattanline(GC gc, int what, double x1, double y1, double x2, double y2)
{ {
double nl_xx1, nl_yy1, nl_xx2, nl_yy2;
double origin_shifted_x2, origin_shifted_y2; double origin_shifted_x2, origin_shifted_y2;
if(tclgetboolvar("orthogonal_wiring")) { if(tclgetboolvar("orthogonal_wiring")) {
/* Origin shift the cartesian coordinate p2(x2,y2) w.r.t. p1(x1,y1) */ /* Origin shift the cartesian coordinate p2(x2,y2) w.r.t. p1(x1,y1) */
@ -1389,28 +1390,28 @@ void drawtemp_manhattanline(GC gc, int what, double x1, double y1, double x2, do
xctx->manhattan_lines = 2; xctx->manhattan_lines = 2;
} }
if(xctx->manhattan_lines & 1) { if(xctx->manhattan_lines & 1) {
xctx->nl_xx1 = x1; xctx->nl_yy1 = y1; nl_xx1 = x1; nl_yy1 = y1;
xctx->nl_xx2 = x2; xctx->nl_yy2 = y2; nl_xx2 = x2; nl_yy2 = y2;
ORDER(xctx->nl_xx1,xctx->nl_yy1,xctx->nl_xx2,xctx->nl_yy1); ORDER(nl_xx1,nl_yy1,nl_xx2,nl_yy1);
drawtempline(gc, what, xctx->nl_xx1,xctx->nl_yy1,xctx->nl_xx2,xctx->nl_yy1); drawtempline(gc, what, nl_xx1,nl_yy1,nl_xx2,nl_yy1);
xctx->nl_xx1 = x1; xctx->nl_yy1 = y1; nl_xx1 = x1; nl_yy1 = y1;
xctx->nl_xx2 = x2; xctx->nl_yy2 = y2; nl_xx2 = x2; nl_yy2 = y2;
ORDER(xctx->nl_xx2,xctx->nl_yy1,xctx->nl_xx2,xctx->nl_yy2); ORDER(nl_xx2,nl_yy1,nl_xx2,nl_yy2);
drawtempline(gc, what, xctx->nl_xx2,xctx->nl_yy1,xctx->nl_xx2,xctx->nl_yy2); drawtempline(gc, what, nl_xx2,nl_yy1,nl_xx2,nl_yy2);
} else if(xctx->manhattan_lines & 2) { } else if(xctx->manhattan_lines & 2) {
xctx->nl_xx1 = x1; xctx->nl_yy1 = y1; nl_xx1 = x1; nl_yy1 = y1;
xctx->nl_xx2 = x2; xctx->nl_yy2 = y2; nl_xx2 = x2; nl_yy2 = y2;
ORDER(xctx->nl_xx1,xctx->nl_yy1,xctx->nl_xx1,xctx->nl_yy2); ORDER(nl_xx1,nl_yy1,nl_xx1,nl_yy2);
drawtempline(gc, what, xctx->nl_xx1,xctx->nl_yy1,xctx->nl_xx1,xctx->nl_yy2); drawtempline(gc, what, nl_xx1,nl_yy1,nl_xx1,nl_yy2);
xctx->nl_xx1 = x1; xctx->nl_yy1 = y1; nl_xx1 = x1; nl_yy1 = y1;
xctx->nl_xx2 = x2; xctx->nl_yy2 = y2; nl_xx2 = x2; nl_yy2 = y2;
ORDER(xctx->nl_xx1,xctx->nl_yy2,xctx->nl_xx2,xctx->nl_yy2); ORDER(nl_xx1,nl_yy2,nl_xx2,nl_yy2);
drawtempline(gc, what, xctx->nl_xx1,xctx->nl_yy2,xctx->nl_xx2,xctx->nl_yy2); drawtempline(gc, what, nl_xx1,nl_yy2,nl_xx2,nl_yy2);
} else { } else {
xctx->nl_xx1 = x1; xctx->nl_yy1 = y1; nl_xx1 = x1; nl_yy1 = y1;
xctx->nl_xx2 = x2; xctx->nl_yy2 = y2; nl_xx2 = x2; nl_yy2 = y2;
ORDER(xctx->nl_xx1,xctx->nl_yy1,xctx->nl_xx2,xctx->nl_yy2); ORDER(nl_xx1,nl_yy1,nl_xx2,nl_yy2);
drawtempline(gc, what, xctx->nl_xx1,xctx->nl_yy1,xctx->nl_xx2,xctx->nl_yy2); drawtempline(gc, what, nl_xx1,nl_yy1,nl_xx2,nl_yy2);
} }
} }

80
src/xschem.tcl
View File

@ -4835,16 +4835,9 @@ proc get_list_of_dirs_with_symbols {{paths {}} {levels -1} {ext {\.(sch|sym)$}}
##### new alternate insert_symbol browser ##### new alternate insert_symbol browser
####################################################################### #######################################################################
#### Display preview of selected symbol #### Display preview of selected symbol and start sym placement
proc insert_symbol_focusin {{paths {}} {maxdepth -1}} { proc insert_symbol_preview {} {
global insert_symbol new_symbol_browser_ext # puts "insert_symbol_preview"
xschem abort_operation
set insert_symbol(ext) $new_symbol_browser_ext
insert_symbol_filelist $paths $maxdepth
}
proc insert_symbol_preview {{paths {}}} {
# puts insert_symbol_preview
global insert_symbol global insert_symbol
xschem preview_window close .ins.center.right {} xschem preview_window close .ins.center.right {}
.ins.center.right configure -bg white .ins.center.right configure -bg white
@ -4855,22 +4848,25 @@ proc insert_symbol_preview {{paths {}}} {
set sel [.ins.center.left.l index active] set sel [.ins.center.left.l index active]
.ins.center.left.l selection set active .ins.center.left.l selection set active
} }
if {$sel ne {}} { if {$sel ne {} && [info exists insert_symbol(fullpathlist)]} {
set f [lindex $insert_symbol(fullpathlist) $sel 0] set insert_symbol(fileindex) $sel
# puts "set fileindex=$sel"
.ins.center.left.l see $sel
set f [lindex $insert_symbol(fullpathlist) $sel]
if {$f ne {}} { if {$f ne {}} {
set type [is_xschem_file $f] set type [is_xschem_file $f]
if {$type ne {0}} { if {$type ne {0}} {
set dir [rel_sym_path $f $paths] set dir [rel_sym_path $f]
.ins.top.dir_e configure -state normal .ins.top.dir_e configure -state normal
.ins.top.dir_e delete 0 end .ins.top.dir_e delete 0 end
.ins.top.dir_e insert 0 $dir .ins.top.dir_e insert 0 $dir
.ins.top.dir_e configure -state readonly .ins.top.dir_e configure -state readonly
.ins.top2.dir_e configure -state normal .ins.top2.dir_e configure -state normal
.ins.top2.dir_e delete 0 end .ins.top2.dir_e delete 0 end
.ins.top2.dir_e insert 0 $f .ins.top2.dir_e insert 0 $f
.ins.top2.dir_e configure -state readonly .ins.top2.dir_e configure -state readonly
.ins.center.right configure -bg {} .ins.center.right configure -bg {}
xschem preview_window create .ins.center.right {} xschem preview_window create .ins.center.right {}
xschem preview_window draw .ins.center.right [list $f] xschem preview_window draw .ins.center.right [list $f]
@ -4884,34 +4880,38 @@ proc insert_symbol_preview {{paths {}}} {
#### fill list of files matching pattern #### fill list of files matching pattern
proc insert_symbol_filelist {paths {maxdepth -1}} { proc insert_symbol_filelist {paths {maxdepth -1}} {
global insert_symbol new_symbol_browser_ext
set sel [.ins.center.leftdir.l curselection]
if {![info exists insert_symbol(dirs)]} {return}
if {$sel eq {}} {
set sel [.ins.center.leftdir.l index active]
.ins.center.leftdir.l selection set active
}
set insert_symbol(dirindex) $sel
# puts "set dirindex=$paths"
set paths [lindex $insert_symbol(dirs) $sel]
# puts "insert_symbol_filelist: paths=$paths" # puts "insert_symbol_filelist: paths=$paths"
global insert_symbol
set paths [.ins.center.leftdir.l curselection]
if {$paths eq {}} { return}
set paths [lindex $insert_symbol(dirs) $paths]
.ins.top2.dir_e configure -state normal .ins.top2.dir_e configure -state normal
.ins.top2.dir_e delete 0 end .ins.top2.dir_e delete 0 end
.ins.top2.dir_e insert 0 $paths .ins.top2.dir_e insert 0 $paths
.ins.top2.dir_e configure -state readonly .ins.top2.dir_e configure -state readonly
set insert_symbol(regex) [.ins.top.pat_e get]
#check if regex is valid #check if regex is valid
set err [catch {regexp $insert_symbol(regex) {12345}} res] set err [catch {regexp $insert_symbol(regex) {12345}} res]
if {$err} {return} if {$err} {return}
set f [match_file $insert_symbol(regex) $paths 0] set f [match_file $insert_symbol(regex) $paths 0]
set filelist {} set filelist {}
set insert_symbol(fullpathlist) {} set insert_symbol(fullpathlist) {}
set sel [.ins.center.left.l curselection] set sel [.ins.center.left.l curselection]
if {$sel ne {}} {
set insert_symbol(fileindex) $sel
# puts "set fileindex=$sel"
}
if {$sel eq {}} { set sel 0} if {$sel eq {}} { set sel 0}
.ins.center.left.l activate $sel .ins.center.left.l activate $sel
foreach i $f { foreach i $f {
set err [catch {regexp $new_symbol_browser_ext $i} type]
set err [catch {regexp $insert_symbol(ext) $i} type]
if {!$err && $type} { if {!$err && $type} {
set fname [rel_sym_path $i $paths] set fname [file tail $i]
lappend filelist $fname lappend filelist $fname
lappend insert_symbol(fullpathlist) $i lappend insert_symbol(fullpathlist) $i
} }
@ -4924,13 +4924,11 @@ proc insert_symbol_filelist {paths {maxdepth -1}} {
set files [lsort -dictionary -index 0 $files] set files [lsort -dictionary -index 0 $files]
set filelist {} set filelist {}
set insert_symbol(fullpathlist) {} set insert_symbol(fullpathlist) {}
foreach f $files { foreach f $files {
lassign $f ff fff lassign $f ff fff
lappend filelist $ff lappend filelist $ff
lappend insert_symbol(fullpathlist) $fff lappend insert_symbol(fullpathlist) $fff
} }
set insert_symbol(nitems) [llength $filelist] set insert_symbol(nitems) [llength $filelist]
# assign listbox variable all at the end, it is faster... # assign listbox variable all at the end, it is faster...
set insert_symbol(list) $filelist set insert_symbol(list) $filelist
@ -4959,14 +4957,15 @@ proc insert_symbol_place {} {
#### paths: list of paths to use for listing symbols #### paths: list of paths to use for listing symbols
#### maxdepth: how many levels to descend for each $paths directory (-1: no limit) #### maxdepth: how many levels to descend for each $paths directory (-1: no limit)
proc insert_symbol {{paths {}} {maxdepth -1} {ext {.*}}} { proc insert_symbol {{paths {}} {maxdepth -1} {ext {.*}}} {
global insert_symbol global insert_symbol new_symbol_browser_ext
set paths [cleanup_paths $paths] ;# remove ~ and other strange path combinations set paths [cleanup_paths $paths] ;# remove ~ and other strange path combinations
# xschem set semaphore [expr {[xschem get semaphore] +1}] # xschem set semaphore [expr {[xschem get semaphore] +1}]
set insert_symbol(ext) $ext set new_symbol_browser_ext $ext
if {[winfo exists .ins]} { if {[winfo exists .ins]} {
raise .ins raise .ins
return return
} }
if {![info exists insert_symbol(regex)]} { set insert_symbol(regex) {}}
toplevel .ins toplevel .ins
frame .ins.top -takefocus 0 frame .ins.top -takefocus 0
frame .ins.top2 -takefocus 0 frame .ins.top2 -takefocus 0
@ -5007,28 +5006,29 @@ proc insert_symbol {{paths {}} {maxdepth -1} {ext {.*}}} {
-readonlybackground [option get . background {}] -takefocus 0 -readonlybackground [option get . background {}] -takefocus 0
label .ins.top.pat_l -text Pattern: label .ins.top.pat_l -text Pattern:
entry .ins.top.pat_e -width 20 -highlightcolor red -highlightthickness 2 \ entry .ins.top.pat_e -width 20 -highlightcolor red -highlightthickness 2 \
-highlightbackground [option get . background {}] -textvariable insert_symbol(regex) -highlightbackground [option get . background {}]
label .ins.top.dir_l -text { Symbol ref: } label .ins.top.dir_l -text { Symbol ref: }
entry .ins.top.dir_e -width 40 -state readonly \ entry .ins.top.dir_e -width 40 -state readonly \
-readonlybackground [option get . background {}] -takefocus 0 -readonlybackground [option get . background {}] -takefocus 0
label .ins.top.ext_l -text Ext: label .ins.top.ext_l -text Ext:
entry .ins.top.ext_e -width 15 -takefocus 0 -state normal -textvariable new_symbol_browser_ext entry .ins.top.ext_e -width 15 -takefocus 0 -state normal -textvariable new_symbol_browser_ext
if {[info exists insert_symbol(regex)]} {
.ins.top.pat_e insert 0 $insert_symbol(regex)
}
bind .ins <KeyPress-Escape> {.ins.bottom.dismiss invoke} bind .ins <KeyPress-Escape> {.ins.bottom.dismiss invoke}
bind .ins <KeyRelease> " bind .ins <KeyRelease> "
if {{%K} eq {Tab} && {%W} eq {.ins.center.left.l}} { if {{%K} eq {Tab} && {%W} eq {.ins.center.left.l}} {
insert_symbol_filelist [list $paths] [list $maxdepth] insert_symbol_filelist [list $paths] [list $maxdepth]
insert_symbol_preview [list $paths] insert_symbol_preview
} elseif {{%K} eq {Tab} && {%W} eq {.ins.center.leftdir.l}} { } elseif {{%K} eq {Tab} && {%W} eq {.ins.center.leftdir.l}} {
insert_symbol_filelist [list $paths] [list $maxdepth] insert_symbol_filelist [list $paths] [list $maxdepth]
} }
" "
bind .ins.center.leftdir.l <<ListboxSelect>> "insert_symbol_filelist [list $paths] [list $maxdepth]" bind .ins.center.leftdir.l <<ListboxSelect>> "insert_symbol_filelist [list $paths] [list $maxdepth]"
bind .ins.center.left.l <<ListboxSelect>> "insert_symbol_preview [list $paths]" bind .ins.center.left.l <<ListboxSelect>> "insert_symbol_preview"
bind .ins.center.left.l <Enter> "insert_symbol_focusin [list $paths] [list $maxdepth]" bind .ins.center.left.l <KeyPress-Return> "
xschem preview_window close .ins.center.right {}
destroy .ins
"
bind .ins.center.left.l <Enter> "xschem abort_operation"
label .ins.bottom.n -text { N. of items:} label .ins.bottom.n -text { N. of items:}
label .ins.bottom.nitems -textvariable insert_symbol(nitems) label .ins.bottom.nitems -textvariable insert_symbol(nitems)
button .ins.bottom.dismiss -takefocus 0 -text Dismiss -command { button .ins.bottom.dismiss -takefocus 0 -text Dismiss -command {
@ -5051,7 +5051,7 @@ proc insert_symbol {{paths {}} {maxdepth -1} {ext {.*}}} {
pack .ins.top.ext_l -side left pack .ins.top.ext_l -side left
pack .ins.top.ext_e -side left pack .ins.top.ext_e -side left
set insert_symbol(dirs) [get_list_of_dirs_with_symbols $paths $maxdepth $insert_symbol(ext)] set insert_symbol(dirs) [get_list_of_dirs_with_symbols $paths $maxdepth $new_symbol_browser_ext]
set insert_symbol(dirtails) {} set insert_symbol(dirtails) {}
foreach i $insert_symbol(dirs) { foreach i $insert_symbol(dirs) {
lappend insert_symbol(dirtails) [file tail $i] lappend insert_symbol(dirtails) [file tail $i]
@ -5072,9 +5072,11 @@ proc insert_symbol {{paths {}} {maxdepth -1} {ext {.*}}} {
lappend insert_symbol(dirs) $fff lappend insert_symbol(dirs) $fff
} }
insert_symbol_filelist $paths $maxdepth # insert_symbol_filelist $paths $maxdepth
# tkwait window .ins # tkwait window .ins
# xschem set semaphore [expr {[xschem get semaphore] -1}] # xschem set semaphore [expr {[xschem get semaphore] -1}]
if {[info exists insert_symbol(dirindex)]} {.ins.center.leftdir.l selection set $insert_symbol(dirindex)}
if {[info exists insert_symbol(fileindex)]} {.ins.center.left.l selection set $insert_symbol(fileindex)}
return {} return {}
} }
####################################################################### #######################################################################