Merge pull request #56 from mihtjel/Development

Bugfix: Handle more than 6 saved markers
NanoVNA-Saver · Oct 23, 2019 · ec59c39 · ec59c39
2 parents e664d15 + 2c12599
commit ec59c39
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/NanoVNASaver/NanoVNASaver.py b/NanoVNASaver/NanoVNASaver.py
@@ -284,7 +284,11 @@ def __init__(self):
 
         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 @@ def __init__(self):
         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)