Mid code cleanup
This commit is contained in:
@@ -180,7 +180,11 @@ class ControlsViewer(QWidget):
|
||||
safe = ['name', 'submitted_date', 'genus', 'target']
|
||||
for column in df.columns:
|
||||
if "percent" in column:
|
||||
count_col = [item for item in df.columns if "count" in item][0]
|
||||
# count_col = [item for item in df.columns if "count" in item][0]
|
||||
try:
|
||||
count_col = next(item for item in df.columns if "count" in item)
|
||||
except StopIteration:
|
||||
continue
|
||||
# NOTE: The actual percentage from kraken was off due to exclusion of NaN, recalculating.
|
||||
df[column] = 100 * df[count_col] / df.groupby('name')[count_col].transform('sum')
|
||||
if column not in safe:
|
||||
|
||||
@@ -129,7 +129,8 @@ class RoleComboBox(QWidget):
|
||||
"""
|
||||
equip = self.box.currentText()
|
||||
# logger.debug(f"Updating equipment: {equip}")
|
||||
equip2 = [item for item in self.role.equipment if item.name == equip][0]
|
||||
# equip2 = [item for item in self.role.equipment if item.name == equip][0]
|
||||
equip2 = next((item for item in self.role.equipment if item.name == equip), self.role.equipment[0])
|
||||
# logger.debug(f"Using: {equip2}")
|
||||
self.process.clear()
|
||||
self.process.addItems([item for item in equip2.processes if item in self.role.processes])
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
'''
|
||||
functions used by all windows in the application's frontend
|
||||
NOTE: Depreciated. Moved to functions.__init__
|
||||
'''
|
||||
from pathlib import Path
|
||||
import logging
|
||||
from PyQt6.QtWidgets import QMainWindow, QFileDialog
|
||||
from tools import Result
|
||||
|
||||
logger = logging.getLogger(f"submissions.{__name__}")
|
||||
|
||||
|
||||
@@ -146,8 +146,9 @@ class ControlsForm(QWidget):
|
||||
for le in self.findChildren(QComboBox):
|
||||
label = [item.strip() for item in le.objectName().split(" : ")]
|
||||
try:
|
||||
dicto = [item for item in output if item['name'] == label[0]][0]
|
||||
except IndexError:
|
||||
# dicto = [item for item in output if item['name'] == label[0]][0]
|
||||
dicto = next(item for item in output if item['name'] == label[0])
|
||||
except StopIteration:
|
||||
dicto = dict(name=label[0], values=[])
|
||||
dicto['values'].append(dict(name=label[1], value=le.currentText()))
|
||||
if label[0] not in [item['name'] for item in output]:
|
||||
|
||||
Reference in New Issue
Block a user