From 7d3d3464e45352305ab1d4e81d4d2b409a65df79 Mon Sep 17 00:00:00 2001
From: mattminder <myfiles@Mattus-MacBook-Pro.local>
Date: Fri, 15 May 2020 20:14:42 +0200
Subject: [PATCH] Select folder and file at the same time
---
disk/DialogFileBrowser.py | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/disk/DialogFileBrowser.py b/disk/DialogFileBrowser.py
index e645820..bf1ad3b 100644
--- a/disk/DialogFileBrowser.py
+++ b/disk/DialogFileBrowser.py
@@ -24,11 +24,11 @@ class FileBrowser(QDialog):
self.button_opennd2.setToolTip("Browse for an image file")
self.button_opennd2.setMaximumWidth(150)
- self.button_openfolder = QPushButton('Open image folder')
- self.button_openfolder.setEnabled(True)
- self.button_openfolder.clicked.connect(self.getfolder)
- self.button_openfolder.setToolTip("Browse for folder with images")
- self.button_openfolder.setMaximumWidth(150)
+# self.button_openfolder = QPushButton('Open image folder')
+# self.button_openfolder.setEnabled(True)
+# self.button_openfolder.clicked.connect(self.getfolder)
+# self.button_openfolder.setToolTip("Browse for folder with images")
+# self.button_openfolder.setMaximumWidth(150)
self.button_openhdf = QPushButton('Open mask file')
self.button_openhdf.setEnabled(True)
@@ -66,7 +66,7 @@ class FileBrowser(QDialog):
self.labelfolder.setText('No folder selected')
flo.addRow(self.labelnd2, self.button_opennd2)
- flo.addRow(self.labelfolder, self.button_openfolder)
+# flo.addRow(self.labelfolder, self.button_openfolder)
flo.addRow(self.labelhdf, self.button_openhdf)
# flo.addWidget(self.button_openhdf)
flo.addRow('If no hdf file already exists, give a name to create a new file', self.newhdfentry)
@@ -79,9 +79,17 @@ class FileBrowser(QDialog):
def getnd2path(self):
- self.nd2name,_ = QFileDialog.getOpenFileName(self, 'Open image file','', 'Image files (*.nd2 *.tif *.tiff)')
+# self.nd2name,_ = QFileDialog.getOpenFileName(self, 'Open image file','', 'Image files (*.nd2 *.tif *.tiff)')
# print(self.nd2name)
# print(self.nd2name)
+
+ dlg = QFileDialog(self, 'Open image file or folder')
+ dlg.setProxyModel(None)
+ if dlg.exec():
+ self.nd2name = dlg.selectedFiles()[0]
+ else:
+ return
+
if self.nd2name != '':
self.labelnd2.setText(self.nd2name)
@@ -91,7 +99,7 @@ class FileBrowser(QDialog):
self.labelhdf.setText(self.hdfname)
self.newhdfentry.setText("")
- def getfolder(self):
- self.nd2name = QFileDialog.getExistingDirectory(self, ("Select Image Folder"))
- if self.nd2name != '':
- self.labelnd2.setText(self.nd2name)
+# def getfolder(self):
+# self.nd2name = QFileDialog.getExistingDirectory(self, ("Select Image Folder"))
+# if self.nd2name != '':
+# self.labelnd2.setText(self.nd2name)
--
GitLab