Welding/WeldingSpotPerformance
9
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 2 Wiki Activity

fix: Некорректное использование значений по умолчанию в dataclass

Browse Source
This commit is contained in:
Леонид Титов 2025-02-19 14:08:31 +03:00
parent 47248ac6a7
commit 1520960a8c
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
params/system_params.json
View File

@ -1,6 +1,6 @@
{ {
"trace_storage_path": [ "trace_storage_path": [
"/home/andrew/weldingspotperformance/trace_samples" "/home/leonid/PycharmProjects/WeldingSpotPerformance/trace_samples"
], ],
"monitor_update_period": [ "monitor_update_period": [
1000.0 1000.0

6
src/base/base.py
View File

@ -79,7 +79,7 @@ class UsefulGraphData:
:param range_ME: Диапазон для ME. :param range_ME: Диапазон для ME.
:param k_hardness: Коэффициент твердости. :param k_hardness: Коэффициент твердости.
""" """
performance: PerformanceData = PerformanceData() performance: PerformanceData = field(default_factory=PerformanceData)
range_ME: float = 0 range_ME: float = 0
k_hardness: float = 0 k_hardness: float = 0
@ -91,9 +91,9 @@ class GraphicPassport:
Графический паспорт, объединяющий DataFrame с данными, Графический паспорт, объединяющий DataFrame с данными,
список паспортов точек и полезные данные для построения графика. список паспортов точек и полезные данные для построения графика.
""" """
dataframe: pd.DataFrame = pd.DataFrame({}) dataframe: pd.DataFrame = field(default_factory=pd.DataFrame)
points_pocket: List[PointPassport] = field(default_factory=list) points_pocket: List[PointPassport] = field(default_factory=list)
useful_data: UsefulGraphData = UsefulGraphData() useful_data: UsefulGraphData = field(default_factory=UsefulGraphData)
@dataclass @dataclass

4
src/controller/file_manager.py
View File

@ -57,7 +57,7 @@ class FileManager(BaseFileManager):
self._monitor.stop() self._monitor.stop()
self._paths_library.clear() self._paths_library.clear()
self._paths_library.add('') self._paths_library.add('')
self._mediator.notify(self, list(self._paths_library)) self._mediator.notify(self.monitor, list(self._paths_library))
self._mode = 1 self._mode = 1
case 2: case 2:
# Режим онлайн-мониторинга папки # Режим онлайн-мониторинга папки
@ -108,7 +108,7 @@ class FileManager(BaseFileManager):
paths_set = set(paths) paths_set = set(paths)
new_paths = self._paths_library.difference(paths_set) new_paths = self._paths_library.difference(paths_set)
self._paths_library.update(new_paths) self._paths_library.update(new_paths)
self._mediator.notify(list(new_paths)) self._mediator.notify(self, list(new_paths))
def open_raw_traces_dir(self, path: str) -> None: def open_raw_traces_dir(self, path: str) -> None:
""" """

1
src/main.py
View File

@ -18,6 +18,7 @@ def main():
app = QtWidgets.QApplication(sys.argv) app = QtWidgets.QApplication(sys.argv)
monitor = DirectoryMonitor() monitor = DirectoryMonitor()
file_manager = FileManager(monitor=monitor) file_manager = FileManager(monitor=monitor)
monitor._file_manager = file_manager
data_converter = DataConverter() data_converter = DataConverter()
controller = Controller(file_manager=file_manager) controller = Controller(file_manager=file_manager)
plot_widget_builder = PlotWidget(controller=controller) plot_widget_builder = PlotWidget(controller=controller)