Add Top and Bottom
This commit is contained in:
jackyu66git
+22
-3
@@ -17,7 +17,7 @@ from pytz import timezone
|
||||
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
from ChanLun import ChanLun
|
||||
from ChanEnum import Chan_BI_DIR, Chan_SEG_DIR
|
||||
from ChanEnum import Chan_BI_DIR, Chan_SEG_DIR, Chan_KLC_FX, Chan_FX_TYPE
|
||||
|
||||
# 添加买卖点枚举类型
|
||||
class TRADE_POINT_TYPE:
|
||||
@@ -180,12 +180,24 @@ def analyze_chan(df):
|
||||
# 添加买卖点识别
|
||||
buy_sell_points = identify_trade_points(bi_list, seg_list, zs_list)
|
||||
|
||||
# 提取K线分型信息
|
||||
klc_fx_info = []
|
||||
for klc in klc_list:
|
||||
if hasattr(klc, 'klc_fx_type') and klc.klc_fx_type != Chan_KLC_FX.UNKNOWN:
|
||||
klc_fx_info.append({
|
||||
'time': klc.end_time,
|
||||
'price': klc.low if klc.fx == Chan_FX_TYPE.BOTTOM else klc.high,
|
||||
'fx_type': str(klc.klc_fx_type).replace("Chan_KLC_FX.", ""),
|
||||
'is_bottom': klc.fx == Chan_FX_TYPE.BOTTOM
|
||||
})
|
||||
|
||||
return {
|
||||
'klc_list': klc_list,
|
||||
'bi_list': bi_list,
|
||||
'seg_list': seg_list,
|
||||
'zs_list': zs_list,
|
||||
'trade_points': buy_sell_points
|
||||
'trade_points': buy_sell_points,
|
||||
'klc_fx_info': klc_fx_info # 添加分型信息
|
||||
}
|
||||
|
||||
def identify_trade_points(bi_list, seg_list, zs_list):
|
||||
@@ -426,7 +438,14 @@ def analyze():
|
||||
'price': point['price'],
|
||||
'desc': point['desc']
|
||||
} for point in analysis_result['trade_points']],
|
||||
'macd': macd_data
|
||||
'macd': macd_data,
|
||||
# 添加K线分型信息
|
||||
'klc_fx_info': [{
|
||||
'time': format_time_safely(point['time'], client_tz),
|
||||
'price': point['price'],
|
||||
'fx_type': point['fx_type'],
|
||||
'is_bottom': point['is_bottom']
|
||||
} for point in analysis_result['klc_fx_info']]
|
||||
})
|
||||
else:
|
||||
print(f"只请求元素数据，跳过主周期数据处理 (elements_only={elements_only})")
|
||||
|
||||
@@ -275,6 +275,10 @@
|
||||
<input class="form-check-input" type="checkbox" id="showMacd" checked>
|
||||
<label class="form-check-label" for="showMacd">MACD</label>
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" id="showKlcFxType">
|
||||
<label class="form-check-label" for="showKlcFxType">分型类型</label>
|
||||
</div>
|
||||
<div class="form-check form-check-inline" style="display: none;">
|
||||
<input class="form-check-input" type="checkbox" id="showTradePoints">
|
||||
<label class="form-check-label" for="showTradePoints">买卖点</label>
|
||||
@@ -730,6 +734,11 @@
|
||||
updateChartDisplay();
|
||||
});
|
||||
|
||||
// 添加分型类型复选框变更事件
|
||||
$('#showKlcFxType').change(function() {
|
||||
updateChartDisplay();
|
||||
});
|
||||
|
||||
// 当选择不同的元素时间周期时
|
||||
$('#elementTimeframe').change(function() {
|
||||
const elementTimeframe = $(this).val();
|
||||
@@ -916,6 +925,7 @@
|
||||
console.log('- 显示未完成中枢:', $('#showMainUncompletedZs').is(':checked'));
|
||||
console.log('- 显示MACD:', $('#showMacd').is(':checked'));
|
||||
console.log('- 显示买卖点:', $('#showTradePoints').is(':checked'));
|
||||
console.log('- 显示分型类型:', $('#showKlcFxType').is(':checked'));
|
||||
|
||||
// 重新初始化图表，这将清除旧图形并重新绘制
|
||||
initTradingView($('#symbol').val(), $('#timeframe').val());
|
||||
@@ -2375,6 +2385,61 @@
|
||||
console.log('绘制买卖点 - 已禁用');
|
||||
}
|
||||
|
||||
// 显示分型类型标签
|
||||
if ($('#showKlcFxType').is(':checked') && currentData.klc_fx_info && currentData.klc_fx_info.length > 0) {
|
||||
console.log(`绘制K线分型类型标签，共${currentData.klc_fx_info.length}条`);
|
||||
|
||||
currentData.klc_fx_info.forEach(function(fx) {
|
||||
try {
|
||||
// 直接使用UTC时间戳（秒）
|
||||
const timestamp = Math.floor(new Date(fx.time).getTime() / 1000);
|
||||
const price = parseFloat(fx.price);
|
||||
|
||||
if (isNaN(timestamp) || isNaN(price)) {
|
||||
console.error('分型类型时间或价格转换错误:', fx.time, fx.price);
|
||||
return;
|
||||
}
|
||||
|
||||
// 确定颜色和位置
|
||||
const color = fx.is_bottom ? '#28a745' : '#dc3545'; // 底分型绿色，顶分型红色
|
||||
|
||||
// 创建标记系列
|
||||
const markerSeries = mainChart.addLineSeries({
|
||||
lastValueVisible: false,
|
||||
priceLineVisible: false,
|
||||
});
|
||||
|
||||
// 设置文本标记
|
||||
markerSeries.setMarkers([
|
||||
{
|
||||
time: timestamp,
|
||||
position: fx.is_bottom ? 'belowBar' : 'aboveBar',
|
||||
color: color,
|
||||
shape: 'circle',
|
||||
text: fx.fx_type,
|
||||
size: 1
|
||||
}
|
||||
]);
|
||||
|
||||
// 可选：添加更加明显的文本标签
|
||||
const textSeries = mainChart.addLineSeries({
|
||||
lastValueVisible: false,
|
||||
priceLineVisible: false,
|
||||
});
|
||||
|
||||
textSeries.setData([{
|
||||
time: timestamp,
|
||||
value: price + (fx.is_bottom ? -0.0005 * price : 0.0005 * price) // 小偏移，避免遮挡
|
||||
}]);
|
||||
|
||||
} catch (e) {
|
||||
console.error('绘制分型类型标签出错:', e);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
console.log('绘制分型类型标签 - 已禁用或无数据');
|
||||
}
|
||||
|
||||
// 调整所有图表以适应数据
|
||||
mainChart.timeScale().fitContent();
|
||||
volumeChart.timeScale().fitContent();
|
||||
|
||||
Reference in New Issue
Block a user