Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
378 changes: 278 additions & 100 deletions cellacdc/apps.py

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions cellacdc/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -3285,7 +3285,7 @@ def check_file_time_proximity(file1, file2, max_seconds=300, logger_func=print):
logger_func(f'Warning: The files "{file1}" and "{file2}" were not saved within {max_seconds} seconds of each other.')
return False

def verify_acdc_df_segm(posData: load.loadData, logger_func=print):
def verify_acdc_df_segm(posData: 'load.loadData', logger_func=print):
if posData.segmMetadata is None:
return None
segm_info = posData.segmMetadata[os.path.basename(posData.segm_npz_path)]
Expand All @@ -3304,7 +3304,7 @@ def verify_acdc_df_segm(posData: load.loadData, logger_func=print):

return csv_filepath

def verify_add_data_segm_proximity(posData: load.loadData, logger_func=print):
def verify_add_data_segm_proximity(posData: 'load.loadData', logger_func=print):
segm_path = posData.segm_npz_path
segm_filename = os.path.basename(segm_path).replace('.npz', '')
add_data_folder = os.path.join(posData.images_path, segm_filename)
Expand Down Expand Up @@ -3336,7 +3336,7 @@ def verify_add_data_segm_proximity(posData: load.loadData, logger_func=print):
# Total time spend optimising here
# >5 hrs
# please update this if you try to optimize again
def count_objects_and_init_rps(posData: load.loadData, logger_func=print):
def count_objects_and_init_rps(posData: 'load.loadData', logger_func=print):
allIDs = set()

segm_data = posData.segm_data
Expand Down
3 changes: 2 additions & 1 deletion cellacdc/dataPrep.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
from . import urls
from . import io
from .help import about
from . import fonts

if os.name == 'nt':
try:
Expand Down Expand Up @@ -373,7 +374,7 @@ def gui_createToolBars(self):
navigateToolbar.addAction(self.interpAction)

self.ROIshapeComboBox = QComboBox()
self.ROIshapeComboBox.setFont(apps.font)
self.ROIshapeComboBox.setFont(fonts.font)
self.ROIshapeComboBox.SizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
self.ROIshapeComboBox.addItems([' 256x256 '])
ROIshapeLabel = QLabel(html_utils.paragraph(
Expand Down
14 changes: 14 additions & 0 deletions cellacdc/fonts.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
from . import GUI_INSTALLED

if GUI_INSTALLED:
from qtpy.QtGui import QFont

font = QFont()
font.setPixelSize(12)
italicFont = QFont()
italicFont.setPixelSize(12)
italicFont.setItalic(True)

else:
font = None
italicFont = None
Loading