From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sun, 21 Aug 2016 13:20:50 +0000 (+0900)
Subject: 資材が大きく減少したときに表示が桁あふれするのを直す
X-Git-Tag: v8.19~4
X-Git-Url: http://git.osdn.net/view?p=kancollesniffer%2FKancolleSniffer.git;a=commitdiff_plain;h=780e5a1c4181e800f217723036096acd7cd582b7

資材が大きく減少したときに表示が桁あふれするのを直す
---

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index 214d64e..276ff4c 100644
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -495,12 +495,8 @@ namespace KancolleSniffer
         private void UpdateBucketHistory()
         {
             var count = _sniffer.Material.MaterialHistory[(int)Material.Bucket];
-            var day = count.Now - count.BegOfDay;
-            var week = count.Now - count.BegOfWeek;
-            if (day >= 1000)
-                day = 999;
-            if (week >= 1000)
-                week = 999;
+            var day = CutOverflow(count.Now - count.BegOfDay, 999);
+            var week = CutOverflow(count.Now - count.BegOfWeek, 999);
             labelBucketHistory.Text = $"{day:+#;-#;±0} 今日\n{week:+#;-#;±0} 今週";
         }
 
@@ -511,19 +507,22 @@ namespace KancolleSniffer
             for (var i = 0; i < labels.Length; i++)
             {
                 var count = _sniffer.Material.MaterialHistory[i];
-                var port = count.Now - _sniffer.Material.PrevPort[i];
-                if (port >= 100000)
-                    port = 99999;
-                var day = count.Now - count.BegOfDay;
-                if (day >= 100000)
-                    day = 99999;
-                var week = count.Now - count.BegOfWeek;
-                if (week >= 100000)
-                    week = 99999;
+                var port = CutOverflow(count.Now - _sniffer.Material.PrevPort[i], 99999);
+                var day = CutOverflow(count.Now - count.BegOfDay, 99999);
+                var week = CutOverflow(count.Now - count.BegOfWeek, 99999);
                 labels[i].Text = $"{text[i]}\n{port:+#;-#;±0}\n{day:+#;-#;±0}\n{week:+#;-#;±0}";
             }
         }
 
+        private int CutOverflow(int value, int limit)
+        {
+            if (value > limit)
+                return limit;
+            if (value < -limit)
+                return -limit;
+            return value;
+        }
+
         private void UpdateShipInfo()
         {
             UpdatePanelShipInfo();