hikyuu 2.2.2__py3-none-win_amd64.whl → 2.2.4__py3-none-win_amd64.whl

hikyuu/gui/HikyuuTDX.py

@@ -16,7 +16,7 @@ import PyQt5
 
 from PyQt5.QtWidgets import QApplication, QMainWindow, QFileDialog, QMessageBox
 from PyQt5.QtCore import pyqtSlot, QObject, pyqtSignal
-from PyQt5.QtGui import QIcon, QTextCursor, QFont
+from PyQt5.QtGui import QIcon, QTextCursor, QFont, QPalette
 
 import mysql.connector
 from mysql.connector import errorcode
@@ -50,11 +50,12 @@ class EmittingStream(QObject):
 
 
 class MyMainWindow(QMainWindow, Ui_MainWindow):
-    def __init__(self, parent=None, capture_output=False, use_dark_style=False):
+    def __init__(self, parent=None, capture_output=False):
         super(MyMainWindow, self).__init__(parent)
         self._capture_output = capture_output  # 捕获Python stdout 输出
-        self._use_dark_style = use_dark_style  # 使用暗黑主题
-        self._text_color = '#FFFFFF' if use_dark_style else '#000000'
+        palette = QApplication.instance().palette()
+        # 获取文字默认颜色
+        self._text_color = palette.color(QPalette.WindowText).name()
         self.setupUi(self)
         self.initUI()
         self.initLogger()
@@ -711,6 +712,14 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             QMessageBox.about(self, "错误", str(e))
             return
 
+        now = hikyuu.Datetime.now()
+        today = hikyuu.Datetime.today()
+        if now.day_of_week() not in (0, 6) and hikyuu.TimeDelta(0, 8, 30) < now - today < hikyuu.TimeDelta(0, 15, 45):
+            reply = QMessageBox.question(self, '警告', '交易日8:30-15:45分之间导入数据将导致盘后数据错误，是否仍要继续执行导入?',
+                                         QMessageBox.Yes | QMessageBox.No, QMessageBox.No)
+            if reply == QMessageBox.No:
+                return
+
         self.import_running = True
         self.start_import_pushButton.setEnabled(False)
         self.reset_progress_bar()
@@ -797,11 +806,7 @@ def start():
     logging.getLogger("requests").setLevel(logging.WARNING)
     logging.getLogger("urllib3").setLevel(logging.WARNING)
     app = QApplication(sys.argv)
-    use_dark_style = False  # 使用暗黑主题
-    if use_dark_style:
-        import qdarkstyle
-        app.setStyleSheet(qdarkstyle.load_stylesheet(qt_api='pyqt5'))
-    myWin = MyMainWindow(capture_output=True, use_dark_style=use_dark_style)
+    myWin = MyMainWindow(capture_output=True)
     myWin.show()
     sys.exit(app.exec())
 
@@ -822,18 +827,14 @@ if __name__ == "__main__":
     f.setPixelSize(12)
     app.setFont(f)
 
-    use_dark_style = False  # 使用暗黑主题
-    if use_dark_style:
-        import qdarkstyle
-        app.setStyleSheet(qdarkstyle.load_stylesheet(qt_api='pyqt5'))
     if (len(sys.argv) > 1 and sys.argv[1] == '0'):
         FORMAT = '%(asctime)-15s [%(levelname)s]: %(message)s [%(name)s::%(funcName)s]'
         logging.basicConfig(format=FORMAT, level=logging.INFO, handlers=[
             logging.StreamHandler(),
         ])
-        myWin = MyMainWindow(capture_output=False, use_dark_style=use_dark_style)
+        myWin = MyMainWindow(capture_output=False)
     else:
-        myWin = MyMainWindow(capture_output=True, use_dark_style=use_dark_style)
+        myWin = MyMainWindow(capture_output=True)
 
     myWin.show()
     sys.exit(app.exec())

hikyuu/gui/data/MainWindow.py

@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(1131, 563)
+        MainWindow.resize(1131, 690)
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.horizontalLayout_12 = QtWidgets.QHBoxLayout(self.centralwidget)
@@ -48,6 +48,7 @@ class Ui_MainWindow(object):
         self.pytdx_radioButton.setObjectName("pytdx_radioButton")
         self.horizontalLayout.addWidget(self.pytdx_radioButton)
         self.label_16 = QtWidgets.QLabel(self.groupBox_2)
+        self.label_16.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_16.setObjectName("label_16")
         self.horizontalLayout.addWidget(self.label_16)
         self.use_tdx_number_spinBox = QtWidgets.QSpinBox(self.groupBox_2)
@@ -59,9 +60,11 @@ class Ui_MainWindow(object):
         self.label_17 = QtWidgets.QLabel(self.groupBox_2)
         self.label_17.setObjectName("label_17")
         self.horizontalLayout.addWidget(self.label_17)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
         self.verticalLayout_12.addLayout(self.horizontalLayout)
-        spacerItem = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_12.addItem(spacerItem)
+        spacerItem1 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_12.addItem(spacerItem1)
         self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_5.setContentsMargins(10, 0, -1, -1)
         self.horizontalLayout_5.setObjectName("horizontalLayout_5")
@@ -72,12 +75,17 @@ class Ui_MainWindow(object):
         self.gridLayout_2 = QtWidgets.QGridLayout()
         self.gridLayout_2.setContentsMargins(10, -1, -1, 10)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.tdx_dir_lineEdit = QtWidgets.QLineEdit(self.groupBox_2)
-        self.tdx_dir_lineEdit.setObjectName("tdx_dir_lineEdit")
-        self.gridLayout_2.addWidget(self.tdx_dir_lineEdit, 0, 1, 1, 2)
         self.label_2 = QtWidgets.QLabel(self.groupBox_2)
         self.label_2.setObjectName("label_2")
         self.gridLayout_2.addWidget(self.label_2, 0, 0, 1, 1)
+        self.tdx_dir_lineEdit = QtWidgets.QLineEdit(self.groupBox_2)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(1)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.tdx_dir_lineEdit.sizePolicy().hasHeightForWidth())
+        self.tdx_dir_lineEdit.setSizePolicy(sizePolicy)
+        self.tdx_dir_lineEdit.setObjectName("tdx_dir_lineEdit")
+        self.gridLayout_2.addWidget(self.tdx_dir_lineEdit, 0, 1, 1, 2)
         self.select_tdx_dir_pushButton = QtWidgets.QPushButton(self.groupBox_2)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -88,8 +96,8 @@ class Ui_MainWindow(object):
         self.gridLayout_2.addWidget(self.select_tdx_dir_pushButton, 0, 3, 1, 1)
         self.verticalLayout_12.addLayout(self.gridLayout_2)
         self.verticalLayout_13.addWidget(self.groupBox_2)
-        spacerItem1 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_13.addItem(spacerItem1)
+        spacerItem2 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_13.addItem(spacerItem2)
         self.groupBox_7 = QtWidgets.QGroupBox(self.tab_4)
         self.groupBox_7.setObjectName("groupBox_7")
         self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.groupBox_7)
@@ -114,6 +122,8 @@ class Ui_MainWindow(object):
         self.import_future_checkBox.setEnabled(False)
         self.import_future_checkBox.setObjectName("import_future_checkBox")
         self.horizontalLayout_3.addWidget(self.import_future_checkBox)
+        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem3)
         self.verticalLayout_11.addLayout(self.horizontalLayout_3)
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_2.setContentsMargins(10, -1, -1, -1)
@@ -135,9 +145,11 @@ class Ui_MainWindow(object):
         self.import_time_checkBox.setEnabled(True)
         self.import_time_checkBox.setObjectName("import_time_checkBox")
         self.horizontalLayout_2.addWidget(self.import_time_checkBox)
+        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem4)
         self.verticalLayout_11.addLayout(self.horizontalLayout_2)
-        spacerItem2 = QtWidgets.QSpacerItem(20, 15, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_11.addItem(spacerItem2)
+        spacerItem5 = QtWidgets.QSpacerItem(20, 15, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_11.addItem(spacerItem5)
         self.line = QtWidgets.QFrame(self.groupBox_7)
         self.line.setFrameShape(QtWidgets.QFrame.HLine)
         self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
@@ -153,7 +165,7 @@ class Ui_MainWindow(object):
         self.label_6.setObjectName("label_6")
         self.gridLayout_4.addWidget(self.label_6, 3, 0, 1, 1)
         self.min5_start_dateEdit = QtWidgets.QDateEdit(self.groupBox_7)
-        self.min5_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1990, 1, 1), QtCore.QTime(0, 0, 0)))
+        self.min5_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 31), QtCore.QTime(0, 0, 0)))
         self.min5_start_dateEdit.setCalendarPopup(True)
         self.min5_start_dateEdit.setObjectName("min5_start_dateEdit")
         self.gridLayout_4.addWidget(self.min5_start_dateEdit, 1, 1, 1, 1)
@@ -162,9 +174,6 @@ class Ui_MainWindow(object):
         self.min_start_dateEdit.setObjectName("min_start_dateEdit")
         self.gridLayout_4.addWidget(self.min_start_dateEdit, 2, 1, 1, 1)
         self.label_3 = QtWidgets.QLabel(self.groupBox_7)
-        font = QtGui.QFont()
-        font.setPointSize(9)
-        self.label_3.setFont(font)
         self.label_3.setObjectName("label_3")
         self.gridLayout_4.addWidget(self.label_3, 0, 0, 1, 1)
         self.label_10 = QtWidgets.QLabel(self.groupBox_7)
@@ -178,7 +187,7 @@ class Ui_MainWindow(object):
         self.trans_start_dateEdit.setObjectName("trans_start_dateEdit")
         self.gridLayout_4.addWidget(self.trans_start_dateEdit, 3, 1, 1, 1)
         self.day_start_dateEdit = QtWidgets.QDateEdit(self.groupBox_7)
-        self.day_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1990, 1, 1), QtCore.QTime(0, 0, 0)))
+        self.day_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 31), QtCore.QTime(0, 0, 0)))
         self.day_start_dateEdit.setCalendarPopup(True)
         self.day_start_dateEdit.setObjectName("day_start_dateEdit")
         self.gridLayout_4.addWidget(self.day_start_dateEdit, 0, 1, 1, 1)
@@ -186,11 +195,11 @@ class Ui_MainWindow(object):
         self.time_start_dateEdit.setCalendarPopup(True)
         self.time_start_dateEdit.setObjectName("time_start_dateEdit")
         self.gridLayout_4.addWidget(self.time_start_dateEdit, 4, 1, 1, 1)
-        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_4.addItem(spacerItem3, 1, 2, 1, 1)
+        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_4.addItem(spacerItem6, 1, 2, 1, 1)
         self.verticalLayout_11.addLayout(self.gridLayout_4)
-        spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_11.addItem(spacerItem4)
+        spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_11.addItem(spacerItem7)
         self.verticalLayout_13.addWidget(self.groupBox_7)
         self.tabWidget.addTab(self.tab_4, "")
         self.tab_3 = QtWidgets.QWidget()
@@ -216,12 +225,12 @@ class Ui_MainWindow(object):
         self.enable_mysql_radioButton = QtWidgets.QRadioButton(self.groupBox_4)
         self.enable_mysql_radioButton.setObjectName("enable_mysql_radioButton")
         self.horizontalLayout_19.addWidget(self.enable_mysql_radioButton)
-        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_19.addItem(spacerItem5)
+        spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_19.addItem(spacerItem8)
         self.verticalLayout_14.addLayout(self.horizontalLayout_19)
         self.verticalLayout_9.addWidget(self.groupBox_4)
-        spacerItem6 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.verticalLayout_9.addItem(spacerItem6)
+        spacerItem9 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.verticalLayout_9.addItem(spacerItem9)
         self.groupBox_3 = QtWidgets.QGroupBox(self.tab_3)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -246,8 +255,8 @@ class Ui_MainWindow(object):
         self.gridLayout_3.addWidget(self.label, 0, 0, 1, 1)
         self.verticalLayout_10.addLayout(self.gridLayout_3)
         self.verticalLayout_9.addWidget(self.groupBox_3)
-        spacerItem7 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.verticalLayout_9.addItem(spacerItem7)
+        spacerItem10 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.verticalLayout_9.addItem(spacerItem10)
         self.groupBox = QtWidgets.QGroupBox(self.tab_3)
         self.groupBox.setObjectName("groupBox")
         self.verticalLayout_8 = QtWidgets.QVBoxLayout(self.groupBox)
@@ -291,11 +300,11 @@ class Ui_MainWindow(object):
         self.label_13 = QtWidgets.QLabel(self.groupBox)
         self.label_13.setObjectName("label_13")
         self.gridLayout_5.addWidget(self.label_13, 5, 0, 1, 1)
-        spacerItem8 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.gridLayout_5.addItem(spacerItem8, 1, 0, 1, 1)
+        spacerItem11 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.gridLayout_5.addItem(spacerItem11, 1, 0, 1, 1)
         self.verticalLayout_8.addLayout(self.gridLayout_5)
-        spacerItem9 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_8.addItem(spacerItem9)
+        spacerItem12 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_8.addItem(spacerItem12)
         self.verticalLayout_9.addWidget(self.groupBox)
         self.tabWidget.addTab(self.tab_3, "")
         self.tab_2 = QtWidgets.QWidget()
@@ -316,12 +325,12 @@ class Ui_MainWindow(object):
         self.sched_import_timeEdit = QtWidgets.QTimeEdit(self.tab_2)
         self.sched_import_timeEdit.setObjectName("sched_import_timeEdit")
         self.horizontalLayout_14.addWidget(self.sched_import_timeEdit)
-        spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_14.addItem(spacerItem10)
+        spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_14.addItem(spacerItem13)
         self.horizontalLayout_11.addLayout(self.horizontalLayout_14)
         self.verticalLayout_7.addLayout(self.horizontalLayout_11)
-        spacerItem11 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.verticalLayout_7.addItem(spacerItem11)
+        spacerItem14 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.verticalLayout_7.addItem(spacerItem14)
         self.horizontalLayout_18 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_18.setContentsMargins(10, -1, 10, -1)
         self.horizontalLayout_18.setObjectName("horizontalLayout_18")
@@ -331,23 +340,24 @@ class Ui_MainWindow(object):
         self.import_status_label = QtWidgets.QLabel(self.tab_2)
         self.import_status_label.setObjectName("import_status_label")
         self.horizontalLayout_18.addWidget(self.import_status_label)
-        spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_18.addItem(spacerItem12)
+        spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_18.addItem(spacerItem15)
         self.verticalLayout_7.addLayout(self.horizontalLayout_18)
-        spacerItem13 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_7.addItem(spacerItem13)
+        spacerItem16 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_7.addItem(spacerItem16)
         self.groupBox_5 = QtWidgets.QGroupBox(self.tab_2)
         self.groupBox_5.setObjectName("groupBox_5")
         self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.groupBox_5)
         self.verticalLayout_5.setObjectName("verticalLayout_5")
         self.gridLayout = QtWidgets.QGridLayout()
         self.gridLayout.setObjectName("gridLayout")
-        self.label_8 = QtWidgets.QLabel(self.groupBox_5)
-        self.label_8.setObjectName("label_8")
-        self.gridLayout.addWidget(self.label_8, 0, 0, 1, 1)
-        self.label_4 = QtWidgets.QLabel(self.groupBox_5)
-        self.label_4.setObjectName("label_4")
-        self.gridLayout.addWidget(self.label_4, 3, 0, 1, 1)
+        self.hdf5_time_progressBar = QtWidgets.QProgressBar(self.groupBox_5)
+        self.hdf5_time_progressBar.setProperty("value", 0)
+        self.hdf5_time_progressBar.setObjectName("hdf5_time_progressBar")
+        self.gridLayout.addWidget(self.hdf5_time_progressBar, 4, 1, 1, 1)
+        self.hdf5_weight_label = QtWidgets.QLabel(self.groupBox_5)
+        self.hdf5_weight_label.setObjectName("hdf5_weight_label")
+        self.gridLayout.addWidget(self.hdf5_weight_label, 5, 1, 1, 1)
         self.label_14 = QtWidgets.QLabel(self.groupBox_5)
         self.label_14.setObjectName("label_14")
         self.gridLayout.addWidget(self.label_14, 2, 0, 1, 1)
@@ -355,13 +365,23 @@ class Ui_MainWindow(object):
         self.hdf5_trans_progressBar.setProperty("value", 0)
         self.hdf5_trans_progressBar.setObjectName("hdf5_trans_progressBar")
         self.gridLayout.addWidget(self.hdf5_trans_progressBar, 3, 1, 1, 1)
+        self.label_4 = QtWidgets.QLabel(self.groupBox_5)
+        self.label_4.setObjectName("label_4")
+        self.gridLayout.addWidget(self.label_4, 3, 0, 1, 1)
+        self.label_8 = QtWidgets.QLabel(self.groupBox_5)
+        self.label_8.setObjectName("label_8")
+        self.gridLayout.addWidget(self.label_8, 0, 0, 1, 1)
+        self.label_5 = QtWidgets.QLabel(self.groupBox_5)
+        self.label_5.setObjectName("label_5")
+        self.gridLayout.addWidget(self.label_5, 4, 0, 1, 1)
+        self.hdf5_5min_progressBar = QtWidgets.QProgressBar(self.groupBox_5)
+        self.hdf5_5min_progressBar.setProperty("value", 0)
+        self.hdf5_5min_progressBar.setObjectName("hdf5_5min_progressBar")
+        self.gridLayout.addWidget(self.hdf5_5min_progressBar, 1, 1, 1, 1)
         self.hdf5_day_progressBar = QtWidgets.QProgressBar(self.groupBox_5)
         self.hdf5_day_progressBar.setProperty("value", 0)
         self.hdf5_day_progressBar.setObjectName("hdf5_day_progressBar")
         self.gridLayout.addWidget(self.hdf5_day_progressBar, 0, 1, 1, 1)
-        self.label_5 = QtWidgets.QLabel(self.groupBox_5)
-        self.label_5.setObjectName("label_5")
-        self.gridLayout.addWidget(self.label_5, 4, 0, 1, 1)
         self.label_12 = QtWidgets.QLabel(self.groupBox_5)
         self.label_12.setObjectName("label_12")
         self.gridLayout.addWidget(self.label_12, 1, 0, 1, 1)
@@ -369,23 +389,14 @@ class Ui_MainWindow(object):
         self.hdf5_min_progressBar.setProperty("value", 0)
         self.hdf5_min_progressBar.setObjectName("hdf5_min_progressBar")
         self.gridLayout.addWidget(self.hdf5_min_progressBar, 2, 1, 1, 1)
-        self.hdf5_time_progressBar = QtWidgets.QProgressBar(self.groupBox_5)
-        self.hdf5_time_progressBar.setProperty("value", 0)
-        self.hdf5_time_progressBar.setObjectName("hdf5_time_progressBar")
-        self.gridLayout.addWidget(self.hdf5_time_progressBar, 4, 1, 1, 1)
-        self.hdf5_5min_progressBar = QtWidgets.QProgressBar(self.groupBox_5)
-        self.hdf5_5min_progressBar.setProperty("value", 0)
-        self.hdf5_5min_progressBar.setObjectName("hdf5_5min_progressBar")
-        self.gridLayout.addWidget(self.hdf5_5min_progressBar, 1, 1, 1, 1)
         self.label_9 = QtWidgets.QLabel(self.groupBox_5)
         self.label_9.setObjectName("label_9")
         self.gridLayout.addWidget(self.label_9, 5, 0, 1, 1)
-        self.hdf5_weight_label = QtWidgets.QLabel(self.groupBox_5)
-        self.hdf5_weight_label.setObjectName("hdf5_weight_label")
-        self.gridLayout.addWidget(self.hdf5_weight_label, 5, 1, 1, 1)
+        spacerItem17 = QtWidgets.QSpacerItem(5, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout.addItem(spacerItem17, 0, 2, 1, 1)
         self.verticalLayout_5.addLayout(self.gridLayout)
-        spacerItem14 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_5.addItem(spacerItem14)
+        spacerItem18 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_5.addItem(spacerItem18)
         self.import_detail_textEdit = QtWidgets.QTextEdit(self.groupBox_5)
         self.import_detail_textEdit.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.import_detail_textEdit.setReadOnly(True)
@@ -411,8 +422,8 @@ class Ui_MainWindow(object):
         self.label_36.setObjectName("label_36")
         self.verticalLayout.addWidget(self.label_36)
         self.verticalLayout_4.addLayout(self.verticalLayout)
-        spacerItem15 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.verticalLayout_4.addItem(spacerItem15)
+        spacerItem19 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.verticalLayout_4.addItem(spacerItem19)
         self.gridLayout_6 = QtWidgets.QGridLayout()
         self.gridLayout_6.setContentsMargins(20, -1, -1, -1)
         self.gridLayout_6.setObjectName("gridLayout_6")
@@ -506,8 +517,8 @@ class Ui_MainWindow(object):
         self.preload_week_checkBox = QtWidgets.QCheckBox(self.groupBox_6)
         self.preload_week_checkBox.setObjectName("preload_week_checkBox")
         self.gridLayout_6.addWidget(self.preload_week_checkBox, 1, 0, 1, 1)
-        spacerItem16 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_6.addItem(spacerItem16, 4, 3, 1, 1)
+        spacerItem20 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_6.addItem(spacerItem20, 4, 3, 1, 1)
         self.preload_quarter_checkBox = QtWidgets.QCheckBox(self.groupBox_6)
         self.preload_quarter_checkBox.setObjectName("preload_quarter_checkBox")
         self.gridLayout_6.addWidget(self.preload_quarter_checkBox, 3, 0, 1, 1)
@@ -542,16 +553,16 @@ class Ui_MainWindow(object):
         self.preload_year_spinBox.setObjectName("preload_year_spinBox")
         self.gridLayout_6.addWidget(self.preload_year_spinBox, 5, 2, 1, 1)
         self.verticalLayout_4.addLayout(self.gridLayout_6)
-        spacerItem17 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_4.addItem(spacerItem17)
+        spacerItem21 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_4.addItem(spacerItem21)
         self.verticalLayout_3.addWidget(self.groupBox_6)
         self.tabWidget.addTab(self.tab_6, "")
         self.tab = QtWidgets.QWidget()
         self.tab.setObjectName("tab")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.tab)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        spacerItem18 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_2.addItem(spacerItem18)
+        spacerItem22 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_2.addItem(spacerItem22)
         self.horizontalLayout_15 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_15.setContentsMargins(20, -1, -1, -1)
         self.horizontalLayout_15.setObjectName("horizontalLayout_15")
@@ -561,11 +572,11 @@ class Ui_MainWindow(object):
         self.collect_status_label = QtWidgets.QLabel(self.tab)
         self.collect_status_label.setObjectName("collect_status_label")
         self.horizontalLayout_15.addWidget(self.collect_status_label)
-        spacerItem19 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_15.addItem(spacerItem19)
+        spacerItem23 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_15.addItem(spacerItem23)
         self.verticalLayout_2.addLayout(self.horizontalLayout_15)
-        spacerItem20 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.verticalLayout_2.addItem(spacerItem20)
+        spacerItem24 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.verticalLayout_2.addItem(spacerItem24)
         self.horizontalLayout_13 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_13.setContentsMargins(20, -1, -1, -1)
         self.horizontalLayout_13.setObjectName("horizontalLayout_13")
@@ -577,11 +588,11 @@ class Ui_MainWindow(object):
         self.collect_source_comboBox.addItem("")
         self.collect_source_comboBox.addItem("")
         self.horizontalLayout_13.addWidget(self.collect_source_comboBox)
-        spacerItem21 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_13.addItem(spacerItem21)
+        spacerItem25 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_13.addItem(spacerItem25)
         self.verticalLayout_2.addLayout(self.horizontalLayout_13)
-        spacerItem22 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.verticalLayout_2.addItem(spacerItem22)
+        spacerItem26 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.verticalLayout_2.addItem(spacerItem26)
         self.horizontalLayout_10 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_10.setContentsMargins(20, -1, -1, -1)
         self.horizontalLayout_10.setObjectName("horizontalLayout_10")
@@ -592,11 +603,11 @@ class Ui_MainWindow(object):
         self.collect_sample_spinBox.setMaximum(86400)
         self.collect_sample_spinBox.setObjectName("collect_sample_spinBox")
         self.horizontalLayout_10.addWidget(self.collect_sample_spinBox)
-        spacerItem23 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_10.addItem(spacerItem23)
+        spacerItem27 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_10.addItem(spacerItem27)
         self.verticalLayout_2.addLayout(self.horizontalLayout_10)
-        spacerItem24 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_2.addItem(spacerItem24)
+        spacerItem28 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_2.addItem(spacerItem28)
         self.horizontalLayout_8 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_8.setContentsMargins(20, -1, -1, -1)
         self.horizontalLayout_8.setObjectName("horizontalLayout_8")
@@ -615,8 +626,8 @@ class Ui_MainWindow(object):
         self.collect_phase1_last_timeEdit = QtWidgets.QTimeEdit(self.tab)
         self.collect_phase1_last_timeEdit.setObjectName("collect_phase1_last_timeEdit")
         self.horizontalLayout_6.addWidget(self.collect_phase1_last_timeEdit)
-        spacerItem25 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_6.addItem(spacerItem25)
+        spacerItem29 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_6.addItem(spacerItem29)
         self.horizontalLayout_8.addLayout(self.horizontalLayout_6)
         self.verticalLayout_2.addLayout(self.horizontalLayout_8)
         self.horizontalLayout_9 = QtWidgets.QHBoxLayout()
@@ -637,12 +648,12 @@ class Ui_MainWindow(object):
         self.collect_phase2_last_timeEdit = QtWidgets.QTimeEdit(self.tab)
         self.collect_phase2_last_timeEdit.setObjectName("collect_phase2_last_timeEdit")
         self.horizontalLayout_7.addWidget(self.collect_phase2_last_timeEdit)
-        spacerItem26 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_7.addItem(spacerItem26)
+        spacerItem30 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_7.addItem(spacerItem30)
         self.horizontalLayout_9.addLayout(self.horizontalLayout_7)
         self.verticalLayout_2.addLayout(self.horizontalLayout_9)
-        spacerItem27 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_2.addItem(spacerItem27)
+        spacerItem31 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_2.addItem(spacerItem31)
         self.horizontalLayout_16 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_16.setContentsMargins(20, 0, -1, -1)
         self.horizontalLayout_16.setObjectName("horizontalLayout_16")
@@ -655,8 +666,8 @@ class Ui_MainWindow(object):
         self.collect_use_zhima_checkBox.setObjectName("collect_use_zhima_checkBox")
         self.horizontalLayout_16.addWidget(self.collect_use_zhima_checkBox)
         self.verticalLayout_2.addLayout(self.horizontalLayout_16)
-        spacerItem28 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_2.addItem(spacerItem28)
+        spacerItem32 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_2.addItem(spacerItem32)
         self.horizontalLayout_17 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_17.setContentsMargins(20, 0, -1, -1)
         self.horizontalLayout_17.setObjectName("horizontalLayout_17")
@@ -729,29 +740,32 @@ class Ui_MainWindow(object):
         self.start_import_pushButton.setText(_translate("MainWindow", "手工执行导入"))
         self.import_status_label.setText(_translate("MainWindow", "请勿盘中导入！"))
         self.groupBox_5.setTitle(_translate("MainWindow", "导入进展"))
-        self.label_8.setText(_translate("MainWindow", "导入日线："))
-        self.label_4.setText(_translate("MainWindow", "导入分笔数据："))
+        self.hdf5_weight_label.setText(_translate("MainWindow", "TextLabel"))
         self.label_14.setText(_translate("MainWindow", "导入1分钟线："))
+        self.label_4.setText(_translate("MainWindow", "导入分笔数据："))
+        self.label_8.setText(_translate("MainWindow", "导入日线："))
         self.label_5.setText(_translate("MainWindow", "导入分时数据："))
         self.label_12.setText(_translate("MainWindow", "导入5分钟线："))
         self.label_9.setText(_translate("MainWindow", "导入权息数据："))
-        self.hdf5_weight_label.setText(_translate("MainWindow", "TextLabel"))
         self.import_detail_textEdit.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><meta charset=\"utf-8\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'SimSun\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入上证日线记录：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入深证日线记录：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入上证5分钟线记录：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入深证5分钟线记录：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入上证1分钟线记录：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入深证1分钟线记录：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入上证分笔记录：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入深证分笔记录：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入上证分时数据：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入深证分时数据：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入权息数据数：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入完毕！</p></body></html>"))
+"hr { height: 1px; border-width: 0; }\n"
+"li.unchecked::marker { content: \"\\2610\"; }\n"
+"li.checked::marker { content: \"\\2612\"; }\n"
+"</style></head><body style=\" font-family:\'Microsoft YaHei UI\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证日线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入深证日线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证5分钟线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入深证5分钟线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证1分钟线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入深证1分钟线记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证分笔记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入深证分笔记录：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证分时数据：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入深证分时数据：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入权息数据数：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入完毕！</span></p></body></html>"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "执行导入"))
         self.groupBox_6.setTitle(_translate("MainWindow", "预加载设置"))
         self.label_35.setText(_translate("MainWindow", "此处为 Hikyuu 运行时的数据预加载设置，请根据机器内存大小选择"))
@@ -794,14 +808,17 @@ class Ui_MainWindow(object):
         self.label_38.setText(_translate("MainWindow", "-"))
         self.collect_use_zhima_checkBox.setText(_translate("MainWindow", "使用芝麻代理"))
         self.textBrowser.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><meta charset=\"utf-8\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'SimSun\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">注：</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt; font-weight:600; color:#ff0000;\">1、行情采集服务仅对预加载数据有效</span>，在行情采集服务运行期间，hikyuu.interactive运行时将自动连接采集服务获取行情数据，并更新预加载的内容数据。</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">2、如使用芝麻代理（<a href=\"http://h.zhimaruanjian.com/\"><span style=\" text-decoration: underline; color:#0000ff;\">http://h.zhimaruanjian.com/</span></a>），请自行申请（需付费），并确保ip为其白名单。</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:696; color:#0000ff;\">3、此处采集为网络采集，更推荐直接运行安装目录下gui子目录下的 start_qmt.py ,使用miniqmt 实时服务。该程序独立运行，不用关闭，和这里的采集效果一样。注意：miniqmt需要QMT交易端配合，且在同一机器上执行。</span></p></body></html>"))
+"hr { height: 1px; border-width: 0; }\n"
+"li.unchecked::marker { content: \"\\2610\"; }\n"
+"li.checked::marker { content: \"\\2612\"; }\n"
+"</style></head><body style=\" font-family:\'Microsoft YaHei UI\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">注：</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:10pt; font-weight:600; color:#ff0000;\">1、行情采集服务仅对预加载数据有效</span><span style=\" font-family:\'SimSun\';\">，在行情采集服务运行期间，hikyuu.interactive运行时将自动连接采集服务获取行情数据，并更新预加载的内容数据。</span></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'SimSun\';\"><br /></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">2、如使用芝麻代理（</span><a href=\"http://h.zhimaruanjian.com/\"><span style=\" font-family:\'SimSun\'; text-decoration: underline; color:#0000ff;\">http://h.zhimaruanjian.com/</span></a><span style=\" font-family:\'SimSun\';\">），请自行申请（需付费），并确保ip为其白名单。</span></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'SimSun\';\"><br /></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-weight:696; color:#0000ff;\">3、此处采集为网络采集，更推荐直接运行安装目录下gui子目录下的 start_qmt.py ,使用miniqmt 实时服务。该程序独立运行，不用关闭，和这里的采集效果一样。注意：miniqmt需要QMT交易端配合，且在同一机器上执行。</span></p></body></html>"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "行情采集服务"))
         self.label_41.setText(_translate("MainWindow", "执行日志"))

hikyuu/hub.py

@@ -206,7 +206,7 @@ class HubManager(metaclass=SingletonType):
         # 检查并下载 hikyuu 默认策略仓库, hikyuu_hub 避免导入时模块和 hikyuu 重名
         hikyuu_hub_path = self._session.query(HubModel.local).filter(HubModel.name == 'default').first()
         if hikyuu_hub_path is None:
-            self.add_remote_hub('default', 'https://gitee.com/fasiondog/hikyuu_hub.git', 'master')
+            self.add_remote_hub('default', 'https://gitee.com/fasiondog/hikyuu_hub.git', 'main')
 
     def download_remote_hub(self, local_dir, url, branch):
         print('正在下载 hikyuu 策略仓库至："{}"'.format(local_dir))
@@ -222,7 +222,7 @@ class HubManager(metaclass=SingletonType):
         print('下载完毕')
 
     @dbsession
-    def add_remote_hub(self, name, url, branch='master'):
+    def add_remote_hub(self, name, url, branch='main'):
         """增加远程策略仓库
 
         :param str name: 本地仓库名称（自行起名）
@@ -502,7 +502,7 @@ class HubManager(metaclass=SingletonType):
         return hub_model.name
 
 
-def add_remote_hub(name, url, branch='master'):
+def add_remote_hub(name, url, branch='main'):
     """增加远程策略仓库
 
     :param str name: 本地仓库名称（自行起名）

hikyuu/include/hikyuu/DataType.h

@@ -17,6 +17,7 @@
 #define NOMINMAX
 #endif
 
+#include "config.h"
 #include <boost/config.hpp>
 
 #include <stdio.h>
@@ -28,8 +29,9 @@
 // #include <vector>
 #include <map>
 #include <unordered_map>
+#include <set>
+#include <unordered_set>
 
-#include "config.h"
 #include "utilities/Log.h"
 #include "utilities/osdef.h"
 #include "utilities/cppdef.h"