Merge branch 'master' into network-update

bluesky/__init__.py

@@ -71,6 +71,8 @@ def init(mode='sim', configfile=None, scenfile=None, discoverable=False,
     from bluesky import settings
     settings.init(configfile)
 
+    from bluesky import stack, tools
+
     # Initialise tools
     from bluesky import tools
     tools.init()

bluesky/stack/simstack.py

@@ -157,6 +157,8 @@ def readscn(fname):
 
             # Try reading timestamp and command
             try:
+                line = line.split("#")[0].strip()
+
                 icmdline = line.index(">")
                 tstamp = line[:icmdline]
                 ttxt = tstamp.strip().split(":")

bluesky/tools/__init__.py

@@ -1,20 +1,7 @@
-from bluesky import settings
-# Register settings defaults
-settings.set_variable_defaults(prefer_compiled=False)
-if settings.prefer_compiled:
-    try:
-        from . import cgeo as geo
-        print('Using compiled geo functions')
-    except ImportError:
-        from . import geo
-        print('Using Python-based geo functions')
-else:
-    from . import geo
-    print('Using Python-based geo functions')
-
-from . import cachefile
+''' BlueSky tools. '''
 
 
 def init():
+    import bluesky.tools.geo as geo
     print("Reading magnetic variation data")
     geo.initdecl_data()

bluesky/tools/geo/__init__.py

@@ -0,0 +1,36 @@
+''' BlueSky functions for geographical calculations. '''
+from bluesky import settings
+from bluesky.tools.geo._geo import nm, magdec, initdecl_data, magdeccmd, kwikpos
+
+
+# Register settings defaults
+settings.set_variable_defaults(prefer_compiled=False)
+if getattr(settings, 'prefer_compiled'):
+    try:
+        from bluesky.tools.geo._cgeo import (
+            rwgs84,
+            rwgs84_matrix,
+            qdrdist,
+            qdrdist_matrix,
+            latlondist,
+            latlondist_matrix,
+            wgsg,
+            qdrpos,
+            kwikdist,
+            kwikdist_matrix,
+            kwikqdrdist,
+            kwikqdrdist_matrix
+        )
+        print('Using compiled geo functions')
+    except ImportError:
+        from bluesky.tools.geo._geo import (rwgs84, rwgs84_matrix, qdrdist, 
+                                        qdrdist_matrix, latlondist, latlondist_matrix,
+                                        wgsg, qdrpos, kwikdist, kwikdist_matrix, 
+                                        kwikqdrdist, kwikqdrdist_matrix)
+        print('Could not load compiled geo functions, Using Python-based geo functions instead')
+else:
+    from bluesky.tools.geo._geo import (rwgs84, rwgs84_matrix, qdrdist, 
+                                        qdrdist_matrix, latlondist, latlondist_matrix,
+                                        wgsg, qdrpos, kwikdist, kwikdist_matrix, 
+                                        kwikqdrdist, kwikqdrdist_matrix)
+    print('Using Python-based geo functions')

bluesky/tools/src_cpp/cgeo.cpp → bluesky/tools/geo/src_cpp/_cgeo.cpp

@@ -674,25 +674,17 @@ static struct PyMethodDef methods[] = {
 #define PyMODINIT_FUNC void
 #endif
 
-#if PY_MAJOR_VERSION >= 3
 static struct PyModuleDef cgeodef =
 {
     PyModuleDef_HEAD_INIT,
-    "cgeo",      /* name of module */
+    "_cgeo",      /* name of module */
     "",          /* module documentation, may be NULL */
     -1,          /* size of per-interpreter state of the module, or -1 if the module keeps state in global variables. */
     methods
 };
 
-PyMODINIT_FUNC PyInit_cgeo(void)
+PyMODINIT_FUNC PyInit__cgeo(void)
 {
     import_array();
     return PyModule_Create(&cgeodef);
 };
-#else
-PyMODINIT_FUNC initcgeo()
-{
-    Py_InitModule("cgeo", methods);
-    import_array();
-};
-#endif

bluesky/tools/src_cpp/setup.py → bluesky/tools/geo/src_cpp/setup.py

@@ -4,7 +4,7 @@
 from distutils.core import setup, Extension
 import numpy as np
 
-ext_modules = [Extension('cgeo', sources=['cgeo.cpp'])]
+ext_modules = [Extension('_cgeo', sources=['_cgeo.cpp'])]
 
-setup(name='cgeo', version='1.0', include_dirs=[np.get_include()],
+setup(name='_cgeo', version='1.0', include_dirs=[np.get_include()],
       ext_modules=ext_modules)

bluesky/ui/qtgl/glnavdata.py

@@ -129,8 +129,7 @@ def defwpt(self, data):
                                 lon=np.array(data.custwplon, dtype=np.float32))
         lbl = [n[:10].ljust(10) for n in data.custwplbl]
         self.custwplblbuf.update(
-            np.array(lbl, dtype=np.string_))
-
+            np.array(lbl, dtype=np.bytes_))
 
     def create(self):
         apt_size = settings.apt_size
@@ -164,7 +163,7 @@ def create(self):
             if len(wptid) <= 3:
                 self.nnavaids += 1
             wptids += wptid[:5].ljust(5)
-        npwpids = np.array(wptids, dtype=np.string_)
+        npwpids = np.array(wptids, dtype=np.bytes_)
         self.wptlabels.create(npwpids, self.waypoints.lat,
                               self.waypoints.lon, palette.wptlabel,
                               (wpt_size, 0.5 * wpt_size), instanced=True)
@@ -199,7 +198,7 @@ def create(self):
         aptids = ''
         for aptid in apnames:
             aptids += aptid.ljust(4)
-        self.aptlabels.create(np.array(aptids, dtype=np.string_),
+        self.aptlabels.create(np.array(aptids, dtype=np.bytes_),
                               self.airports.lat, self.airports.lon,
                               palette.aptlabel, (apt_size, 0.5 * apt_size),
                               instanced=True)

bluesky/ui/qtgl/gltraffic.py

@@ -429,7 +429,7 @@ def update_aircraft_data(self, data):
                 self.ssd.update(selssd=selssd)
             self.cpalines.update(vertex=cpalines)
             self.color.update(color)
-            self.lbl.update(np.array(rawlabel.encode('utf8'), dtype=np.string_))
+            self.lbl.update(np.array(rawlabel.encode('utf8'), dtype=np.bytes_))
 
             # If there is a visible route, update the start position
             if self.route_acid in data.id:

requirements-gui.txt

@@ -2,11 +2,11 @@ PyQt6
 PyQt6-WebEngine
 pygame
 pyopengl
-numpy
-scipy
-pandas
-matplotlib
-msgpack
+numpy >= 2.0.0
+scipy >= 1.13.0
+matplotlib >= 3.9.0
+pandas >= 2.2.0
+msgpack >= 1.0.0
 zmq
 textual
 bluesky-simdata

requirements.txt

@@ -1,7 +1,7 @@
-numpy
-scipy
-matplotlib
+numpy >= 2.0.0
+scipy >= 1.13.0
+matplotlib >= 3.9.0
 msgpack >= 1.0.0
 zmq
-pandas
+pandas >= 2.2.0
 bluesky-simdata

setup.py

@@ -78,6 +78,6 @@ def get_numpy_include():
         'Source': 'https://github.com/TUDelft-CNS-ATM/bluesky',
     },
     include_dirs=[get_numpy_include()],
-    ext_modules=[Extension('bluesky.tools.cgeo', ['bluesky/tools/src_cpp/cgeo.cpp']),
+    ext_modules=[Extension('bluesky.tools.geo._cgeo', ['bluesky/tools/geo/src_cpp/_cgeo.cpp']),
                 Extension('bluesky.traffic.asas.cstatebased', ['bluesky/traffic/asas/src_cpp/cstatebased.cpp'], include_dirs=['bluesky/tools/src_cpp'])]
 )