GSOC Config editor update (#1103)

* initial implementation of profile window; extended test scope

* completed profile window implementation and related tests

* fixed flake8 test failure

* fixed http auth bugs; extended test scope

* added qt-json-view to support dir; added info in NOTICE

* modified qt-json-view; mentioned modifications in readme

* tested qt-json-view for proper usability

* Provide same test signature

* fixed failing test

* handled socket conn exception; cleaned up unwanted comments

* started implementation of config editor window

* partially implemented merging user settings with default; fixed tests

* implemented merging of default and user settings

* implemented remove option handler

* fixed bugs in 'remove' functionality

* implemented restore defaults functionality

* fixed restore default bugs and added logging statements

* implemented import, export, save_restart

* added comments

* moved import/save/export options to toolbar

Co-authored-by: May <baermay98@gmail.com>

Author: aravindm711

.gitignore

@@ -1,6 +1,7 @@
 .cache/
 .idea/
 .vscode/
+.DS_Store
 *.pyc
 *.swp
 *.patch

NOTICE

@@ -117,3 +117,12 @@ Airports Data
 
 To draw airspaces on the topview we use the services provided by openaip.net
 Further Information: http://www.openaip.net/
+
+Qt-json-view
+------------
+
+Author: Paul Schweizer (https://github.com/PaulSchweizer)
+License: https://github.com/PaulSchweizer/qt-json-view/blob/master/LICENSE (MIT License)
+
+Package for working with JSON files in PyQt5.
+Obtained from Github (https://github.com/PaulSchweizer/qt-json-view), on 23/7/2021.

mslib/_tests/test_utils.py

@@ -193,8 +193,8 @@ def test_get_distance(self):
             assert int(utils.get_distance(coord1, coord2)) == distance
 
     def test_find_location(self):
-        assert utils.find_location(50.92, 6.36) == ((50.92, 6.36), 'Juelich')
-        assert utils.find_location(50.9200002, 6.36) == ((50.92, 6.36), 'Juelich')
+        assert utils.find_location(50.92, 6.36) == ([50.92, 6.36], 'Juelich')
+        assert utils.find_location(50.9200002, 6.36) == ([50.92, 6.36], 'Juelich')
 
 
 class TestProjections(object):

mslib/msui/__init__.py

@@ -57,10 +57,10 @@ class MissionSupportSystemDefaultConfig(object):
     data_dir = "~/mssdata"
 
     # layout of different views, with immutable they can't resized
-    layout = {"topview": (963, 702),
-              "sideview": (913, 557),
-              "linearview": (913, 557),
-              "tableview": (1236, 424),
+    layout = {"topview": [963, 702],
+              "sideview": [913, 557],
+              "linearview": [913, 557],
+              "tableview": [1236, 424],
               "immutable": False}
 
     # Predefined map regions to be listed in the corresponding topview combobox
@@ -97,8 +97,9 @@ class MissionSupportSystemDefaultConfig(object):
     # Also set the location of the image file cache and its size.
 
     # URLs of default WMS servers.
-    default_WMS = ["http://localhost:8081/",
-                   ]
+    default_WMS = [
+        "http://localhost:8081/"
+    ]
 
     default_VSEC_WMS = [
         "http://localhost:8081/"
@@ -119,15 +120,15 @@ class MissionSupportSystemDefaultConfig(object):
     # password to sign in
     MSCOLAB_password = ""
 
-    # dictionary of MSC servers {"http://www.your-mscolab-server.de" : ("youruser", "yourpassword")]
+    # dictionary of MSC servers {"http://www.your-mscolab-server.de" : ("youruser", "yourpassword")}
     MSC_login = {}
 
     # timeout of Url request
     WMS_request_timeout = 30
 
     WMS_preload = []
 
-    # dictionary of WMS servers {"http://www.your-wms-server.de" : ("youruser", "yourpassword")]
+    # dictionary of WMS servers {"http://www.your-wms-server.de" : ("youruser", "yourpassword")}
     WMS_login = {}
 
     # WMS image cache settings:
@@ -147,24 +148,24 @@ class MissionSupportSystemDefaultConfig(object):
     }
 
     locations = {
-        "EDMO": (48.08, 11.28),
-        "Hannover": (52.37, 9.74),
-        "Hamburg": (53.55, 9.99),
-        "Juelich": (50.92, 6.36),
-        "Leipzig": (51.34, 12.37),
-        "Muenchen": (48.14, 11.57),
-        "Stuttgart": (48.78, 9.18),
-        "Wien": (48.20833, 16.373064),
-        "Zugspitze": (47.42, 10.98),
-        "Kiruna": (67.821, 20.336),
-        "Ny-Alesund": (78.928, 11.986),
-        "Zhukovsky": (55.6, 38.116),
-        "Paphos": (34.775, 32.425),
-        "Sharjah": (25.35, 55.65),
-        "Brindisi": (40.658, 17.947),
-        "Nagpur": (21.15, 79.083),
-        "Mumbai": (19.089, 72.868),
-        "Delhi": (28.566, 77.103),
+        "EDMO": [48.08, 11.28],
+        "Hannover": [52.37, 9.74],
+        "Hamburg": [53.55, 9.99],
+        "Juelich": [50.92, 6.36],
+        "Leipzig": [51.34, 12.37],
+        "Muenchen": [48.14, 11.57],
+        "Stuttgart": [48.78, 9.18],
+        "Wien": [48.20833, 16.373064],
+        "Zugspitze": [47.42, 10.98],
+        "Kiruna": [67.821, 20.336],
+        "Ny-Alesund": [78.928, 11.986],
+        "Zhukovsky": [55.6, 38.116],
+        "Paphos": [34.775, 32.425],
+        "Sharjah": [25.35, 55.65],
+        "Brindisi": [40.658, 17.947],
+        "Nagpur": [21.15, 79.083],
+        "Mumbai": [19.089, 72.868],
+        "Delhi": [28.566, 77.103],
     }
 
     # Main application: Template for new flight tracks
@@ -206,3 +207,38 @@ class MissionSupportSystemDefaultConfig(object):
 
     linearview = {"plot_title_size": 10,
                   "axes_label_size": 10}
+
+    config_descriptions = {
+        "filepicker_default": "Documentation Required",
+        "data_dir": "Documentation Required",
+        "predefined_map_sections": "Documentation Required",
+        "num_interpolation_points": "Documentation Required",
+        "num_labels": "Documentation Required",
+        "default_WMS": "Documentation Required",
+        "default_VSEC_WMS": "Documentation Required",
+        "default_LSEC_WMS": "Documentation Required",
+        "default_MSCOLAB": "Documentation Required",
+        "MSCOLAB_mailid": "Documentation Required",
+        "MSCOLAB_password": "Documentation Required",
+        "MSC_login": "Documentation Required",
+        "WMS_request_timeout": "Documentation Required",
+        "WMS_preload": "Documentation Required",
+        "WMS_login": "Documentation Required",
+        "wms_cache": "Documentation Required",
+        "wms_cache_max_size_bytes": "Documentation Required",
+        "wms_cache_max_age_seconds": "Documentation Required",
+        "wms_prefetch": "Documentation Required",
+        "locations": "Documentation Required",
+        "new_flighttrack_template": "Documentation Required",
+        "new_flighttrack_flightlevel": "Documentation Required",
+        "proxies": "Documentation Required",
+        "mscolab_server_url": "Documentation Required",
+        "mss_dir": "Documentation Required",
+        "gravatar_ids": "Documentation Required",
+        "export_plugins": "Documentation Required",
+        "import_plugins": "Documentation Required",
+        "layout": "Documentation Required",
+        "topview": "Documentation Required",
+        "sideview": "Documentation Required",
+        "linearview": "Documentation Required",
+    }

mslib/msui/_tests/test_mscolab.py

@@ -120,7 +120,7 @@ def __init__(self, code, text):
         with mock.patch("PyQt5.QtWidgets.QWidget.setStyleSheet") as mockset:
             with mock.patch("requests.Session.post", new=ExceptionMock(requests.exceptions.ConnectionError).raise_exc):
                 self._login()
-                mockset.assert_has_calls([mock.call("color: red;"), mock.call("color: white;")])
+                mockset.assert_has_calls([mock.call("color: red;"), mock.call("")])
 
         # case: when the credentials are incorrect for login
         self._connect_to_mscolab()