Move displayscreen to the general utility directory "instrument/util"

This commit is contained in:
Douglas Clowes
2013-07-01 12:20:11 +10:00
parent cbc1c940a1
commit a0bf852024
6 changed files with 10 additions and 0 deletions

View File

@ -7,12 +7,14 @@ from twisted.internet.task import LoopingCall
import argparse
import random
import re
import os
import sys
import time
import inspect
from galilfactory import GalilFactory
import curses
sys.path.insert(0, os.path.realpath(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]),"../../util"))))
from displayscreen import Screen
def device_iterator():

View File

@ -6,6 +6,7 @@ from twisted.python import log
from twisted.internet.task import LoopingCall
import random
import re
import os
import sys
import time
import inspect
@ -14,6 +15,7 @@ from counterclient import CounterClientFactory
from powdersample import CubicPowderSample
import curses
sys.path.insert(0, os.path.realpath(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]),"../../util"))))
from displayscreen import Screen
def stopCallbackM1M2(motor):

View File

@ -9,8 +9,10 @@ from twisted.python import log, usage
from Lakeshore336 import Lakeshore336 as MYBASE
from LakeshoreFactory import LakeshoreFactory
from LakeshoreProtocol import LakeshoreProtocol
import os
import sys
sys.path.insert(0, os.path.realpath(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]),"../../../util"))))
from displayscreen import Screen
class MyOptions(usage.Options):

View File

@ -9,8 +9,10 @@ from twisted.python import log, usage
from Lakeshore340 import Lakeshore340 as MYBASE
from LakeshoreFactory import LakeshoreFactory
from LakeshoreProtocol import LakeshoreProtocol
import os
import sys
sys.path.insert(0, os.path.realpath(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]),"../../../util"))))
from displayscreen import Screen
class MyOptions(usage.Options):

View File

@ -9,8 +9,10 @@ from twisted.python import log, usage
from Lakeshore370 import Lakeshore370 as MYBASE
from LakeshoreFactory import LakeshoreFactory
from LakeshoreProtocol import LakeshoreProtocol
import os
import sys
sys.path.insert(0, os.path.realpath(os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]),"../../../util"))))
from displayscreen import Screen
class MyOptions(usage.Options):