From be819b720075f56a1ef3b0607f8cc348c8b9723e Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Sat, 16 Jul 2016 15:48:51 -0400 Subject: [PATCH] Added resistors and inductors to the list of devices whose merging properties are defined by "property default". --- tcltk/tclnetgen.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tcltk/tclnetgen.c b/tcltk/tclnetgen.c index ca2cda3..6bd83f0 100644 --- a/tcltk/tclnetgen.c +++ b/tcltk/tclnetgen.c @@ -3029,9 +3029,17 @@ _netcmp_property(ClientData clientData, PropertyDelete(tp->name, tp->file, "ps"); PropertyDelete(tp->name, tp->file, "pd"); break; + case CLASS_RES: case CLASS_RES3: + PropertyMerge(tp->name, tp->file, "l", MERGE_PAR_CRIT); + break; case CLASS_CAP: case CLASS_ECAP: case CLASS_CAP3: + // NOTE: No attempt to combine area, width, or length; + // only value. PropertyMerge(tp->name, tp->file, "value", MERGE_ADD_CRIT); break; + case CLASS_INDUCTOR: + PropertyMerge(tp->name, tp->file, "value", MERGE_PAR_CRIT); + break; } tp = NextCell(); }