Merge pull request #737 from bnmajor/file-names

Store all file paths as strings
HEXRD · Feb 3, 2021 · dd7eab2 · dd7eab2
2 parents ea766c5 + 0cc18de
commit dd7eab2
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/hexrd/ui/load_panel.py b/hexrd/ui/load_panel.py
@@ -67,8 +67,8 @@ def setup_gui(self):
             self.ui.img_directory.setText('No directory set')
         else:
             directory = self.parent_dir
-            if os.path.isfile(directory):
-                directory = os.path.basename(directory)
+            if Path(directory).is_file():
+                directory = str(Path(directory).parent)
             self.ui.img_directory.setText(directory)
 
         self.detectors_changed()
@@ -143,7 +143,7 @@ def dir_changed(self):
         new_dir = str(Path(self.files[0][0]).parent)
         HexrdConfig().set_images_dir(new_dir)
         self.parent_dir = new_dir
-        self.ui.img_directory.setText(os.path.dirname(self.parent_dir))
+        self.ui.img_directory.setText(str(Path(self.parent_dir).parent))
 
     def config_changed(self):
         if HexrdConfig().detector_names != self.dets:
@@ -358,7 +358,7 @@ def get_yml_files(self):
                 raw_images = data['files'].split()
                 for raw_image in raw_images:
                     path = Path(self.parent_dir, data['directory'])
-                    files.extend(path.glob(raw_image))
+                    files.extend([str(p) for p in path.glob(raw_image)])
             self.yml_files.append(files)
 
     def enable_read(self):
@@ -396,7 +396,7 @@ def create_table(self):
         # Populate the rows
         for i in range(self.ui.file_options.rowCount()):
             curr = table_files[self.idx][i]
-            self.ui.file_options.item(i, 0).setText(curr.name)
+            self.ui.file_options.item(i, 0).setText(Path(curr).name)
             self.ui.file_options.item(i, 1).setText(str(self.empty_frames))
             self.ui.file_options.item(i, 2).setText(str(self.total_frames[i]))
             self.ui.file_options.item(i, 3).setText(str(self.omega_min[i]))
@@ -405,7 +405,7 @@ def create_table(self):
                 str(round(self.delta[i], 6)))
 
             # Set tooltips
-            self.ui.file_options.item(i, 0).setToolTip(curr.name)
+            self.ui.file_options.item(i, 0).setToolTip(Path(curr).name)
             self.ui.file_options.item(i, 3).setToolTip('Minimum must be set')
             self.ui.file_options.item(i, 4).setToolTip(
                 'Must set either maximum or delta')