diff --git a/BitgetApi/BitgetApi.csproj b/BitgetApi/BitgetApi.csproj
index 58e09d6..4f227f2 100644
--- a/BitgetApi/BitgetApi.csproj
+++ b/BitgetApi/BitgetApi.csproj
@@ -76,7 +76,7 @@
-
+
Form
@@ -92,6 +92,7 @@
MainForm.cs
+
ResXFileCodeGenerator
Resources.Designer.cs
diff --git a/BitgetApi/CommonProperty.cs b/BitgetApi/CommonProperty.cs
index c25d7d4..d29fc62 100644
--- a/BitgetApi/CommonProperty.cs
+++ b/BitgetApi/CommonProperty.cs
@@ -144,23 +144,6 @@ namespace BitgetAPI
*/
}
- // 기준선 설정 (볼린저)
- public enum Indicator_BolingerOverLine
- {
- 하향선 = -1,
- 기준선 = 0,
- 상향선 = 1
- }
-
- // 기준선 설정 (일목)
- public enum Indicator_IchmokuOverLine
- {
- 선행스팬1 = 1,
- 선행스팬2 = 2,
- 선행스팬1OR2중고가 = 3,
- 선행스팬1OR2중저가 = 4
- }
-
// 이동평균선 종류
public enum MovingAverageType
{
diff --git a/BitgetApi/Data/CandleData.cs b/BitgetApi/Data/CandleData.cs
index 14a5721..629078b 100644
--- a/BitgetApi/Data/CandleData.cs
+++ b/BitgetApi/Data/CandleData.cs
@@ -47,5 +47,7 @@ namespace BitgetAPI.Data
}
public IchimokData IchimokData { get; set; }
+
+ public Dictionary movingAverageDataList { get; set; }
}
}
diff --git a/BitgetApi/IndicatorConditionSetup/IchimokuConditionSetup.cs b/BitgetApi/IndicatorConditionSetup/IchimokuConditionSetup.cs
index a20fd51..a77a2dc 100644
--- a/BitgetApi/IndicatorConditionSetup/IchimokuConditionSetup.cs
+++ b/BitgetApi/IndicatorConditionSetup/IchimokuConditionSetup.cs
@@ -34,13 +34,9 @@ namespace BitgetAPI.IndicatorConditionSetup
///
public int Displacement { get; set; } = 26;
- // 기준선 설정z
- public CommonProperty.Indicator_IchmokuOverLine IndicatorIchmokuOverLine { get; set; }
-
// 캔들당 일목균형표 계산하기
public void calIchimokuData(List candleDatas, CandleData candleData)
{
-
// 현재 종가 인덱스
var endIndex = candleDatas.Count() - 1;
diff --git a/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs
new file mode 100644
index 0000000..3333211
--- /dev/null
+++ b/BitgetApi/IndicatorConditionSetup/IndicatorProcess.cs
@@ -0,0 +1,241 @@
+using BitgetApi.Data;
+using BitgetAPI.IndicatorConditionSetup;
+using DevExpress.Utils.IoC;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace BitgetAPI.IndicatorConditionSetup
+{
+ public class IndicatorProcess
+ {
+ CommonProperty commonProperty = CommonProperty.Instance;
+
+ // 스레드 시작/종료 플래그
+ public bool Is_th_SignalInfo;
+
+ public List