diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | gpsclient.c (renamed from gpslib.c) | 18 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rwxr-xr-x | xgps | 26 |
5 files changed, 32 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index a8bdca73..12f9d47a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -238,7 +238,7 @@ $(PYEXTENSIONS): stamp-python-modules +@WITNESS=stamp-python-modules; $(MULTIOUT_RECOVER_DELETED) # TODO: Should the dependency on libgps.la be enforced inside # setup.py? (See the variable 'needed_files' in setup.py.) -stamp-python-modules: gpspacket.c gpslib.c libgps.la setup.py +stamp-python-modules: gpspacket.c gpsclient.c libgps.la setup.py @rm -f '$@' '$@.tmp' @echo 'timestamp for $@' > '$@.tmp' (cd '$(srcdir)' && \ @@ -423,7 +423,7 @@ EXTRA_DIST = \ valgrind-audit \ valgrind-suppressions \ gpspacket.c \ - gpslib.c \ + gpsclient.c \ driver_proto.c \ monitor_proto.c \ setup.py \ @@ -1,4 +1,4 @@ -* Fri Dec 4 2009 Eric S. Raymond <esr@snark.thyrsus.com> - 2.91dev +* Tue Dec 15 2009 Eric S. Raymond <esr@snark.thyrsus.com> - 2.91dev We have support for NMEA GLONASS sentences, and a regression test. Clients now get a DEVICE dotification on every driver switch. It is possible to specify a TCP/IP AIS feed such as AISHub @@ -6,7 +6,8 @@ it was probably nonfunctional for several releases before this. Fixed buggy display of satellite-used flags in cgps. xgps is replaced by a rewrite in Python that uses pygtk, eliminating a - dependency on Motif. + dependency on Motif. Uniform treatment of display-unit defaulting and + -u in xgps, cgps, and lcdgps. * Fri Dec 4 2009 Eric S. Raymond <esr@snark.thyrsus.com> - 2.90 GPSD-NG, the new JSON-based command protocol, is now deployed; as a @@ -13,7 +13,7 @@ */ static PyObject * -gpslib_deg_to_str(PyObject *self, PyObject *args) +gpsclient_deg_to_str(PyObject *self, PyObject *args) { int fmt; double degrees; @@ -24,7 +24,7 @@ gpslib_deg_to_str(PyObject *self, PyObject *args) } static PyObject * -gpslib_gpsd_units(PyObject *self, PyObject *args) +gpsclient_gpsd_units(PyObject *self, PyObject *args) { if (!PyArg_ParseTuple(args, "")) return NULL; @@ -36,7 +36,7 @@ gpslib_gpsd_units(PyObject *self, PyObject *args) */ static PyObject * -gpslib_wgs84_separation(PyObject *self, PyObject *args) +gpsclient_wgs84_separation(PyObject *self, PyObject *args) { const double lat, lon; double sep; @@ -49,12 +49,12 @@ gpslib_wgs84_separation(PyObject *self, PyObject *args) /* List of functions defined in the module */ -static PyMethodDef gpslib_methods[] = { - {"wgs84_separation", gpslib_wgs84_separation, METH_VARARGS, +static PyMethodDef gpsclient_methods[] = { + {"wgs84_separation", gpsclient_wgs84_separation, METH_VARARGS, PyDoc_STR("Return WGS84 geodetic separation in meters.")}, - {"deg_to_str", gpslib_deg_to_str, METH_VARARGS, + {"deg_to_str", gpsclient_deg_to_str, METH_VARARGS, PyDoc_STR("String-format a latitude/longitude.")}, - {"gpsd_units", gpslib_gpsd_units, METH_VARARGS, + {"gpsd_units", gpsclient_gpsd_units, METH_VARARGS, PyDoc_STR("Deduce a set of units from locale and environment.")}, {NULL, NULL} /* sentinel */ }; @@ -64,11 +64,11 @@ PyDoc_STRVAR(module_doc, "); PyMODINIT_FUNC -initgpslib(void) +initclient(void) { PyObject *m; - m = Py_InitModule3("gpslib", gpslib_methods, module_doc); + m = Py_InitModule3("gps.client", gpsclient_methods, module_doc); PyModule_AddIntConstant(m, "deg_dd", deg_dd); PyModule_AddIntConstant(m, "deg_ddmm", deg_ddmm); @@ -58,7 +58,7 @@ setup( name="gpsd", version="1.0", ext_modules=[ Extension("gps.packet", gpspacket_sources), - Extension("gps.client", ["gpslib.c", "geoid.c", "gpsdclient.c", "strl.c"]) + Extension("gps.client", ["gpsclient.c", "geoid.c", "gpsdclient.c", "strl.c"]) ], py_modules = ['gpsfake','gps'], data_files=[('bin', ['gpscat','gpsfake','gpsprof'])] + manpages @@ -207,19 +207,27 @@ class Base: quit.connect("clicked", lambda w: gtk.main_quit()) quit.show() + #viewmenu = gtk.Menu() + #for (t, w) in (("Satellites", self.satbox), + # ("Raw Data", self.rawdisplay), + # ("GPS Display", self.dataframe)): + # button = gtk.CheckButton(t) + # viewmenu.add(button) + #viewmenu.show_all() + #properties = gtk.ToolButton(gtk.STOCK_PROPERTIES) #toolbar.insert(properties, -1) #properties.set_tooltip_text("Preferences.") #properties.connect("clicked", self.properties_handler) #properties.show() - hbox = gtk.HBox(False, 0) - vbox.add(hbox) - hbox.show() + self.satbox = gtk.HBox(False, 0) + vbox.add(self.satbox) + self.satbox.show() skyframe = gtk.Frame(label="Satellite List") skyframe.show() - hbox.add(skyframe) + self.satbox.add(skyframe) self.satlist = gtk.ListStore(str,str,str,str,str) view = gtk.TreeView(model=self.satlist) @@ -241,7 +249,7 @@ class Base: viewframe = gtk.Frame(label="Skyview") viewframe.show() - hbox.add(viewframe) + self.satbox.add(viewframe) self.skyview = SkyView() self.skyview.show() viewframe.add(self.skyview) @@ -251,9 +259,9 @@ class Base: self.rawdisplay.show() vbox.add(self.rawdisplay) - dataframe = gtk.Frame(label="GPS data") + self.dataframe = gtk.Frame(label="GPS data") datatable = gtk.Table(7, 4, False) - dataframe.add(datatable) + self.dataframe.add(datatable) gpswidgets = [] for i in range(len(Base.gpsfields)): if i < len(Base.gpsfields) / 2: @@ -267,8 +275,8 @@ class Base: entry = gtk.Entry() datatable.attach(entry, colbase+1, colbase+2, i % 7, i % 7 + 1) gpswidgets.append(entry) - dataframe.show_all() - vbox.add(dataframe) + self.dataframe.show_all() + vbox.add(self.dataframe) self.window.show() |