hikyuu 2.6.8.5__py3-none-win_amd64.whl → 2.6.9__py3-none-win_amd64.whl

hikyuu/gui/data/EscapetimeThread.py

@@ -3,10 +3,10 @@
 # cp936
 
 import time
-from PyQt5.QtCore import QThread, pyqtSignal
+from PySide6.QtCore import QThread, Signal
 
 class EscapetimeThread(QThread):
-    message = pyqtSignal(list)
+    message = Signal(list)
 
     def __init__(self):
         super(self.__class__, self).__init__()
@@ -14,19 +14,13 @@ class EscapetimeThread(QThread):
         self.msg_name = 'ESCAPE_TIME'
         self.init_time = time.time()
 
-    def __del__(self):
-        self.working = False
-        #print("EscapetimeThread", "__del__", time.time() - self.init_time)
-        self.wait()
-
-    def send_message(self, msg):
-        self.message.emit([self.msg_name] + msg)
+    def run(self):
+        while self.working:
+            time.sleep(1)
+            current_time = time.time()
+            self.message.emit([self.msg_name, round(current_time - self.init_time, 1)])
 
     def stop(self):
         self.working = False
+        self.quit()
         self.wait()
-
-    def run(self):
-        while self.working:
-            self.msleep(10)
-            self.send_message([(time.time() - self.init_time),])

hikyuu/gui/data/ImportBlockInfoTask.py

@@ -6,7 +6,6 @@
 
 import sqlite3
 import mysql.connector
-from hikyuu.data.common import MARKET, get_stk_code_name_list
 from hikyuu.data.em_block_to_mysql import em_import_block_to_mysql
 from hikyuu.data.em_block_to_sqlite import em_import_block_to_sqlite
 from hikyuu.data.em_block_to_clickhouse import em_import_block_to_clickhouse
@@ -14,11 +13,10 @@ from hikyuu.util import *
 
 
 class ImportBlockInfoTask:
-    def __init__(self, log_queue, queue, config, categorys):
+    def __init__(self, log_queue, queue, config):
         self.log_queue = log_queue
         self.queue = queue
         self.config = config
-        self.categorys = categorys
         self.task_name = 'IMPORT_BLOCKINFO'
         self.status = "no run"
 
@@ -52,16 +50,11 @@ class ImportBlockInfoTask:
 
         count = 0
         try:
-            code_market_dict = {}
-            for market in (MARKET.SH, MARKET.SZ, MARKET.BJ):
-                x = get_stk_code_name_list(market)
-                for v in x:
-                    code_market_dict[v["code"]] = market
-            count = import_block(connect, code_market_dict, self.categorys)
+            count = import_block(connect)
         except Exception as e:
             hku_error(str(e))
 
         connect.close()
 
-        self.queue.put([self.task_name, "BLOCKINFO", f"{self.categorys}板块信息下载完毕: {count}", None, None])
+        self.queue.put([self.task_name, "BLOCKINFO", f"板块信息更新完毕: {count}", None, None])
         self.status = "finished"