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

WIP: library browser - drag & drop of PCell instances

This commit is contained in:
Matthias Koefferlein 2019-08-02 22:49:55 +02:00
parent 56bf9dd8d5
commit de9db84ac7
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/edt/edt/edtEditorOptionsPages.cc
View File

@ -643,10 +643,12 @@ EditorOptionsInst::apply (lay::Plugin *root)
if (pc.first) {
const db::PCellDeclaration *pc_decl = layout->pcell_declaration (pc.second);
if (pc_decl) {
param += "!"; // flags PCells
std::vector<tl::Variant> pv = mp_pcell_parameters->get_parameters ();
const std::vector<db::PCellParameterDeclaration> &pcp = pc_decl->parameter_declarations ();
for (size_t i = 0; i < std::min (pv.size (), pcp.size ()); ++i) {
param += tl::to_word_or_quoted_string (pcp [i].get_name ()) + ":";
param += tl::to_word_or_quoted_string (pcp [i].get_name ());
param += ":";
param += pv [i].to_parsable_string ();
param += ";";
}
@ -742,6 +744,7 @@ EditorOptionsInst::setup (lay::Plugin *root)
std::map<std::string, tl::Variant> parameters;
try {
tl::Extractor ex (param.c_str ());
ex.test ("!"); // used to flag PCells
while (! ex.at_end ()) {
std::string n;
ex.read_word_or_quoted (n);

30
src/edt/edt/edtServiceImpl.cc
View File

@ -1107,7 +1107,7 @@ PathService::config_finalize ()
InstService::InstService (db::Manager *manager, lay::LayoutView *view)
: edt::Service (manager, view),
m_angle (0.0), m_scale (1.0),
m_mirror (false), m_cell_name (""), m_lib_name (""), m_pcell_parameters (),
m_mirror (false), m_is_pcell (false),
m_array (false), m_rows (1), m_columns (1),
m_row_x (0.0), m_row_y (0.0), m_column_x (0.0), m_column_y (0.0),
m_place_origin (false), m_reference_transaction_id (0),
@ -1158,14 +1158,17 @@ InstService::drag_enter_event (const db::DPoint &p, const lay::DragDropDataBase
}
m_pcell_parameters.clear ();
m_cell_name.clear ();
m_cell_or_pcell_name.clear ();
m_is_pcell = false;
if (cd->is_pcell ()) {
const db::PCellDeclaration *pcell_decl = cd->layout ()->pcell_declaration (cd->cell_index ());
if (pcell_decl) {
m_cell_name = pcell_decl->name ();
m_cell_or_pcell_name = pcell_decl->name ();
m_is_pcell = true;
const std::vector<db::PCellParameterDeclaration> &pd = pcell_decl->parameter_declarations();
for (std::vector<db::PCellParameterDeclaration>::const_iterator i = pd.begin (); i != pd.end (); ++i) {
m_pcell_parameters.insert (std::make_pair (i->get_name (), i->get_default ()));
@ -1178,7 +1181,7 @@ InstService::drag_enter_event (const db::DPoint &p, const lay::DragDropDataBase
} else if (cd->layout ()->is_valid_cell_index (cd->cell_index ())) {
m_cell_name = cd->layout ()->cell_name (cd->cell_index ());
m_cell_or_pcell_name = cd->layout ()->cell_name (cd->cell_index ());
do_begin_edit (p);
return true;
@ -1299,10 +1302,16 @@ InstService::make_cell (const lay::CellView &cv)
layout = &cv->layout ();
}
std::pair<bool, db::cell_index_type> ci = layout->cell_by_name (m_cell_name.c_str ());
std::pair<bool, db::pcell_id_type> pci = layout->pcell_by_name (m_cell_name.c_str ());
std::pair<bool, db::cell_index_type> ci (false, db::cell_index_type (0));
std::pair<bool, db::pcell_id_type> pci (false, db::pcell_id_type (0));
if (! m_is_pcell) {
ci = layout->cell_by_name (m_cell_or_pcell_name.c_str ());
} else {
pci = layout->pcell_by_name (m_cell_or_pcell_name.c_str ());
}
if (! ci.first && ! pci.first) {
// throw tl::Exception (tl::to_string (QObject::tr ("Not a valid cell name: %s")).c_str (), tl::to_string (cell_name_le->text ()).c_str ());
return std::pair<bool, db::cell_index_type> (false, 0);
}
@ -1487,7 +1496,7 @@ bool
InstService::configure (const std::string &name, const std::string &value)
{
if (name == cfg_edit_inst_cell_name) {
m_cell_name = value;
m_cell_or_pcell_name = value;
m_needs_update = true;
return true; // taken
}
@ -1500,8 +1509,11 @@ InstService::configure (const std::string &name, const std::string &value)
if (name == cfg_edit_inst_pcell_parameters) {
m_pcell_parameters.clear ();
tl::Extractor ex (value.c_str ());
m_pcell_parameters.clear ();
m_is_pcell = ex.test ("!") || ! ex.at_end ();
while (! ex.at_end ()) {
std::string n;
ex.read_word_or_quoted (n);

3
src/edt/edt/edtServiceImpl.h
View File

@ -223,8 +223,9 @@ private:
double m_scale;
bool m_mirror;
db::DPoint m_disp;
std::string m_cell_name, m_lib_name;
std::string m_cell_or_pcell_name, m_lib_name;
std::map<std::string, tl::Variant> m_pcell_parameters;
bool m_is_pcell;
bool m_array;
unsigned int m_rows, m_columns;
double m_row_x, m_row_y, m_column_x, m_column_y;