Loading VSWR marker values failed if only one value was saved.

R+jX charts now have 4 distinct colours for lines as well. (Fixes #39)
pull/44/head
Rune B. Broberg 2019-10-13 17:57:39 +02:00
rodzic 0e18bbb095
commit f628e9df7e
2 zmienionych plików z 5 dodań i 1 usunięć

Wyświetl plik

@ -1758,7 +1758,7 @@ class RealImaginaryChart(FrequencyChart):
prev_y_re = self.getReYPosition(self.reference[i-1])
prev_y_im = self.getImYPosition(self.reference[i-1])
line_pen.setColor(self.secondaryReferenceColor)
line_pen.setColor(self.referenceColor)
qp.setPen(line_pen)
# Real part first
if self.isPlotable(x, y_re) and self.isPlotable(prev_x, prev_y_re):

Wyświetl plik

@ -1186,6 +1186,10 @@ class DisplaySettingsWindow(QtWidgets.QWidget):
self.vswrMarkers: List[float] = self.app.settings.value("VSWRMarkers", [], float)
if isinstance(self.vswrMarkers, float):
# Single values from the .ini become floats rather than lists. Convert them.
self.vswrMarkers = [self.vswrMarkers]
self.btn_vswr_picker = QtWidgets.QPushButton("")
self.btn_vswr_picker.setFixedWidth(20)
self.btn_vswr_picker.clicked.connect(lambda: self.setColor("vswr", QtWidgets.QColorDialog.getColor(self.vswrColor, options=QtWidgets.QColorDialog.ShowAlphaChannel)))