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

nettracer3d/nettracer_gui.py

@@ -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-0.9.7.dist-info → nettracer3d-0.9.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nettracer3d
-Version: 0.9.7
+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,7 +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.7 Updates --
+-- Version 0.9.8 Updates --
 
-	* Fixed a bug with the segmenter and color images.
-	* The overlay 2 is now cyan by default.
+	* Some minor bug fixes

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

@@ -6,7 +6,7 @@ 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=VsZep2sgES10ZePVJDoUoFGgsg3wGRW-rAp1NMgQQwQ,628409
+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
@@ -17,9 +17,9 @@ nettracer3d/segmenter.py,sha256=aOO3PwZ2UeizEIFX7N8midwzTzbEDzgM2jQ7WTdbrUg,7067
 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.7.dist-info/licenses/LICENSE,sha256=jnNT-yBeIAKAHpYthPvLeqCzJ6nSurgnKmloVnfsjCI,764
-nettracer3d-0.9.7.dist-info/METADATA,sha256=oJJZS4YPNc21NZd5sFUY6doxe5vpgzZwdEObUGIwswg,7067
-nettracer3d-0.9.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nettracer3d-0.9.7.dist-info/entry_points.txt,sha256=Nx1rr_0QhJXDBHAQg2vcqCzLMKBzSHfwy3xwGkueVyc,53
-nettracer3d-0.9.7.dist-info/top_level.txt,sha256=zsYy9rZwirfCEOubolhee4TyzqBAL5gSUeFMzhFTX8c,12
-nettracer3d-0.9.7.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,,