nettracer3d 0.9.6__py3-none-any.whl → 0.9.8__py3-none-any.whl

nettracer3d/nettracer_gui.py

@@ -109,7 +109,7 @@ class ImageViewerWindow(QMainWindow):
             self.color_dictionary['LIGHT_RED'],    # Lighter red
             self.color_dictionary['LIGHT_GREEN'],    # Lighter green
             self.color_dictionary['WHITE'],        # White
-            self.color_dictionary['WHITE']         # White
+            self.color_dictionary['CYAN']         # Now cyan
         ]
         
         
@@ -2494,6 +2494,12 @@ class ImageViewerWindow(QMainWindow):
         
         self.update_display(preserve_zoom=(current_xlim, current_ylim))
 
+        if self.pan_mode:
+            self.create_pan_background()
+            current_xlim = self.ax.get_xlim()
+            current_ylim = self.ax.get_ylim()
+            self.update_display_pan_mode(current_xlim, current_ylim)
+
         
     def toggle_zoom_mode(self):
         """Toggle zoom mode on/off."""
@@ -2501,7 +2507,9 @@ class ImageViewerWindow(QMainWindow):
 
         if self.zoom_mode:
             if self.pan_mode:
-                self.pan_button.click()
+                self.update_display(preserve_zoom=(self.ax.get_xlim(), self.ax.get_ylim()))
+                self.pan_mode = False
+                self.pan_button.setChecked(False)
 
             self.pen_button.setChecked(False)
             self.brush_mode = False
@@ -2522,11 +2530,6 @@ class ImageViewerWindow(QMainWindow):
                 current_xlim = self.ax.get_xlim()
                 current_ylim = self.ax.get_ylim()
                 self.update_display(preserve_zoom=(current_xlim, current_ylim))
-            if self.pan_mode:
-                current_xlim = self.ax.get_xlim()
-                current_ylim = self.ax.get_ylim()
-                self.update_display(preserve_zoom=(current_xlim, current_ylim))
-            self.pan_mode = False
 
         else:
             if self.machine_window is None:
@@ -2605,7 +2608,9 @@ class ImageViewerWindow(QMainWindow):
         if self.brush_mode:
 
             if self.pan_mode:
-                self.pan_button.click()
+                self.update_display(preserve_zoom=(self.ax.get_xlim(), self.ax.get_ylim()))
+                self.pan_mode = False
+                self.pan_button.setChecked(False)
 
             self.pm = painting.PaintManager(parent = self)
 
@@ -3594,8 +3599,8 @@ class ImageViewerWindow(QMainWindow):
             # Multi-color highlight for machine window
             mask_1 = (highlight_data == 1)
             mask_2 = (highlight_data == 2)
-            rgba[mask_1] = [1, 1, 0, 0.5]      # Yellow for 1
-            rgba[mask_2] = [0, 0.7, 1, 0.5]    # Blue for 2
+            rgba[mask_1] = [1, 1, 0, 0.3]      # Yellow for 1
+            rgba[mask_2] = [0, 0.7, 1, 0.3]    # Blue for 2
         
         return rgba
 
@@ -6088,17 +6093,6 @@ class ImageViewerWindow(QMainWindow):
                     pass
                 self.static_background = None
                 
-                # Your existing machine_window logic
-                if self.machine_window is None:
-                    try:
-                        self.channel_data[4][self.current_slice, :, :] = n3d.overlay_arrays_simple(
-                            self.channel_data[self.temp_chan][self.current_slice, :, :], 
-                            self.channel_data[4][self.current_slice, :, :])
-                        self.load_channel(self.temp_chan, self.channel_data[4], data=True, end_paint=True)
-                        self.channel_data[4] = None
-                        self.channel_visible[4] = False
-                    except:
-                        pass
 
             # Get dimensions
             active_channels = [i for i in range(4) if self.channel_data[i] is not None]
@@ -10991,6 +10985,8 @@ class MachineWindow(QMainWindow):
     def toggle_brush_mode(self):
         """Toggle brush mode on/off"""
         self.parent().brush_mode = self.brush_button.isChecked()
+        if self.parent().pan_mode:
+            self.parent().update_display(preserve_zoom=(self.parent().ax.get_xlim(), self.parent().ax.get_ylim()))
 
         if self.parent().brush_mode:
 

nettracer3d/segmenter.py

@@ -192,10 +192,10 @@ class InteractiveSegmenter:
         if image_2d is None:
             image_2d = self.image_3d[z, :, :]
 
-        if image_2d.ndim == 3 and image_2d.shape[-1] == 3:
+        if image_2d.ndim == 3 and (image_2d.shape[-1] == 3 or image_2d.shape[-1] == 4):
             # RGB case - process each channel
             features_per_channel = []
-            for channel in range(3):
+            for channel in range(image_2d.shape[-1]):
                 channel_features = self.compute_deep_feature_maps_cpu_2d(image_2d = image_2d[..., channel])
                 features_per_channel.append(channel_features)
             
@@ -308,10 +308,10 @@ class InteractiveSegmenter:
         if image_2d is None:
             image_2d = self.image_3d[z, :, :]
 
-        if image_2d.ndim == 3 and image_2d.shape[-1] == 3:
+        if image_2d.ndim == 3 and (image_2d.shape[-1] == 3 or image_2d.shape[-1] == 4):
             # RGB case - process each channel
             features_per_channel = []
-            for channel in range(3):
+            for channel in range(image_2d.shape[-1]):
                 channel_features = self.compute_feature_maps_cpu_2d(image_2d = image_2d[..., channel])
                 features_per_channel.append(channel_features)
             
@@ -361,10 +361,10 @@ class InteractiveSegmenter:
         if image_3d is None:
             image_3d = self.image_3d
 
-        if image_3d.ndim == 4 and image_3d.shape[-1] == 3:
+        if image_3d.ndim == 4 and (image_3d.shape[-1] == 3 or image_3d.shape[-1] == 4):
             # RGB case - process each channel
             features_per_channel = []
-            for channel in range(3):
+            for channel in range(image_3d.shape[-1]):
                 channel_features = self.compute_deep_feature_maps_cpu(image_3d[..., channel])
                 features_per_channel.append(channel_features)
             
@@ -483,127 +483,15 @@ class InteractiveSegmenter:
         
         return features
 
-    def compute_deep_feature_maps_cpu_smaller(self, image_3d=None): #smaller
-        """Optimized version using determinant instead of full eigenvalue computation. Currently not in use anywhere"""
-        if image_3d is None:
-            image_3d = self.image_3d
-        
-        # Calculate total number of features (using determinant instead of 3 eigenvalues)
-        num_basic_features = 1 + len(self.sigmas) + len(self.dogs)
-        num_gradient_features = len(self.sigmas)
-        num_laplacian_features = len(self.sigmas)
-        num_hessian_features = len(self.sigmas) * 3  # determinant + trace + frobenius norm
-        
-        total_features = num_basic_features + num_gradient_features + num_laplacian_features + num_hessian_features
-        
-        # Pre-allocate result array
-        features = np.empty(image_3d.shape + (total_features,), dtype=image_3d.dtype)
-        features[..., 0] = image_3d
-        
-        feature_idx = 1
-        
-        # Cache for Gaussian filters
-        gaussian_cache = {}
-        all_sigmas = set(self.sigmas)
-        for s1, s2 in self.dogs:
-            all_sigmas.add(s1)
-            all_sigmas.add(s2)
-        
-        # Pre-compute all Gaussian filters
-        for sigma in all_sigmas:
-            gaussian_cache[sigma] = ndimage.gaussian_filter(image_3d, sigma)
-        
-        # Gaussian smoothing
-        for sigma in self.sigmas:
-            features[..., feature_idx] = gaussian_cache[sigma]
-            feature_idx += 1
-        
-        # Difference of Gaussians
-        for s1, s2 in self.dogs:
-            features[..., feature_idx] = gaussian_cache[s1] - gaussian_cache[s2]
-            feature_idx += 1
-        
-        # Gaussian gradient magnitudes
-        for sigma in self.sigmas:
-            gaussian_img = gaussian_cache[sigma]
-            gx = ndimage.sobel(gaussian_img, axis=2, mode='reflect')
-            gy = ndimage.sobel(gaussian_img, axis=1, mode='reflect')
-            gz = ndimage.sobel(gaussian_img, axis=0, mode='reflect')
-            features[..., feature_idx] = np.sqrt(gx**2 + gy**2 + gz**2)
-            feature_idx += 1
-        
-        # Laplacian of Gaussian
-        for sigma in self.sigmas:
-            gaussian_img = gaussian_cache[sigma]
-            features[..., feature_idx] = ndimage.laplace(gaussian_img, mode='reflect')
-            feature_idx += 1
-        
-        # Hessian-based features (much faster than full eigenvalue computation)
-        for sigma in self.sigmas:
-            gaussian_img = gaussian_cache[sigma]
-            
-            # Compute second derivatives
-            hxx = ndimage.gaussian_filter(gaussian_img, sigma=0, order=[0, 0, 2], mode='reflect')
-            hyy = ndimage.gaussian_filter(gaussian_img, sigma=0, order=[0, 2, 0], mode='reflect')
-            hzz = ndimage.gaussian_filter(gaussian_img, sigma=0, order=[2, 0, 0], mode='reflect')
-            hxy = ndimage.gaussian_filter(gaussian_img, sigma=0, order=[0, 1, 1], mode='reflect')
-            hxz = ndimage.gaussian_filter(gaussian_img, sigma=0, order=[1, 0, 1], mode='reflect')
-            hyz = ndimage.gaussian_filter(gaussian_img, sigma=0, order=[1, 1, 0], mode='reflect')
-            
-            # Hessian determinant (captures overall curvature)
-            determinant = (hxx * (hyy * hzz - hyz**2) - 
-                          hxy * (hxy * hzz - hxz * hyz) + 
-                          hxz * (hxy * hyz - hyy * hxz))
-            features[..., feature_idx] = determinant
-            feature_idx += 1
-            
-            # Hessian trace (sum of eigenvalues)
-            trace = hxx + hyy + hzz
-            features[..., feature_idx] = trace
-            feature_idx += 1
-            
-            # Frobenius norm (overall curvature magnitude)
-            frobenius_norm = np.sqrt(hxx**2 + hyy**2 + hzz**2 + 2*(hxy**2 + hxz**2 + hyz**2))
-            features[..., feature_idx] = frobenius_norm
-            feature_idx += 1
-
-        """
-        # Normalize features: zero-mean, unit variance per feature band
-        # Compute mean and std across spatial dimensions (0,1,2), keeping feature dimension
-        feature_means = np.mean(features, axis=(0, 1, 2), keepdims=True)
-        feature_stds = np.std(features, axis=(0, 1, 2), keepdims=True)
-        
-        # Avoid division by zero for constant features
-        feature_stds = np.where(feature_stds == 0, 1, feature_stds)
-        
-        # Normalize in-place for memory efficiency
-        features = (features - feature_means) / feature_stds
-        """
-        # Normalize only morphological features, keep intensity features raw
-        intensity_features = features[..., :num_basic_features]  # original + gaussians + DoGs
-        morphology_features = features[..., num_basic_features:]  # gradients + laplacians + eigenvalues
-
-        # Normalize only morphological features
-        morph_means = np.mean(morphology_features, axis=(0,1,2), keepdims=True)
-        morph_stds = np.std(morphology_features, axis=(0,1,2), keepdims=True)
-        morph_stds = np.where(morph_stds == 0, 1, morph_stds)
-        morphology_features = (morphology_features - morph_means) / morph_stds
-
-        # Recombine
-        features = np.concatenate([intensity_features, morphology_features], axis=-1)
-
-        return features
-
-
     def compute_feature_maps_cpu(self, image_3d=None): #lil
         """Optimized version that caches Gaussian filters to avoid redundant computation"""
         if image_3d is None:
             image_3d = self.image_3d
 
-        if image_3d.ndim == 4 and image_3d.shape[-1] == 3:
+        if image_3d.ndim == 4 and (image_3d.shape[-1] == 3 or image_3d.shape[-1] == 4):
             # RGB case - process each channel
             features_per_channel = []
-            for channel in range(3):
+            for channel in range(image_3d.shape[-1]):
                 channel_features = self.compute_feature_maps_cpu(image_3d[..., channel])
                 features_per_channel.append(channel_features)
             
@@ -1420,7 +1308,10 @@ class InteractiveSegmenter:
                 chunk_size = max(16, min(chunk_size, min(self.image_3d.shape) // 2))
                 chunk_size = ((chunk_size + 7) // 16) * 16
         
-        depth, height, width = self.image_3d.shape
+        try:
+            depth, height, width = self.image_3d.shape
+        except:
+            depth, height, width, rgb = self.image_3d.shape
         
         # Calculate chunk grid dimensions
         z_chunks = (depth + chunk_size - 1) // chunk_size

nettracer3d/segmenter_GPU.py

@@ -320,10 +320,10 @@ class InteractiveSegmenter:
         if image_3d is None:
             image_3d = self.image_3d  # Assuming this is already a cupy array
 
-        if image_3d.ndim == 4 and image_3d.shape[-1] == 3:
+        if image_3d.ndim == 4 and (image_3d.shape[-1] == 3 or image_3d.shape[-1] == 4):
             # RGB case - process each channel
             features_per_channel = []
-            for channel in range(3):
+            for channel in range(image_3d.shape[-1]):
                 channel_features = self.compute_feature_maps_gpu(image_3d[..., channel])
                 features_per_channel.append(channel_features)
             
@@ -376,10 +376,10 @@ class InteractiveSegmenter:
         if image_3d is None:
             image_3d = self.image_3d  # Assuming this is already a cupy array
 
-        if image_3d.ndim == 4 and image_3d.shape[-1] == 3:
+        if image_3d.ndim == 4 and (image_3d.shape[-1] == 3 or image_3d.shape[-1] == 4):
             # RGB case - process each channel
             features_per_channel = []
-            for channel in range(3):
+            for channel in range(image_3d.shape[-1]):
                 channel_features = self.compute_deep_feature_maps_gpu(image_3d[..., channel])
                 features_per_channel.append(channel_features)
             
@@ -507,10 +507,10 @@ class InteractiveSegmenter:
         if image_2d is None:
             image_2d = cp.asarray(self.image_3d[z, :, :])
 
-        if image_2d.ndim == 3 and image_2d.shape[-1] == 3:
+        if image_2d.ndim == 3 and (image_2d.shape[-1] == 3 or image_2d.shape[-1] == 4):
             # RGB case - process each channel
             features_per_channel = []
-            for channel in range(3):
+            for channel in range(image_2d.shape[-1]):
                 channel_features = self.compute_feature_maps_gpu_2d(image_2d = image_2d[..., channel])
                 features_per_channel.append(channel_features)
             
@@ -567,10 +567,10 @@ class InteractiveSegmenter:
         if image_2d is None:
             image_2d = cp.asarray(self.image_3d[z, :, :])
 
-        if image_2d.ndim == 3 and image_2d.shape[-1] == 3:
+        if image_2d.ndim == 3 and (image_2d.shape[-1] == 3 or image_2d.shape[-1] == 4):
             # RGB case - process each channel
             features_per_channel = []
-            for channel in range(3):
+            for channel in range(image_2d.shape[-1]):
                 channel_features = self.compute_deep_feature_maps_gpu_2d(image_2d = image_2d[..., channel])
                 features_per_channel.append(channel_features)
             
@@ -1082,7 +1082,10 @@ class InteractiveSegmenter:
                 chunk_size = max(16, min(chunk_size, min(self.image_3d.shape) // 2))
                 chunk_size = ((chunk_size + 7) // 16) * 16
         
-        depth, height, width = self.image_3d.shape
+        try:
+            depth, height, width = self.image_3d.shape
+        except:
+            depth, height, width, rgb = self.image_3d.shape
         
         # Calculate chunk grid dimensions
         z_chunks = (depth + chunk_size - 1) // chunk_size

{nettracer3d-0.9.6.dist-info → nettracer3d-0.9.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nettracer3d
-Version: 0.9.6
+Version: 0.9.8
 Summary: Scripts for intializing and analyzing networks from segmentations of three dimensional images.
 Author-email: Liam McLaughlin <liamm@wustl.edu>
 Project-URL: Documentation, https://nettracer3d.readthedocs.io/en/latest/
@@ -110,10 +110,6 @@ McLaughlin, L., Zhang, B., Sharma, S. et al. Three dimensional multiscalar neuro
 
 NetTracer3D was developed by Liam McLaughlin while working under Dr. Sanjay Jain at Washington University School of Medicine.
 
--- Version 0.9.6 Updates --
+-- Version 0.9.8 Updates --
 
-	* Moved some file menu options around.
-	* The 'merge node id' option now offers interactive support for assisted thresholding for any new identity channels the user is trying to merge with.
-	* Bug Fixes
-	* The 'merge nodes' option now can provide centroids prior to the merge, since oftentimes objects end up on top of each other.
-	* A few other minor adjustments.
+	* Some minor bug fixes

{nettracer3d-0.9.6.dist-info → nettracer3d-0.9.8.dist-info}/RECORD

@@ -6,20 +6,20 @@ nettracer3d/modularity.py,sha256=pborVcDBvICB2-g8lNoSVZbIReIBlfeBmjFbPYmtq7Y,224
 nettracer3d/morphology.py,sha256=jyDjYzrZ4LvI5jOyw8DLsxmo-i5lpqHsejYpW7Tq7Mo,19786
 nettracer3d/neighborhoods.py,sha256=iIaHU1COIdRtzRpAuIQKfLGLNKYFK3dL8Vb_EeJIlEA,46459
 nettracer3d/nettracer.py,sha256=d9Mhz-pHox5OfGGUSTrkTBJzCWCrbQvClTu2ANt-jUE,267943
-nettracer3d/nettracer_gui.py,sha256=ZJzW3-P3m18LPhoIkCqLVTqsRb8nRFzzwYmQ-vfIs5Y,628407
+nettracer3d/nettracer_gui.py,sha256=2OuTeJ1xnarlZAYjW9R4hvBA4ZiW_Ce0NtfTamqpbWU,628156
 nettracer3d/network_analysis.py,sha256=kBzsVaq4dZkMe0k-VGvQIUvM-tK0ZZ8bvb-wtsugZRQ,46150
 nettracer3d/network_draw.py,sha256=F7fw6Pcf4qWOhdKwLmhwqWdschbDlHzwCVolQC9imeU,14117
 nettracer3d/node_draw.py,sha256=kZcR1PekLg0riioNeGcALIXQyZ5PtHA_9MT6z7Zovdk,10401
 nettracer3d/painting.py,sha256=K_dwngivw80r-Yyg4btKMsWGn566ZE9PnrQl986uxJE,23497
 nettracer3d/proximity.py,sha256=WaHPwE6ypeInFO_LnMT0zaVE53jX3TJx6h7nmtYtr8U,41824
 nettracer3d/run.py,sha256=xYeaAc8FCx8MuzTGyL3NR3mK7WZzffAYAH23bNRZYO4,127
-nettracer3d/segmenter.py,sha256=-Llkhp3TlAIBXZNhcfMFQRdg0vec1xtlOm0c4_bSU9U,75761
-nettracer3d/segmenter_GPU.py,sha256=optCZ_zLIfe99rgqmyKWUZlWW5TF5jEC_C3keu1m7VQ,77771
+nettracer3d/segmenter.py,sha256=aOO3PwZ2UeizEIFX7N8midwzTzbEDzgM2jQ7WTdbrUg,70671
+nettracer3d/segmenter_GPU.py,sha256=OUekQljLKPiC4d4hNZmqrRa9HSVQ6HcCnILiAfHE5Hg,78051
 nettracer3d/simple_network.py,sha256=dkG4jpc4zzdeuoaQobgGfL3PNo6N8dGKQ5hEEubFIvA,9947
 nettracer3d/smart_dilate.py,sha256=TvRUh6B4q4zIdCO1BWH-xgTdND5OUNmo99eyxG9oIAU,27145
-nettracer3d-0.9.6.dist-info/licenses/LICENSE,sha256=jnNT-yBeIAKAHpYthPvLeqCzJ6nSurgnKmloVnfsjCI,764
-nettracer3d-0.9.6.dist-info/METADATA,sha256=MHM0yBkUeOtSk_cdnD6-5KEmgS7oiQaLBBDGg4ZMbE8,7343
-nettracer3d-0.9.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nettracer3d-0.9.6.dist-info/entry_points.txt,sha256=Nx1rr_0QhJXDBHAQg2vcqCzLMKBzSHfwy3xwGkueVyc,53
-nettracer3d-0.9.6.dist-info/top_level.txt,sha256=zsYy9rZwirfCEOubolhee4TyzqBAL5gSUeFMzhFTX8c,12
-nettracer3d-0.9.6.dist-info/RECORD,,
+nettracer3d-0.9.8.dist-info/licenses/LICENSE,sha256=jnNT-yBeIAKAHpYthPvLeqCzJ6nSurgnKmloVnfsjCI,764
+nettracer3d-0.9.8.dist-info/METADATA,sha256=h-H4X4k6Yf1n9ZFgVbyYBLmXQDvcpgQncQt5QZfBh6k,6997
+nettracer3d-0.9.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nettracer3d-0.9.8.dist-info/entry_points.txt,sha256=Nx1rr_0QhJXDBHAQg2vcqCzLMKBzSHfwy3xwGkueVyc,53
+nettracer3d-0.9.8.dist-info/top_level.txt,sha256=zsYy9rZwirfCEOubolhee4TyzqBAL5gSUeFMzhFTX8c,12
+nettracer3d-0.9.8.dist-info/RECORD,,