Commit Graph

2414 Commits

Author SHA1 Message Date
vn.py
289bcfa13e Revert "[Add]net_position member of ContractData"
This reverts commit f5917b9cdc.
2019-03-25 16:28:06 +08:00
vn.py
f5917b9cdc [Add]net_position member of ContractData 2019-03-25 14:50:41 +08:00
vn.py
a6b4afecff
Merge pull request #1511 from nanoric/ctp_new_version
Ctp new version
2019-03-25 14:46:05 +08:00
vn.py
a97a41c645
Merge pull request #1520 from nanoric/oes_use_push
[Mod] OesGateway: 使用推送的初始化信息,而不是主动查询
2019-03-25 14:45:51 +08:00
nanoric
671dd88791 [Fix] 修复order.time类型不一致的问题 2019-03-25 02:30:28 -04:00
nanoric
0e3b79f6f4 [Mod] OesGateway: 使用推送的初始化信息,而不是主动查询
[Mod] OesGateway: 改变部分函数名,跟vnpynic
[Fix] 修正已撤单状态订单的数量不正确的问题
2019-03-25 02:25:18 -04:00
vn.py
7be55ff659
Merge pull request #1513 from nanoric/oes_order_type
[Add] oes: added order_type to OrderData.
2019-03-25 11:50:33 +08:00
vn.py
4a309ac199 [Mod]connect dialog use chinese for setting key 2019-03-22 23:22:15 +08:00
vn.py
e296a8098c [Add]call strategy on_stop_order when receives server stop order event update 2019-03-22 23:07:20 +08:00
vn.py
a6ae319333 [Add]cta strategy app supports for server side stop order 2019-03-22 22:31:19 +08:00
vn.py
ec9a170ef3 [Mod]remove CtaOrderType enum 2019-03-22 22:04:15 +08:00
vn.py
ab929f196a [Add]stop_supported member data of ContractData object 2019-03-22 21:39:36 +08:00
vn.py
8586b5c2fb [Add]support for server stop order in bitmex gateway 2019-03-22 16:16:01 +08:00
nanoric
6ceacc94c1 [Add] oes: added order_type to OrderData. 2019-03-22 04:12:19 -04:00
vn.py
9e91df57d4 [Add]OrderData object support order type data (ctp/ib) 2019-03-22 15:52:26 +08:00
nanoric
17eefab346 [Mod] make flake8 happy 2019-03-22 01:27:16 -04:00
nanoric
4753986a20 [Add] ctp: updated generated cpp binding files
[Mod] ctp: updated windows pyd
2019-03-22 01:25:45 -04:00
nanoric
76fccf55e3 [Mod] update generate scripts 2019-03-22 01:05:31 -04:00
nanoric
e33b7dee25 [Mod] CTP使用6.3.11_20180109 2019-03-22 00:35:48 -04:00
vn.py
38f00a24ed [Fix]close #1507 2019-03-22 11:51:32 +08:00
vn.py
20b5ef4e9b [Mod]change constant PriceType to OrderType 2019-03-21 23:32:39 +08:00
vn.py
50cb39f11b [Mod]change author name 2019-03-21 22:57:08 +08:00
vn.py
ec409189be
Merge pull request #1509 from nanoric/travis_fix
[Mod] prevent travis vm from terminating: change -qq into -y
2019-03-21 22:47:29 +08:00
vn.py
d34ce5cb67 [Mod]remove designer ui file from csv loader 2019-03-21 12:04:53 +08:00
nanoric
9503143398 [Mod] prevent travis vm from terminating: change -qq into -y 2019-03-20 21:49:24 -04:00
vn.py
af7b433370 [Mod]improve code style of csv_loader 2019-03-20 18:12:19 +08:00
vn.py
aa56086d96 [Mod]change template path 2019-03-20 17:57:01 +08:00
vn.py
b201ace4d1
Merge pull request #1505 from nanoric/csv_loader_opt
Optimize CSV loader
2019-03-20 16:33:48 +08:00
nanoric
d640c8c899 [Mod] Added blank lines: make flake8 happy 2019-03-20 04:08:26 -04:00
nanoric
a7a647a3b8 [Add] Disable maximun button
[Add] Added an icon
[Add] Popup an message if market data is fully loaded

[Mod] combobox: remove Prefix
[Mod] rename: CSV行情载入器
2019-03-20 02:55:04 -04:00
vn.py
9d44f4e0f3
Merge pull request #1502 from nanoric/travis_windows
Travis windows
2019-03-20 11:49:01 +08:00
nanoric
6c47c869dd [Mod] oes gateway: use anohter .a file. 2019-03-19 10:42:57 -04:00
nanoric
27d49b3604 [Fix] travis.yml: fixed miss typed vnctp 2019-03-19 10:42:53 -04:00
nanoric
689d8fede1 [Add] api.oes: added __init__.py 2019-03-19 10:42:30 -04:00
nanoric
d99d486297 [Add] travis-ci: windows build 2019-03-19 10:42:30 -04:00
vn.py
7e6a2bc938
Merge pull request #1500 from nanoric/travis_all
Travis all
2019-03-19 18:58:56 +08:00
vn.py
59a4def393 [Mod]import rqdatac only if required 2019-03-19 18:58:39 +08:00
vn.py
7c533458ff
Merge pull request #1497 from nanoric/csv_loader_designer
Csv loader designer
2019-03-19 18:42:57 +08:00
vn.py
da757e89e6
Merge pull request #1499 from 1122455801/restclient
[Mod] 修复rest_client.py里错误字段
2019-03-19 18:42:44 +08:00
nanoric
fb2dc7002e [Add] travis-ci: Added gcc-7 build 2019-03-19 06:38:24 -04:00
nanoric
159ab71495 [Fix] 更新autocxxpy脚本 2019-03-19 06:36:18 -04:00
nanoric
9a8911d952 [Fix] fixed import error 2019-03-19 06:12:47 -04:00
nanoric
a6867e43d7 [Fix] updated autocxxpy: no constant instance will be passed from pybind11 2019-03-19 05:57:23 -04:00
nanoric
584f28ceaa Merge branch 'fixed_setup' into travis_all 2019-03-19 05:25:16 -04:00
nanoric
1b2a567e1e [Mod] updated oes binding 2019-03-19 05:24:31 -04:00
nanoric
0ce5e15c8b [Add] .travis.yml: added names for build matrix 2019-03-19 05:06:51 -04:00
nanoric
bcc110b1ae [Fix] new travis script 2019-03-19 04:25:35 -04:00
nanoric
969c59a08a [Add] Added some comments
[Mod] rename files
2019-03-19 02:36:59 -04:00
1122455801
0d79e796ae Update rest_client.py 2019-03-19 13:58:44 +08:00
vn.py
244bd8cec0
Merge pull request #1489 from nanoric/oes_optimize
Oes optimize
2019-03-19 13:45:46 +08:00