Skip to content
Snippets Groups Projects
Commit 1019d13a authored by Kien Le's avatar Kien Le
Browse files

Merge branch 'feature-detectDataType_return_only_data_type' into 'master'

Change detectDataType to return only data type

See merge request !26
parents 6db5d972 c2713c5e
No related branches found
No related tags found
1 merge request!26Change detectDataType to return only data type
Pipeline #1845 passed with stage
in 4 minutes and 6 seconds
......@@ -120,7 +120,7 @@ def detectDataType(tracking_box, listOfDir):
dirDataTypeDict[d] = ("Unknown", '_')
else:
dirDataTypeDict[d] = (dataType, chan)
dataTypeList = {d for d in dirDataTypeDict.values()}
dataTypeList = {d[0] for d in dirDataTypeDict.values()}
if len(dataTypeList) > 1:
dirDataTypeStr = json.dumps(dirDataTypeDict)
dirDataTypeStr = re.sub(r'\{|\}|"', '', dirDataTypeStr)
......@@ -131,13 +131,13 @@ def detectDataType(tracking_box, listOfDir):
displayTrackingInfo(tracking_box, msg, "error")
return
elif dataTypeList == [('Unknown', '_')]:
elif dataTypeList == {'Unknown'}:
msg = ("There are no known data detected.\n"
"Please select different folder(s).")
displayTrackingInfo(tracking_box, msg, "error")
return
return list(dirDataTypeDict.values())[0]
return list(dirDataTypeDict.values())[0][0]
def getDataTypeFromFile(path2file, sign_chan_data_type_dict):
......
......@@ -232,7 +232,8 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
msg = "No directories has been selected."
QtWidgets.QMessageBox.warning(self, "Select directory", msg)
return
self.data_type, _ = detectDataType(self, self.dir_names)
self.data_type = detectDataType(self.tracking_info_text_browser,
self.dir_names)
if self.data_type is None:
return
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment