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

Merge pull request #398 from KLayout/issue-393 

Issue 393
This commit is contained in:
Matthias Köfferlein 2019-11-06 01:01:48 +01:00 committed by GitHub
parent 3476e40e79 4f49447fe8
commit 990f01adec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/laybasic/laybasic/layLayerToolbox.cc
View File

@ -530,7 +530,6 @@ LCPStylePalette::LCPStylePalette (QWidget *parent, const char *name)
b->setMinimumSize (25, 16);
b->setAlignment (Qt::AlignCenter);
b->setLineWidth (1);
b->setSizePolicy (sp);
b->setText (QObject::tr ("0px"));
connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int)));
ll->addWidget (b);
@ -539,7 +538,6 @@ LCPStylePalette::LCPStylePalette (QWidget *parent, const char *name)
b->setMinimumSize (25, 16);
b->setAlignment (Qt::AlignCenter);
b->setLineWidth (1);
b->setSizePolicy (sp);
b->setText (QObject::tr ("1px"));
connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int)));
ll->addWidget (b);
@ -548,7 +546,6 @@ LCPStylePalette::LCPStylePalette (QWidget *parent, const char *name)
b->setMinimumSize (25, 16);
b->setAlignment (Qt::AlignCenter);
b->setLineWidth (1);
b->setSizePolicy (sp);
b->setText (QObject::tr ("2px"));
connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int)));
ll->addWidget (b);
@ -557,7 +554,6 @@ LCPStylePalette::LCPStylePalette (QWidget *parent, const char *name)
b->setMinimumSize (25, 16);
b->setAlignment (Qt::AlignCenter);
b->setLineWidth (1);
b->setSizePolicy (sp);
b->setText (QObject::tr ("3px"));
connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int)));
ll->addWidget (b);
@ -572,7 +568,6 @@ LCPStylePalette::LCPStylePalette (QWidget *parent, const char *name)
b->setMinimumSize (50, 16);
b->setAlignment (Qt::AlignCenter);
b->setLineWidth (1);
b->setSizePolicy (sp);
b->setText (QObject::tr ("No Cross"));
connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int)));
ll->addWidget (b);
@ -581,7 +576,6 @@ LCPStylePalette::LCPStylePalette (QWidget *parent, const char *name)
b->setMinimumSize (50, 16);
b->setAlignment (Qt::AlignCenter);
b->setLineWidth (1);
b->setSizePolicy (sp);
b->setText (QObject::tr ("Cross"));
connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int)));
ll->addWidget (b);
@ -596,7 +590,6 @@ LCPStylePalette::LCPStylePalette (QWidget *parent, const char *name)
b->setMinimumSize (50, 16);
b->setAlignment (Qt::AlignCenter);
b->setLineWidth (1);
b->setSizePolicy (sp);
b->setText (QObject::tr ("Simple"));
connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int)));
ll->addWidget (b);
@ -605,7 +598,6 @@ LCPStylePalette::LCPStylePalette (QWidget *parent, const char *name)
b->setMinimumSize (50, 16);
b->setAlignment (Qt::AlignCenter);
b->setLineWidth (1);
b->setSizePolicy (sp);
b->setText (QObject::tr ("Marked"));
connect (b, SIGNAL (clicked (int)), this, SLOT (button_clicked (int)));
ll->addWidget (b);

8
src/rba/rba/rbaUtils.cc
View File

@ -160,7 +160,13 @@ rba_check_error ()
// parse the backtrace to get the line number
tl::BacktraceElement info;
if (! bt.empty ()) {
if (CLASS_OF (lasterr) == rb_eSyntaxError) {
// for syntax errors we try to parse the message
info = rba_split_bt_information (emsg.c_str (), emsg.size ());
if (info.line == 0 && ! bt.empty ()) {
info = bt.front ();
}
} else if (! bt.empty ()) {
// use the backtrace
info = bt.front ();
} else {