Refactoring

This commit is contained in:
Matthias Koefferlein 2026-06-25 23:18:11 +02:00
parent 17bb54675b
commit 8e89acd8ff
3 changed files with 5 additions and 20 deletions

View File

@ -1388,7 +1388,7 @@ namespace
: public ShapesTransformer
{
public:
DeepShapeStoreToShapeTransformer (const DeepShapeStore &dss, const db::Layout &layout)
DeepShapeStoreToShapeTransformer (const DeepShapeStore &dss)
{
// gets the text annotation property ID -
// this is how the texts are passed for annotating the net names
@ -1473,7 +1473,7 @@ DeepShapeStore::insert (const DeepLayer &deep_layer, db::Layout *into_layout, db
source_cells.push_back (*source_layout.begin_top_down());
// prepare a transformer to convert text-annotated markers back to texts (without transformation however)
DeepShapeStoreToShapeTransformer dsst (*this, source_layout);
DeepShapeStoreToShapeTransformer dsst (*this);
// actually copy the shapes
db::copy_shapes (*into_layout, source_layout, trans, source_cells, cm.table (), lm, &dsst);

View File

@ -164,12 +164,6 @@ void NetlistDeviceExtractor::extract (db::DeepShapeStore &dss, unsigned int layo
extract_without_initialize (dss.layout (layout_index), dss.initial_cell (layout_index), clusters, layers, device_scaling, dss.breakout_cells (layout_index));
}
// @@@ needed?
void NetlistDeviceExtractor::extract (db::Layout &layout, db::Cell &cell, const std::vector<unsigned int> &layers, hier_clusters_type &clusters, double device_scaling, const std::set<db::cell_index_type> *breakout_cells)
{
extract_without_initialize (layout, cell, clusters, layers, device_scaling, breakout_cells);
}
namespace {
struct ExtractorCacheValueType {

View File

@ -132,10 +132,10 @@ public:
void initialize (Netlist *netlist);
/**
* @brief Performs the extraction
* @brief Extracts the devices from a list of regions
*
* layout and cell specify the layout and the top cell from which to perform the
* extraction.
* This method accepts named regions for input. These regions need to be of deep region type and
* originate from the same layout than the DeepShapeStore.
*
* The netlist will be filled with circuits (unless not present yet) to represent the
* cells from the layout.
@ -147,15 +147,6 @@ public:
*
* The definition of the input layers is device class specific.
*/
void extract (Layout &layout, Cell &cell, const std::vector<unsigned int> &layers, hier_clusters_type &clusters, double device_scaling = 1.0, const std::set<cell_index_type> *breakout_cells = 0);
/**
* @brief Extracts the devices from a list of regions
*
* This method behaves identical to the other "extract" method, but accepts
* named regions for input. These regions need to be of deep region type and
* originate from the same layout than the DeepShapeStore.
*/
void extract (DeepShapeStore &dss, unsigned int layout_index, const input_layers &layers, hier_clusters_type &clusters, double device_scaling = 1.0);
/**