Skip to content
Snippets Groups Projects
Commit 4509236e authored by Lan Dam's avatar Lan Dam
Browse files

merging bug

parent f270fcb7
No related branches found
No related tags found
1 merge request!122allow to select multi folder to load
Pipeline #2747 passed with stage
in 2 minutes and 57 seconds
Hide whitespace changes
Inline Side-by-side
sohstationviewer/model/data_loader.py
+ 0
− 1
View file @ 4509236e
...@@ -73,7 +73,6 @@ class DataLoaderWorker(QtCore.QObject): ...@@ -73,7 +73,6 @@ class DataLoaderWorker(QtCore.QObject):
self.button_chosen.connect(data_object.receive_pause_response, self.button_chosen.connect(data_object.receive_pause_response,
type=QtCore.Qt.DirectConnection) type=QtCore.Qt.DirectConnection)
data_object.__init__( data_object.__init__(
self.data_type, self.tracking_box,
self.data_type, self.tracking_box, self.data_type, self.tracking_box,
self.is_multiplex, self.list_of_dir, self.is_multiplex, self.list_of_dir,
self.list_of_rt130_paths, req_wf_chans=self.req_wf_chans, self.list_of_rt130_paths, req_wf_chans=self.req_wf_chans,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment