← Back to branch summary

~dsdale24/xpaxs/trunk

« back to all changes in this revision

Viewing changes to xpaxs/instrumentation/spec/specinterface.py

  • Committer: Darren Dale
  • Date: 2009-11-27 18:38:05 UTC
  • mfrom: (731.1.2 0.10)
  • Revision ID: dsdale24@gmail.com-20091127183805-q1r9netuvcmiq5ln
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
xpaxs/instrumentation/spec/specinterface.py
9
9
from SpecClient import SpecClientError
10
10
 
11
11
from .ui import ui_specconnect
12
 
from . import configdialog, sshdialog
13
12
from .scancontrols import ScanControls
14
13
from .runner import SpecRunner
15
14
 
67
66
 
68
67
    def connectToSpec(self):
69
68
        if USESSH and not self.ssh:
70
 
            self.ssh = sshdialog.SshDialog(self.parent()).exec_()
 
69
            try:
 
70
                from . import sshdialog
 
71
                self.ssh = sshdialog.SshDialog(self.parent()).exec_()
 
72
            except ImportError:
 
73
                pass
71
74
            if not self.ssh: return
72
75
        try:
73
76
            self._connectToSpec()
155
158
                   'SpecInterfaceWidget')
156
159
 
157
160
    def _configure(self):
158
 
#        logger.debug('configuring Spec Interface')
 
161
        from . import configdialog
159
162
 
160
163
        self.connect(
161
164
            self.mainWindow.actionConfigure,