Fix some imports

heeres · Feb 23, 2009 · 25351ba · 25351ba
1 parent 259b0e2
commit 25351ba
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/shell/02_qtlab_start.py b/shell/02_qtlab_start.py
@@ -1,7 +1,7 @@
 import types
 from instrument import Instrument
 from lib.gui.qtwindow import QTWindow
-from lib.calltimer import exact_time
+from lib.misc import exact_time
 
 try:
     import psyco

diff --git a/shell/20_measurement_loops.py b/shell/20_measurement_loops.py
@@ -4,6 +4,7 @@
 import shutil
 import copy
 from lib import calltimer
+from measurement import Measurement
 
 def _get_steps(start, end, steps, stepsize):
     if steps == 0 and stepsize == 0:

diff --git a/source/gui/measurement_window.py b/source/gui/measurement_window.py
@@ -25,7 +25,6 @@
 import qt
 from instrument import Instrument
 from lib.gui.qtwindow import QTWindow
-from lib.calltimer import CallTimerThread
 from lib.gui.dropdowns import AllParametersDropdown
 import lib.gui as gui
 

diff --git a/source/instrument.py b/source/instrument.py
@@ -20,7 +20,6 @@
 import copy
 import time
 import math
-import threading
 from gettext import gettext as _L
 from lib import calltimer