Changeset 26

Timestamp:

Dec 27, 2004, 11:59:43 PM (19 years ago)

Author:

altba\rryu

Message:

メモリ残量でパターンスイート切り替えるようにしてみた。

File:

• trunk/MacFaceFloat/MainForm.cs (modified) (3 diffs)

trunk/MacFaceFloat/MainForm.cs

@@ -33 +33 @@
 
                 private int prevPattern;
+                private FaceDef.PatternSuite prevSuite;
                 private int prevMarkers;
 
@@ -46 +47 @@
 
                         prevPattern = -1;
+                        prevSuite   = FaceDef.PatternSuite.Normal;
                         prevMarkers = -1;
 
@@ -208 +210 @@
 
                         int pattern = cpuUsage.Active / 10;
-                        if (pattern > 10)
-                        {
-                                pattern = 10;
-                        }
-                        else if (pattern < 0)
-                        {
-                                pattern = 0;
+
+                        FaceDef.PatternSuite suite = FaceDef.PatternSuite.Normal;
+                        if (memUsage.Available < (10 * 1024 *1024)) 
+                        {
+                                suite = FaceDef.PatternSuite.MemoryInsufficient;
+                        } 
+                        else if (memUsage.Available < (30 * 1024 *1024)) 
+                        {
+                                suite = FaceDef.PatternSuite.MemoryDecline;
                         }
 
                         int markers = FaceDef.MarkerNone;
-                        int pagein = memUsage.Pagein;
-                        int pageout = memUsage.Pageout;
-                        if (pagein > 0) markers += FaceDef.MarkerPageIn;
-                        if (pageout > 0) markers += FaceDef.MarkerPageOut;
-
-                        if (prevPattern != pattern || prevMarkers != markers) 
+                        if (memUsage.Pagein > 0) markers += FaceDef.MarkerPageIn;
+                        if (memUsage.Pageout > 0) markers += FaceDef.MarkerPageOut;
+
+                        if (prevPattern != pattern || prevSuite != suite || prevMarkers != markers) 
                         {
                                 Graphics g = this.Graphics;
                                 g.Clear(Color.FromArgb(0, 0, 0, 0));
-                                _currentFaceDef.DrawPatternImage(g, FaceDef.PatternSuite.Normal, pattern, markers);
+                                _currentFaceDef.DrawPatternImage(g, suite, pattern, markers);
                                 this.Update();
                         }
                                 
                         prevPattern = pattern;
+                        prevSuite   = suite;
                         prevMarkers = markers;
                 }