adding back in CPx model (#885)

MouseLand · Sep 12, 2024 · 209a232 · 209a232
1 parent aea1c85
commit 209a232
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cellpose/gui/gui.py b/cellpose/gui/gui.py
@@ -695,15 +695,16 @@ def make_buttons(self):
         self.modelBoxG.addWidget(self.ModelButtonC, b0, 8, 1, 1)
         self.ModelButtonC.setEnabled(False)
 
-        # compute segmentation with style model
         self.net_names = [
             "nuclei", "cyto2_cp3", "tissuenet_cp3", "livecell_cp3", "yeast_PhC_cp3",
-            "yeast_BF_cp3", "bact_phase_cp3", "bact_fluor_cp3", "deepbacs_cp3"
-        ]
+            "yeast_BF_cp3", "bact_phase_cp3", "bact_fluor_cp3", "deepbacs_cp3",
+            "cyto", "cyto2", "CPx"]
+
         nett = [
             "nuclei", "cellpose (cyto2_cp3)", "tissuenet_cp3", "livecell_cp3",
             "yeast_PhC_cp3", "yeast_BF_cp3", "bact_phase_cp3", "bact_fluor_cp3",
-            "deepbacs_cp3"
+            "deepbacs_cp3", "cyto", "cyto2",
+            "CPx (from Cellpose2)"
         ]
         b0 += 1
         self.ModelChooseB = QComboBox()

diff --git a/cellpose/models.py b/cellpose/models.py
@@ -24,7 +24,7 @@
 
 MODEL_NAMES = [
     "cyto3", "nuclei", "cyto2_cp3", "tissuenet_cp3", "livecell_cp3", "yeast_PhC_cp3",
-    "yeast_BF_cp3", "bact_phase_cp3", "bact_fluor_cp3", "deepbacs_cp3", "cyto2", "cyto",
+    "yeast_BF_cp3", "bact_phase_cp3", "bact_fluor_cp3", "deepbacs_cp3", "cyto2", "cyto", "CPx",
     "transformer_cp3", "neurips_cellpose_default", "neurips_cellpose_transformer",
     "neurips_grayscale_cyto2"
 ]