Merge branch 'refs/heads/feature-client-trace-modifier'
This commit is contained in:
commit
00a847abc7
@ -1,6 +1,6 @@
|
||||
{
|
||||
"trace_storage_path": [
|
||||
"/home/andrew/weldingspotperformance/trace_samples"
|
||||
"/home/leonid/PycharmProjects/WeldingSpotPerformance/trace_samples"
|
||||
],
|
||||
"monitor_update_period": [
|
||||
1000.0
|
||||
|
@ -79,7 +79,7 @@ class UsefulGraphData:
|
||||
:param range_ME: Диапазон для ME.
|
||||
:param k_hardness: Коэффициент твердости.
|
||||
"""
|
||||
performance: PerformanceData = PerformanceData()
|
||||
performance: PerformanceData = field(default_factory=PerformanceData)
|
||||
range_ME: float = 0
|
||||
k_hardness: float = 0
|
||||
|
||||
@ -91,9 +91,9 @@ class GraphicPassport:
|
||||
Графический паспорт, объединяющий DataFrame с данными,
|
||||
список паспортов точек и полезные данные для построения графика.
|
||||
"""
|
||||
dataframe: pd.DataFrame = pd.DataFrame({})
|
||||
dataframe: pd.DataFrame = field(default_factory=pd.DataFrame)
|
||||
points_pocket: List[PointPassport] = field(default_factory=list)
|
||||
useful_data: UsefulGraphData = UsefulGraphData()
|
||||
useful_data: UsefulGraphData = field(default_factory=UsefulGraphData)
|
||||
|
||||
|
||||
@dataclass
|
||||
|
@ -57,7 +57,7 @@ class FileManager(BaseFileManager):
|
||||
self._monitor.stop()
|
||||
self._paths_library.clear()
|
||||
self._paths_library.add('')
|
||||
self._mediator.notify(self, list(self._paths_library))
|
||||
self._mediator.notify(self.monitor, list(self._paths_library))
|
||||
self._mode = 1
|
||||
case 2:
|
||||
# Режим онлайн-мониторинга папки
|
||||
@ -108,7 +108,7 @@ class FileManager(BaseFileManager):
|
||||
paths_set = set(paths)
|
||||
new_paths = self._paths_library.difference(paths_set)
|
||||
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:
|
||||
"""
|
||||
|
@ -18,6 +18,7 @@ def main():
|
||||
app = QtWidgets.QApplication(sys.argv)
|
||||
monitor = DirectoryMonitor()
|
||||
file_manager = FileManager(monitor=monitor)
|
||||
monitor._file_manager = file_manager
|
||||
data_converter = DataConverter()
|
||||
controller = Controller(file_manager=file_manager)
|
||||
plot_widget_builder = PlotWidget(controller=controller)
|
||||
|
Loading…
Reference in New Issue
Block a user