Merge branch 'feature-detectDataType_return_only_data_type' into 'master'

Change detectDataType to return only data type

See merge request !26

sohstationviewer/controller/processing.py

@@ -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):

sohstationviewer/view/main_window.py

@@ -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