celldetective 1.5.0b12__py3-none-any.whl → 1.5.0b14__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- celldetective/_version.py +1 -1
- celldetective/gui/layouts/local_correction_layout.py +3 -1
- celldetective/gui/viewers/contour_viewer.py +6 -1
- celldetective/utils/parsing.py +5 -0
- {celldetective-1.5.0b12.dist-info → celldetective-1.5.0b14.dist-info}/METADATA +1 -1
- {celldetective-1.5.0b12.dist-info → celldetective-1.5.0b14.dist-info}/RECORD +12 -10
- tests/gui/test_classifier_widget.py +754 -0
- tests/gui/test_measurement_settings.py +1083 -0
- {celldetective-1.5.0b12.dist-info → celldetective-1.5.0b14.dist-info}/WHEEL +0 -0
- {celldetective-1.5.0b12.dist-info → celldetective-1.5.0b14.dist-info}/entry_points.txt +0 -0
- {celldetective-1.5.0b12.dist-info → celldetective-1.5.0b14.dist-info}/licenses/LICENSE +0 -0
- {celldetective-1.5.0b12.dist-info → celldetective-1.5.0b14.dist-info}/top_level.txt +0 -0
celldetective/_version.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
__version__ = "1.5.
|
|
1
|
+
__version__ = "1.5.0b14"
|
|
@@ -5,6 +5,7 @@ from celldetective import get_logger
|
|
|
5
5
|
|
|
6
6
|
logger = get_logger(__name__)
|
|
7
7
|
|
|
8
|
+
|
|
8
9
|
class LocalCorrectionLayout(BackgroundFitCorrectionLayout):
|
|
9
10
|
"""docstring for ClassName"""
|
|
10
11
|
|
|
@@ -57,11 +58,12 @@ class LocalCorrectionLayout(BackgroundFitCorrectionLayout):
|
|
|
57
58
|
n_channels=len(self.channel_names),
|
|
58
59
|
target_channel=self.channels_cb.currentIndex(),
|
|
59
60
|
edge_range=(0, 30),
|
|
60
|
-
initial_edge
|
|
61
|
+
initial_edge=-int(thresh),
|
|
61
62
|
invert=True,
|
|
62
63
|
window_title="Set an edge distance to estimate local intensity",
|
|
63
64
|
channel_cb=False,
|
|
64
65
|
PxToUm=1,
|
|
66
|
+
single_value_mode=True,
|
|
65
67
|
)
|
|
66
68
|
self.viewer.show()
|
|
67
69
|
|
|
@@ -198,7 +198,12 @@ class CellEdgeVisualizer(StackVisualizer):
|
|
|
198
198
|
def set_measurement_in_parent_le(self):
|
|
199
199
|
# Set the edge size in the parent QLineEdit
|
|
200
200
|
|
|
201
|
-
self.
|
|
201
|
+
slider_val = self.edge_slider.value()
|
|
202
|
+
if isinstance(slider_val, tuple):
|
|
203
|
+
val = max(abs(slider_val[0]), abs(slider_val[1]))
|
|
204
|
+
self.parent_le.setText(str(int(val)))
|
|
205
|
+
else:
|
|
206
|
+
self.parent_le.setText(str(int(slider_val)))
|
|
202
207
|
self.close()
|
|
203
208
|
|
|
204
209
|
def set_measurement_in_parent_list(self):
|
celldetective/utils/parsing.py
CHANGED
|
@@ -392,6 +392,11 @@ def extract_cols_from_query(query: str):
|
|
|
392
392
|
# 2. Remove backtick sections so they don't get double-counted
|
|
393
393
|
cleaned_query = re.sub(backtick_pattern, "", query)
|
|
394
394
|
|
|
395
|
+
# 2b. Remove quoted strings (double and single quotes) so string literals
|
|
396
|
+
# like "W1" or 'W1' are not mistakenly parsed as column names
|
|
397
|
+
cleaned_query = re.sub(r'"[^"]*"', "", cleaned_query)
|
|
398
|
+
cleaned_query = re.sub(r"'[^']*'", "", cleaned_query)
|
|
399
|
+
|
|
395
400
|
# 3. Extract bare identifiers from the remaining string
|
|
396
401
|
identifier_pattern = r"\b([A-Za-z_]\w*)\b"
|
|
397
402
|
bare = set(re.findall(identifier_pattern, cleaned_query))
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
celldetective/__init__.py,sha256=LfnOyfUnYPGDc8xcsF_PfYEL7-CqAb7BMBPBIWGv84o,666
|
|
2
2
|
celldetective/__main__.py,sha256=Rzzu9ArxZSgfBVjV-lyn-3oanQB2MumQR6itK5ZaRpA,2597
|
|
3
|
-
celldetective/_version.py,sha256=
|
|
3
|
+
celldetective/_version.py,sha256=amPopcQgtkLsO4PonyHRn3RcuDFQrei6x9QLnJip2sE,25
|
|
4
4
|
celldetective/event_detection_models.py,sha256=A7ZJFhJwfdhzfxJ-YZIj6IoI9Gc1hyAodFkKt8kNxDk,93549
|
|
5
5
|
celldetective/events.py,sha256=n15R53c7QZ2wT8gjb0oeNikQbuRBrVVbyNsRCqXjzXA,8166
|
|
6
6
|
celldetective/exceptions.py,sha256=f3VmIYOthWTiqMEV5xQCox2rw5c5e7yog88h-CcV4oI,356
|
|
@@ -64,7 +64,7 @@ celldetective/gui/help/tracking.json,sha256=yIAoOToqCSQ_XF4gwEZCcyXcvQ3mROju263Z
|
|
|
64
64
|
celldetective/gui/layouts/__init__.py,sha256=Rm0i-juuITLlBLyvwaLaOCY9yyWV4OCKp8uVc89rQps,320
|
|
65
65
|
celldetective/gui/layouts/background_model_free_layout.py,sha256=YvuO2YmHxDTuPxIwfuVsNrO_uM3TQCiFvZFT_6diBaI,20332
|
|
66
66
|
celldetective/gui/layouts/channel_offset_layout.py,sha256=DKn0HKSVg_44khxopUz55YQoLxccMM84fmyH8H88n-c,5133
|
|
67
|
-
celldetective/gui/layouts/local_correction_layout.py,sha256=
|
|
67
|
+
celldetective/gui/layouts/local_correction_layout.py,sha256=NG708MKI9ghFdcDrh32BG_jE8tAL2C2q9uDQe9F94Qw,3178
|
|
68
68
|
celldetective/gui/layouts/model_fit_layout.py,sha256=7rxwYKaV9YaMuJljjx2oDvlF38fgd7nvWM5rCxFV_QA,14474
|
|
69
69
|
celldetective/gui/layouts/operation_layout.py,sha256=mdUPEdoViFlvLy05-XP9lQyN6-MlEx3EcbbQbovUONs,2381
|
|
70
70
|
celldetective/gui/layouts/protocol_designer_layout.py,sha256=JkEbUiYOHSPV08hYIC8_g2Znj4IznTYO-ui-iR_F9Us,3344
|
|
@@ -90,7 +90,7 @@ celldetective/gui/table_ops/_rename_col.py,sha256=UAgDSpXJo_h4pLJpHaNc2w2VhbaW4D
|
|
|
90
90
|
celldetective/gui/viewers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
91
91
|
celldetective/gui/viewers/base_viewer.py,sha256=Wn4na79xRL1R6PSXIoE_UabxJNtNQ-Y5l9Q-HSb508c,32013
|
|
92
92
|
celldetective/gui/viewers/channel_offset_viewer.py,sha256=cywBkxyMPyKIuwZTGA03DBSS4a-H1SAohMJYOPISLEE,16289
|
|
93
|
-
celldetective/gui/viewers/contour_viewer.py,sha256=
|
|
93
|
+
celldetective/gui/viewers/contour_viewer.py,sha256=i5kjk57KjgGWwLPityLYnLuUiH0gG60Rz08oohQJM1A,15564
|
|
94
94
|
celldetective/gui/viewers/size_viewer.py,sha256=uXITjaxg5dhQ09Q6TNUxwLxi-ZglyGFcxEH1RtGIZWw,6020
|
|
95
95
|
celldetective/gui/viewers/spot_detection_viewer.py,sha256=JSo6tpb7qBxGjUzUXQ-Zi4uts74eVZ2gxUdD67yhQ4A,17195
|
|
96
96
|
celldetective/gui/viewers/threshold_viewer.py,sha256=F-13JF2wFhyvvKfUvgRcSjWL3leAliOXy5yUergndnE,12000
|
|
@@ -158,7 +158,7 @@ celldetective/utils/maths.py,sha256=pbbWWYNIHTnIBiaR2kJHPDaTPO0rpmQSPjHB7liUSG0,
|
|
|
158
158
|
celldetective/utils/model_getters.py,sha256=jVq9FhAF-xUmFOETWP6hByhoWgapmJGlNmSK11fQ69g,11370
|
|
159
159
|
celldetective/utils/model_loaders.py,sha256=CjScJBGtnenb8qRMZkEozdj1-ULYHvsDFS4AVgYbB5s,10576
|
|
160
160
|
celldetective/utils/normalization.py,sha256=SN-nrycZtmtqv8v1S9bAKvDTGiN6cQKfryitwNtH1bA,15635
|
|
161
|
-
celldetective/utils/parsing.py,sha256=
|
|
161
|
+
celldetective/utils/parsing.py,sha256=1yu2dZWY7E2qmeJXW2btG39Chqlb78og7ye3GV9GrvE,14708
|
|
162
162
|
celldetective/utils/resources.py,sha256=3Fz_W0NYWl_Ixc2AjEmkOv5f7ejXerCLJ2z1iWhGWUI,1153
|
|
163
163
|
celldetective/utils/stats.py,sha256=4TVHRqi38Y0sed-izaMI51sMP0fd5tC5M68EYyfJjkE,3636
|
|
164
164
|
celldetective/utils/types.py,sha256=lRfWSMVzTkxgoctGGp0NqD551akuxu0ygna7zVGonTg,397
|
|
@@ -167,7 +167,7 @@ celldetective/utils/event_detection/__init__.py,sha256=GvsdyQLMTXJj1S_FfRXjrpOxE
|
|
|
167
167
|
celldetective/utils/plots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
168
168
|
celldetective/utils/plots/regression.py,sha256=oUCn29-hp7PxMqC-R0yoL60KMw5ZWpZAIoCDh2ErlcY,1764
|
|
169
169
|
celldetective/utils/stardist_utils/__init__.py,sha256=SY2kxFNXSRjXN4ncs3heDdXT3UNk8M3dELJQySysAf4,4231
|
|
170
|
-
celldetective-1.5.
|
|
170
|
+
celldetective-1.5.0b14.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
|
171
171
|
tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
172
172
|
tests/test_cellpose_fallback.py,sha256=BJZTDFF8sFR1x7rDbvZQ2RQOB1OP6wuFBRfc8zbl5zw,3513
|
|
173
173
|
tests/test_contour_format.py,sha256=N11Rue_mxxwsZBhocRA621bpt4Cps-1DnPGzhKLSq9o,10873
|
|
@@ -184,15 +184,17 @@ tests/test_signals.py,sha256=upfhDyQMquOOKuYf7a34TglimHK74oYWQ9RyuK7Mg7c,4285
|
|
|
184
184
|
tests/test_tracking.py,sha256=_YLjwQ3EChQssoHDfEnUJ7fI1yC5KEcJsFnAVR64L70,18909
|
|
185
185
|
tests/test_utils.py,sha256=aSB_eMw9fzTsnxxdYoNmdQQRrXkWqBXB7Uv4TGU6kYE,4778
|
|
186
186
|
tests/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
187
|
+
tests/gui/test_classifier_widget.py,sha256=dnzTewwgbZ8h8mmO32wN6kqxIkznDZnkE2RljdxJrxE,27037
|
|
187
188
|
tests/gui/test_enhancements.py,sha256=3x9au_rkQtMZ94DRj3OaEHKPr511RrWqBAUAcNQn1ys,13453
|
|
188
189
|
tests/gui/test_event_annotator_cleanup.py,sha256=nIFWqC3za06VF5n8EDnK-URbir2WiXzECBeNaVNS_FI,11226
|
|
189
190
|
tests/gui/test_measure_annotator_bugfix.py,sha256=tPfgWNKC0UkvrVssSrUcVDC1qgpzx6l2yCqvKtKYkM4,4544
|
|
191
|
+
tests/gui/test_measurement_settings.py,sha256=1ecJeKmgff5J9yRETlVWJOHjvjNitaUv2E1HmvuXXqo,40756
|
|
190
192
|
tests/gui/test_new_project.py,sha256=wRjW2vEaZb0LWT-f8G8-Ptk8CW9z8-FDPLpV5uqj6ck,8778
|
|
191
193
|
tests/gui/test_project.py,sha256=KzAnodIc0Ovta0ARL5Kr5PkOR5euA6qczT_GhEZpyE4,4710
|
|
192
194
|
tests/gui/test_spot_detection_viewer.py,sha256=mCEsfTAJb5W5IeLyQmaZXq9Sjr8ehCI552RkiCEQvLw,13355
|
|
193
195
|
tests/gui/test_tableui_track_collapse.py,sha256=SA2Ot3wcW64nziK260QaaXY22_VEbJFbUfBVDNte7Us,6831
|
|
194
|
-
celldetective-1.5.
|
|
195
|
-
celldetective-1.5.
|
|
196
|
-
celldetective-1.5.
|
|
197
|
-
celldetective-1.5.
|
|
198
|
-
celldetective-1.5.
|
|
196
|
+
celldetective-1.5.0b14.dist-info/METADATA,sha256=ZtE6pGNjG4ElXzsZny820TVk0vh3TwcEr1xC-fLWSyY,11524
|
|
197
|
+
celldetective-1.5.0b14.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
|
|
198
|
+
celldetective-1.5.0b14.dist-info/entry_points.txt,sha256=2NU6_EOByvPxqBbCvjwxlVlvnQreqZ3BKRCVIKEv3dg,62
|
|
199
|
+
celldetective-1.5.0b14.dist-info/top_level.txt,sha256=6rsIKKfGMKgud7HPuATcpq6EhdXwcg_yknBVWn9x4C4,20
|
|
200
|
+
celldetective-1.5.0b14.dist-info/RECORD,,
|