diff --git a/plugins/extensions/pykrita/plugin/plugins/scripter/debugger_scripter/debugger.py b/plugins/extensions/pykrita/plugin/plugins/scripter/debugger_scripter/debugger.py --- a/plugins/extensions/pykrita/plugin/plugins/scripter/debugger_scripter/debugger.py +++ b/plugins/extensions/pykrita/plugin/plugins/scripter/debugger_scripter/debugger.py @@ -14,7 +14,7 @@ self.debugq = multiprocessing.Queue() self.scripter = scripter self.applicationq = multiprocessing.Queue() - + self.filePath = self.scripter.documentcontroller.activeDocument.filePath # Create the debug process self.debugprocess = multiprocessing.Process(target=self.run, args=(cmd,)) self.application_data = {} @@ -28,6 +28,10 @@ def user_line(self, frame): """Handler that executes with every line of code""" co = frame.f_code + + if self.filePath!=co.co_filename: + return + self.currentLine = frame.f_lineno self.applicationq.put({ "code": { "file": co.co_filename, "name": co.co_name, @@ -39,16 +43,12 @@ }, "trace": "line" }) - if self.quit: return self.set_quit() if self.currentLine==0: return else: - # Get a reference to the code object and source - source = inspect.getsourcelines(co)[0] - # Wait for a debug command cmd = self.debugq.get() diff --git a/plugins/extensions/pykrita/plugin/plugins/scripter/ui_scripter/stackwidgets/debuggerwidget/debuggertable.py b/plugins/extensions/pykrita/plugin/plugins/scripter/ui_scripter/stackwidgets/debuggerwidget/debuggertable.py --- a/plugins/extensions/pykrita/plugin/plugins/scripter/ui_scripter/stackwidgets/debuggerwidget/debuggertable.py +++ b/plugins/extensions/pykrita/plugin/plugins/scripter/ui_scripter/stackwidgets/debuggerwidget/debuggertable.py @@ -21,18 +21,18 @@ locals_list = data['frame']['locals'] globals_list = data['frame']['globals'] - for item in locals_list: - for key, value in item.items(): - self.setItem(line, 0, QTableWidgetItem('locals')) - self.setItem(line, 1, QTableWidgetItem(key)) - self.setItem(line, 2, QTableWidgetItem(str(value))) - self.setItem(line, 3, QTableWidgetItem(str(type(value)))) - line += 1 - - for item in globals_list: - for key, value in item.items(): - self.setItem(line, 0, QTableWidgetItem('globals')) - self.setItem(line, 1, QTableWidgetItem(key)) - self.setItem(line, 2, QTableWidgetItem(str(value))) - self.setItem(line, 3, QTableWidgetItem(str(type(value)))) - line += 1 + # for item in locals_list: + # for key, value in item.items(): + # self.setItem(line, 0, QTableWidgetItem('locals')) + # self.setItem(line, 1, QTableWidgetItem(key)) + # self.setItem(line, 2, QTableWidgetItem(str(value))) + # self.setItem(line, 3, QTableWidgetItem(str(type(value)))) + # line += 1 + # + # for item in globals_list: + # for key, value in item.items(): + # self.setItem(line, 0, QTableWidgetItem('globals')) + # self.setItem(line, 1, QTableWidgetItem(key)) + # self.setItem(line, 2, QTableWidgetItem(str(value))) + # self.setItem(line, 3, QTableWidgetItem(str(type(value)))) + # line += 1