Skip to content

Commit

Permalink
Version 2.2.1:
Browse files Browse the repository at this point in the history
- Changed the conda environment file: removed package mkl and add a specific version to pyqt (5.9).
- Changed blast Evalue default back to 1.0
  • Loading branch information
inbalpaz committed Nov 27, 2024
1 parent c06c076 commit 0785fb7
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion clans/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ def main():
try:
app = QApplication([])
window = MainWindow()
window.app.run()
window.show()
sys.exit(app.exec_())

except Exception as error:
print(error)
Expand Down
7 changes: 6 additions & 1 deletion clans/clans/GUI/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ def __init__(self):
self.save_image_submenu.addAction(self.save_stereo_image_action)

self.quit_action = QAction("Quit", self)
self.quit_action.triggered.connect(QApplication.quit)
# self.quit_action.triggered.connect(QApplication.quit)
self.quit_action.triggered.connect(self.close_main_window)
self.file_menu.addAction(self.quit_action)

# Create the Configuration menu
Expand Down Expand Up @@ -603,6 +604,10 @@ def __init__(self):
self.load_file_worker = io.ReadInputWorker(cfg.run_params['input_format'])
self.load_input_file()

def close_main_window(self):
qApp.closeAllWindows()
QApplication.quit()

# Bring all the buttons to their default state
def reset_window(self):

Expand Down
2 changes: 1 addition & 1 deletion clans/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
output_format = 'clans'

# Blast-related default parameters
BLAST_Evalue_cutoff = 0.01
BLAST_Evalue_cutoff = 1.0
BLAST_scoring_matrix = 'BLOSUM62'
BLAST_threads_num = 2
blast_batch_size = 500
Expand Down
Binary file modified clans/manual/Manual.docx
Binary file not shown.
Binary file modified clans/manual/Manual.pdf
Binary file not shown.
3 changes: 1 addition & 2 deletions clans_2_2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ channels:
- conda-forge
dependencies:
- numba=0.53
- mkl
- vispy
- pyqt
- pyqt=5.9
- biopython
- pillow

0 comments on commit 0785fb7

Please sign in to comment.