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

WIP: interactive controls for generic edit options, bug fix for instance marker - appeared also when editing generic editor options for polygon, box ...

This commit is contained in:
Matthias Koefferlein 2020-08-14 01:24:46 +02:00
parent e12746526f
commit 85e68940f2
2 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,18 +242,20 @@ END_PROTECTED_W (this)
// ------------------------------------------------------------------
// Indicates an error on a line edit
static void indicate_error (QLineEdit *le, bool error)
static void indicate_error (QLineEdit *le, const tl::Exception *ex)
{
// by the way, update the foreground color of the cell edit box as well (red, if not valid)
QPalette pl = le->palette ();
if (error) {
if (ex) {
pl.setColor (QPalette::Active, QPalette::Text, Qt::red);
pl.setColor (QPalette::Active, QPalette::Base, QColor (Qt::red).lighter (180));
le->setToolTip (tl::to_qstring (ex->msg ()));
} else {
QWidget *pw = dynamic_cast<QWidget *> (le->parent ());
tl_assert (pw != 0);
pl.setColor (QPalette::Active, QPalette::Text, pw->palette ().color (QPalette::Text));
pl.setColor (QPalette::Active, QPalette::Base, pw->palette ().color (QPalette::Base));
le->setToolTip (QString ());
}
le->setPalette (pl);
}
@ -265,9 +267,9 @@ static void configure_from_line_edit (lay::Dispatcher *dispatcher, QLineEdit *le
Value value = Value (0);
tl::from_string (tl::to_string (le->text ()), value);
dispatcher->config_set (cfg_name, tl::to_string (value));
indicate_error (le, false);
} catch (...) {
indicate_error (le, true);
indicate_error (le, 0);
} catch (tl::Exception &ex) {
indicate_error (le, &ex);
}
}
@ -281,6 +283,16 @@ EditorOptionsGeneric::EditorOptionsGeneric (lay::Dispatcher *dispatcher)
mp_ui->setupUi (this);
connect (mp_ui->grid_cb, SIGNAL (activated (int)), this, SLOT (grid_changed (int)));
connect (mp_ui->edit_grid_le, SIGNAL (editingFinished ()), this, SLOT (edited ()));
connect (mp_ui->grid_cb, SIGNAL (activated (int)), this, SLOT (edited ()));
connect (mp_ui->move_angle_cb, SIGNAL (activated (int)), this, SLOT (edited ()));
connect (mp_ui->conn_angle_cb, SIGNAL (activated (int)), this, SLOT (edited ()));
connect (mp_ui->hier_sel_cbx, SIGNAL (clicked ()), this, SLOT (edited ()));
connect (mp_ui->hier_copy_mode_cbx, SIGNAL (activated (int)), this, SLOT (edited ()));
connect (mp_ui->snap_objects_cbx, SIGNAL (clicked ()), this, SLOT (edited ()));
connect (mp_ui->max_shapes_le, SIGNAL (editingFinished ()), this, SLOT (edited ()));
connect (mp_ui->show_shapes_cbx, SIGNAL (clicked ()), this, SLOT (edited ()));
}
EditorOptionsGeneric::~EditorOptionsGeneric ()
@ -300,16 +312,21 @@ EditorOptionsGeneric::apply (lay::Dispatcher *root)
{
// Edit grid
db::DVector eg;
EditGridConverter egc;
if (mp_ui->grid_cb->currentIndex () == 0) {
eg = db::DVector (-1.0, -1.0);
root->config_set (cfg_edit_grid, egc.to_string (db::DVector (-1.0, -1.0)));
} else if (mp_ui->grid_cb->currentIndex () == 1) {
eg = db::DVector ();
root->config_set (cfg_edit_grid, egc.to_string (db::DVector ()));
} else {
egc.from_string_picky (tl::to_string (mp_ui->edit_grid_le->text ()), eg);
try {
db::DVector eg;
egc.from_string_picky (tl::to_string (mp_ui->edit_grid_le->text ()), eg);
indicate_error (mp_ui->edit_grid_le, 0);
root->config_set (cfg_edit_grid, egc.to_string (eg));
} catch (tl::Exception &ex) {
indicate_error (mp_ui->edit_grid_le, &ex);
}
}
root->config_set (cfg_edit_grid, egc.to_string (eg));
// Edit & move angle
@ -641,7 +658,8 @@ EditorOptionsInst::update_cell_edits ()
std::pair<bool, db::cell_index_type> cc = layout->cell_by_name (tl::to_string (mp_ui->cell_le->text ()).c_str ());
// by the way, update the foreground color of the cell edit box as well (red, if not valid)
indicate_error (mp_ui->cell_le, ! pc.first && ! cc.first);
tl::Exception ex ("No cell or PCell with this name");
indicate_error (mp_ui->cell_le, (! pc.first && ! cc.first) ? &ex : 0);
}
void

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

@ -1673,16 +1673,22 @@ InstService::config_finalize ()
void
InstService::update_marker ()
{
lay::Marker *marker = new lay::Marker (view (), m_cv_index, ! show_shapes_of_instances (), show_shapes_of_instances () ? max_shapes_of_instances () : 0);
marker->set_vertex_shape (lay::ViewOp::Cross);
marker->set_vertex_size (9 /*cross vertex size*/);
set_edit_marker (marker);
if (editing ()) {
lay::Marker *marker = new lay::Marker (view (), m_cv_index, ! show_shapes_of_instances (), show_shapes_of_instances () ? max_shapes_of_instances () : 0);
marker->set_vertex_shape (lay::ViewOp::Cross);
marker->set_vertex_size (9 /*cross vertex size*/);
set_edit_marker (marker);
db::CellInstArray inst;
if (get_inst (inst)) {
marker->set (inst, m_trans);
} else {
marker->set ();
}
db::CellInstArray inst;
if (get_inst (inst)) {
marker->set (inst, m_trans);
} else {
marker->set ();
set_edit_marker (0);
}
}