Merge pull request #11 from kiyu-git/PyQt5

PyQt5更新

Author: kiyu-git

main.py

@@ -164,8 +164,15 @@ def load_new_file(self, idx):
                 self.InputFiles.setCurrentText(droppdown_item_labels[self.pre_file_idx])
                 self.InputFiles.blockSignals(False)
             else:
+                # validation
+                folder_paths = tools.get_latest_folder_paths(dir)
+                if len(folder_paths) == 0:
+                    logger.info("########\nError: フォルダーが無効です。")
+                    # 再度QFileDialogを表示
+                    self.load_new_file(idx)
+                    return
                 self.dir_path = dir
-                self.folder_paths = tools.get_latest_folder_paths(self.dir_path)
+                self.folder_paths = folder_paths
                 path_latest_folder: str = self.folder_paths[0]
                 self.folder_path = path_latest_folder
                 self.droppdown_items = tools.make_droppdown_item(self.folder_paths)
@@ -304,21 +311,24 @@ def init_variables(self, _settings, _measurement_settings):
 
     def set_view_area(self, _setX=True, _setY=True):
         self.graphs["signals"]["graphic"].setLimits(
-            xMin=0,
-            xMax=sys.float_info.max,
-            yMin=sys.float_info.min,
-            yMax=sys.float_info.max,
+            xMin=None,
+            xMax=None,
+            yMin=None,
+            yMax=None,
         )
         if _setX:
             self.graphs["range"]["region"].setRegion(
                 [self.data.index[0], self.data.index[-1]]
             )
         self.graphs["signals"]["graphic"].enableAutoRange(axis="y")
         self.graphs["signals"]["graphic"].setAutoVisible(y=True)
-        view = self.graphs["signals"]["graphic"].viewRange()
-        self.graphs["signals"]["graphic"].setLimits(
-            xMin=view[0][0], xMax=view[0][1], yMin=view[1][0], yMax=view[1][1]
-        )
+        # Issue #7の対応でコメントアウト
+        # self.graphs["signals"]["graphic"].viewRange()の計算がおかしいことが原因と思われる
+        # view = self.graphs["signals"]["graphic"].viewRange()
+        # print(view)
+        # self.graphs["signals"]["graphic"].setLimits(
+        #     xMin=view[0][0], xMax=view[0][1], yMin=view[1][0], yMax=view[1][1]
+        # )
 
     def set_graph_ui(self) -> dict:
         """

tools.py

@@ -5,10 +5,14 @@
 
 def get_latest_folder_paths(dirname):
     target = os.path.join(dirname, "*")
-    files = [(f, os.path.getmtime(f)) for f in glob(target)]
-    # ファイルの名前を参照して並べ替え
-    file_paths = [path for path, file in sorted(files, reverse=True)]
-    return file_paths
+    folders = [f for f in glob(target) if os.path.isdir(f)]
+    # フォルダの名前を参照して並べ替え / .csvファイルを内包するファイルのみ抽出
+    folder_paths = [
+        path
+        for path in sorted(folders, reverse=True)
+        if os.path.isfile(get_csv_path(path))
+    ]
+    return folder_paths
 
 
 def get_csv_path(_path_folder: str) -> str: