|
16 | 16 | __all__ = ['view', 'edit', 'debug', 'compare', 'REOPEN_LAST_FILE', 'run_editor_on_exception'] |
17 | 17 |
|
18 | 18 |
|
19 | | -def qapplication(): |
20 | | - return QApplication(sys.argv) |
| 19 | +def get_app_and_window(app_name): |
| 20 | + _app = QApplication.instance() |
| 21 | + if _app is None: |
| 22 | + _app = QApplication(sys.argv) |
| 23 | + _app.setOrganizationName("LArray") |
| 24 | + _app.setApplicationName(app_name) |
| 25 | + parent = None |
| 26 | + else: |
| 27 | + parent = _app.activeWindow() |
| 28 | + return _app, parent |
21 | 29 |
|
22 | 30 |
|
23 | 31 | def find_names(obj, depth=0): |
@@ -110,14 +118,7 @@ def edit(obj=None, title='', minvalue=None, maxvalue=None, readonly=False, depth |
110 | 118 | orig_except_hook = sys.excepthook |
111 | 119 | sys.excepthook = _qt_except_hook |
112 | 120 |
|
113 | | - _app = QApplication.instance() |
114 | | - if _app is None: |
115 | | - _app = qapplication() |
116 | | - _app.setOrganizationName("LArray") |
117 | | - _app.setApplicationName("Viewer") |
118 | | - parent = None |
119 | | - else: |
120 | | - parent = _app.activeWindow() |
| 121 | + _app, parent = get_app_and_window("Viewer") |
121 | 122 |
|
122 | 123 | caller_frame = sys._getframe(depth + 1) |
123 | 124 | if display_caller_info: |
@@ -192,14 +193,7 @@ def _debug(stack_summary, stack_pos=None): |
192 | 193 | orig_except_hook = sys.excepthook |
193 | 194 | sys.excepthook = _qt_except_hook |
194 | 195 |
|
195 | | - _app = QApplication.instance() |
196 | | - if _app is None: |
197 | | - _app = qapplication() |
198 | | - _app.setOrganizationName("LArray") |
199 | | - _app.setApplicationName("Debugger") |
200 | | - parent = None |
201 | | - else: |
202 | | - parent = _app.activeWindow() |
| 196 | + _app, parent = get_app_and_window("Debugger") |
203 | 197 |
|
204 | 198 | assert isinstance(stack_summary, StackSummary) |
205 | 199 | dlg = MappingEditor(parent) |
@@ -276,14 +270,7 @@ def compare(*args, **kwargs): |
276 | 270 | depth = kwargs.pop('depth', 0) |
277 | 271 | display_caller_info = kwargs.pop('display_caller_info', True) |
278 | 272 |
|
279 | | - _app = QApplication.instance() |
280 | | - if _app is None: |
281 | | - _app = qapplication() |
282 | | - _app.setOrganizationName("LArray") |
283 | | - _app.setApplicationName("Viewer") |
284 | | - parent = None |
285 | | - else: |
286 | | - parent = _app.activeWindow() |
| 273 | + _app, parent = get_app_and_window("Viewer") |
287 | 274 |
|
288 | 275 | caller_frame = sys._getframe(depth + 1) |
289 | 276 | if display_caller_info: |
|
0 commit comments