diff --git a/core/parsing.py b/core/parsing.py index 2a75483..5915eaf 100644 --- a/core/parsing.py +++ b/core/parsing.py @@ -377,7 +377,7 @@ def parse_ccpn_peaklist(peaklist_file): if v in row[5]: a2 = row[5].strip().split(v)[-1] atoms.append(a2) - + peak = Peak( peak_number=row[1], positions=[row[2], row[3]], @@ -391,7 +391,7 @@ def parse_ccpn_peaklist(peaklist_file): details=row[11], format='ccpn' ) - + peakList.append(peak) fin.close() diff --git a/core/setup_farseer_calculation.py b/core/setup_farseer_calculation.py index 6edf484..a0263c1 100644 --- a/core/setup_farseer_calculation.py +++ b/core/setup_farseer_calculation.py @@ -197,9 +197,7 @@ def add_residue_information(peak_list, fasta_file, fasta_start): fasta_dict = \ {ii + fasta_start: aal1tol3.get(residue) for ii, residue in enumerate(fasta)} - - import pprint - + for peak in peak_list: if all(ass is None for ass in peak.assignments) and \ not '' in peak.assignments: diff --git a/gui/components/PeakListArea.py b/gui/components/PeakListArea.py index 4b21b3c..536e01f 100644 --- a/gui/components/PeakListArea.py +++ b/gui/components/PeakListArea.py @@ -194,6 +194,10 @@ def update_tree(self): num_y = len(y_conds) num_z = len(z_conds) total_x = num_x*num_y*num_z + keys_to_remove = [k for k in self.variables['fasta_files'].keys() if k not in y_conds] + for k in keys_to_remove: + del self.variables['fasta_files'][k] + if total_x > 10: self.scrollContents.setSceneRect(0, 0, width, total_x * 22) @@ -305,7 +309,7 @@ def update_tree(self): for x_marker in y_markers: self.add_connecting_line(zz, x_marker) - + self.updateClicks += 1 self.variables["experimental_dataset"] = self.peak_list_dict diff --git a/gui/gui_utils.py b/gui/gui_utils.py index b73e2f7..c713f9d 100644 --- a/gui/gui_utils.py +++ b/gui/gui_utils.py @@ -126,22 +126,18 @@ def deliver_settings(resolution): if (resolution.height(), resolution.width()) == (1440, 2560): stylesheet = open(os.path.join(GUI_DIR, 'stylesheet_2k.qss')).read() - print('2k') return settings_2k, stylesheet elif (resolution.height(), resolution.width()) == (1080, 1920) or \ 1040 < resolution.height() < 1440: - print('1k') stylesheet = open(os.path.join(GUI_DIR, 'stylesheet_1k.qss')).read() return settings_1k, stylesheet elif (resolution.height(), resolution.width()) == (800, 1280): - print('1280x800') msg = " @@@@@@@@@@@@@@@@@@@@@@ \nATTENTION YOU WILL BE USING A PROTOTYPE GUI DEVELOPED ONLY TO BE FUNCTIONAL IN 1280X800 SCREENS. IT IS NOT SUPPOSED TO HAVE A GOOD LOOK.\n@@@@@@@@@@@@@@@@@@@@@@" print(msg) stylesheet = open(os.path.join(GUI_DIR, 'stylesheet_1280x800.qss')).read() return settings_1280x800, stylesheet else: - print('720p') stylesheet = open(os.path.join(GUI_DIR, 'stylesheet_720p.qss')).read() return settings_720p, stylesheet diff --git a/gui/popups/FastaSelectionPopup.py b/gui/popups/FastaSelectionPopup.py index f611a36..c26929c 100644 --- a/gui/popups/FastaSelectionPopup.py +++ b/gui/popups/FastaSelectionPopup.py @@ -70,7 +70,6 @@ def __init__(self, parent=None, **kw): self.layout().addWidget(self.buttonBox) def get_values(self): - print(self.fasta_files) if self.fasta_files: for cond_name, fasta_path in self.fasta_files.items(): self.add_field(cond_name, fasta_path) diff --git a/gui/tabs/peaklist_selection.py b/gui/tabs/peaklist_selection.py index fabe967..ca0a542 100644 --- a/gui/tabs/peaklist_selection.py +++ b/gui/tabs/peaklist_selection.py @@ -136,7 +136,7 @@ def update_condition_boxes(self, row, dim, value): layout = self.widget2.layout() colCount = layout.columnCount() valuesDict = self.variables["conditions"] - + for m in range(3, colCount): item = layout.itemAtPosition(row, m)