nettracer3d 0.8.5__tar.gz → 0.8.6__tar.gz

{nettracer3d-0.8.5/src/nettracer3d.egg-info → nettracer3d-0.8.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nettracer3d
-Version: 0.8.5
+Version: 0.8.6
 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,6 +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.8.5 Updates -- 
+-- Version 0.8.6 Updates -- 
 
 	* See Documentation Once Updated

{nettracer3d-0.8.5 → nettracer3d-0.8.6}/README.md

@@ -65,6 +65,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.8.5 Updates -- 
+-- Version 0.8.6 Updates -- 
 
 	* See Documentation Once Updated

{nettracer3d-0.8.5 → nettracer3d-0.8.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nettracer3d"
-version = "0.8.5"
+version = "0.8.6"
 authors = [
   { name="Liam McLaughlin", email="liamm@wustl.edu" },
 ]

{nettracer3d-0.8.5 → nettracer3d-0.8.6}/src/nettracer3d/nettracer_gui.py

@@ -464,6 +464,8 @@ class ImageViewerWindow(QMainWindow):
         self.paint_batch = []
         self.last_paint_pos = None
 
+        self.resume = False
+
     def start_left_scroll(self):
         """Start scrolling left when left arrow is pressed."""
         # Single increment first
@@ -2498,6 +2500,8 @@ class ImageViewerWindow(QMainWindow):
 
                 if self.machine_window is not None:
                     if self.machine_window.segmentation_worker is not None:
+                        if not self.machine_window.segmentation_worker._paused:
+                            self.resume = True
                         self.machine_window.segmentation_worker.pause()
                 
                 # Store current channel visibility state
@@ -2520,10 +2524,28 @@ class ImageViewerWindow(QMainWindow):
             """Handle brush mode with virtual painting."""
             if event.inaxes != self.ax:
                 return
+
+            """
+            try:
+                if self.machine_window is not None and not self.machine_window.segmentation_worker._paused:
+                    current_xlim = self.ax.get_xlim() if hasattr(self, 'ax') and self.ax.get_xlim() != (0, 1) else None
+                    current_ylim = self.ax.get_ylim() if hasattr(self, 'ax') and self.ax.get_ylim() != (0, 1) else None
+
+                    if self.pen_button.isChecked():
+                        channel = self.active_channel
+                    else:
+                        channel = 2
+
+                    self.pm.initiate_paint_session(channel, current_xlim, current_ylim)
+            except:
+                pass
+            """
             
             if event.button == 1 or event.button == 3:
                 if self.machine_window is not None:
                     if self.machine_window.segmentation_worker is not None:
+                        if not self.machine_window.segmentation_worker._paused:
+                            self.resume = True
                         self.machine_window.segmentation_worker.pause()
                         
                 x, y = int(event.xdata), int(event.ydata)
@@ -3118,10 +3140,9 @@ class ImageViewerWindow(QMainWindow):
 
             self.update_display(preserve_zoom=(current_xlim, current_ylim), continue_paint = True)
 
-            if self.machine_window is not None:
-                if self.machine_window.segmentation_worker is not None:
-                    self.machine_window.segmentation_worker.resume()
-
+            if self.resume:
+                self.machine_window.segmentation_worker.resume()
+                self.resume = False
             
 
     def highlight_value_in_tables(self, clicked_value):
@@ -5121,9 +5142,9 @@ class ImageViewerWindow(QMainWindow):
                 self.channel_visible = self.pre_pan_channel_state.copy()
                 self.is_pan_preview = False
                 self.pan_background_image = None
-                if self.machine_window is not None:
-                    if self.machine_window.segmentation_worker is not None:
-                        self.machine_window.segmentation_worker.resume()
+                if self.resume:
+                    self.machine_window.segmentation_worker.resume()
+                    self.resume = False
             if self.static_background is not None:
                 # NEW: Convert virtual strokes to real data before cleanup
                 if (hasattr(self, 'virtual_draw_operations') and self.virtual_draw_operations) or \
@@ -9605,6 +9626,8 @@ class MachineWindow(QMainWindow):
             self.fore_button.click()
             self.fore_button.click()
 
+            self.num_chunks = 0
+
         except:
             return
 
@@ -9892,6 +9915,7 @@ class MachineWindow(QMainWindow):
 
         self._last_z = current_z
 
+        self.num_chunks += 1
 
         current_time = time.time()
         if current_time - self._last_update >= 1:  # Match worker's interval
@@ -10110,6 +10134,8 @@ class SegmentationWorker(QThread):
                 current_time = time.time()
                 if (self.chunks_since_update >= self.chunks_per_update and 
                     current_time - self.last_update >= self.update_interval):
+                    if self.machine_window.parent().shape[1] * self.machine_window.parent().shape[2] > 3000 * 3000: #arbitrary throttle for large arrays.
+                        self.msleep(3000)
                     self.chunk_processed.emit()
                     self.chunks_since_update = 0
                     self.last_update = current_time 

{nettracer3d-0.8.5 → nettracer3d-0.8.6}/src/nettracer3d/painting.py

@@ -8,6 +8,8 @@ class PaintManager(QMainWindow):
     def __init__(self, parent = None):
         super().__init__(parent)
 
+        self.resume = False
+
     def get_line_points(self, x0, y0, x1, y1):
         """Get all points in a line between (x0,y0) and (x1,y1) using Bresenham's algorithm."""
         points = []
@@ -44,7 +46,8 @@ class PaintManager(QMainWindow):
 
         if self.parent().machine_window is not None:
             if self.parent().machine_window.segmentation_worker is not None:
-                # Instead of just pausing, completely stop and clean up the worker
+                if not self.parent().machine_window.segmentation_worker._paused:
+                    self.resume = True
                 self.parent().machine_window.segmentation_worker.pause()
 
 
@@ -54,10 +57,9 @@ class PaintManager(QMainWindow):
         # Capture the background once
         self.parent().static_background = self.parent().canvas.copy_from_bbox(self.parent().ax.bbox)
 
-        if self.parent().machine_window is not None:
-            if self.parent().machine_window.segmentation_worker is not None:
-                # Instead of just pausing, completely stop and clean up the worker
-                self.parent().machine_window.segmentation_worker.resume()
+        if self.resume:
+            self.parent().machine_window.segmentation_worker.resume()
+            self.resume = False
 
 
 

{nettracer3d-0.8.5 → nettracer3d-0.8.6/src/nettracer3d.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nettracer3d
-Version: 0.8.5
+Version: 0.8.6
 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,6 +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.8.5 Updates -- 
+-- Version 0.8.6 Updates -- 
 
 	* See Documentation Once Updated