Skip to content

Commit

Permalink
ENH: add initialize and terminate methods to widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
KurtJacobson committed Feb 20, 2019
1 parent 0315c19 commit 30c7823
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 2 deletions.
21 changes: 20 additions & 1 deletion qtpyvcp/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

from qtpyvcp.utilities.logger import initBaseLogger
from qtpyvcp.plugins import getPlugin
from qtpyvcp.widgets.base_widgets.base_widget import QtPyVCPBaseWidget
from qtpyvcp.widgets.form_widgets.main_window import VCPMainWindow

# initialize logging. If a base logger was already initialized in a startup
Expand Down Expand Up @@ -67,7 +68,7 @@ def __init__(self, theme=None, stylesheet=None):
self.perf_timer.timeout.connect(self.logPerformance)
self.perf_timer.start()

self.aboutToQuit.connect(self.terminateDataPlugins)
self.aboutToQuit.connect(self.terminate)

def loadVCPMainWindow(self, opts, vcp_file=None):
"""
Expand Down Expand Up @@ -186,6 +187,24 @@ def logPerformance(self):
" Per Thread: {}\n"
.format(total_percent, ' '.join(usage)))

def terminate(self):
self.terminateWidgets()
self.terminateDataPlugins()

def initialiseWidgets(self):
for w in self.allWidgets():
if isinstance(w, QtPyVCPBaseWidget):
w.initialize()

def terminateWidgets(self):
LOG.debug("Terminating widgets")
for w in self.allWidgets():
if isinstance(w, QtPyVCPBaseWidget):
try:
w.terminate()
except Exception:
LOG.exception('Error terminating %s widget', w)

def initialiseDataPlugins(self):
for plugin, obj in qtpyvcp.PLUGINS.items():
LOG.debug("Initializing %s plugin", plugin)
Expand Down
4 changes: 4 additions & 0 deletions qtpyvcp/vcp_launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ def launch_application(opts, config):
loadWindows(config['windows'])
log_time('done loading windows')

LOG.debug('Initializing widgets')
app.initialiseWidgets()
log_time('done initializing widgets')

postgui_halfile = INFO.getPostguiHalfile()
if postgui_halfile:

Expand Down
6 changes: 6 additions & 0 deletions qtpyvcp/widgets/base_widgets/base_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@ def registerRules(self, rules):
for trigger in triggers:
trigger(exp)

def initialize(self):
pass

def terminate(self):
pass


class VCPWidget(QtPyVCPBaseWidget):
"""VCP Widget
Expand Down
3 changes: 2 additions & 1 deletion qtpyvcp/widgets/input_widgets/mdientry_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from qtpy.QtCore import Qt, QEvent, QStringListModel, Slot
from qtpy.QtGui import QKeySequence, QValidator

from qtpyvcp.widgets.base_widgets.base_widget import CMDWidget
from qtpyvcp.plugins import getPlugin

STATUS = getPlugin('status')
Expand All @@ -23,7 +24,7 @@ def validate(self, string, pos):
return QValidator.Acceptable, string.upper(), pos


class MDIEntry(QLineEdit):
class MDIEntry(QLineEdit, CMDWidget):
def __init__(self, parent=None):
super(MDIEntry, self).__init__(parent)

Expand Down

0 comments on commit 30c7823

Please # to comment.