fix

Author: C-Achard

napari_cellseg_annotator/plugin_loader.py

@@ -38,18 +38,25 @@ def format_Warning(message, category, filename, lineno, line=""):
 
 class Loader(QWidget):
     def __init__(self, parent: "napari.viewer.Viewer"):
-        super().__init__()
+        super(Loader, self).__init__()
+
         # self.master = parent
         self._viewer = parent
         self.opath = ""
         self.modpath = ""
+        self.filetype = ""
+
         self.btn1 = QPushButton("Open", self)
         self.btn1.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
         self.btn1.clicked.connect(self.show_dialog_o)
         self.btn2 = QPushButton("Open", self)
         self.btn2.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
         self.btn2.clicked.connect(self.show_dialog_mod)
 
+        self.filetype_choice = QComboBox()
+        self.filetype_choice.addItems([".png", ".tif"])
+        self.filetype_choice.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+
         self.textbox = QLineEdit(self)
         self.textbox.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
 
@@ -58,27 +65,38 @@ def __init__(self, parent: "napari.viewer.Viewer"):
 
         self.btn4 = QPushButton("Start reviewing", self)
         self.btn4.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-        self.btn4.clicked.connect(self.launch_napari)
-        self.btn4.clicked.connect(self.close)
+
+        self.btn4.clicked.connect(self.run_review)
+        # self.btn4.clicked.connect(self.close)
         self.btnb = QPushButton("Close", self)
         self.btnb.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
         self.btnb.clicked.connect(self.close)
         self.lbl = QLabel("Images directory", self)
         self.lbl2 = QLabel("Labels directory", self)
         self.lbl4 = QLabel("Model name", self)
         #####################################################################
-        # TODO
+        # TODO remove once done
         self.btntest = QPushButton("test", self)
+        self.lblft = QLabel("Filetype :", self)
+        self.lblft2 = QLabel("(Folders of .png or single .tif files)")
         self.btntest.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
         self.btntest.clicked.connect(self.run_test)
         #####################################################################
+
         self.build()
 
     def build(self):
+
         vbox = QVBoxLayout()
+
         vbox.addWidget(utils.combine_blocks(self.btn1, self.lbl))
+
         vbox.addWidget(utils.combine_blocks(self.btn2, self.lbl2))
+        vbox.addWidget(self.lblft2)
+        vbox.addWidget(utils.combine_blocks(self.filetype_choice, self.lblft))
+
         vbox.addWidget(utils.combine_blocks(self.textbox, self.lbl4))
+
         vbox.addWidget(self.checkBox)
         vbox.addWidget(self.btn4)
         vbox.addWidget(self.btnb)
@@ -109,56 +127,82 @@ def close(self):
         # self.master.setCurrentIndex(0)
         self._viewer.window.remove_dock_widget(self)
 
-    def launch_napari(self):
-        images = utils.load_images(self.opath)
+    def run_review(self):
+
+        self.filetype = self.filetype_choice.currentText()
+        images = utils.load_images(self.opath, self.filetype)
         if self.modpath == "":  # saves empty images of the same size as original images
             labels = np.zeros_like(images.compute())  # dask to numpy
             self.modpath = os.path.join(
                 os.path.dirname(self.opath), self.textbox.text()
             )
             os.makedirs(self.modpath, exist_ok=True)
             filenames = [
-                fn.name for fn in sorted(list(Path(self.opath).glob("./*png")))
+                fn.name
+                for fn in sorted(list(Path(self.opath).glob("./*" + self.filetype)))
             ]
             for i in range(len(labels)):
                 io.imsave(
-                    os.path.join(self.modpath, str(i).zfill(4) + ".png"), labels[i]
+                    os.path.join(self.modpath, str(i).zfill(4) + self.filetype),
+                    labels[i],
                 )
         else:
-            labels = utils.load_saved_masks(self.modpath)
+            labels = utils.load_saved_masks(self.modpath, self.filetype)
         try:
-            labels_raw = utils.load_raw_masks(self.modpath + "_raw")
+            labels_raw = utils.load_raw_masks(self.modpath + "_raw", self.filetype)
         except:
             labels_raw = None
             # TODO: viewer argument ?
-        view1 = launch_viewers(
-            self._viewer,
-            images,
-            labels,
-            labels_raw,
-            self.modpath,
-            self.textbox.text(),
-            self.checkBox.isChecked(),
-        )
+        global launched
+        if launched:
+            new_viewer = napari.Viewer()
+            view1 = launch_viewers(
+                new_viewer,
+                images,
+                labels,
+                labels_raw,
+                self.modpath,
+                self.textbox.text(),
+                self.checkBox.isChecked(),
+                self.filetype,
+            )
+            warnings.warn(
+                "WARNING : Opening several loader sessions in one window is not supported; opening in new window"
+            )
+            self._viewer.close()
+        else:
+            new_viewer = self._viewer
+
+            view1 = launch_viewers(
+                new_viewer,
+                images,
+                labels,
+                labels_raw,
+                self.modpath,
+                self.textbox.text(),
+                self.checkBox.isChecked(),
+                self.filetype,
+            )
+            launched = True
+            self.close()
+            # global view_l
+        # view_l.close()  # why does it not close the window ??  #use self.close() ?
 
-        # global view_l
-        # view_l.close()  # why does it not close the window ??  #TODO use  self.close() ?
-        # self.close
         return view1
 
     ########################
     # TODO : remove once done
     def run_test(self):
-        tif = False
+        self.filetype = self.filetype_choice.currentText()
 
         self.opath = "C:/Users/Cyril/Desktop/Proj_bachelor/data/visual_png/sample"
         self.modpath = (
             "C:/Users/Cyril/Desktop/Proj_bachelor/data/visual_png/sample_labels"
         )
-        if tif:
+        if self.filetype == ".tif":
             self.opath = "C:/Users/Cyril/Desktop/Proj_bachelor/data/visual_tif/volumes"
             self.modpath = "C:/Users/Cyril/Desktop/Proj_bachelor/data/visual_tif/labels"
-        self.launch_napari()
-        self.close()
+        self.run_review()
+        # self.close()
 
     ########################