mirror
/
nanovna-saver
kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Bugfix: Handle more than 6 saved markers

pull/56/head
Rune Broberg 2019-10-23 09:36:34 +02:00
rodzic eabe6fb488
commit 2c12599e33
1 zmienionych plików z 7 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
NanoVNASaver/NanoVNASaver.py
Wyświetl plik

@ -284,7 +284,11 @@ class NanoVNASaver(QtWidgets.QWidget):
marker_count = self.settings.value("MarkerCount", 3, int)
for i in range(marker_count):
color = self.settings.value("Marker" + str(i+1) + "Color", self.default_marker_colors[i])
if i < len(self.default_marker_colors):
default_color = self.default_marker_colors[i]
else:
default_color = self.default_marker_colors[len(self.default_marker_colors) - 1]
color = self.settings.value("Marker" + str(i+1) + "Color", default_color)
marker = Marker("Marker " + str(i+1), color)
marker.updated.connect(self.dataUpdated)
label, layout = marker.getRow()
@ -309,9 +313,8 @@ class NanoVNASaver(QtWidgets.QWidget):
self.marker_data_layout = QtWidgets.QVBoxLayout()
self.marker_data_layout.setContentsMargins(0, 0, 0, 0)
self.marker_data_layout.addWidget(self.markers[0].getGroupBox())
self.marker_data_layout.addWidget(self.markers[1].getGroupBox())
self.marker_data_layout.addWidget(self.markers[2].getGroupBox())
for m in self.markers:
self.marker_data_layout.addWidget(m.getGroupBox())
self.marker_column.addLayout(self.marker_data_layout)