Merge branch 'hotfix/bucket'

terry-u16 · Dec 13, 2015 · 8c83533 · 8c83533
2 parents 871e10d + acf7b03
commit 8c83533
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/MaterialChartPlugin/MaterialChartPlugin.cs b/MaterialChartPlugin/MaterialChartPlugin.cs
@@ -15,7 +15,7 @@ namespace MaterialChartPlugin
     [ExportMetadata("Guid", "56B66906-608A-4BCC-9FE2-6B3B0093F377")]
     [ExportMetadata("Title", "MaterialChart")]
     [ExportMetadata("Description", "資材の推移をグラフで表示します。")]
-    [ExportMetadata("Version", "1.1.0")]
+    [ExportMetadata("Version", "1.1.1")]
     [ExportMetadata("Author", "@terry_u16")]
     [Export(typeof(ITool))]
     [Export(typeof(IRequestNotify))]

diff --git a/MaterialChartPlugin/ViewModels/ToolViewModel.cs b/MaterialChartPlugin/ViewModels/ToolViewModel.cs
@@ -383,9 +383,9 @@ private void SetXAxis(TimeMaterialsPair newData)
         /// <param name="mostMaterial">最も多い資材の量</param>
         private void SetMaterialYAxis(int mostMaterial)
         {
-            this.mostMaterial = mostMaterial;
-            var interval = ChartUtilities.GetInterval(0, mostMaterial);
-            YMax1 = ChartUtilities.GetYAxisMax(mostMaterial, interval);
+            this.mostMaterial = Math.Max(mostMaterial, 100);
+            var interval = ChartUtilities.GetInterval(0, this.mostMaterial);
+            YMax1 = ChartUtilities.GetYAxisMax(this.mostMaterial, interval);
         }
 
         /// <summary>
@@ -394,9 +394,9 @@ private void SetMaterialYAxis(int mostMaterial)
         /// <param name="mostRepairTool">最も多い高速修復材の量</param>
         private void SetRepairToolYAxis(int mostRepairTool)
         {
-            this.mostRepairTool = RepairTool;
-            var interval = ChartUtilities.GetInterval(0, mostRepairTool);
-            YMax2 = ChartUtilities.GetYAxisMax(mostRepairTool, interval);
+            this.mostRepairTool = Math.Max(mostRepairTool, 10);
+            var interval = ChartUtilities.GetInterval(0, this.mostRepairTool);
+            YMax2 = ChartUtilities.GetYAxisMax(this.mostRepairTool, interval);
         }
 
         public async void ExportAsCsv()