update 1.4.3

EUFAR · Apr 14, 2021 · 52fb8e7 · 52fb8e7
1 parent 32b9ad6
commit 52fb8e7
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 9 deletions.
diff --git a/...DS Lineage GUI Documentation - v1.4.2.pdf → ...DS Lineage GUI Documentation - v1.4.3.pdf b/...DS Lineage GUI Documentation - v1.4.2.pdf → ...DS Lineage GUI Documentation - v1.4.3.pdf
diff --git a/Documentation/changelog.txt b/Documentation/changelog.txt
@@ -12,6 +12,14 @@
 * nothing.
 
 
+### April 14 2021, Release version 1.4.3 ###
+
+  * FIXED:
+    * an issue was fixed with the dictionary of dimensions when the user tries to modify the name of a dimension.
+	* when the name of a dimension is modified, the Dimension part of the GUI wasn't updated correctly.
+	* fixed an issue with the dedicated function to display algorithms when the app is frozen.
+
+
 ### January 6 2021, Release version 1.4.2 ###
 EGADS Lineage has been updated to v1.2.8 fixing an important issue with NetCDF handling. Thus this version of EGADS Lineage is mandatory to run the GUI.
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Version:
 -------
 
-EGADS Lineage GUI 1.4.2 (Python 3).
+EGADS Lineage GUI 1.4.3 (Python 3).
 
 
 Developments:

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.4.2'
+version = '1.4.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.4.2'
+release = '1.4.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/functions/gui_functions/gui_global_functions.py b/functions/gui_functions/gui_global_functions.py
@@ -2,6 +2,8 @@
 import pathlib
 import xml
 import os
+import copy
+from collections import OrderedDict
 from egads import EgadsData
 from PyQt5 import QtWidgets, QtCore, QtGui
 from functions.utils import (font_creation_function, stylesheet_creation_function, humansize, icon_creation_function,
@@ -320,15 +322,18 @@ def modify_attribute_gui_var(self, click):
                 self.list_of_variables_and_attributes[new_path] = self.list_of_variables_and_attributes.pop(path)
                 if self.list_of_variables_and_attributes[new_path][2]:
                     for var, value in self.list_of_variables_and_attributes.items():
-                        dim_dict = value[1]
                         modified = False
                         if isinstance(value[0], EgadsData) and not value[2]:
+                            dim_dict = copy.deepcopy(value[1])
+                            new_dim_dict = OrderedDict()
                             for dim_path in dim_dict:
                                 if dim_path == path:
-                                    dim_dict[new_path] = dim_dict.pop(path)
+                                    new_dim_dict[new_path] = dim_dict[path]
                                     modified = True
+                                else:
+                                    new_dim_dict[dim_path] = dim_dict[dim_path]
                             if modified:
-                                self.list_of_variables_and_attributes[var][1] = dim_dict
+                                self.list_of_variables_and_attributes[var][1] = new_dim_dict
                     dimensions_str = ''
                     if self.list_of_variables_and_attributes[new_path][1] is not None:
                         no_dim = False
@@ -352,7 +357,7 @@ def modify_attribute_gui_var(self, click):
                     else:
                         if self.list_of_variables_and_attributes[new_path][2]:
                             dimensions_str = (str(self.list_of_variables_and_attributes[new_path][0].shape[0])
-                                              + ' (' + os.path.basename(path) + '), ')
+                                              + ' (' + os.path.basename(new_path) + '), ')
                         else:
                             self.var_dimensions_lb.setStyleSheet(stylesheet_creation_function('qlabel_warning'))
                             self.var_dimensions_lb.setToolTip('This variable has no dimension')

diff --git a/functions/gui_functions/gui_menu_functions.py b/functions/gui_functions/gui_menu_functions.py
@@ -2,6 +2,7 @@
 from PyQt5 import QtWidgets
 from functions.utils import font_creation_function, icon_creation_function
 from functions.window_functions.algorithm_windows_functions import MyAlgorithmDisplay
+from functions.help_functions import frozen_algorithm_formula_text
 
 
 def algorithm_menu_initialization(self):

diff --git a/ui/_version.py b/ui/_version.py
@@ -1,5 +1,5 @@
-_gui_version = '1.4.2'
+_gui_version = '1.4.3'
 _gui_branch = 'Lineage'
-_pycharm_version = '2020.2.3'
+_pycharm_version = '2021.1'
 _python_version = '3.7.8'
 _pyqt5_version = '5.15.0'