hikyuu 2.1.0__cp311-none-win_amd64.whl → 2.1.2__cp311-none-win_amd64.whl

hikyuu/gui/HikyuuTDX.py

@@ -8,6 +8,10 @@ import datetime
 import multiprocessing
 from configparser import ConfigParser
 from logging.handlers import QueueListener
+
+# 优先加载，处理 VS 17.10 升级后依赖 dll 不兼容问题
+import hikyuu
+
 import PyQt5
 
 from PyQt5.QtWidgets import QApplication, QMainWindow, QFileDialog, QMessageBox
@@ -77,7 +81,8 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             self.hdf5_import_thread.stop()
         if self.escape_time_thread:
             self.escape_time_thread.stop()
-        self.mp_log_q_lisener.stop()
+        if hasattr(self, 'mp_log_q_lisener'):
+            self.mp_log_q_lisener.stop()
         event.accept()
 
     def getUserConfigDir(self):
@@ -240,6 +245,13 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.mp_log_q_lisener.start()
 
     def initUI(self):
+        # 读取配置文件放在 output 重定向之前，防止配置文件读取失败没有提示
+        # 读取保存的配置文件信息，如果不存在，则使用默认配置
+        this_dir = self.getUserConfigDir()
+        import_config = ConfigParser()
+        if os.path.exists(this_dir + '/importdata-gui.ini'):
+            import_config.read(this_dir + '/importdata-gui.ini', encoding='utf-8')
+
         self._is_sched_import_running = False
         self._is_collect_running = False
         self._stream = None
@@ -272,12 +284,6 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.time_start_dateEdit.setMinimumDate(today - datetime.timedelta(300))
         self.collect_status_label.setText("已停止")
 
-        # 读取保存的配置文件信息，如果不存在，则使用默认配置
-        this_dir = self.getUserConfigDir()
-        import_config = ConfigParser()
-        if os.path.exists(this_dir + '/importdata-gui.ini'):
-            import_config.read(this_dir + '/importdata-gui.ini', encoding='utf-8')
-
         # 初始化导入行情数据类型配置
         self.import_stock_checkBox.setChecked(import_config.getboolean('quotation', 'stock', fallback=True))
         self.import_fund_checkBox.setChecked(import_config.getboolean('quotation', 'fund', fallback=True))

hikyuu/gui/data/MainWindow.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'MainWindow.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.10
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -343,122 +343,121 @@ class Ui_MainWindow(object):
         self.save_pushButton.setGeometry(QtCore.QRect(390, 190, 75, 23))
         self.save_pushButton.setObjectName("save_pushButton")
         self.layoutWidget4 = QtWidgets.QWidget(self.groupBox_6)
-        self.layoutWidget4.setGeometry(QtCore.QRect(40, 80, 321, 282))
+        self.layoutWidget4.setGeometry(QtCore.QRect(40, 80, 321, 296))
         self.layoutWidget4.setObjectName("layoutWidget4")
         self.gridLayout_6 = QtWidgets.QGridLayout(self.layoutWidget4)
         self.gridLayout_6.setContentsMargins(0, 0, 0, 0)
         self.gridLayout_6.setObjectName("gridLayout_6")
-        self.preload_day_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
-        self.preload_day_checkBox.setObjectName("preload_day_checkBox")
-        self.gridLayout_6.addWidget(self.preload_day_checkBox, 0, 0, 1, 1)
+        self.preload_week_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
+        self.preload_week_checkBox.setObjectName("preload_week_checkBox")
+        self.gridLayout_6.addWidget(self.preload_week_checkBox, 1, 0, 1, 1)
         self.label_24 = QtWidgets.QLabel(self.layoutWidget4)
         self.label_24.setObjectName("label_24")
         self.gridLayout_6.addWidget(self.label_24, 0, 1, 1, 1)
+        self.preload_day_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
+        self.preload_day_checkBox.setObjectName("preload_day_checkBox")
+        self.gridLayout_6.addWidget(self.preload_day_checkBox, 0, 0, 1, 1)
+        self.preload_min15_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
+        self.preload_min15_checkBox.setObjectName("preload_min15_checkBox")
+        self.gridLayout_6.addWidget(self.preload_min15_checkBox, 8, 0, 1, 1)
+        self.preload_month_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
+        self.preload_month_checkBox.setObjectName("preload_month_checkBox")
+        self.gridLayout_6.addWidget(self.preload_month_checkBox, 2, 0, 1, 1)
         self.preload_day_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
         self.preload_day_spinBox.setMaximum(999999)
         self.preload_day_spinBox.setObjectName("preload_day_spinBox")
         self.gridLayout_6.addWidget(self.preload_day_spinBox, 0, 2, 1, 1)
-        self.preload_week_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
-        self.preload_week_checkBox.setObjectName("preload_week_checkBox")
-        self.gridLayout_6.addWidget(self.preload_week_checkBox, 1, 0, 1, 1)
-        self.label_25 = QtWidgets.QLabel(self.layoutWidget4)
-        self.label_25.setObjectName("label_25")
-        self.gridLayout_6.addWidget(self.label_25, 1, 1, 1, 1)
-        self.preload_week_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
-        self.preload_week_spinBox.setMaximum(999999)
-        self.preload_week_spinBox.setObjectName("preload_week_spinBox")
-        self.gridLayout_6.addWidget(self.preload_week_spinBox, 1, 2, 1, 1)
-        self.preload_month_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
-        self.preload_month_checkBox.setObjectName("preload_month_checkBox")
-        self.gridLayout_6.addWidget(self.preload_month_checkBox, 2, 0, 1, 1)
+        self.preload_min5_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
+        self.preload_min5_checkBox.setObjectName("preload_min5_checkBox")
+        self.gridLayout_6.addWidget(self.preload_min5_checkBox, 7, 0, 1, 1)
+        self.preload_halfyear_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
+        self.preload_halfyear_spinBox.setMaximum(999999)
+        self.preload_halfyear_spinBox.setObjectName("preload_halfyear_spinBox")
+        self.gridLayout_6.addWidget(self.preload_halfyear_spinBox, 4, 2, 1, 1)
+        self.label_30 = QtWidgets.QLabel(self.layoutWidget4)
+        self.label_30.setObjectName("label_30")
+        self.gridLayout_6.addWidget(self.label_30, 6, 1, 1, 1)
+        self.label_32 = QtWidgets.QLabel(self.layoutWidget4)
+        self.label_32.setObjectName("label_32")
+        self.gridLayout_6.addWidget(self.label_32, 8, 1, 1, 1)
         self.label_26 = QtWidgets.QLabel(self.layoutWidget4)
         self.label_26.setObjectName("label_26")
         self.gridLayout_6.addWidget(self.label_26, 2, 1, 1, 1)
-        self.preload_month_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
-        self.preload_month_spinBox.setMaximum(999999)
-        self.preload_month_spinBox.setObjectName("preload_month_spinBox")
-        self.gridLayout_6.addWidget(self.preload_month_spinBox, 2, 2, 1, 1)
-        self.preload_quarter_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
-        self.preload_quarter_checkBox.setObjectName("preload_quarter_checkBox")
-        self.gridLayout_6.addWidget(self.preload_quarter_checkBox, 3, 0, 1, 1)
-        self.label_27 = QtWidgets.QLabel(self.layoutWidget4)
-        self.label_27.setObjectName("label_27")
-        self.gridLayout_6.addWidget(self.label_27, 3, 1, 1, 1)
         self.preload_quarter_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
         self.preload_quarter_spinBox.setMaximum(999999)
         self.preload_quarter_spinBox.setObjectName("preload_quarter_spinBox")
         self.gridLayout_6.addWidget(self.preload_quarter_spinBox, 3, 2, 1, 1)
+        self.preload_min60_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
+        self.preload_min60_checkBox.setObjectName("preload_min60_checkBox")
+        self.gridLayout_6.addWidget(self.preload_min60_checkBox, 10, 0, 1, 1)
+        self.preload_min1_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
+        self.preload_min1_checkBox.setObjectName("preload_min1_checkBox")
+        self.gridLayout_6.addWidget(self.preload_min1_checkBox, 6, 0, 1, 1)
+        self.preload_week_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
+        self.preload_week_spinBox.setMaximum(999999)
+        self.preload_week_spinBox.setObjectName("preload_week_spinBox")
+        self.gridLayout_6.addWidget(self.preload_week_spinBox, 1, 2, 1, 1)
         self.preload_halfyear_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
         self.preload_halfyear_checkBox.setObjectName("preload_halfyear_checkBox")
         self.gridLayout_6.addWidget(self.preload_halfyear_checkBox, 4, 0, 1, 1)
-        self.label_28 = QtWidgets.QLabel(self.layoutWidget4)
-        self.label_28.setObjectName("label_28")
-        self.gridLayout_6.addWidget(self.label_28, 4, 1, 1, 1)
-        self.preload_halfyear_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
-        self.preload_halfyear_spinBox.setMaximum(999999)
-        self.preload_halfyear_spinBox.setObjectName("preload_halfyear_spinBox")
-        self.gridLayout_6.addWidget(self.preload_halfyear_spinBox, 4, 2, 1, 1)
-        self.preload_year_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
-        self.preload_year_checkBox.setObjectName("preload_year_checkBox")
-        self.gridLayout_6.addWidget(self.preload_year_checkBox, 5, 0, 1, 1)
+        self.preload_min30_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
+        self.preload_min30_checkBox.setObjectName("preload_min30_checkBox")
+        self.gridLayout_6.addWidget(self.preload_min30_checkBox, 9, 0, 1, 1)
         self.label_29 = QtWidgets.QLabel(self.layoutWidget4)
         self.label_29.setObjectName("label_29")
         self.gridLayout_6.addWidget(self.label_29, 5, 1, 1, 1)
+        self.preload_min30_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
+        self.preload_min30_spinBox.setMaximum(999999)
+        self.preload_min30_spinBox.setObjectName("preload_min30_spinBox")
+        self.gridLayout_6.addWidget(self.preload_min30_spinBox, 9, 2, 1, 1)
+        self.label_34 = QtWidgets.QLabel(self.layoutWidget4)
+        self.label_34.setObjectName("label_34")
+        self.gridLayout_6.addWidget(self.label_34, 10, 1, 1, 1)
+        self.preload_min5_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
+        self.preload_min5_spinBox.setMaximum(999999)
+        self.preload_min5_spinBox.setObjectName("preload_min5_spinBox")
+        self.gridLayout_6.addWidget(self.preload_min5_spinBox, 7, 2, 1, 1)
+        self.preload_min60_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
+        self.preload_min60_spinBox.setMaximum(999999)
+        self.preload_min60_spinBox.setObjectName("preload_min60_spinBox")
+        self.gridLayout_6.addWidget(self.preload_min60_spinBox, 10, 2, 1, 1)
         self.preload_year_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
         self.preload_year_spinBox.setMaximum(999999)
         self.preload_year_spinBox.setObjectName("preload_year_spinBox")
         self.gridLayout_6.addWidget(self.preload_year_spinBox, 5, 2, 1, 1)
-        self.preload_min1_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
-        self.preload_min1_checkBox.setObjectName("preload_min1_checkBox")
-        self.gridLayout_6.addWidget(self.preload_min1_checkBox, 6, 0, 1, 1)
-        self.label_30 = QtWidgets.QLabel(self.layoutWidget4)
-        self.label_30.setObjectName("label_30")
-        self.gridLayout_6.addWidget(self.label_30, 6, 1, 1, 1)
+        self.preload_month_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
+        self.preload_month_spinBox.setMaximum(999999)
+        self.preload_month_spinBox.setObjectName("preload_month_spinBox")
+        self.gridLayout_6.addWidget(self.preload_month_spinBox, 2, 2, 1, 1)
+        self.label_25 = QtWidgets.QLabel(self.layoutWidget4)
+        self.label_25.setObjectName("label_25")
+        self.gridLayout_6.addWidget(self.label_25, 1, 1, 1, 1)
+        self.label_33 = QtWidgets.QLabel(self.layoutWidget4)
+        self.label_33.setObjectName("label_33")
+        self.gridLayout_6.addWidget(self.label_33, 9, 1, 1, 1)
+        self.label_27 = QtWidgets.QLabel(self.layoutWidget4)
+        self.label_27.setObjectName("label_27")
+        self.gridLayout_6.addWidget(self.label_27, 3, 1, 1, 1)
+        self.label_28 = QtWidgets.QLabel(self.layoutWidget4)
+        self.label_28.setObjectName("label_28")
+        self.gridLayout_6.addWidget(self.label_28, 4, 1, 1, 1)
+        self.label_31 = QtWidgets.QLabel(self.layoutWidget4)
+        self.label_31.setObjectName("label_31")
+        self.gridLayout_6.addWidget(self.label_31, 7, 1, 1, 1)
         self.preload_min1_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
         self.preload_min1_spinBox.setMaximum(999999)
         self.preload_min1_spinBox.setObjectName("preload_min1_spinBox")
         self.gridLayout_6.addWidget(self.preload_min1_spinBox, 6, 2, 1, 1)
-        self.preload_min5_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
-        self.preload_min5_checkBox.setObjectName("preload_min5_checkBox")
-        self.gridLayout_6.addWidget(self.preload_min5_checkBox, 7, 0, 1, 1)
-        self.label_31 = QtWidgets.QLabel(self.layoutWidget4)
-        self.label_31.setObjectName("label_31")
-        self.gridLayout_6.addWidget(self.label_31, 7, 1, 1, 1)
-        self.preload_min5_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
-        self.preload_min5_spinBox.setMaximum(999999)
-        self.preload_min5_spinBox.setObjectName("preload_min5_spinBox")
-        self.gridLayout_6.addWidget(self.preload_min5_spinBox, 7, 2, 1, 1)
-        self.preload_min15_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
-        self.preload_min15_checkBox.setObjectName("preload_min15_checkBox")
-        self.gridLayout_6.addWidget(self.preload_min15_checkBox, 8, 0, 1, 1)
-        self.label_32 = QtWidgets.QLabel(self.layoutWidget4)
-        self.label_32.setObjectName("label_32")
-        self.gridLayout_6.addWidget(self.label_32, 8, 1, 1, 1)
         self.preload_min15_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
         self.preload_min15_spinBox.setMaximum(999999)
         self.preload_min15_spinBox.setObjectName("preload_min15_spinBox")
         self.gridLayout_6.addWidget(self.preload_min15_spinBox, 8, 2, 1, 1)
-        self.preload_min30_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
-        self.preload_min30_checkBox.setObjectName("preload_min30_checkBox")
-        self.gridLayout_6.addWidget(self.preload_min30_checkBox, 9, 0, 1, 1)
-        self.label_33 = QtWidgets.QLabel(self.layoutWidget4)
-        self.label_33.setObjectName("label_33")
-        self.gridLayout_6.addWidget(self.label_33, 9, 1, 1, 1)
-        self.preload_min30_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
-        self.preload_min30_spinBox.setMaximum(999999)
-        self.preload_min30_spinBox.setObjectName("preload_min30_spinBox")
-        self.gridLayout_6.addWidget(self.preload_min30_spinBox, 9, 2, 1, 1)
-        self.preload_min60_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
-        self.preload_min60_checkBox.setObjectName("preload_min60_checkBox")
-        self.gridLayout_6.addWidget(self.preload_min60_checkBox, 10, 0, 1, 1)
-        self.label_34 = QtWidgets.QLabel(self.layoutWidget4)
-        self.label_34.setObjectName("label_34")
-        self.gridLayout_6.addWidget(self.label_34, 10, 1, 1, 1)
-        self.preload_min60_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
-        self.preload_min60_spinBox.setMaximum(999999)
-        self.preload_min60_spinBox.setObjectName("preload_min60_spinBox")
-        self.gridLayout_6.addWidget(self.preload_min60_spinBox, 10, 2, 1, 1)
-
+        self.preload_year_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
+        self.preload_year_checkBox.setObjectName("preload_year_checkBox")
+        self.gridLayout_6.addWidget(self.preload_year_checkBox, 5, 0, 1, 1)
+        self.preload_quarter_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
+        self.preload_quarter_checkBox.setObjectName("preload_quarter_checkBox")
+        self.gridLayout_6.addWidget(self.preload_quarter_checkBox, 3, 0, 1, 1)
         self.preload_hour2_checkBox = QtWidgets.QCheckBox(self.layoutWidget4)
         self.preload_hour2_checkBox.setObjectName("preload_hour2_checkBox")
         self.gridLayout_6.addWidget(self.preload_hour2_checkBox, 11, 0, 1, 1)
@@ -467,9 +466,8 @@ class Ui_MainWindow(object):
         self.gridLayout_6.addWidget(self.label_42, 11, 1, 1, 1)
         self.preload_hour2_spinBox = QtWidgets.QSpinBox(self.layoutWidget4)
         self.preload_hour2_spinBox.setMaximum(999999)
-        self.preload_hour2_spinBox.setObjectName("preload_hour20_spinBox")
+        self.preload_hour2_spinBox.setObjectName("preload_hour2_spinBox")
         self.gridLayout_6.addWidget(self.preload_hour2_spinBox, 11, 2, 1, 1)
-
         self.layoutWidget5 = QtWidgets.QWidget(self.groupBox_6)
         self.layoutWidget5.setGeometry(QtCore.QRect(40, 30, 362, 40))
         self.layoutWidget5.setObjectName("layoutWidget5")
@@ -499,7 +497,7 @@ class Ui_MainWindow(object):
         self.collect_sample_spinBox.setObjectName("collect_sample_spinBox")
         self.horizontalLayout_10.addWidget(self.collect_sample_spinBox)
         self.collect_use_zhima_checkBox = QtWidgets.QCheckBox(self.tab)
-        self.collect_use_zhima_checkBox.setGeometry(QtCore.QRect(40, 280, 141, 16))
+        self.collect_use_zhima_checkBox.setGeometry(QtCore.QRect(40, 275, 141, 16))
         self.collect_use_zhima_checkBox.setObjectName("collect_use_zhima_checkBox")
         self.layoutWidget7 = QtWidgets.QWidget(self.tab)
         self.layoutWidget7.setGeometry(QtCore.QRect(40, 190, 214, 24))
@@ -546,7 +544,7 @@ class Ui_MainWindow(object):
         self.horizontalLayout_7.addWidget(self.collect_phase2_last_timeEdit)
         self.horizontalLayout_9.addLayout(self.horizontalLayout_7)
         self.textBrowser = QtWidgets.QTextBrowser(self.tab)
-        self.textBrowser.setGeometry(QtCore.QRect(30, 321, 511, 181))
+        self.textBrowser.setGeometry(QtCore.QRect(30, 311, 511, 191))
         self.textBrowser.setObjectName("textBrowser")
         self.layoutWidget8 = QtWidgets.QWidget(self.tab)
         self.layoutWidget8.setGeometry(QtCore.QRect(40, 90, 141, 23))
@@ -560,6 +558,7 @@ class Ui_MainWindow(object):
         self.collect_source_comboBox = QtWidgets.QComboBox(self.layoutWidget8)
         self.collect_source_comboBox.setObjectName("collect_source_comboBox")
         self.collect_source_comboBox.addItem("")
+        self.collect_source_comboBox.addItem("")
         self.horizontalLayout_13.addWidget(self.collect_source_comboBox)
         self.collect_start_pushButton = QtWidgets.QPushButton(self.tab)
         self.collect_start_pushButton.setGeometry(QtCore.QRect(40, 30, 141, 23))
@@ -639,50 +638,50 @@ class Ui_MainWindow(object):
         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\" /><meta charset=\"utf-8\" /><style type=\"text/css\">\n"
-                                                       "p, li { white-space: pre-wrap; }\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>"))
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><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>"))
         self.import_status_label.setText(_translate("MainWindow", "import_status_label"))
         self.sched_import_pushButton.setText(_translate("MainWindow", "启动定时导入"))
         self.label_40.setText(_translate("MainWindow", "导入执行时间："))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "执行导入"))
         self.groupBox_6.setTitle(_translate("MainWindow", "预加载设置"))
         self.save_pushButton.setText(_translate("MainWindow", "保存设置"))
-        self.preload_day_checkBox.setText(_translate("MainWindow", "预加载日线"))
-        self.label_24.setText(_translate("MainWindow", "最大缓存数量："))
         self.preload_week_checkBox.setText(_translate("MainWindow", "预加载周线"))
-        self.label_25.setText(_translate("MainWindow", "最大缓存数量："))
+        self.label_24.setText(_translate("MainWindow", "最大缓存数量："))
+        self.preload_day_checkBox.setText(_translate("MainWindow", "预加载日线"))
+        self.preload_min15_checkBox.setText(_translate("MainWindow", "预加载15分钟线"))
         self.preload_month_checkBox.setText(_translate("MainWindow", "预加载月线"))
-        self.label_26.setText(_translate("MainWindow", "最大缓存数量："))
-        self.preload_quarter_checkBox.setText(_translate("MainWindow", "预加载季线"))
-        self.label_27.setText(_translate("MainWindow", "最大缓存数量："))
-        self.preload_halfyear_checkBox.setText(_translate("MainWindow", "预加载半年线"))
-        self.label_28.setText(_translate("MainWindow", "最大缓存数量："))
-        self.preload_year_checkBox.setText(_translate("MainWindow", "预加载年线"))
-        self.label_29.setText(_translate("MainWindow", "最大缓存数量："))
-        self.preload_min1_checkBox.setText(_translate("MainWindow", "预加载1分钟线"))
-        self.label_30.setText(_translate("MainWindow", "最大缓存数量："))
         self.preload_min5_checkBox.setText(_translate("MainWindow", "预加载5分钟线"))
-        self.label_31.setText(_translate("MainWindow", "最大缓存数量："))
-        self.preload_min15_checkBox.setText(_translate("MainWindow", "预加载15分钟线"))
+        self.label_30.setText(_translate("MainWindow", "最大缓存数量："))
         self.label_32.setText(_translate("MainWindow", "最大缓存数量："))
-        self.preload_min30_checkBox.setText(_translate("MainWindow", "预加载30分钟线"))
-        self.label_33.setText(_translate("MainWindow", "最大缓存数量："))
+        self.label_26.setText(_translate("MainWindow", "最大缓存数量："))
         self.preload_min60_checkBox.setText(_translate("MainWindow", "预加载60分钟线"))
+        self.preload_min1_checkBox.setText(_translate("MainWindow", "预加载1分钟线"))
+        self.preload_halfyear_checkBox.setText(_translate("MainWindow", "预加载半年线"))
+        self.preload_min30_checkBox.setText(_translate("MainWindow", "预加载30分钟线"))
+        self.label_29.setText(_translate("MainWindow", "最大缓存数量："))
         self.label_34.setText(_translate("MainWindow", "最大缓存数量："))
-        self.preload_hour2_checkBox.setText(_translate("MainWindow", "预加载2小时线"))
+        self.label_25.setText(_translate("MainWindow", "最大缓存数量："))
+        self.label_33.setText(_translate("MainWindow", "最大缓存数量："))
+        self.label_27.setText(_translate("MainWindow", "最大缓存数量："))
+        self.label_28.setText(_translate("MainWindow", "最大缓存数量："))
+        self.label_31.setText(_translate("MainWindow", "最大缓存数量："))
+        self.preload_year_checkBox.setText(_translate("MainWindow", "预加载年线"))
+        self.preload_quarter_checkBox.setText(_translate("MainWindow", "预加载季线"))
+        self.preload_hour2_checkBox.setText(_translate("MainWindow", "预加载120分钟线"))
         self.label_42.setText(_translate("MainWindow", "最大缓存数量："))
         self.label_35.setText(_translate("MainWindow", "此处为 Hikyuu 运行时的数据预加载设置，请根据机器内存大小选择"))
         self.label_36.setText(_translate("MainWindow", "（目前加载全部日线数据目前需要约需900M内存）"))
@@ -694,17 +693,18 @@ class Ui_MainWindow(object):
         self.label_37.setText(_translate("MainWindow", "执行时间段2："))
         self.label_38.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\" /><meta charset=\"utf-8\" /><style type=\"text/css\">\n"
-                                            "p, li { white-space: pre-wrap; }\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:700; color:#0000ff;\">3、此处采集为网络采集，更推荐直接运行安装目录下gui子目录下的 start_huatai_insight.py ,使用华泰 insight 的实时服务。运行前，需手工修改该文件最下方 __main__ 中的 login，放入自己的账号和密码。该程序独立运行，不用关闭，和这里的采集效果一样。</span></p></body></html>"))
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><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>"))
         self.label_39.setText(_translate("MainWindow", "行情数据源："))
         self.collect_source_comboBox.setItemText(0, _translate("MainWindow", "qq"))
+        self.collect_source_comboBox.setItemText(1, _translate("MainWindow", "qmt"))
         self.collect_start_pushButton.setText(_translate("MainWindow", "启动采集"))
         self.collect_status_label.setText(_translate("MainWindow", "TextLabel"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "行情采集服务"))

hikyuu/gui/spot_server.py

@@ -18,7 +18,8 @@ import threading
 import hikyuu.flat as fb
 
 from hikyuu.util import *
-from hikyuu.fetcher.stock.zh_stock_a_sina_qq import get_spot
+from hikyuu.fetcher.stock.zh_stock_a_sina_qq import get_spot as qq_get_spot
+from hikyuu.fetcher.stock.zh_stock_a_qmt import get_spot as qmt_get_spot
 from hikyuu import hikyuu_init, StockManager, constant, Datetime, TimeDelta
 
 
@@ -269,14 +270,22 @@ def collect(server, use_proxy, source, seconds, phase1, phase2, ignore_weekend):
     hikyuu_init(config_file, ignore_preload=True)
 
     sm = StockManager.instance()
-    stk_list = [
-        stk.market_code.lower() for stk in sm if stk.valid and stk.type in
-        (constant.STOCKTYPE_A, constant.STOCKTYPE_INDEX, constant.STOCKTYPE_GEM,
-         constant.STOCKTYPE_START, constant.STOCKTYPE_A_BJ)
-    ]
+    if source == 'qmt':
+        stk_list = [s for s in sm if s.valid]
+    else:
+        stk_list = [
+            stk.market_code.lower() for stk in sm if stk.valid and stk.type in
+            (constant.STOCKTYPE_A, constant.STOCKTYPE_INDEX, constant.STOCKTYPE_GEM,
+             constant.STOCKTYPE_START, constant.STOCKTYPE_A_BJ)
+        ]
 
     _ = get_nng_senders()
 
+    if source == 'qmt':
+        get_spot = qmt_get_spot
+    elif source == 'qq':
+        get_spot = qq_get_spot
+
     start_time = Datetime.now()
     delta = next_delta(start_time, seconds, phase1_delta, phase2_delta, ignore_weekend)
     next_time = start_time + delta
@@ -308,7 +317,7 @@ def collect(server, use_proxy, source, seconds, phase1, phase2, ignore_weekend):
 @click.command()
 @click.option('-server', '--server', default='tcp://*:9200')
 @click.option('-use_proxy', '--use_proxy', is_flag=True, help='是否使用代理，须自行申请芝麻http代理并加入ip白名单')
-@click.option('-source', '--source', default='qq', type=click.Choice(['sina', 'qq']), help='数据来源')
+@click.option('-source', '--source', default='qq', type=click.Choice(['qmt', 'qq']), help='数据来源')
 @click.option('-seconds', '--seconds', default=10)
 @click.option('-phase1', '--phase1', default='9:00-12:00')
 @click.option('-phase2', '--phase2', default='13:00-15:00')

hikyuu/gui/start_qmt.py

@@ -0,0 +1,36 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+
+
+from hikyuu.fetcher.stock.zh_stock_a_qmt import parse_one_result_qmt
+from hikyuu.gui.spot_server import release_nng_senders, start_send_spot, end_send_spot, send_spot
+
+
+def callback(datas):
+    records = []
+    for stock_code, data in datas.items():
+        # print(stock_code, data)
+        records.append(parse_one_result_qmt(stock_code, data))
+
+    if records:
+        start_send_spot()
+        send_spot(records)
+        end_send_spot()
+
+
+if __name__ == "__main__":
+    from hikyuu.interactive import *
+    from xtquant import xtdata
+
+    code_list = [f'{s.code}.{s.market}' for s in sm if s.valid]
+    # code_list = ['000001.SZ']
+
+    xtdata.subscribe_whole_quote(code_list, callback)
+
+    try:
+        xtdata.run()
+    except Exception as e:
+        hku_error(e)
+    finally:
+        # 退出释放资源
+        release_nng_senders()

hikyuu/include/hikyuu/DataType.h

@@ -29,7 +29,8 @@
 #include <map>
 #include <unordered_map>
 
-#include "Log.h"
+#include "config.h"
+#include "utilities/Log.h"
 #include "utilities/osdef.h"
 #include "utilities/cppdef.h"
 #include "utilities/datetime/Datetime.h"

hikyuu/include/hikyuu/KRecord.h

@@ -23,7 +23,7 @@ public:
     price_t openPrice;    ///< 开盘价
     price_t highPrice;    ///< 最高价
     price_t lowPrice;     ///< 最低价
-    price_t closePrice;   ///< 最低价
+    price_t closePrice;   ///< 收盘价
     price_t transAmount;  ///< 成交金额（千元）
     price_t transCount;   ///< 成交量（手），日线以下为股数
 

hikyuu/include/hikyuu/Stock.h

@@ -278,7 +278,7 @@ struct HKU_API Stock::Data {
 
     mutable vector<HistoryFinanceInfo>
       m_history_finance;  // 历史财务信息 [财务报告日期, 字段1, 字段2, ...]
-    mutable bool m_history_finance_ready{false};
+    mutable std::atomic_bool m_history_finance_ready{false};
     mutable std::mutex m_history_finance_mutex;
 
     price_t m_tick;

hikyuu/include/hikyuu/StockManager.h

@@ -255,6 +255,9 @@ private:
     /** 加载历史财经字段索引 */
     void loadHistoryFinanceField();
 
+    /** 加载历史财务数据 */
+    void loadHistoryFinance();
+
 private:
     StockManager();
 

hikyuu/include/hikyuu/StrategyContext.h

@@ -22,11 +22,16 @@ public:
     explicit StrategyContext(vector<string>&& stockCodeList)
     : m_stockCodeList(std::move(stockCodeList)) {}
 
+    StrategyContext(const vector<string>& stockCodeList, const vector<KQuery::KType>& ktypeList)
+    : m_stockCodeList(stockCodeList), m_ktypeList(ktypeList) {}
+
     virtual ~StrategyContext() = default;
 
-    bool isAll() const;
+    bool isAll() const noexcept;
+
+    bool isValid() const noexcept;
 
-    Datetime startDatetime() const {
+    Datetime startDatetime() const noexcept {
         return m_startDatetime;
     }
 

hikyuu/include/hikyuu/analysis/combinate.h

@@ -10,7 +10,7 @@
 #include "hikyuu/indicator/Indicator.h"
 #include "hikyuu/trade_sys/system/System.h"
 #include "hikyuu/trade_manage/Performance.h"
-#include "../Log.h"
+#include "hikyuu/utilities/Log.h"
 
 namespace hku {
 

hikyuu/include/hikyuu/config.h

@@ -19,18 +19,6 @@
 // 检查下标越界
 #define CHECK_ACCESS_BOUND 1
 
-// 默认激活的日志级别
-#define LOG_ACTIVE_LEVEL 2
-
-// 是否使用 spdlog
-#define USE_SPDLOG_LOGGER 1
-
-// 使用异步 logger
-#define HKU_USE_SPDLOG_ASYNC_LOGGER 0
-
-// spdlog默认日志级别
-#define SPDLOG_ACTIVE_LEVEL 2
-
 // 启用MSVC内存泄漏检查
 #define ENABLE_MSVC_LEAK_DETECT 0
 

hikyuu/include/hikyuu/data_driver/base_info/table/HistoryFinanceTable.h

@@ -13,8 +13,8 @@ namespace hku {
 
 struct HistoryFinanceTable {
     TABLE_BIND4(HistoryFinanceTable, HistoryFinance, file_date, report_date, market_code, values)
-    uint64_t file_date;
-    uint64_t report_date;
+    uint64_t file_date{0};
+    uint64_t report_date{0};
     std::string market_code;
     // std::vector<float> values;
     std::vector<char> values;

hikyuu/include/hikyuu/doc.h

@@ -137,8 +137,8 @@
  * @details 合成多因子
  * @ingroup TradeSystem
  *
- * @defgroup SystemInstance SystemInstance 系统实例
- * @details 系统实例
+ * @defgroup Stratgy Strategy 策略运行时
+ * @details 策略运行时
  * @ingroup Hikyuu
  *
  * @defgroup Agent Agent 对外数据接收发送代理