Skip to content

Commit 7d267fb

Browse files
authored
Merge pull request #233 from semuconsulting/make_settings_dockable
RC 1.6.0
2 parents d69f732 + 57c8922 commit 7d267fb

71 files changed

Lines changed: 2522 additions & 1634 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.vscode/tasks.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
"pip",
196196
"install",
197197
"--force-reinstall",
198-
"${workspaceFolder}/dist/pygpsclient-1.5.22-py3-none-any.whl",
198+
"${workspaceFolder}/dist/pygpsclient-1.6.0-py3-none-any.whl",
199199
]
200200
},
201201
"problemMatcher": [],
@@ -275,15 +275,18 @@
275275
"problemMatcher": []
276276
},
277277
{
278-
"label": "Run Installed Version",
278+
"label": "Run from Source",
279279
"type": "shell",
280-
"command": "${config:python.defaultInterpreterPath}",
280+
"command": "python3",
281281
"args": [
282282
"-m",
283283
"pygpsclient",
284284
//"--verbosity",
285285
//"3"
286286
],
287+
"options": {
288+
"cwd": "${workspaceFolder}/src"
289+
},
287290
"problemMatcher": []
288291
},
289292
]

CONTRIBUTING.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ Please help us keep our issue list small by adding fixes: #{$ISSUE_NO} to the co
1515
## Coding conventions
1616

1717
* This is open source software. Code should be as simple and transparent as possible. Favour clarity over brevity.
18-
* Avoid external library dependencies unless there's a compelling reason not to.
19-
* We use and recommend [Visual Studio Code](https://code.visualstudio.com/) with the [Python Extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python) for development and testing.
18+
* Avoid external library dependencies (*especially those only available as source distributions*) unless there's a compelling reason not to.
19+
* Avoid platform-specific methods (*be vigilant with tkinter window manager methods*).
2020
* Code should be documented in accordance with [Sphinx](https://www.sphinx-doc.org/en/master/) docstring conventions.
2121
* Code should formatted using [black](https://pypi.org/project/black/).
22+
* We use and recommend [Visual Studio Code](https://code.visualstudio.com/) with the [Python Extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python) for development and testing.
2223
* We use and recommend [pylint](https://pypi.org/project/pylint/) for code analysis.
2324
* We use and recommend [bandit](https://pypi.org/project/bandit/) for security vulnerability analysis.
2425
* Commits must be [signed](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits).

INSTALLATION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ In the following, `python3` & `pip` refer to the Python 3 executables. You may n
6363

6464
- Python >= 3.10⁴
6565
- Tk (tkinter) >= 8.6⁵ (*tkinter is a commonly used library for developing Graphical User Interfaces (GUI) in Python*)
66-
- Screen resolution >= 640 x 400; Ideally 1920 x 1080, though at lower screen resolutions (<= 1024 width), top level dialogs will be resizable and scrollable.
66+
- Screen resolution >= 640 x 480 (VGA); Ideally 1920 x 1080, though at lower screen resolutions (<= 1024 width), top level dialogs will be resizable and scrollable.
6767

6868
**NB** It is highly recommended to use the latest official [Python.org](https://www.python.org/downloads/) installation package for your platform, rather than any pre-installed version.
6969

README.md

Lines changed: 44 additions & 21 deletions
Large diffs are not rendered by default.

RELEASE_NOTES.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# PyGPSClient Release Notes
22

3+
### RELEASE 1.6.0
4+
5+
FIXES:
6+
7+
1. Fix Load Configuration error \#232 `AttributeError: 'tuple' object has no attribute 'upper'`.
8+
9+
ENHANCEMENTS:
10+
11+
1. Add user-selectable Signals widget, displaying individual GNSS PRN / Signal ID levels and (where applicable) correction sources (receiver must support UBX NAV-SIG messages). Provides greater granularity than the existing Levels widget for UBX devices. Signal IDs are shown in RINEX format e.g. "L1_C/A", "E5_aQ", etc.
12+
1. Add user-defined preset import facility to Configuration Load/Save/Record panel (accessed via Menu..Options..Configuration Command Recorder). This allows user to record a sequence of UBX, NMEA or TTY commands as they are sent to the receiver and to import this sequence as a user-defined preset in the PyGPSClient json configuration file. This obviates the need to edit the configuration file manually. Remember to re-save the configuration file to persist the changes.
13+
1. Add Undock/Dock Settings panel facility, via Menu..View..Undock/Dock Settings. Settings panel can now be undocked from the main application window and displayed as a separate Toplevel dialog. If (*and only if*) non-transient (`transient_dialog_b: 0`), the settings panel can be minimized independently of the main window.
14+
1. NTRIP Caster / Socket Server Configuration is now a separate Toplevel dialog panel, accessed through Server Config button on Settings panel or via Menu..Options..Server Configuration. Number of connected clients is now displayed in topmost banner panel.
15+
1. Show "C/No = 0 dbHz" option ("unused satellites") is now accessible through double-right-click on LevelsView and SignalsView widgets; option removed from main Settings panel.
16+
1. Minor cosmetic updates to various panels to improve navigation on smaller / lower resolution screens.
17+
318
### RELEASE 1.5.23
419

520
FIXES:

docs/pygpsclient.rst

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ pygpsclient.canvas\_map module
3636
:undoc-members:
3737
:show-inheritance:
3838

39-
pygpsclient.canvas\_plot module
40-
-------------------------------
39+
pygpsclient.canvas\_subclasses module
40+
-------------------------------------
4141

42-
.. automodule:: pygpsclient.canvas_plot
42+
.. automodule:: pygpsclient.canvas_subclasses
4343
:members:
4444
:undoc-members:
4545
:show-inheritance:
@@ -300,10 +300,26 @@ pygpsclient.serialconfig\_lband\_frame module
300300
:undoc-members:
301301
:show-inheritance:
302302

303-
pygpsclient.serverconfig\_frame module
304-
--------------------------------------
303+
pygpsclient.serverconfig\_dialog module
304+
---------------------------------------
305+
306+
.. automodule:: pygpsclient.serverconfig_dialog
307+
:members:
308+
:undoc-members:
309+
:show-inheritance:
310+
311+
pygpsclient.settings\_child\_frame module
312+
-----------------------------------------
313+
314+
.. automodule:: pygpsclient.settings_child_frame
315+
:members:
316+
:undoc-members:
317+
:show-inheritance:
305318

306-
.. automodule:: pygpsclient.serverconfig_frame
319+
pygpsclient.settings\_dialog module
320+
-----------------------------------
321+
322+
.. automodule:: pygpsclient.settings_dialog
307323
:members:
308324
:undoc-members:
309325
:show-inheritance:
@@ -316,6 +332,14 @@ pygpsclient.settings\_frame module
316332
:undoc-members:
317333
:show-inheritance:
318334

335+
pygpsclient.signalsview\_frame module
336+
-------------------------------------
337+
338+
.. automodule:: pygpsclient.signalsview_frame
339+
:members:
340+
:undoc-members:
341+
:show-inheritance:
342+
319343
pygpsclient.skyview\_frame module
320344
---------------------------------
321345

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ disable = """
129129
too-many-public-methods,
130130
too-many-locals,
131131
invalid-name,
132-
logging-fstring-interpolation
132+
logging-fstring-interpolation,
133133
"""
134134

135135
[tool.pytest.ini_options]
136136
minversion = "7.0"
137-
addopts = "--cov --cov-report html --cov-fail-under 18"
137+
addopts = "--cov --cov-report html --cov-fail-under 16"
138138
pythonpath = ["src"]
139139
testpaths = ["tests"]
140140

@@ -145,7 +145,7 @@ source = ["src"]
145145
source = ["src"]
146146

147147
[tool.coverage.report]
148-
fail_under = 18
148+
fail_under = 16
149149

150150
[tool.coverage.html]
151151
directory = "htmlcov"

src/pygpsclient/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# pylint: disable=invalid-name
1010

1111
from pygpsclient._version import __version__
12-
from pygpsclient.helpers import nmea2preset, ubx2preset
12+
from pygpsclient.helpers import nmea2preset, tty2preset, ubx2preset
1313
from pygpsclient.sqlite_handler import retrieve_data
1414

1515
version = __version__

src/pygpsclient/__main__.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ def main():
102102
type=int,
103103
default=SUPPRESS,
104104
)
105+
ap.add_argument(
106+
"--tlspempath",
107+
help="Fully qualified path to TLS PEM (private key/certificate) file",
108+
default=SUPPRESS,
109+
)
110+
ap.add_argument(
111+
"--tlscrtpath",
112+
help="Fully qualified path to TLS CRT (certificate) file",
113+
default=SUPPRESS,
114+
)
105115
ap.add_argument(
106116
"--verbosity",
107117
help=(

src/pygpsclient/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
:license: BSD 3-Clause
99
"""
1010

11-
__version__ = "1.5.23"
11+
__version__ = "1.6.0"

0 commit comments

Comments
 (0)