Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
byemaxx committed Sep 23, 2024
2 parents 4faa5d0 + 899f36b commit 239d751
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
5 changes: 5 additions & 0 deletions Docs/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Version: 1.114.5
## Date: 2024-09-23
### Changes:
- Fix: Fixed the bug of finish the data preprossing, the page was not changed to the next page.

# Version: 1.114.4
## Date: 2024-09-23
### Changes:
Expand Down
7 changes: 6 additions & 1 deletion metax/gui/main_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -1947,7 +1947,12 @@ def run_after_set_multi_tables(self):
print(f'\n----Multi Table Result----\n{msg_for_print}\n---------------------------\n')
self.logger.write_log(msg_for_print.replace('\n', ''))
QMessageBox.information(self.MainWindow, 'Result', msg)

print("\n---------------------------------- Set Multi Table End ----------------------------------\n")
# go to basic analysis tab and the first tab
self.stackedWidget.setCurrentIndex(0) # go to page_analyzer
self.tabWidget_TaxaFuncAnalyzer.setCurrentIndex(3)
self.tabWidget_4.setCurrentIndex(0)
self.pushButton_set_multi_table.setEnabled(True)

## Database builder by own Table
def show_toolButton_db_own_anno_help(self):
Expand Down
2 changes: 1 addition & 1 deletion metax/utils/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = '1.114.4'
__version__ = '1.114.5'
API_version = '2'
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "MetaXTools"
version = "1.114.4"
version = "1.114.5"
description = "MetaXTools is a novel tool for linking peptide sequences with taxonomic and functional information in Metaproteomics."
readme = "README_PyPi.md"
license = { text = "NorthOmics" }
Expand Down

0 comments on commit 239d751

Please sign in to comment.