merging in GSOC2021-AravindMurali (#1171)

* Squashed commit of the following: commit c4b273c Merge: e6014c0 d7716ba Author: ReimarBauer <rb.proj@gmail.com> Date: Mon Aug 23 15:10:26 2021 +0200 Merge pull request #1169 from aravindm711/gsoc-develop-merge-4 Gsoc develop merge 4 commit d7716ba Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Aug 23 17:11:00 2021 +0530 refactored tests for help dialog commit 111f64c Merge: e6014c0 da77f88 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Aug 23 16:58:35 2021 +0530 Merge branch 'develop' into gsoc-develop-merge-4 # Conflicts: # mslib/mscolab/_tests/test_chat_manager.py # mslib/mscolab/_tests/test_file_manager.py # mslib/mscolab/_tests/test_files.py # mslib/mscolab/_tests/test_files_api.py # mslib/mscolab/_tests/test_seed.py # mslib/mscolab/_tests/test_server.py # mslib/mscolab/_tests/test_user.py # mslib/mscolab/_tests/test_utils.py # mslib/msui/_tests/test_mscolab.py commit e6014c0 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sun Aug 22 11:49:12 2021 +0530 GSoC update - Updated MSColab help dialog (#1161) * partially updated mscolab help dialog * updated mscolab help dialog * updated collaborator description commit b6517e2 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sun Aug 22 02:46:33 2021 +0530 GSoC config editor update 3 - refactor of config_loader (#1159) * refactor of config_loader * moved config class to config submodule * moved config related tests to its own submodule; extended test scope * fixed restart bug commit 7a10464 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 18 01:04:20 2021 +0530 GSoC config editor update 2 - validations (#1154) * added validations for config options * removed comments; fixed bugs * changed shortcut for views to meta for macOS * changed dialogs from question to warning commit 3cf5476 Merge: 242f1f9 478af6b Author: ReimarBauer <rb.proj@gmail.com> Date: Wed Aug 11 15:14:21 2021 +0200 Merge pull request #1143 from aravindm711/GSOC2021-AravindMurali_gets_updated GSoC develop merge 3 commit 478af6b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 11 17:37:40 2021 +0530 added assert statements from recent changes in develop commit bec4268 Merge: 242f1f9 36f4467 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 11 17:22:26 2021 +0530 Merge branch 'develop' into GSOC2021-AravindMurali_gets_updated # Conflicts: # mslib/msui/_tests/test_mscolab_version_history.py commit 242f1f9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 11 13:09:20 2021 +0530 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> commit ff38534 Merge: f57bbb8 ae254f0 Author: J. Ungermann <j.ungermann@fz-juelich.de> Date: Wed Aug 4 10:46:43 2021 +0200 Merge pull request #1119 from aravindm711/gsoc-develop-merge-2 Gsoc develop merge 2 commit ae254f0 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Aug 3 14:04:24 2021 +0530 changed connect_window in tests to non modal to prevent time-out commit 9dad762 Merge: f57bbb8 7d4d924 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Aug 3 10:12:47 2021 +0530 Merge remote-tracking branch 'upstream/develop' into gsoc-develop-merge-2 commit f57bbb8 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jul 23 16:22:12 2021 +0530 New Profile window (#1086) * 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 * Provide same test signature * fixed failing test Co-authored-by: May <baermay98@gmail.com> commit 853e2d5 Merge: 69672e4 7050cd9 Author: ReimarBauer <rb.proj@gmail.com> Date: Sun Jul 18 07:29:12 2021 +0200 Merge pull request #1082 from aravindm711/gsoc-develop-merge Gsoc develop merge commit 7050cd9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sat Jul 17 16:08:16 2021 +0530 fixed tests; merged open/import commit 8c0f788 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Thu Jul 15 14:24:31 2021 +0530 fixed mainwindow tests commit 69672e4 Merge: 018babe 45b2343 Author: ReimarBauer <rb.proj@gmail.com> Date: Thu Jul 15 09:45:19 2021 +0200 Merge pull request #1079 from aravindm711/GSOC2021-AravindMurali GSoC Progress Update 2 - Integrated plugins, refactored tests commit 19faae6 Merge: 45b2343 e2607fb Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jul 13 20:11:23 2021 +0530 Merge remote-tracking branch 'upstream/develop' into gsoc-develop-merge # Conflicts: # mslib/msui/_tests/test_mscolab.py # mslib/msui/_tests/test_mss_pyui.py # mslib/msui/mscolab.py commit 45b2343 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jul 13 19:51:05 2021 +0530 fixed requested changes commit d8d7987 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jul 13 10:55:53 2021 +0530 fixed failing tests and flake8 errors commit 38107a7 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sun Jul 11 15:47:38 2021 +0530 added plugin filter to add project browse; refactored tests commit 018babe Merge: 7895db8 4eecd75 Author: J. Ungermann <j.ungermann@fz-juelich.de> Date: Thu Jul 8 09:05:37 2021 +0200 Merge pull request #1059 from aravindm711/GSOC2021-AravindMurali GSoC progress update commit 4eecd75 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jul 7 15:03:13 2021 +0530 integrated plugins with save flighttrack commit a4fdf64 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Jul 5 21:23:04 2021 +0530 removed activate flighttrack submenu commit 1f72361 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jul 2 16:27:33 2021 +0530 made some improvements to ui commit 943216b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jul 2 11:50:58 2021 +0530 fixed bug while opening views in local commit 2ea1282 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Thu Jul 1 21:44:14 2021 +0530 moved from tabs to parallel layout of lists commit fb9d359 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Thu Jul 1 14:41:21 2021 +0530 fixed view behaviour commit 690b49c Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jun 30 23:24:02 2021 +0530 initial implementation of change in view behaviour commit 21727f9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jun 30 19:53:43 2021 +0530 partially fixed mscolab tests commit 2354ae9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jun 30 00:21:46 2021 +0530 fixed view appearance; started test refactoring commit 7895db8 Merge: e516945 f55501d Author: J. Ungermann <j.ungermann@fz-juelich.de> Date: Fri Jun 25 13:41:58 2021 +0200 Merge pull request #1030 from aravindm711/GSOC2021-AravindMurali Implementation of Connect Window commit f55501d Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jun 25 14:49:09 2021 +0530 fixed view submenus, fatal errors commit 2649a45 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jun 22 21:12:30 2021 +0530 improvements to ui commit 5b76093 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jun 22 01:01:02 2021 +0530 completed merging of both window functionalities commit 83fe70b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sat Jun 19 00:27:12 2021 +0530 retained mscolab functionalities in separate file commit 8660f5b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Jun 14 13:59:02 2021 +0530 partial implementation of after_login in main window commit 91c6b35 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jun 11 17:04:34 2021 +0530 implemented new connect window * fixed popup bug; handled json error message loading Co-authored-by: Aravind Murali <aravindmurali711@gmail.com>
Open-MSS · Aug 24, 2021 · 029089e · 029089e
1 parent da77f88
commit 029089e
Show file tree

Hide file tree

Showing 88 changed files with 25,347 additions and 21,330 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .cache/
 .idea/
 .vscode/
+.DS_Store
 *.pyc
 *.swp
 *.patch

diff --git a/NOTICE b/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.
diff --git a/mslib/mscolab/_tests/test_chat.py b/mslib/mscolab/_tests/test_chat.py
@@ -38,8 +38,8 @@
 from mslib.mscolab.conf import mscolab_settings
 from mslib.mscolab.models import Message, MessageType
 from mslib.msui.icons import icons
-from mslib.msui.mscolab import MSSMscolabWindow
 from mslib._tests.utils import mscolab_start_server
+import mslib.msui.mss_pyui as mss_pyui
 
 
 PORTS = list(range(9300, 9320))
@@ -52,17 +52,16 @@ def setup(self):
         self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS)
         QtTest.QTest.qWait(500)
         self.application = QtWidgets.QApplication(sys.argv)
-        self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
-                                       mscolab_server_url=self.url)
+        self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
         self.sockets = []
 
     def teardown(self):
         for socket in self.sockets:
             socket.disconnect()
-        if self.window.version_window:
-            self.window.version_window.close()
-        if self.window.conn:
-            self.window.conn.disconnect()
+        if self.window.mscolab.version_window:
+            self.window.mscolab.version_window.close()
+        if self.window.mscolab.conn:
+            self.window.mscolab.conn.disconnect()
         self.window.hide()
         QtWidgets.QApplication.processEvents()
         self.application.quit()

diff --git a/mslib/mscolab/_tests/test_sockets.py b/mslib/mscolab/_tests/test_sockets.py
@@ -34,8 +34,8 @@
 
 from PyQt5 import QtWidgets, QtTest
 from mslib.mscolab.conf import mscolab_settings
-from mslib.msui.mscolab import MSSMscolabWindow
 from mslib._tests.utils import mscolab_start_server
+import mslib.msui.mss_pyui as mss_pyui
 
 
 PORTS = list(range(9521, 9540))
@@ -51,17 +51,16 @@ def setup(self):
         self.process, self.url, self.app, _, self.cm, self.fm = mscolab_start_server(PORTS)
         QtTest.QTest.qWait(500)
         self.application = QtWidgets.QApplication(sys.argv)
-        self.window = MSSMscolabWindow(data_dir=mscolab_settings.MSCOLAB_DATA_DIR,
-                                       mscolab_server_url=self.url)
+        self.window = mss_pyui.MSSMainWindow(mscolab_data_dir=mscolab_settings.MSCOLAB_DATA_DIR)
         self.sockets = []
 
     def teardown(self):
         for socket in self.sockets:
             socket.disconnect()
-        if self.window.version_window:
-            self.window.version_window.close()
-        if self.window.conn:
-            self.window.conn.disconnect()
+        if self.window.mscolab.version_window:
+            self.window.mscolab.version_window.close()
+        if self.window.mscolab.conn:
+            self.window.mscolab.conn.disconnect()
         self.application.quit()
         QtWidgets.QApplication.processEvents()
         self.process.terminate()

diff --git a/mslib/msui/__init__.py b/mslib/msui/__init__.py
@@ -4,8 +4,6 @@
     mslib.msui
     ~~~~~~~~~~
 
-    This module provides the default configuration for the msui
-
     This file is part of mss.
 
     :copyright: Copyright 2008-2014 Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
@@ -25,181 +23,3 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 """
-
-import os
-import tempfile
-
-
-class MissionSupportSystemDefaultConfig(object):
-    """Central configuration for the Mission Support System User Interface
-       Application (mss).
-
-    This file is part of the Mission Support System User Interface (mss).
-
-    DESCRIPTION:
-    ============
-
-    This file includes configuration settings central to the entire
-    Mission Support User Interface (mss). Among others, define
-     -- available map projections
-     -- vertical section interpolation options
-     -- the lists of predefined web service URLs
-     -- predefined waypoints for the table view
-    in this file.
-
-    Do not change any value for good reasons.
-    Your values can be set in your personal mss_settings.json file
-    """
-    # Default for general filepicker. Pick "default", "qt", or "fs"
-    filepicker_default = "default"
-
-    # dir where mss output files are stored
-    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),
-              "immutable": False}
-
-    # Predefined map regions to be listed in the corresponding topview combobox
-    predefined_map_sections = {
-        "01 Europe (cyl)": {"CRS": "EPSG:4326",
-                            "map": {"llcrnrlon": -15.0, "llcrnrlat": 35.0,
-                                    "urcrnrlon": 30.0, "urcrnrlat": 65.0}},
-        "02 Germany (cyl)": {"CRS": "EPSG:4326",
-                             "map": {"llcrnrlon": 5.0, "llcrnrlat": 45.0,
-                                     "urcrnrlon": 15.0, "urcrnrlat": 57.0}},
-        "03 Global (cyl)": {"CRS": "EPSG:4326",
-                            "map": {"llcrnrlon": -180.0, "llcrnrlat": -90.0,
-                                    "urcrnrlon": 180.0, "urcrnrlat": 90.0}},
-        "04 Northern Hemisphere (stereo)": {"CRS": "MSS:stere,0,90,90",
-                                            "map": {"llcrnrlon": -45.0, "llcrnrlat": 0.0,
-                                                    "urcrnrlon": 135.0, "urcrnrlat": 0.0}}
-    }
-
-    # Side View.
-    # The following two parameters are passed to the WMS in the BBOX
-    # argument when a vertical cross section is requested.
-
-    # Number of interpolation points used to interpolate the flight track
-    # to a great circle.
-    num_interpolation_points = 201
-
-    # Number of x-axis labels in the side view.
-    num_labels = 10
-
-    # Web Map Service Client.
-    # Settings for the WMS client. Set the URLs of WMS servers that appear
-    # by default in the WMS control (for examples, see
-    # http://external.opengis.org/twiki_public/bin/view/MetOceanDWG/MetocWMS_Servers).
-    # Also set the location of the image file cache and its size.
-
-    # URLs of default WMS servers.
-    default_WMS = ["http://localhost:8081/",
-                   ]
-
-    default_VSEC_WMS = [
-        "http://localhost:8081/"
-    ]
-
-    default_LSEC_WMS = [
-        "http://localhost:8081/"
-    ]
-
-    # URLs of default mscolab servers
-    default_MSCOLAB = [
-        "http://localhost:8083",
-    ]
-
-    # mail address to sign in
-    MSCOLAB_mailid = ""
-
-    # password to sign in
-    MSCOLAB_password = ""
-
-    # 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")]
-    WMS_login = {}
-
-    # WMS image cache settings:
-    wms_cache = os.path.join(tempfile.gettempdir(), "msui_wms_cache")
-
-    # Maximum size of the cache in bytes.
-    wms_cache_max_size_bytes = 20 * 1024 * 1024
-
-    # Maximum age of a cached file in seconds.
-    wms_cache_max_age_seconds = 5 * 86400
-
-    wms_prefetch = {
-        "validtime_fwd": 0,
-        "validtime_bck": 0,
-        "level_up": 0,
-        "level_down": 0
-    }
-
-    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),
-    }
-
-    # Main application: Template for new flight tracks
-    # Flight track template that is used when a new flight track is
-    # created. Specify a list of place names that can be found in the
-    # "locations" dictionary defined above.
-    new_flighttrack_template = ["Nagpur", "Delhi"]
-
-    # This configures the flight level for waypoints inserted by the
-    # flighttrack template
-    new_flighttrack_flightlevel = 0
-
-    # None is not wanted here
-    proxies = {}
-
-    # ToDo configurable later
-    # mscolab server
-    mscolab_server_url = "http://localhost:8083"
-    # ToDo refactor to rename this to data_dir/mss_data_dir
-    # mss dir
-    mss_dir = "~/mss"
-
-    # dictionary for export plugins, e.g.  {"Text": ["txt", "mslib.plugins.io.text", "save_to_txt"] }
-    export_plugins = {}
-
-    # dictionary for import plugins, e.g. { "FliteStar": ["txt", "mslib.plugins.io.flitestar", "load_from_flitestar"] }
-    import_plugins = {}
-
-    # dictionary to make title, label and ticklabel sizes for topview and sideview configurable.
-    # You can put your default value here, whatever you want to give,it should be a number.
-    topview = {"plot_title_size": 10,
-               "axes_label_size": 10}
-
-    sideview = {"plot_title_size": 10,
-                "axes_label_size": 10}
-
-    linearview = {"plot_title_size": 10,
-                  "axes_label_size": 10}
diff --git a/mslib/msui/_tests/test_editor.py b/mslib/msui/_tests/test_editor.py
@@ -34,6 +34,7 @@
 from mslib._tests.constants import ROOT_DIR
 
 
+@pytest.mark.skip("To be done for new UI")
 class Test_Editor(object):
     sample_file = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", "docs",
                                   "samples", "config", "mss", "mss_settings.json.sample"))