Commit Graph

1045 Commits

Author SHA1 Message Date
qqqlyx
455a1851a7 [Add] ping_interval
增加了一个变量,用来控制websocket_client中ping的时间间隔。
2019-04-03 16:31:53 +08:00
vn.py
e897907110
Merge pull request #1544 from 1122455801/rpc_dev
[Add] RPC 模块
2019-04-03 15:58:56 +08:00
vn.py
aceb46c3fd [Add]okex gateway 2019-04-03 15:56:06 +08:00
vn.py
2beceb9552 [Mod]updater version number to v2.0.1 2019-04-03 12:42:57 +08:00
1122455801
d5585ff269 Create vnrpc.py 2019-04-02 17:07:14 +08:00
1122455801
b3a72c1283 Create test_server.py 2019-04-02 17:07:10 +08:00
1122455801
e4a1997296 Create test_client.py 2019-04-02 17:07:07 +08:00
1122455801
3d99ccb5f8 Create __init__.py 2019-04-02 17:07:04 +08:00
vn.py
66b7bff938 [Mod]use bytes instead of string in apex api 2019-04-02 14:24:45 +08:00
vn.py
59d2219785 [Mod]change apex FixApi.dll to x64 version 2019-04-02 10:04:48 +08:00
vn.py
548cd22ef3 [Del]remove unused import 2019-04-01 16:08:32 +08:00
vn.py
472bdf66f7 [Fix]close #1487 2019-04-01 15:45:40 +08:00
vn.py
7ca9eec426 [Fix]close #1460 2019-04-01 15:41:50 +08:00
vn.py
466eac66cf [Fix]add more state control in cta engine 2019-04-01 14:54:06 +08:00
vn.py
e63542c44a [Mod]change ctp gateway orderid format to avoid conflict with negative sessionid 2019-03-30 23:42:19 +08:00
vn.py
cd7a3a0d53 Merge branch 'v2.0.1-DEV' of https://github.com/vnpy/vnpy into v2.0.1-DEV 2019-03-30 23:15:50 +08:00
vn.py
8254d2310d [Fix]bugs in load apex dll 2019-03-30 23:15:39 +08:00
vn.py
e842b6b06f
Merge pull request #1533 from nanoric/sdist2
[Add] 支持sdist
2019-03-30 23:02:33 +08:00
vn.py
9b216c1668 Merge branch 'v2.0.1-DEV' of https://github.com/vnpy/vnpy into v2.0.1-DEV 2019-03-29 16:14:01 +08:00
vn.py
9f9e721983 [Mod]cancel only allowd when cta template trading == true 2019-03-29 16:13:55 +08:00
vn.py
cc390e9ba7
Merge pull request #1531 from 1122455801/22
[FIX] 修改multi_signal, multi_timeframe 和test Strategy的代码风格
2019-03-29 14:39:28 +08:00
1122455801
8fa9f2ae9c Update test_strategy.py 2019-03-29 12:56:44 +08:00
1122455801
29fe0b072c Update multi_timeframe_strategy.py 2019-03-29 12:56:04 +08:00
1122455801
3c884d9568 Update multi_signal_strategy.py 2019-03-29 12:55:57 +08:00
nanoric
85fc35e48a [Mod] 版本号改为v2.0.1b0 2019-03-28 23:00:26 -04:00
1122455801
6a0b0be02f Create genetic_algorithm.ipynb 2019-03-29 10:27:35 +08:00
vn.py
d52b900876 [Add]MANIFEST.in file for source distribution 2019-03-28 22:35:45 +08:00
nanoric
800055ba1a Merge remote-tracking branch 'remotes/origin/v2.0.1-DEV' into pip_from_oss
# Conflicts:
#	requirements.txt
2019-03-28 02:29:08 -04:00
vn.py
44f6d376aa [Del]remove ibapi from vnpy source code 2019-03-28 13:55:44 +08:00
vn.py
4474e12e39 [Del]remove talib from vnpy source code 2019-03-28 13:54:23 +08:00
vn.py
cd716b4da8 [Mod]change ctp orderid format 2019-03-28 11:23:31 +08:00
vn.py
90682ab92d [Fix]bugs in king keltner strategy 2019-03-28 11:11:29 +08:00
nanoric
c9f303bcc5 [Mod] make flake8 happy 2019-03-27 04:17:51 -04:00
vn.py
003d903907 [Add]TestStrategy for testing cta strategy app 2019-03-27 14:45:16 +08:00
vn.py
1c601278ab [Fix]bugs in cta strategy app 2019-03-27 14:44:48 +08:00
vn.py
4a1af72300 [Mod]change demo strategies to support list result of send_order function 2019-03-27 11:42:22 +08:00
vn.py
15fbb54960 [Mod]change send order return data to vt_orderids (list) to support offset converter function 2019-03-27 11:31:44 +08:00
vn.py
353a9c0d8d [Mod]add offset converter function to cta strategy app 2019-03-27 11:31:11 +08:00
1122455801
ce64ede969 Update tiger_gateway.py 2019-03-26 15:53:25 +08:00
1122455801
fc1c76ce48 Update backtesting.py 2019-03-26 15:53:22 +08:00
vn.py
873a8080ab [Fix]Close #1518 2019-03-26 10:07:31 +08:00
vn.py
e143f6582e Revert "Revert "[Add]net_position member of ContractData""
This reverts commit 289bcfa13e.
2019-03-25 23:11:12 +08:00
vn.py
0fa314faa8 [Fix]change brokerid to str in CtpGateway 2019-03-25 16:31:15 +08:00
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
d34ce5cb67 [Mod]remove designer ui file from csv loader 2019-03-21 12:04:53 +08:00
vn.py
af7b433370 [Mod]improve code style of csv_loader 2019-03-20 18:12:19 +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
nanoric
6c47c869dd [Mod] oes gateway: use anohter .a file. 2019-03-19 10:42:57 -04:00
nanoric
689d8fede1 [Add] api.oes: added __init__.py 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
nanoric
159ab71495 [Fix] 更新autocxxpy脚本 2019-03-19 06:36:18 -04:00
nanoric
a6867e43d7 [Fix] updated autocxxpy: no constant instance will be passed from pybind11 2019-03-19 05:57:23 -04:00
nanoric
1b2a567e1e [Mod] updated oes binding 2019-03-19 05:24:31 -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
nanoric
6ade6bc388 [Mod] use designer 2019-03-18 06:25:44 -04:00
nanoric
277a6f6be1 [Fix] make flake8 happy 2019-03-18 05:47:41 -04:00
nanoric
023e6b4221 [Add] CsvLoader 2019-03-18 05:37:18 -04:00
vn.py
8e5ea24a36 Merge branch 'v2.0.1-DEV' of https://github.com/vnpy/vnpy into v2.0.1-DEV 2019-03-17 13:11:59 +08:00
vn.py
57fc77a1b0 [Fix]Close #1486 2019-03-17 13:11:33 +08:00
vn.py
9cad3587a2
Merge pull request #1485 from 1122455801/tiger_gateway_version_06
[Mod] tiger_gateway.py
2019-03-17 11:07:45 +08:00
vn.py
9603866f13
Merge pull request #1488 from nanoric/bitmex_optimize
Bitmex optimize
2019-03-17 10:59:00 +08:00
vn.py
4334b44b33
Merge pull request #1490 from nanoric/type_hint_and_docs
Type hint and docs for RestClient, WebSocketClient and BaseGateway.
2019-03-17 10:58:09 +08:00
nanoric
b8ab027081 [Fix] WebsocketClient: removed unused import: make flake8 happy. 2019-03-15 05:46:33 -04:00
nanoric
7bcc9c876b [Fix] OesGateway: make flake8 happy 2019-03-15 05:44:20 -04:00
nanoric
0fd1901ada [Add] OesGateway: 增加一些注释 2019-03-15 04:28:23 -04:00
nanoric
0eb9630b23 [Add] BaseGateway Document: send_order.orderid should be unique 2019-03-15 03:37:42 -04:00
nanoric
c414f561f6 [Add] BaseGateway: 增加说明回调函数on_xxxx的参数必须为常量的要求 2019-03-15 03:07:01 -04:00
nanoric
f6d0cda6ce [Mod] WebSocketClient: remove useless lock. 2019-03-15 03:00:28 -04:00
nanoric
ee307d6323 [Fix] OesGateway: ensure all on_order on_tick response will receive a new python object. 2019-03-15 02:58:37 -04:00
nanoric
fed48e1a06 [Add] BitmexGateway: Added some comment to make logic more clear. 2019-03-15 02:51:49 -04:00
nanoric
88f661615c [Add] BitmexGateway: make send_order thread-safe 2019-03-15 02:43:05 -04:00
nanoric
39effc29b4 [Mod] BtimexGateway: renaeme setting.session into session_number 2019-03-15 02:28:54 -04:00
nanoric
49e721844e [Mod] change typing and docs for RestClient and WebSocketClient 2019-03-15 02:26:05 -04:00
nanoric
51c8ed3b03 [Add] some docs for BaseGateway 2019-03-15 02:24:58 -04:00