From 67526c7f4e85a23bfaa35aa621e273ed285134af Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 5 Oct 2019 20:06:30 +0000 Subject: [PATCH 1/2] Fixed #372 (build issue with 64 bit coordinates) --- src/pya/pya/pyaConvert.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pya/pya/pyaConvert.h b/src/pya/pya/pyaConvert.h index 81624491a..89c741921 100644 --- a/src/pya/pya/pyaConvert.h +++ b/src/pya/pya/pyaConvert.h @@ -142,7 +142,7 @@ struct test_type_func<__int128> { bool operator() (PyObject *rval, bool loose) { - return test_type (rval, loose); + return test_type_func () (rval, loose); } }; #endif @@ -582,7 +582,7 @@ struct c2python_func #if defined(HAVE_64BIT_COORD) template <> -struct c2python_func +struct c2python_func<__int128> { PyObject *operator() (const __int128 &c) { From d8e7d29e98daca6c1bbfc89a66a68e0388ebcb8b Mon Sep 17 00:00:00 2001 From: Christos Rizos Date: Fri, 27 Sep 2019 18:30:03 +0300 Subject: [PATCH 2/2] Fixed #376 - PCell callbacks invoked on value change --- src/edt/edt/edtPCellParametersPage.cc | 10 ++++++++-- src/edt/edt/edtPCellParametersPage.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/edt/edt/edtPCellParametersPage.cc b/src/edt/edt/edtPCellParametersPage.cc index 6c00105e4..2df334ee4 100644 --- a/src/edt/edt/edtPCellParametersPage.cc +++ b/src/edt/edt/edtPCellParametersPage.cc @@ -284,6 +284,8 @@ PCellParametersPage::setup (const db::Layout *layout, lay::LayoutView *view, int ul->setText (tl::to_qstring (p->get_unit ())); inner_grid->addWidget (f, row, 1); + + connect (le, SIGNAL (editingFinished ()), this, SLOT (activated ())); } break; @@ -295,6 +297,8 @@ PCellParametersPage::setup (const db::Layout *layout, lay::LayoutView *view, int le->setEnabled (! p->is_readonly ()); m_widgets.push_back (le); inner_grid->addWidget (le, row, 1); + + connect (le, SIGNAL (editingFinished ()), this, SLOT (activated ())); } break; @@ -315,6 +319,8 @@ PCellParametersPage::setup (const db::Layout *layout, lay::LayoutView *view, int cbx->setEnabled (! p->is_readonly ()); m_widgets.push_back (cbx); inner_grid->addWidget (cbx, row, 1); + + connect (cbx, SIGNAL (stateChanged (int)), this, SLOT (activated ())); } break; @@ -336,7 +342,7 @@ PCellParametersPage::setup (const db::Layout *layout, lay::LayoutView *view, int } } - connect (cb, SIGNAL (activated (int)), this, SLOT (activated (int))); + connect (cb, SIGNAL (activated (int)), this, SLOT (activated ())); cb->setEnabled (! p->is_readonly ()); cb->setMinimumContentsLength (30); cb->setSizeAdjustPolicy (QComboBox::AdjustToMinimumContentsLengthWithIcon); @@ -381,7 +387,7 @@ PCellParametersPage::set_state (const State &s) } void -PCellParametersPage::activated (int) +PCellParametersPage::activated () { // does a coerce and update get_parameters (); diff --git a/src/edt/edt/edtPCellParametersPage.h b/src/edt/edt/edtPCellParametersPage.h index 020dda3b0..f134107b4 100644 --- a/src/edt/edt/edtPCellParametersPage.h +++ b/src/edt/edt/edtPCellParametersPage.h @@ -111,7 +111,7 @@ public: void set_parameters (const std::vector &values); public slots: - void activated (int); + void activated (); void clicked (); private: