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

Python debugger compatible with PyQt 

Problem was that PyQt generates spontaneous Python events
that do not originate from KLayout itself. This made the
IDE detect a stop request and the application crashed.
This commit is contained in:
Matthias Koefferlein 2023-02-23 17:07:41 +01:00
parent 90b59ca14d
commit a3ff671eb9
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/lay/lay/layMacroEditorDialog.cc
View File

@ -3152,11 +3152,6 @@ MacroEditorDialog::translate_pseudo_id (size_t &file_id, int &line)
}
}
static void exit_from_macro ()
{
throw tl::ExitException ();
}
void
MacroEditorDialog::exception_thrown (gsi::Interpreter *interpreter, size_t file_id, int line, const std::string &eclass, const std::string &emsg, const gsi::StackTraceProvider *stack_trace_provider)
{
@ -3165,9 +3160,7 @@ MacroEditorDialog::exception_thrown (gsi::Interpreter *interpreter, size_t file_
return;
}
if (!m_in_exec) {
exit_from_macro ();
}
exit_if_needed ();
// avoid recursive breakpoints and exception catches from the console while in a breakpoint or exception stop
if (lay::BusySection::is_busy ()) {
@ -3251,17 +3244,25 @@ MacroEditorDialog::exception_thrown (gsi::Interpreter *interpreter, size_t file_
throw;
}
if (! m_in_exec) {
exit_from_macro ();
exit_if_needed ();
}
void
MacroEditorDialog::exit_if_needed ()
{
// Exit if a stop is requested.
// NOTE: we must not raise ExitException from outside events (e.g. PyQt5 events)
// as ExitException would otherwise terminate the application.
// "mp_exec_controller" is 0 in that case.
if (! m_in_exec && mp_exec_controller != 0) {
throw tl::ExitException ();
}
}
void
MacroEditorDialog::trace (gsi::Interpreter *interpreter, size_t file_id, int line, const gsi::StackTraceProvider *stack_trace_provider)
{
if (!m_in_exec) {
exit_from_macro ();
}
exit_if_needed ();
// avoid recursive breakpoints and exception catches from the console while in a breakpoint or exception stop
if (lay::BusySection::is_busy ()) {
@ -3310,9 +3311,7 @@ MacroEditorDialog::trace (gsi::Interpreter *interpreter, size_t file_id, int lin
throw;
}
if (! m_in_exec) {
exit_from_macro ();
}
exit_if_needed ();
} else if (++m_trace_count == 20) {
@ -3328,9 +3327,7 @@ MacroEditorDialog::trace (gsi::Interpreter *interpreter, size_t file_id, int lin
m_last_process_events = tl::Clock::current ();
m_process_events_interval = std::max (0.05, std::min (2.0, (m_last_process_events - start).seconds () * 5.0));
if (!m_in_exec) {
exit_from_macro ();
}
exit_if_needed ();
}

1
src/lay/lay/layMacroEditorDialog.h
View File

@ -302,6 +302,7 @@ private:
bool configure (const std::string &name, const std::string &value);
void config_finalize ();
void translate_pseudo_id (size_t &file_id, int &line);
void exit_if_needed ();
lay::Dispatcher *mp_plugin_root;
lym::MacroCollection *mp_root;