diff --git a/conda_env.yml b/conda_env.yml index 0e21ff5..8beca5c 100644 --- a/conda_env.yml +++ b/conda_env.yml @@ -6,15 +6,18 @@ channels: - defaults dependencies: - python=3.10 - - napari=0.4.18 + - napari[version='>=0.4.19'] - pandas - numpy - pyqt - matplotlib - scipy - scikit-learn - - napari-clusters-plotter - tqdm - mrcfile - cuml=23.12 - cuda-version=11.8 + - git + - pip: + - napari-boxmanager # Install napari-boxmanager via pip because otherwise scripts in setup.cfg are ignored + - git+https://github.com/BiAPoL/napari-clusters-plotter.git@b9b08f3500c9b0831d2cd1b4d9a757c688f76005 #until 0.7.4 is released diff --git a/src/napari_tomotwin/umap_tool.py b/src/napari_tomotwin/umap_tool.py index c4fb616..37e73c8 100644 --- a/src/napari_tomotwin/umap_tool.py +++ b/src/napari_tomotwin/umap_tool.py @@ -160,6 +160,10 @@ def select_file_clicked(): self.load_umap_tool: LoadUmapTool def load_umap_btn_clicked(): + + if self._selected_umap_pth.text() == None or self._selected_umap_pth.text() == "": + return + if self.plotter_widget is not None: ret = QMessageBox.question(self, '', "Do you really want to close the current UMAP and load another?", QMessageBox.Yes | QMessageBox.No) if ret == QMessageBox.No: @@ -254,7 +258,7 @@ def patched_run(self, *args, **kwargs): self._run_show_targets.setEnabled(True) if self.nvidia_available: self._run_umap_recalc_btn.setEnabled(True) - except: + except Exception as e: pass return result @@ -318,7 +322,7 @@ def set_umap_tool(self, tool: LoadUmapTool): self.load_umap_tool = tool def _on_refine_click(self): - self.viewer.window._qt_window.setEnabled(False) + self.viewer.window.setEnabled(False) self.delete_points_layer() self.reestimate_umap() @@ -368,14 +372,15 @@ def show_targets_callback(self, future: futures.Future): out_of_slice_display=True, name="Targets") - self.viewer.window._qt_window.setEnabled(True) + self.viewer.window.setEnabled(True) self.progressBar.setHidden(True) self.progressBar.set_label_text("") def show_umap_callback(self, future: futures.Future): (umap_embeddings, used_embeddings) = future.result() - self.viewer.window._qt_window.setEnabled(True) + self.viewer.window.setEnabled(True) + self.viewer.window.set self.napari_update_umap(umap_embeddings, used_embeddings) def reestimate_umap(self):