Don't reset layer selection on get_capabilities (#1167)

* Don't switch layer selection if already selected

* Reselect after deleted server

Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de>

Author: Marilyth

mslib/msui/_tests/test_wms_control.py

@@ -81,6 +81,12 @@ def _setup(self, widget_type):
             self.window = wc.VSecWMSControlWidget(
                 view=self.view, wms_cache=self.tempdir, waypoints_model=waypoints_model)
         self.window.show()
+
+        # Remove all previous cached URLs
+        for url in self.window.multilayers.layers.copy():
+            server = self.window.multilayers.listLayers.findItems(url, QtCore.Qt.MatchFixedString)[0]
+            self.window.multilayers.delete_server(server)
+
         QtWidgets.QApplication.processEvents()
         QtTest.QTest.qWait(2000)
         QtTest.QTest.qWaitForWindowExposed(self.window)
@@ -566,6 +572,12 @@ def setup(self):
         self.view = HSecViewMockup()
         self.window = wc.HSecWMSControlWidget(view=self.view)
         self.window.show()
+
+        # Remove all previous cached URLs
+        for url in self.window.multilayers.layers.copy():
+            server = self.window.multilayers.listLayers.findItems(url, QtCore.Qt.MatchFixedString)[0]
+            self.window.multilayers.delete_server(server)
+
         QtWidgets.QApplication.processEvents()
 
     def teardown(self):

mslib/msui/multilayers.py

@@ -315,7 +315,7 @@ def add_wms(self, wms):
             icon = QtGui.QIcon(icons("64x64", "bin.png"))
             header.setIcon(0, icon)
 
-    def add_multilayer(self, name, wms):
+    def add_multilayer(self, name, wms, auto_select=False):
         """
         Adds a layer to the multilayer list, with the wms url as a parent
         """
@@ -369,8 +369,10 @@ def style_changed(layer):
             if widget.is_invalid:
                 widget.setDisabled(True)
                 return
-            self.current_layer = widget
-            self.listLayers.setCurrentItem(widget)
+
+            if not self.current_layer or auto_select:
+                self.current_layer = widget
+                self.listLayers.setCurrentItem(widget)
 
     def multilayer_clicked(self, item):
         """

mslib/msui/wms_control.py

@@ -745,13 +745,14 @@ def activate_wms(self, wms, cache=False):
         logging.debug("discovered %i layers that can be used in this view",
                       len(filtered_layers))
         filtered_layers = sorted(filtered_layers)
+        selected = self.multilayers.current_layer.text(0) if self.multilayers.current_layer else None
         if not cache and wms.url in self.multilayers.layers and \
                 wms.capabilities_document.decode("utf-8") != \
                 self.multilayers.layers[wms.url]["wms"].capabilities_document.decode("utf-8"):
             self.multilayers.delete_server(self.multilayers.layers[wms.url]["header"])
         self.multilayers.add_wms(wms)
         for layer in filtered_layers:
-            self.multilayers.add_multilayer(layer, wms)
+            self.multilayers.add_multilayer(layer, wms, layer == selected)
         self.multilayers.filter_multilayers()
         self.multilayers.update_checkboxes()
         self.multilayers.pbViewCapabilities.setEnabled(True)