From 6b3b1a1f768038c6c341c1821914f5b3024a08d7 Mon Sep 17 00:00:00 2001 From: "GDP\\solonot" Date: Tue, 25 Nov 2025 17:27:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/main_ui.py | 8 +++----- core/sfgrid/constants.py | 2 -- core/sfgrid/objects.py | 7 ------- core/sfgrid/sfgrid_strategy.py | 4 +--- core/sfgrid/sfgrid_ui.py | 1 - 5 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 core/sfgrid/constants.py delete mode 100644 core/sfgrid/objects.py diff --git a/core/main_ui.py b/core/main_ui.py index 076d21b..1fa1e47 100644 --- a/core/main_ui.py +++ b/core/main_ui.py @@ -1,10 +1,9 @@ import tkinter as tk from tkinter import ttk from core.logger import LogLevel, LogData, PrintLog -from core.qmt import qmtv from core.sfgrid.sfgrid_ui import TradeTargetUI -from tkinter import ttk, messagebox +from tkinter import ttk from core.eventbus import EventPrintLog from core.eventbus import event_bus as eBus @@ -15,6 +14,8 @@ class MainWindow: self.root.title("神之一手 - 交易系统") self.root.geometry("1400x700") + self.logLevel = LogLevel[configLogLevel] + PrintLog(LogLevel.DEBUG, f"系统启动成功 {self.logLevel.name}") # 当前选中的策略Tab索引 self.current_strategy_index = 0 # 存储各个Frame的引用 @@ -23,9 +24,6 @@ class MainWindow: self.log_visible = False self.create_ui() - self.logLevel = LogLevel[configLogLevel] - PrintLog(LogLevel.DEBUG, f"系统启动成功 {self.logLevel.name}") - eBus.subscribe(EventPrintLog, self.on_log_event) diff --git a/core/sfgrid/constants.py b/core/sfgrid/constants.py deleted file mode 100644 index 0beab3b..0000000 --- a/core/sfgrid/constants.py +++ /dev/null @@ -1,2 +0,0 @@ -GridTypePercentage = "Percentage" -GridTypeFixed = "PriceBreak" diff --git a/core/sfgrid/objects.py b/core/sfgrid/objects.py deleted file mode 100644 index 62917e4..0000000 --- a/core/sfgrid/objects.py +++ /dev/null @@ -1,7 +0,0 @@ -from core.sfgrid.model import SFGridTradeTarget as TradeTarget - - -class GridFixData: - def __init__(self, grid_index, tradeTarget:TradeTarget): - self.grid_index = grid_index - self.tradeTarget = tradeTarget diff --git a/core/sfgrid/sfgrid_strategy.py b/core/sfgrid/sfgrid_strategy.py index 200514f..2c785e9 100644 --- a/core/sfgrid/sfgrid_strategy.py +++ b/core/sfgrid/sfgrid_strategy.py @@ -1,4 +1,3 @@ -from core import util from core.logger import LogLevel, PrintLog from core.qmt import qmtv from core.sfgrid import bus_events @@ -6,7 +5,6 @@ from core.sfgrid.bus_events import EventTradeTargetUpdate import core.sfgrid.model as model from core.eventbus import event_bus from core.constants import OrderTypeBuy, OrderTypeSell, OrderTypeInit -from core.util import is_trading_time from xtquant import xtconstant from xtquant.xttype import XtOrderResponse, XtTrade @@ -96,7 +94,7 @@ class SFGridStrategy: print(f'length: {len(self.tradeTarget.getPriceGrid())}, currentIdx = {currentIdx}') buyIdx = currentIdx + 1 buyPrice = self.tradeTarget.getPriceGrid()[buyIdx] - remark = f'{OrderTypeInit},{buyIdx},{self.tradeTarget.stock_code}' + remark = f'{OrderTypeBuy},{buyIdx},{self.tradeTarget.stock_code}' if len([order for order in orders if order.order_type == xtconstant.STOCK_BUY and order.price == buyPrice]) == 0: tmpOrderSeq = qmtv.orderAsync( str(self.tradeTarget.stock_code), diff --git a/core/sfgrid/sfgrid_ui.py b/core/sfgrid/sfgrid_ui.py index 6425b9c..b2b6786 100644 --- a/core/sfgrid/sfgrid_ui.py +++ b/core/sfgrid/sfgrid_ui.py @@ -1,4 +1,3 @@ -from mimetypes import inited from typing import Any import tkinter as tk