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

delete(): clear lab_show.sym symbols if nets get unhilight after wire deletion

This commit is contained in:
Stefan Frederik 2021-01-08 05:26:37 +01:00
parent a7831ce972
commit db4b372719
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
XSchemWin/XSchemWix/Product.wxs
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="Xschem" Language="1033" Version="2.9.9.2" Manufacturer="Xschem" UpgradeCode="0deb9c17-cbbd-491c-be3e-24446b27ccd5">
<Product Id="*" Name="Xschem" Language="1033" Version="2.9.9.3" Manufacturer="Xschem" UpgradeCode="0deb9c17-cbbd-491c-be3e-24446b27ccd5">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<WixVariable Id="WixUILicenseRtf"
Value="License.rtf" />
@ -21,8 +21,8 @@
<Upgrade Id="0deb9c17-cbbd-491c-be3e-24446b27ccd5">
<UpgradeVersion
Property="OLD_VERSION_FOUND"
Minimum="2.9.9.0"
Maximum="2.9.9.2"
Minimum="2.9.8.0"
Maximum="2.9.9.3"
IncludeMinimum="yes"
IncludeMaximum="no"
OnlyDetect="no"
@ -30,7 +30,7 @@
MigrateFeatures="yes" />
<UpgradeVersion
Property="NEWER_VERSION_FOUND"
Minimum="2.9.9.2"
Minimum="2.9.9.3"
IncludeMinimum="no"
OnlyDetect="yes" />
</Upgrade>

16
src/actions.c
View File

@ -1662,16 +1662,18 @@ void new_wire(int what, double mx_snap, double my_snap)
update_conn_cues(1,1);
if( xctx->hilight_nets || show_pin_net_names) prepare_netlist_structs(0);
if(!big) {
xRect boundbox;
/* xRect boundbox; */
bbox(START , 0.0 , 0.0 , 0.0 , 0.0);
#if 0
if( xctx->hilight_nets ) calc_drawing_bbox(&boundbox, 2);
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2); /* <<< remove ? */
bbox(ADD, boundbox.x1, boundbox.y1, boundbox.x2, boundbox.y2);
#endif
if(show_pin_net_names || xctx->hilight_nets) {
int_hash_lookup(xctx->node_redraw_table, xctx->wire[xctx->wires-1].node, 0, XINSERT_NOREPLACE);
find_inst_to_be_redrawn();
}
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
}
if(show_pin_net_names || xctx->hilight_nets) {
int_hash_lookup(xctx->node_redraw_table, xctx->wire[xctx->wires-1].node, 0, XINSERT_NOREPLACE);
find_inst_to_be_redrawn();
}
if(!big) bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
draw();
if(!big) bbox(END , 0.0 , 0.0 , 0.0 , 0.0);
/* draw_hilight_net(1);*/ /* for updating connection bubbles on hilight nets */

10
src/select.c
View File

@ -475,6 +475,16 @@ void delete(void)
if(autotrim_wires) trim_wires();
del_rect_line_arc_poly();
update_conn_cues(0, 0);
if(xctx->hilight_nets) for(i=0; i < xctx->instances; i++) {
char *type = (xctx->inst[i].ptr+ xctx->sym)->type;
prepare_netlist_structs(0);
if(type && xctx->inst[i].node && IS_LABEL_SH_OR_PIN(type)) {
if(!bus_hilight_lookup( xctx->inst[i].node[0], 0, XLOOKUP)) {
xctx->inst[i].color = -10000;
}
}
}
xctx->lastsel = 0;
bbox(SET , 0.0 , 0.0 , 0.0 , 0.0);
draw();