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

Small DXF bugfix: persist name of subcells of cell variants.

This commit is contained in:
Matthias Koefferlein 2018-04-11 21:52:23 +02:00
parent 1e2f8a0ce5
commit 256de9bc84
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/db/db/dbDXFReader.cc
View File

@ -764,7 +764,7 @@ DXFReader::read_cell (db::Layout &layout)
// create a first representative. Later, layer variants are built
db::cell_index_type cell = layout.add_cell ();
m_block_per_name.insert (std::make_pair (cell_name, cell));
m_template_cells.insert (cell);
m_template_cells.insert (std::make_pair (cell, cell_name));
read_entities (layout, layout.cell (cell), db::DVector (-xoff, -yoff));
} else {
@ -782,7 +782,7 @@ DXFReader::read_cell (db::Layout &layout)
}
void
DXFReader::fill_layer_variant_cell (db::Layout &layout, const std::string &cellname, db::cell_index_type template_cell, db::cell_index_type var_cell, unsigned int layer, double sx, double sy)
DXFReader::fill_layer_variant_cell (db::Layout &layout, const std::string & /*cellname*/, db::cell_index_type template_cell, db::cell_index_type var_cell, unsigned int layer, double sx, double sy)
{
m_used_template_cells.insert (template_cell);
@ -796,13 +796,14 @@ DXFReader::fill_layer_variant_cell (db::Layout &layout, const std::string &celln
// replace instances to template cells (those are not layer variants yet). This
// achieves a recursive variant building.
if (m_template_cells.find (cell_inst.object ().cell_index ()) != m_template_cells.end () || fabs (sx - 1.0) > 1e-6 || fabs (sy - 1.0) > 1e-6) {
std::map<db::cell_index_type, std::string>::const_iterator tc = m_template_cells.find (cell_inst.object ().cell_index ());
if (tc != m_template_cells.end () || fabs (sx - 1.0) > 1e-6 || fabs (sy - 1.0) > 1e-6) {
db::Trans t = cell_inst.front ();
t = db::Trans (t.rot (), db::Vector (t.disp ().x () * sx, t.disp ().y () * sy));
bool swap_sxy = ((t.angle () % 2) != 0);
db::CellInst obj (make_layer_variant (layout, cellname, cell_inst.object ().cell_index (), layer, swap_sxy ? sy : sx, swap_sxy ? sx : sy));
db::CellInst obj (make_layer_variant (layout, tc->second, cell_inst.object ().cell_index (), layer, swap_sxy ? sy : sx, swap_sxy ? sx : sy));
db::Vector a, b;
unsigned long na = 0, nb = 0;
@ -2779,7 +2780,7 @@ DXFReader::read_entities (db::Layout &layout, db::Cell &cell, const db::DVector
// create a first representative. Build variants and fill later when the cell is defined in a BLOCK statement.
db::cell_index_type cell = layout.add_cell ();
b = m_block_per_name.insert (std::make_pair (cellname, cell)).first;
m_template_cells.insert (cell);
m_template_cells.insert (std::make_pair (cell, cellname));
}
@ -2857,7 +2858,7 @@ DXFReader::read_entities (db::Layout &layout, db::Cell &cell, const db::DVector
// create a first representative. Build variants and fill later when the cell is defined in a BLOCK statement.
db::cell_index_type cell = layout.add_cell ();
b = m_block_per_name.insert (std::make_pair (cellname, cell)).first;
m_template_cells.insert (cell);
m_template_cells.insert (std::make_pair (cell, cellname));
}

2
src/db/db/dbDXFReader.h
View File

@ -322,7 +322,7 @@ private:
unsigned int m_zero_layer;
unsigned int m_next_layer_index;
std::map <std::string, unsigned int> m_new_layers;
std::set <db::cell_index_type> m_template_cells;
std::map <db::cell_index_type, std::string> m_template_cells;
std::set <db::cell_index_type> m_used_template_cells;
std::map <std::string, db::cell_index_type> m_block_per_name;
std::map <VariantKey, db::cell_index_type> m_block_to_variant;