Merge pull request #195 from NanoVNA-Saver/Development

v0.3.1 fixes assited calibration crash
pull/216/head v0.3.1
Holger Müller 2020-06-27 21:58:41 +02:00 zatwierdzone przez GitHub
commit b33034acff
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 13 dodań i 8 usunięć

Wyświetl plik

@ -1,3 +1,8 @@
v0.3.1
======
- fixed crash with calibration assistant
v0.3.0
======

Wyświetl plik

@ -17,12 +17,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
VERSION = "0.3.0"
VERSION = "0.3.1"
VERSION_URL = (
"https://raw.githubusercontent.com/"
"NanoVNA-Saver/nanovna-saver/master/NanoVNASaver/About.py")
INFO_URL="https://github.com/NanoVNA-Saver/nanovna-saver"
INFO_URL = "https://github.com/NanoVNA-Saver/nanovna-saver"
INFO = f"""NanoVNASaver {VERSION}
Copyright (C) 2019, 2020 Rune B. Broberg
@ -34,4 +34,4 @@ This program is licensed under the GNU General Public License version 3
See {INFO_URL} for further details.
"""
RELEASE_URL="https://github.com/NanoVNA-Saver/nanovna-saver"
RELEASE_URL = "https://github.com/NanoVNA-Saver/nanovna-saver"

Wyświetl plik

@ -673,7 +673,7 @@ class CalibrationWindow(QtWidgets.QWidget):
if self.nextStep == 0:
# Short
self.save("short")
self.cal_save("short")
self.nextStep = 1
open_step = QtWidgets.QMessageBox(
@ -697,7 +697,7 @@ class CalibrationWindow(QtWidgets.QWidget):
if self.nextStep == 1:
# Open
self.save("open")
self.cal_save("open")
self.nextStep = 2
load_step = QtWidgets.QMessageBox(
QtWidgets.QMessageBox.Information,
@ -718,7 +718,7 @@ class CalibrationWindow(QtWidgets.QWidget):
if self.nextStep == 2:
# Load
self.save("load")
self.cal_save("load")
self.nextStep = 3
continue_step = QtWidgets.QMessageBox(
QtWidgets.QMessageBox.Information,
@ -762,7 +762,7 @@ class CalibrationWindow(QtWidgets.QWidget):
if self.nextStep == 3:
# Isolation
self.save("isolation")
self.cal_save("isolation")
self.nextStep = 4
through_step = QtWidgets.QMessageBox(
QtWidgets.QMessageBox.Information,
@ -784,7 +784,7 @@ class CalibrationWindow(QtWidgets.QWidget):
if self.nextStep == 4:
# Done
self.save("through")
self.cal_save("through")
apply_step = QtWidgets.QMessageBox(
QtWidgets.QMessageBox.Information,
"Calibrate complete",