Merge pull request Open-MSS#2724 from Open-MSS/merge_stable_to_develop

Author: ReimarBauer

CHANGES.rst

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+
+Version 10.1.0
+~~~~~~~~~~~~~~
+
+Bug fix release and minor enhancements:
+We added a simpler way of moving flight tracks between local flighttrack / operation.
+See the new menu entries below File - Import and File - Copy Into New
+
+All changes:
+https://github.com/Open-MSS/MSS/milestone/114?closed=1
+
+
 Version 10.0.1
 ~~~~~~~~~~~~~~
 Bug fix release:

docs/conf.py

@@ -27,7 +27,7 @@ def get_tutorial_images():
         os.makedirs(TUTORIAL_DIR)
     TUTORIAL_ARCHIVE = 'videos/mp4/tutorials.zip'
     if not os.path.exists(TUTORIAL_ARCHIVE):
-        response = requests.get(TUTORIAL_URL)
+        response = requests.get(TUTORIAL_URL, timeout=(2, 600))
         open(TUTORIAL_ARCHIVE, "wb").write(response.content)
         with zipfile.ZipFile(TUTORIAL_ARCHIVE) as zip_file:
             for item in zip_file.namelist():

docs/samples/automation/retriever.py

@@ -260,9 +260,9 @@ def modify_user(self, user, attribute=None, value=None, action=None):
         return True
 
     def delete_user_profile_image(self, image_to_be_deleted):
-        '''
+        """
         This function is called when deleting account or updating the profile picture
-        '''
+        """
         upload_folder = mscolab_settings.UPLOAD_FOLDER
         if sys.platform.startswith('win'):
             upload_folder = upload_folder.replace('\\', '/')

mslib/mscolab/file_manager.py

@@ -666,7 +666,7 @@ def do(self, request, binding, relay_state="", encrypt_cert=None, **kwargs):
                 IdpServerSettings_.IDP.session_db.remove_authn_statements(msg.name_id)
             except KeyError as exc:
                 logger.error("Unknown session: %s", exc)
-                resp = ServiceError("Unknown session: %s", exc)
+                resp = ServiceError(f"Unknown session: {exc}")
                 return resp(self.environ, self.start_response)
 
         resp = IdpServerSettings_.IDP.create_logout_response(msg, [binding])

mslib/msidp/idp.py

@@ -164,6 +164,15 @@ def download_plots_cli(self, config_settings):
                 "Cannot download empty treewidget"
             )
             return
+        if self.intv == "":
+            if self.stime and self.etime:
+                QMessageBox.information(
+                    self,
+                    "ERROR",
+                    "Please provide a valid time step value"
+                )
+                return
+
         view = "top"
         intv = 0
         if self.intv != "":

mslib/msui/autoplot_dockwidget.py

@@ -437,7 +437,7 @@ def setData(self, index, value, role=QtCore.Qt.EditRole, update=True):
         return False
 
     def insertRows(self, position, rows=1, index=QtCore.QModelIndex(),
-                   waypoints=None, hexagonCreated=False):
+                   waypoints=None, hexagonCreated=False, data_copied=False):
         """
         Insert waypoint; overrides the corresponding QAbstractTableModel
         method.
@@ -447,7 +447,11 @@ def insertRows(self, position, rows=1, index=QtCore.QModelIndex(),
 
         assert len(waypoints) == rows, (waypoints, rows)
 
-        savedChangeMessage = "Hexagon created." if hexagonCreated else ("Inserted a new waypoint.")
+        savedChangeMessage = "Inserted a new waypoint."
+        if hexagonCreated:
+            savedChangeMessage = "Hexagon created."
+        elif data_copied:
+            savedChangeMessage = "Imported from another flight track"
         self.changeMessageSignal.emit(savedChangeMessage)
 
         self.beginInsertRows(QtCore.QModelIndex(), position,
@@ -609,7 +613,7 @@ def invert_direction(self):
 
     def replace_waypoints(self, new_waypoints):
         self.waypoints = []
-        self.insertRows(0, rows=len(new_waypoints), waypoints=new_waypoints)
+        self.insertRows(0, rows=len(new_waypoints), waypoints=new_waypoints, data_copied=True)
 
     def save_to_ftml(self, filename=None):
         """