Skip to content

Commit

Permalink
半年モード追加
Browse files Browse the repository at this point in the history
  • Loading branch information
ruhiel committed Oct 22, 2016
1 parent d7da4c9 commit c51069c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
5 changes: 5 additions & 0 deletions MaterialChartPlugin/Models/DisplayedPeriod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ public enum DisplayedPeriod
/// </summary>
ThreeMonths,

/// <summary>
/// 半年分のデータを表示します。
/// </summary>
HalfYear,

/// <summary>
/// 1年分のデータを表示します。
/// </summary>
Expand Down
6 changes: 6 additions & 0 deletions MaterialChartPlugin/Models/Utilities/ChartExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ private static TimeSpan GetMinimumTimeStep(DisplayedPeriod period)
return TimeSpan.FromHours(4);
case DisplayedPeriod.ThreeMonths:
return TimeSpan.FromHours(12);
case DisplayedPeriod.HalfYear:
return TimeSpan.FromDays(1);
case DisplayedPeriod.OneYear:
return TimeSpan.FromDays(2);
case DisplayedPeriod.ThreeYears:
Expand All @@ -77,6 +79,8 @@ private static double GetMinimumMaterialRatio(DisplayedPeriod period)
return 0.05;
case DisplayedPeriod.ThreeMonths:
return 0.08;
case DisplayedPeriod.HalfYear:
return 0.10;
case DisplayedPeriod.OneYear:
return 0.12;
case DisplayedPeriod.ThreeYears:
Expand Down Expand Up @@ -137,6 +141,8 @@ public static TimeSpan ToTimeSpan(this DisplayedPeriod period)
return TimeSpan.FromDays(30);
case DisplayedPeriod.ThreeMonths:
return TimeSpan.FromDays(90);
case DisplayedPeriod.HalfYear:
return TimeSpan.FromDays(180);
case DisplayedPeriod.OneYear:
return TimeSpan.FromDays(365);
case DisplayedPeriod.ThreeYears:
Expand Down
1 change: 1 addition & 0 deletions MaterialChartPlugin/ViewModels/ToolViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ public ToolViewModel(MaterialChartPlugin plugin)
DisplayViewModel.Create(DisplayedPeriod.OneWeek, "1週間"),
DisplayViewModel.Create(DisplayedPeriod.OneMonth, "1ヶ月"),
DisplayViewModel.Create(DisplayedPeriod.ThreeMonths, "3ヶ月"),
DisplayViewModel.Create(DisplayedPeriod.HalfYear, "半年"),
DisplayViewModel.Create(DisplayedPeriod.OneYear, "1年"),
DisplayViewModel.Create(DisplayedPeriod.ThreeYears, "3年")
};
Expand Down

0 comments on commit c51069c

Please sign in to comment.