fix layer_ortho index error due to size mismatch on dropping image when image already loaded in 3D GUI

- refactor ortho outpix calculation
- add update function where needed
- move crosshair update to before getting locations to fix IndexError on previous image size

Author: mrariden

cellpose/gui/gui.py

@@ -1116,6 +1116,8 @@ def remove_single_cell(self, idx):
         self.cellpix[self.cellpix > idx] -= 1
         self.outpix[self.outpix > idx] -= 1
 
+        self.update_outpix_ortho()
+
         if self.NZ == 1:
             self.removed_cell = [
                 self.ismanual[idx - 1], self.cellcolors[idx],
@@ -1485,12 +1487,26 @@ def draw_mask(self, z, ar, ac, vr, vc, color, idx=None):
         self.cellpix[z, ar, ac] = idx
         self.outpix[z, vr, vc] = idx
 
+        self.update_ortho_outpix()
+
         if z == self.currentZ:
             self.layerz[ar, ac, :3] = color
             if self.masksOn:
                 self.layerz[ar, ac, -1] = self.opacity
             if self.outlinesOn:
                 self.layerz[vr, vc] = np.array(self.outcolor)
+    
+    def update_ortho_outpix(self):
+        if self.NZ == 1: 
+            return
+
+        # calculate ZY and ZX outlines: 
+        outlines_YZ = masks_to_outlines(self.cellpix.transpose(1, 2, 0))
+        self.outpix_YZ = outlines_YZ * self.cellpix.transpose(1, 2, 0)
+
+        outlines_ZX = masks_to_outlines(self.cellpix.transpose(2, 1, 0))
+        self.outpix_ZX = outlines_ZX * self.cellpix.transpose(2, 1, 0)
+
 
     def compute_scale(self):
         # get diameter from gui

cellpose/gui/gui3d.py

@@ -376,6 +376,7 @@ def add_orthoviews(self):
         self.yortho = self.Ly // 2
         self.xortho = self.Lx // 2
         if self.NZ > 1:
+            self.update_ortho_outpix()
             self.update_ortho()
 
         self.win.addItem(self.pOrtho[0], 0, 1, rowspan=1, colspan=1)
@@ -429,8 +430,6 @@ def update_ortho(self):
                 self.pOrtho[0].setXRange(-self.dz / 3, self.dz * 2 + self.dz / 3)
                 self.pOrtho[1].setYRange(-self.dz / 3, self.dz * 2 + self.dz / 3)
             dztot = min(self.NZ, self.dz * 2)
-            y = self.yortho
-            x = self.xortho
             z = self.currentZ
             if dztot == self.NZ:
                 zmin, zmax = 0, self.NZ
@@ -445,6 +444,8 @@ def update_ortho(self):
                     zmin, zmax = z - self.dz, z + self.dz
             self.zc = z - zmin
             self.update_crosshairs()
+            y = self.yortho
+            x = self.xortho
             if self.view == 0 or self.view == 4:
                 for j in range(2):
                     if j == 0:
@@ -578,6 +579,7 @@ def plot_clicked(self, event):
     def update_plot(self):
         super().update_plot()
         if self.NZ > 1 and self.orthobtn.isChecked():
+            self.update_ortho_outpix()
             self.update_ortho()
         self.win.show()
         self.show()

cellpose/gui/io.py

@@ -429,22 +429,10 @@ def _masks_to_gui(parent, masks, outlines=None, colors=None):
         outlines = masks_to_outlines(parent.cellpix)
         parent.outpix = outlines * parent.cellpix
 
-        # calculate ZY and ZX outlines: 
-        outlines_YZ = masks_to_outlines(parent.cellpix.transpose(1, 2, 0))
-        parent.outpix_YZ = outlines_YZ * parent.cellpix.transpose(1, 2, 0)
-
-        outlines_ZX = masks_to_outlines(parent.cellpix.transpose(2, 1, 0))
-        parent.outpix_ZX = outlines_ZX * parent.cellpix.transpose(2, 1, 0)
-
     else:
         parent.outpix = outlines # set YX outlines
 
-        # calculate ZY and ZX outlines: 
-        outlines_YZ = masks_to_outlines(parent.cellpix.transpose(1, 2, 0))
-        parent.outpix_YZ = outlines_YZ * parent.cellpix.transpose(1, 2, 0)
-
-        outlines_ZX = masks_to_outlines(parent.cellpix.transpose(2, 1, 0))
-        parent.outpix_ZX = outlines_ZX * parent.cellpix.transpose(2, 1, 0)
+    parent.update_ortho_outpix()
 
     if parent.outpix.ndim == 2:
         parent.outpix = parent.outpix[np.newaxis, :, :]