duxingchen/WQ_GUI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(gui): step8_panel QBrush崩溃修复 + step9_panel step5→step8_panel 回填链路对齐

Browse Source
This commit is contained in:
DXC
2026-06-09 13:23:17 +08:00
parent 47cbb4a013
commit c9b9eded84
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/panels/step8_panel.py
View File

@ -42,10 +42,11 @@ class Step8Panel(QWidget):
def __init__(self, parent=None): def __init__(self, parent=None):
super().__init__(parent) super().__init__(parent)
self.index_checkboxes: Dict[str, QCheckBox] = {} self.index_checkboxes: Dict[str, QListWidgetItem] = {}
self.work_dir: Optional[str] = None self.work_dir: Optional[str] = None
self.builtin_formula_path = get_resource_path("waterindex.csv") self.builtin_formula_path = get_resource_path("waterindex.csv")
self._formula_type_map: Dict[str, str] = {} self._formula_type_map: Dict[str, str] = {}
self._formula_color_map: Dict[str, QColor] = {}
self.init_ui() self.init_ui()
self._auto_load_formulas() self._auto_load_formulas()
@ -156,11 +157,12 @@ class Step8Panel(QWidget):
def _on_item_changed(self, item: QListWidgetItem): def _on_item_changed(self, item: QListWidgetItem):
if item.checkState() == Qt.Checked: if item.checkState() == Qt.Checked:
color_data = item.data(Qt.UserRole + 1) bg_color = self.COLOR_RATIO
if isinstance(color_data, QColor): for name, ref_item in self.index_checkboxes.items():
item.setBackground(QBrush(QColor(color_data))) if ref_item is item:
else: bg_color = self._formula_color_map.get(name, self.COLOR_RATIO)
item.setBackground(QBrush(self.COLOR_RATIO)) break
item.setBackground(QBrush(bg_color))
else: else:
item.setBackground(QBrush(self.COLOR_RATIO)) item.setBackground(QBrush(self.COLOR_RATIO))
@ -203,17 +205,16 @@ class Step8Panel(QWidget):
self.formula_list.clear() self.formula_list.clear()
self.index_checkboxes.clear() self.index_checkboxes.clear()
self._formula_color_map.clear()
for name, ftype in self._formula_type_map.items(): for name, ftype in self._formula_type_map.items():
item = QListWidgetItem(name, self.formula_list) item = QListWidgetItem(name, self.formula_list)
item.setCheckState(Qt.Checked) item.setCheckState(Qt.Checked)
if ftype == 'concentration': if ftype == 'concentration':
bg_color = QColor(220, 240, 255) bg_color = QColor(220, 240, 255)
item.setData(Qt.UserRole + 1, bg_color)
item.setBackground(QBrush(bg_color))
else: else:
bg_color = self.COLOR_RATIO bg_color = self.COLOR_RATIO
item.setData(Qt.UserRole + 1, bg_color) self._formula_color_map[name] = bg_color
item.setBackground(QBrush(bg_color)) item.setBackground(QBrush(bg_color))
self.index_checkboxes[name] = item self.index_checkboxes[name] = item
self.formula_list.adjustSize() self.formula_list.adjustSize()

23
src/gui/panels/step9_panel.py
View File

@ -297,23 +297,20 @@ class Step9Panel(QWidget):
else: else:
self.work_dir = None self.work_dir = None
# 1. 尝试从 Step5 界面读取训练光谱 CSV 路径 # 1. 尝试从 Step8 界面读取训练光谱 CSV 路径
main_window = self.window() main_window = self.window()
if main_window and hasattr(main_window, 'step5_panel'): if main_window and hasattr(main_window, 'step8_panel'):
step5_widget = getattr(main_window.step5_panel, 'output_file', None) step8_widget = main_window.step8_panel.training_data_widget
step5_output_path = "" step8_output_path = ""
if hasattr(step5_widget, 'get_path'): if hasattr(step8_widget, 'get_path'):
step5_output_path = step5_widget.get_path() or "" step8_output_path = step8_widget.get_path() or ""
elif hasattr(step5_widget, 'text'):
step5_output_path = step5_widget.text() or ""
if step5_output_path: if step8_output_path:
# 若为相对路径，使用 work_dir 合成为绝对路径 if not os.path.isabs(step8_output_path):
if not os.path.isabs(step5_output_path): step8_output_path = os.path.join(self.work_dir or '', step8_output_path).replace('\\', '/')
step5_output_path = os.path.join(self.work_dir or '', step5_output_path).replace('\\', '/')
existing = self.csv_file.get_path() existing = self.csv_file.get_path()
if not existing or not existing.strip(): if not existing or not existing.strip():
self.csv_file.set_path(step5_output_path) self.csv_file.set_path(step8_output_path)
# 1.5 自动探测并回填 Step 8 双轨输出的 Traditional_Indices 目录 # 1.5 自动探测并回填 Step 8 双轨输出的 Traditional_Indices 目录
if self.work_dir: if self.work_dir: