apscale-gui 3.2.3__tar.gz → 3.2.4__tar.gz

{apscale_gui-3.2.3/apscale_gui.egg-info → apscale_gui-3.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apscale_gui
-Version: 3.2.3
+Version: 3.2.4
 Summary: Advanced Pipeline for Simple yet Comprehensive AnaLysEs of DNA metabarcoding data - Graphical User Interface
 Home-page: https://github.com/TillMacher/apscale_gui
 Author: Till-Hendrik Macher

{apscale_gui-3.2.3 → apscale_gui-3.2.4}/apscale_gui/apscale_gui.py

@@ -472,8 +472,7 @@ def run_apscale_blast(project_folder, available_fasta_files, available_databases
 
     categories = ['t_species', 't_genus', 't_family', 't_order', 't_class']
     thresholds = ','.join([str(st.session_state[i]) for i in categories])
-    filter_mode = 1
-    b_filter(output_folder, database, thresholds, str(st.session_state['n_cores']), filter_mode, st.session_state['rating_range'])
+    b_filter(output_folder, database, thresholds, str(st.session_state['n_cores']), st.session_state["filter_mode"], st.session_state['rating_range'], st.session_state['sim_range'])
 
     st.success('Finished blastn!')
     print('')
@@ -1004,7 +1003,7 @@ def main():
                     st.text_input(label='n_cores', key='n_cores', value=multiprocessing.cpu_count()-2)
                     st.text_input(label='subset_size', key='subset_size', value=100)
                 with col2:
-                    st.selectbox(label='Task', key='task', options=['blastn', 'megablast', 'dc-megablast'])
+                    st.selectbox(label='Task', key='task', options=['blastn', 'megablast', 'dc-megablast'], index=1)
                     st.text_input(label='max_target_seqs', key='max_target_seqs', value=20)
                 # Database & query
                 available_databases = {Path(i).name:Path(i) for i in glob.glob(str(path_to_projects / 'APSCALE_databases' / '*'))}
@@ -1023,7 +1022,11 @@ def main():
                         st.text_input(label='Order (%)', key='t_order', value=87)
                     with col2:
                         st.selectbox(label='Masking', key='masking', options=[True, False], index=0)
-                        st.text_input(label='Rating range', key='rating_range', value=10)
+                        filter_mode_dict = {'similarity -> e-value -> rating (optional)':"1", 'e-value -> similarity -> rating (optional)':"2", 'similarity -> rating (optional)':"3"}
+                        filter_mode_key = st.selectbox(label='Filter mode', key='filter_mode_key', options=filter_mode_dict.keys())
+                        st.session_state["filter_mode"] = filter_mode_dict[filter_mode_key]
+                        st.selectbox(label='Rating range', key='rating_range', options=[i for i in range(0, 11)], index=5)
+                        st.selectbox(label='Similarity range', key='sim_range', options=[i for i in range(0, 11)], index=0)
                 # Run blast
                 st.subheader('Run apscale-blast')
                 if st.button(f'Start taxonomic assignment'):

{apscale_gui-3.2.3 → apscale_gui-3.2.4/apscale_gui.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apscale_gui
-Version: 3.2.3
+Version: 3.2.4
 Summary: Advanced Pipeline for Simple yet Comprehensive AnaLysEs of DNA metabarcoding data - Graphical User Interface
 Home-page: https://github.com/TillMacher/apscale_gui
 Author: Till-Hendrik Macher

{apscale_gui-3.2.3 → apscale_gui-3.2.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="apscale_gui",
-    version="3.2.3",
+    version="3.2.4",
     author="Till-Hendrik Macher",
     author_email="macher@uni-trier.de",
     description="Advanced Pipeline for Simple yet Comprehensive AnaLysEs of DNA metabarcoding data - Graphical User Interface",