매수, 매도 색상 수정
This commit is contained in:
+5
-6
@@ -67,17 +67,12 @@ public class StrategyConditionTimeframeService {
|
||||
GcStrategy strategy = opt.get();
|
||||
ensureDslRepaired(strategy);
|
||||
|
||||
Set<String> fromFlowLayout = collectFromFlowLayoutJson(strategy.getFlowLayoutJson());
|
||||
if (!fromFlowLayout.isEmpty()) {
|
||||
return sanitizeEvaluationTimeframes(fromFlowLayout, strategy);
|
||||
}
|
||||
|
||||
Set<String> buyOut = new LinkedHashSet<>();
|
||||
Set<String> sellOut = new LinkedHashSet<>();
|
||||
boolean buyScoped = collectStartScopeFromJson(strategy.getBuyConditionJson(), buyOut);
|
||||
boolean sellScoped = collectStartScopeFromJson(strategy.getSellConditionJson(), sellOut);
|
||||
|
||||
// 매수 START 분봉 우선 — 매도 쪽 레거시 1m TIMEFRAME 이 합집합에 섞이지 않도록
|
||||
// 평가 분봉은 buy/sell DSL(TIMEFRAME·START)이 단일 원천 — flow_layout 은 편집기 UI 보조
|
||||
if (buyScoped && !buyOut.isEmpty()) {
|
||||
return sanitizeEvaluationTimeframes(buyOut, strategy);
|
||||
}
|
||||
@@ -96,6 +91,10 @@ public class StrategyConditionTimeframeService {
|
||||
}
|
||||
|
||||
if (out.isEmpty()) {
|
||||
Set<String> fromFlowLayout = collectFromFlowLayoutJson(strategy.getFlowLayoutJson());
|
||||
if (!fromFlowLayout.isEmpty()) {
|
||||
return sanitizeEvaluationTimeframes(fromFlowLayout, strategy);
|
||||
}
|
||||
String fromName = StrategyDslTimeframeNormalizer.inferFromStrategyName(strategy.getName());
|
||||
return Set.of(fromName != null ? fromName : "1m");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user