Skip to content

Commit

Permalink
update 1.4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Olivier Henry committed May 5, 2021
1 parent 52fb8e7 commit 34ccd0f
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 11 deletions.
Binary file not shown.
6 changes: 6 additions & 0 deletions Documentation/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* nothing.


### May 5 2021, Release version 1.4.4 ###

* FIXED:
* fixed an issue when a user wants to plot multiple time series and select manually the location of each plot.


### April 14 2021, Release version 1.4.3 ###

* FIXED:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Version:
-------

EGADS Lineage GUI 1.4.3 (Python 3).
EGADS Lineage GUI 1.4.4 (Python 3).


Developments:
Expand Down
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
version = '1.4.3'
version = '1.4.4'
# The full version, including alpha/beta/rc tags.
release = '1.4.3'
release = '1.4.4'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
22 changes: 15 additions & 7 deletions functions/window_functions/other_windows_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def close_window(self):

class MySubplot(QtWidgets.QDialog, Ui_subplotWindow):
def __init__(self, var_list):
logging.debug('gui - other_windows_functions.py - MyTest - __init__')
logging.debug('gui - other_windows_functions.py - MySubplot - __init__')
QtWidgets.QWidget.__init__(self)
self.setupUi(self)
self.var_list = var_list
Expand All @@ -148,9 +148,10 @@ def __init__(self, var_list):
self.add_row.clicked.connect(self.add_table_row)
self.subplot_layout = {}
self.parse_var_list()
logging.info('gui - other_windows_functions.py - MyTest - ready')
logging.info('gui - other_windows_functions.py - MySubplot - ready')

def parse_var_list(self):
logging.debug('gui - other_windows_functions.py - MySubplot - parse_var_list')
k = 0
for i in range(0, 3):
for j in range(0, 3):
Expand All @@ -168,18 +169,21 @@ def parse_var_list(self):
k += 1

def add_table_column(self):
logging.debug('gui - other_windows_functions.py - MySubplot - parse_var_list')
idx = int(self.sw_table.columnCount())
self.sw_table.insertColumn(idx)
for i in range(0, int(self.sw_table.rowCount())):
self.sw_table.setItem(i, idx, QtWidgets.QTableWidgetItem(''))

def add_table_row(self):
logging.debug('gui - other_windows_functions.py - MySubplot - parse_var_list')
idx = int(self.sw_table.rowCount())
self.sw_table.insertRow(idx)
for i in range(0, int(self.sw_table.columnCount())):
self.sw_table.setItem(idx, i, QtWidgets.QTableWidgetItem(''))

def create_layout(self):
logging.debug('gui - other_windows_functions.py - MySubplot - parse_var_list')
self.remove_empty_row()
self.remove_empty_column()
k = 1
Expand All @@ -193,31 +197,35 @@ def create_layout(self):
self.close()

def remove_empty_row(self):
logging.debug('gui - other_windows_functions.py - MySubplot - parse_var_list')
empty_row = []
for i in range(0, int(self.sw_table.rowCount())):
empty = True
for j in range(0, int(self.sw_table.columnCount())):
if self.sw_table.item(i, j).text():
empty = False
if self.sw_table.item(i, j) is not None:
if self.sw_table.item(i, j).text():
empty = False
if empty:
empty_row.append(i)
for i in reversed(empty_row):
self.sw_table.removeRow(i)

def remove_empty_column(self):
logging.debug('gui - other_windows_functions.py - MySubplot - parse_var_list')
empty_col = []
for i in range(0, int(self.sw_table.columnCount())):
empty = True
for j in range(0, int(self.sw_table.rowCount())):
if self.sw_table.item(j, i).text():
empty = False
if self.sw_table.item(j, i) is not None:
if self.sw_table.item(j, i).text():
empty = False
if empty:
empty_col.append(i)
for i in reversed(empty_col):
self.sw_table.removeColumn(i)

def closeWindow(self):
logging.debug('gui - other_windows_functions.py - MyInfo - closeWindow')
logging.debug('gui - other_windows_functions.py - MySubplot - closeWindow')
self.close()


Expand Down
2 changes: 1 addition & 1 deletion ui/_version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
_gui_version = '1.4.3'
_gui_version = '1.4.4'
_gui_branch = 'Lineage'
_pycharm_version = '2021.1'
_python_version = '3.7.8'
Expand Down

0 comments on commit 34ccd0f

Please sign in to comment.