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

Refining the display enhancements for terminals in netlist browser.

This commit is contained in:
Matthias Koefferlein 2021-03-27 00:44:48 +01:00
parent 3ce13f6769
commit e0eac2147b
1 changed files with 81 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
src/laybasic/laybasic/layNetlistBrowserModel.cc
View File

@ -513,56 +513,90 @@ static std::pair<const db::DeviceTerminalDefinition *, const db::DeviceTerminalD
return std::make_pair (termrefs.first ? termrefs.first->terminal_def () : 0, termrefs.second ? termrefs.second->terminal_def () : 0); return std::make_pair (termrefs.first ? termrefs.first->terminal_def () : 0, termrefs.second ? termrefs.second->terminal_def () : 0);
} }
static std::pair<const db::DeviceTerminalDefinition *, const db::DeviceTerminalDefinition *> terminal_defs_from_device_classes (IndexedNetlistModel *model, const std::pair<const db::DeviceClass *, const db::DeviceClass *> &device_classes, const std::pair<const db::Device *, const db::Device *> &devices, size_t terminal_id) static std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::DeviceTerminalDefinition *> > terminal_defs_from_device_classes (IndexedNetlistModel *model, const std::pair<const db::DeviceClass *, const db::DeviceClass *> &device_classes, const std::pair<const db::Device *, const db::Device *> &devices)
{ {
const db::DeviceTerminalDefinition *td1 = 0, *td2 = 0; std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::DeviceTerminalDefinition *> > result;
if (device_classes.first && device_classes.first->terminal_definitions ().size () > terminal_id) {
td1 = &device_classes.first->terminal_definitions () [terminal_id]; std::map<size_t, std::pair<std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::Net *> >, std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::Net *> > > > nets;
size_t n1 = 0;
if (device_classes.first) {
n1 = device_classes.first->terminal_definitions ().size ();
} }
size_t n2 = 0;
if (device_classes.second) { if (device_classes.second) {
n2 = device_classes.second->terminal_definitions ().size ();
}
size_t second_terminal_id = terminal_id; for (size_t i = 0; i < n1 || i < n2; ++i) {
// Because of terminal swapping we need to look up the second terminal by looking for equivalent terminals which carry the corresponding net if (i < n2) {
if (td1 && devices.first && devices.second) { const db::DeviceTerminalDefinition &td = device_classes.second->terminal_definitions () [i];
size_t id = td.id ();
size_t id_norm = device_classes.second->normalize_terminal_id (id);
nets [id_norm].second.push_back (std::make_pair (&td, devices.second->net_for_terminal (id)));
}
size_t td1_id_norm = device_classes.first->normalize_terminal_id (td1->id ()); if (i < n1) {
const db::Net *n2 = model->second_net_for (devices.first->net_for_terminal (terminal_id)); const db::DeviceTerminalDefinition &td = device_classes.first->terminal_definitions () [i];
size_t id = td.id ();
size_t id_norm = device_classes.first->normalize_terminal_id (id);
nets [id_norm].first.push_back (std::make_pair (&td, devices.first->net_for_terminal (id)));
}
// this scheme makes a guess what terminal to use when a pair of terminals does not connect }
// to matching nets
std::set<const db::Net *> n2_excluded; for (std::map<size_t, std::pair<std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::Net *> >, std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::Net *> > > >::iterator n = nets.begin (); n != nets.end (); ++n) {
if (! n2) {
for (size_t i = 0; i < device_classes.first->terminal_definitions ().size (); ++i) { std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::Net *> > &nn1 = n->second.first;
const db::DeviceTerminalDefinition &td = device_classes.first->terminal_definitions () [i]; std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::Net *> > &nn2 = n->second.second;
if (device_classes.first->normalize_terminal_id (td.id ()) == td1_id_norm) {
const db::Net *n2x = model->second_net_for (devices.first->net_for_terminal (td.id ())); if (nn2.empty ()) {
if (n2x) {
n2_excluded.insert (n2x); for (std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::Net *> >::const_iterator i = nn1.begin (); i != nn1.end (); ++i) {
} result.push_back (std::make_pair (i->first, (const db::DeviceTerminalDefinition *) 0));
}
}
} }
for (size_t i = 0; i < device_classes.second->terminal_definitions ().size (); ++i) { } else if (nn1.empty ()) {
const db::DeviceTerminalDefinition &td = device_classes.second->terminal_definitions () [i];
if (device_classes.second->normalize_terminal_id (td.id ()) == td1_id_norm) { for (std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::Net *> >::const_iterator j = nn2.begin (); j != nn2.end (); ++j) {
const db::Net *n2_actual = devices.second->net_for_terminal (i); result.push_back (std::make_pair ((const db::DeviceTerminalDefinition *) 0, j->first));
if ((! n2 || n2_actual == n2) && n2_excluded.find (n2_actual) == n2_excluded.end ()) { }
second_terminal_id = i;
break; } else {
std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::Net *> >::iterator w = nn1.begin ();
for (std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::Net *> >::const_iterator i = nn1.begin (); i != nn1.end (); ++i) {
bool found = false;
for (std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::Net *> >::iterator j = nn2.begin (); j != nn2.end () && ! found; ++j) {
const db::Net *n2 = model->second_net_for (i->second);
if (n2 == j->second) {
result.push_back (std::make_pair (i->first, j->first));
nn2.erase (j);
found = true;
} }
} }
if (! found) {
*w++ = *i;
}
}
nn1.erase (w, nn1.end ());
for (size_t i = 0; i < nn1.size () && i < nn2.size (); ++i) {
result.push_back (std::make_pair (nn1 [i].first, nn2 [i].first));
} }
} }
td2 = &device_classes.second->terminal_definitions () [second_terminal_id];
} }
return std::make_pair (td1, td2); return result;
} }
static static
@ -601,24 +635,6 @@ static std::string combine_search_strings (const std::string &s1, const std::str
} }
} }
static size_t rows_for (const db::Device *device)
{
if (! device || ! device->device_class ()) {
return 0;
} else {
return device->device_class ()->terminal_definitions ().size ();
}
}
static size_t rows_for (const db::NetTerminalRef *ref)
{
if (! ref || ! ref->device_class ()) {
return 0;
} else {
return ref->device_class ()->terminal_definitions ().size ();
}
}
static QIcon icon_for_net () static QIcon icon_for_net ()
{ {
static QIcon icon; static QIcon icon;
@ -1981,12 +1997,14 @@ CircuitNetDeviceTerminalItemData::do_ensure_children (NetlistBrowserModel *model
return; return;
} }
size_t n = std::max (rows_for (m_tp.first), rows_for (m_tp.second)); std::pair<const db::Device *, const db::Device *> devices = dp ();
for (size_t i = 0; i < n; ++i) { std::pair<const db::DeviceClass *, const db::DeviceClass *> device_classes = device_classes_from_devices (devices);
std::pair<const db::DeviceClass *, const db::DeviceClass *> device_classes = device_classes_from_devices (dp ());
std::pair<const db::DeviceTerminalDefinition *, const db::DeviceTerminalDefinition *> termdefs = terminal_defs_from_device_classes (model->indexer (), device_classes, dp (), i); std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::DeviceTerminalDefinition *> > tp = terminal_defs_from_device_classes (model->indexer (), device_classes, devices);
IndexedNetlistModel::net_pair nets = nets_from_device_terminals (dp (), termdefs);
push_back (new CircuitNetDeviceTerminalOthersItemData (this, nets, termdefs)); for (std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::DeviceTerminalDefinition *> >::const_iterator i = tp.begin (); i != tp.end (); ++i) {
IndexedNetlistModel::net_pair nets = nets_from_device_terminals (dp (), *i);
push_back (new CircuitNetDeviceTerminalOthersItemData (this, nets, *i));
} }
} }
@ -2336,10 +2354,13 @@ CircuitDeviceItemData::CircuitDeviceItemData (NetlistModelItemData *parent, cons
void void
CircuitDeviceItemData::do_ensure_children (NetlistBrowserModel *model) CircuitDeviceItemData::do_ensure_children (NetlistBrowserModel *model)
{ {
size_t n = std::max (rows_for (dp ().first), rows_for (dp ().second)); std::pair<const db::Device *, const db::Device *> devices = dp ();
for (size_t i = 0; i < n; ++i) { std::pair<const db::DeviceClass *, const db::DeviceClass *> device_classes = device_classes_from_devices (devices);
std::pair<const db::DeviceTerminalDefinition *, const db::DeviceTerminalDefinition *> tp = terminal_defs_from_device_classes (model->indexer (), device_classes_from_devices (dp ()), dp (), i);
push_back (new CircuitDeviceTerminalItemData (this, tp)); std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::DeviceTerminalDefinition *> > tp = terminal_defs_from_device_classes (model->indexer (), device_classes, devices);
for (std::vector<std::pair<const db::DeviceTerminalDefinition *, const db::DeviceTerminalDefinition *> >::const_iterator i = tp.begin (); i != tp.end (); ++i) {
push_back (new CircuitDeviceTerminalItemData (this, *i));
} }
} }