commit stable

src/helpers.py

@@ -99,9 +99,7 @@ def delete_recursive(dir):
     cfg.main_window.setPbarText('Deleting Files...')
 
     to_delete = []
-    to_delete.extend(glob(dir +'/img_aligned.zarr/s*'))
-    to_delete.extend(glob(dir +'/img_src.zarr/s*'))
-    to_delete.append(dir +'/thumbnails')
+
     scales = glob(dir + '/scale_*')
     if scales:
         for s in natural_sort(scales)[::-1]:
@@ -117,7 +115,9 @@ def delete_recursive(dir):
                 to_delete.append(os.path.join(dir, s, 'thumbnails_aligned'))
             if os.path.exists(os.path.join(dir, s, 'img_src')):
                 to_delete.append(os.path.join(dir, s, 'img_src'))
-
+    to_delete.extend(glob(dir +'/img_aligned.zarr/s*'))
+    to_delete.extend(glob(dir +'/img_src.zarr/s*'))
+    to_delete.append(dir +'/thumbnails')
     to_delete.append(dir)
     to_delete.append(dir) #delete twice
     cfg.nCompleted = 0

src/ui/main_window.py

@@ -1359,7 +1359,6 @@ def apply_default_style(self):
         self.hud.set_theme_light()
 
 
-
     def reset_groupbox_styles(self):
         logger.info('reset_groupbox_styles:')
 

src/ui/tab_project.py

@@ -1450,7 +1450,7 @@ def fn():
         self.w_ng_extended_toolbar.addAction(cfg.main_window.ngShowYellowFrameAction)
         self.w_ng_extended_toolbar.addAction(cfg.main_window.ngShowAxisLinesAction)
         self.w_ng_extended_toolbar.addAction(self.showHudOverlayAction)
-        self.w_ng_extended_toolbar.addWidget(QLabel('      '))
+        self.w_ng_extended_toolbar.addWidget(ExpandingWidget(self))
         self.w_ng_extended_toolbar.addWidget(self.labNgLayout)
         self.w_ng_extended_toolbar.addWidget(self.comboNgLayout)
         self.w_ng_extended_toolbar.addWidget(ExpandingWidget(self))

src/viewer_em.py

@@ -517,7 +517,7 @@ def initViewerSlim(self, nglayout=None):
 
         if getData('state,ng_layout') == 'xy':
             # logger.info('Initializing zoom for xy plane ...')
-            w = cfg.project_tab.webengine.width()
+            w = cfg.main_window.width()
             h = cfg.project_tab.webengine.height()
             self.initZoom(w=w, h=h, adjust=1.10)