million/Million
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/V1.1' of http://222.96.13.116/Million into feature/V1.1

Browse Source
This commit is contained in:
kyh
2022-11-29 09:55:47 +09:00
parent 40d8e80011 a4afb09cd6
commit 538ee16f98
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Million Buyer/MainForm.cs
View File

@@ -411,7 +411,7 @@ namespace Million_Buyer
this.BeginInvoke(new Action(delegate ()
{
InitManager.BuyerInit(cb_IncludeClearIndicator.Checked, overlapBuyManagementList, totalIndicatorList);
InitManager.SettingInit(cb_IncludeClearIndicator.Checked, overlapBuyManagementList, totalIndicatorList);
foreach (var item in buyList)
{
var recentlyData = item.CandleDataLists_Im[0];

3
Million Hunter/HunterMainForm.cs
View File

@@ -280,6 +280,9 @@ namespace Million
var startDate = _saveResultData.StartDateTime;
var endDate = _saveResultData.EndDateTime;
InitManager.SettingInit(true, null, totalIndicator);
//TODO 이전 조건보다 현재 조건이 더 높아야 한다는 조건 걸기
var upperMainIndicatorFlag = cb_UpperMainIndi.Checked;

4
Million/Manager/CalculateManager.cs
View File

@@ -386,8 +386,6 @@ namespace Million.Manager
foreach (var item in parentCandleDataList)
{
var itemValue = GetValue(item, setUp);
if (setUp.CandlePriceType == CommonProperty.CandlePriceType.종가)
itemValue = item.LowValue;
if(rateVal > itemValue)
{
@@ -396,8 +394,6 @@ namespace Million.Manager
foreach (var child in childrenCandleDataList)
{
itemValue = GetValue(child, setUp);
if (setUp.CandlePriceType == CommonProperty.CandlePriceType.종가)
itemValue = child.LowValue;
if (rateVal > itemValue)
child.CalculateFlag[setUp.IndexString] = true;

16
Million/Manager/InitManager.cs
View File

@@ -78,17 +78,19 @@ namespace Million.Manager
/// <param name="checkData"></param>
/// <param name="overlapBuyManagementList"></param>
/// <param name="totalIndicatorList"></param>
public static void BuyerInit(bool checkData, Dictionary<string, bool> overlapBuyManagementList, List<IndicatorCoditionSetup> totalIndicatorList)
public static void SettingInit(bool checkData, Dictionary<string, bool> overlapBuyManagementList, List<IndicatorCoditionSetup> totalIndicatorList)
{
var coinFullNameList = CommonProperty.selectedMarketOfPlaceList.Select(t => t.CoinFullName).ToList();
foreach (var item in coinFullNameList)
if (overlapBuyManagementList != null)
{
if (checkData)
overlapBuyManagementList[item] = false;
else
overlapBuyManagementList[item] = true;
foreach (var item in coinFullNameList)
{
if (checkData)
overlapBuyManagementList[item] = false;
else
overlapBuyManagementList[item] = true;
}
}
foreach (var item in totalIndicatorList)