diff --git a/src/helpers.py b/src/helpers.py index bb8945a49..1b98b7a26 100755 --- a/src/helpers.py +++ b/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 diff --git a/src/ui/main_window.py b/src/ui/main_window.py index 108820b71..8c0373f80 100644 --- a/src/ui/main_window.py +++ b/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:') diff --git a/src/ui/tab_project.py b/src/ui/tab_project.py index 1c091aa35..8abc58fc4 100644 --- a/src/ui/tab_project.py +++ b/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)) diff --git a/src/viewer_em.py b/src/viewer_em.py index ae1c3b817..f1a5f7da9 100755 --- a/src/viewer_em.py +++ b/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)