load_visuals: moved common imports outside of if statement

TUDelft-CNS-ATM · Oct 6, 2016 · 04aeec4 · 04aeec4
1 parent ce2e9ff
commit 04aeec4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/bluesky/tools/load_visuals_txt.py b/bluesky/tools/load_visuals_txt.py
@@ -1,5 +1,7 @@
 from ..settings import gui, data_path
-
+import numpy as np
+from math import cos, radians, degrees, sqrt, atan2, sin, asin
+from zipfile import ZipFile
 REARTH_INV = 1.56961231e-7
 
 
@@ -32,6 +34,7 @@ def load_coastline_txt():
 
 
 if gui == 'qtgl':
+    import OpenGL.GLU as glu
     try:
         from PyQt5.QtCore import Qt
         from PyQt5.QtWidgets import QApplication, QProgressDialog
@@ -66,11 +69,6 @@ def close(self):
             if self.dialog:
                 self.dialog.close()
 
-    import OpenGL.GLU as glu
-    import numpy as np
-    from math import cos, radians, degrees, sqrt, atan2, sin, asin
-    from zipfile import ZipFile
-
     tess = glu.gluNewTess()
     glu.gluTessCallback(tess, glu.GLU_TESS_VERTEX_DATA, lambda vertex, vbuf: vbuf.extend(vertex[0:2]))
     glu.gluTessCallback(tess, glu.GLU_EDGE_FLAG, lambda flag: None)

diff --git a/bluesky/traf/adsbmodel.py b/bluesky/traf/adsbmodel.py
@@ -41,7 +41,7 @@ def SetNoise(self, n):
         self.transnoise = n
         self.truncated  = n
         self.transerror = [1, 100, 100 * ft]  # [degree,m,m] standard bearing, distance, altitude error
-        self.trunctime  = 5  # [s]
+        self.trunctime  = 0  # [s]
 
     def create(self):
         super(ADSB, self).create()