Commit Graph

77 Commits

Author SHA1 Message Date
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
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
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
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
nanoric
17eefab346 [Mod] make flake8 happy 2019-03-22 01:27:16 -04: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
vn.py
59a4def393 [Mod]import rqdatac only if required 2019-03-19 18:58:39 +08:00
nanoric
969c59a08a [Add] Added some comments
[Mod] rename files
2019-03-19 02:36:59 -04: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
57fc77a1b0 [Fix]Close #1486 2019-03-17 13:11:33 +08:00
vn.py
5a6f496cb1 [Fix]Close #1481 2019-03-15 08:58:44 +08:00
vn.py
7711825486 [Fix]Close #1474 2019-03-14 09:10:57 +08:00
vn.py
a54699b11d [Fix]Close #1454 2019-03-08 10:12:21 +08:00
vn.py
0ac6034fd7 [Fix]Close #1451 2019-03-08 09:44:38 +08:00
vn.py
c282ab13f9 [Fix]Close #1427 2019-03-07 13:51:51 +08:00
vn.py
bfb5e1ea42 [Fix]Close #1439 2019-03-07 13:47:29 +08:00
vn.py
f4d34bae13 [Fix]Close #1443 2019-03-07 13:32:45 +08:00
vn.py
e6f8060e99 [Mod]reformat code 2019-02-23 16:01:19 +08:00
vn.py
a9f652607c [Fix]close #1387 2019-02-23 09:41:46 +08:00
vn.py
f94e078a75 [Fix]bug in send_order of CtaEngine 2019-02-22 14:11:47 +08:00
vn.py
a203f864c4
Merge pull request #1402 from 1122455801/Add_MultiSignalstrategy
[Add] multi_signal_strategy
2019-02-21 10:13:08 +08:00
1122455801
cc1db0164f Create multi_signal_strategy.py 2019-02-21 10:05:46 +08:00
vn.py
760da8e7d2 [Mod]change filename of MultiTimeframStrategy 2019-02-21 09:22:59 +08:00
vn.py
d0ff8f904d
Merge pull request #1395 from 1122455801/Mod_double_ma_strategy
[Mod] double_ma_strategy
2019-02-21 08:54:36 +08:00
vn.py
54fb249564
Merge pull request #1396 from 1122455801/Add_dualthrust_strategy
Create dual_thrust_strategy.py
2019-02-21 08:54:21 +08:00
vn.py
3a8cfe35cc
Merge pull request #1397 from 1122455801/Add_multi_time_frame_strategy
Create multi_time_frame_strategy.py
2019-02-21 08:54:04 +08:00
vn.py
150a41d74f
Merge pull request #1399 from 1122455801/Mod_CTATEMPLATE
[Mod] template.py
2019-02-21 08:52:57 +08:00
vn.py
2124c504a6
Merge pull request #1401 from 1122455801/Add_atr_rsi_strategy
[Add] atr_rsi_strategy.py
2019-02-21 08:50:54 +08:00
1122455801
713ecc14b6 Create atr_rsi_strategy.py 2019-02-20 14:23:38 +08:00
1122455801
ce568ae3a6 Update template.py 2019-02-20 14:07:50 +08:00
1122455801
905bccf6f6 Create multi_time_frame_strategy.py 2019-02-20 11:30:19 +08:00
1122455801
0b93038f19 Create dual_thrust_strategy.py 2019-02-20 10:17:29 +08:00
1122455801
e64cfd7223 Update double_ma_strategy.py 2019-02-20 10:01:18 +08:00
vn.py
dfb85286d1
Merge pull request #1392 from 1122455801/Add_King_Keltner_strategy
[Add] king_keltner_strategy.py
2019-02-19 23:27:24 +08:00