From ed9e2367eea9baa6c8bea82e0f81c209ffb2a56f Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 02 一月 2023 17:55:50 +0800
Subject: [PATCH] 撤单策略再次修改
---
gui.py | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/gui.py b/gui.py
index 27ee994..659adff 100644
--- a/gui.py
+++ b/gui.py
@@ -323,6 +323,11 @@
except:
pass
+ # 鑾峰彇鏈夋晥鐨凩2瀹㈡埛绔暟閲�
+ l2_client_count = client_manager.getValidL2Clients()
+ if len(l2_client_count) < 2:
+ normal = False
+
# 鐘舵�佹湁闂锛岄渶瑕佹姤璀�
if not normal:
alert_util.alarm()
@@ -502,7 +507,6 @@
def set_accept_l2():
settings.set_accept_l2(accept_l2.get())
-
width = 800
height = 290
frame = Frame(root, {"height": height, "width": width, "bg": "#DDDDDD"})
@@ -510,14 +514,13 @@
cl.place(x=5, y=5)
accept_l2 = IntVar()
- ch_accept_l2 = Checkbutton(frame, text='鎺ュ彈l2鏁版嵁', variable=accept_l2, onvalue=1, offvalue=0, background="#DDDDDD",activebackground="#DDDDDD",command=set_accept_l2)
+ ch_accept_l2 = Checkbutton(frame, text='鎺ュ彈l2鏁版嵁', variable=accept_l2, onvalue=1, offvalue=0,
+ background="#DDDDDD", activebackground="#DDDDDD", command=set_accept_l2)
ch_accept_l2.place(x=width - 350, y=5)
if settings.is_accept_l2_data():
accept_l2.set(1)
else:
accept_l2.set(0)
-
-
btn = Button(frame, text="姣忔棩鍒濆鍖�", command=init)
btn.place(x=width - 250, y=5)
@@ -595,14 +598,15 @@
table_delegate.model.addRow()
table_delegate.model.setValueAt(data["time"], index, 0)
table_delegate.model.setValueAt(data["code"], index, 1)
- table_delegate.model.setValueAt(data["num"], index, 2)
- table_delegate.model.setValueAt(data.get("price"), index, 3)
- table_delegate.model.setValueAt(data.get("trade_price"), index, 4)
- table_delegate.model.setValueAt(data.get("trade_num"), index, 5)
+ table_delegate.model.setValueAt(data["apply_time"], index, 2)
+ table_delegate.model.setValueAt(data["num"], index, 3)
+ table_delegate.model.setValueAt(data.get("price"), index, 4)
+ table_delegate.model.setValueAt(data.get("trade_price"), index, 5)
+ table_delegate.model.setValueAt(data.get("trade_num"), index, 6)
if int(data["type"]) > 0:
- table_delegate.model.setValueAt("鍗栧嚭", index, 6)
+ table_delegate.model.setValueAt("鍗栧嚭", index, 7)
else:
- table_delegate.model.setValueAt("涔板叆", index, 6)
+ table_delegate.model.setValueAt("涔板叆", index, 7)
index += 1
table_delegate.redraw()
@@ -630,7 +634,7 @@
pass
- def create_table(_frame, data, cell_width=70):
+ def create_table(_frame, data, cell_width=75):
table = tkintertable.TableCanvas(_frame, data=data, read_only=True, width=table_width,
height=table_height, thefont=('寰蒋闆呴粦', 10), cellwidth=cell_width,
rowheaderwidth=20)
@@ -665,7 +669,7 @@
cl = Label(frame, text="浠婃棩濮旀墭锛�", bg="#DDDDDD", fg="#666666")
cl.place(x=5, y=30)
delegate_datas = {}
- delegate_datas["row{}".format(0)] = {'濮旀墭鏃堕棿': '', '浠ｇ爜': '', '濮旀墭鏁伴噺': '', '濮旀墭浠锋牸': '', '鎴愪氦鍧囦环': '', '鎴愪氦鏁伴噺': '',
+ delegate_datas["row{}".format(0)] = {'濮旀墭鏃堕棿': '', '浠ｇ爜': '', '鐢虫姤鏃堕棿': '', '濮旀墭鏁伴噺': '', '濮旀墭浠锋牸': '', '鎴愪氦鍧囦环': '', '鎴愪氦鏁伴噺': '',
'鎿嶄綔': ''}
cl = Label(frame, text="鏇存柊鏃堕棿锛�", bg="#DDDDDD", fg="#666666")
--
Gitblit v1.8.0