Changeset 53

Timestamp:

Apr 1, 2005, 11:23:55 PM (19 years ago)

Author:

altba\rryu

Message:

メモリグラフの上限をCommit Limitに変更した。
グラフの色などを微調整。

Location:

trunk

Files:

• MacFaceFloat/MacFaceApp.cs (modified) (6 diffs)
• MacFaceLibrary/MemoryUsageCounter.cs (modified) (3 diffs)

trunk/MacFaceFloat/MacFaceApp.cs

@@ -56 +56 @@
                         config.Load();
 
-                        cpuHistory = new CPUUsage[60];
+                        cpuHistory = new CPUUsage[61];
                         cpuHistoryCount = 0;
                         cpuHistoryHead = 0;
 
-                        memHistory = new MemoryUsage[60];
+                        memHistory = new MemoryUsage[61];
                         memHistoryCount = 0;
                         memHistoryHead = 0;
@@ -116 +116 @@
                         statusWindow.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
                         statusWindow.ControlBox = false;
+                        statusWindow.MaximizeBox = false;
+                        statusWindow.MinimizeBox = false;
                         statusWindow.Icon = new Icon(asm.GetManifestResourceStream("MacFace.FloatApp.App.ico"));
                         statusWindow.Text = "ƒXƒe[ƒ^ƒX";
@@ -386 +388 @@
                         Graphics g = Graphics.FromImage(memoryGraph);
 
+                        int totalMemory = (int)MemoryUsageCounter.TotalVisibleMemorySize * 1024;
+                        double rate = 100.0 / MemoryUsageCounter.CommitLimit;
+                        int border = (int)(totalMemory * rate);
+
                         g.FillRectangle(new SolidBrush(Color.White), 0, 0, 300, 100);
                         Pen pen = new Pen(Color.FromArgb(220, 220, 220), 1F);
-                        for (int y = 100; y > 0; y -= 7) 
+                        for (int y = 100; y > 0; y -= (int)(128*1024*1024 * rate)) 
                         {
                                 g.DrawLine(pen, 0, y, 300, y);
                         }
-                        g.DrawLine(Pens.Gray, 0, 100-5*7, 300, 100-5*7);
-
-                        int totalMemory = (int)MemoryUsageCounter.TotalVisibleMemorySize * 1024;
-                        double rate = 70.0 / totalMemory;
 
                         g.SmoothingMode = SmoothingMode.None;
                         Brush commitedBrush = new SolidBrush(Color.FromArgb(180, 255, 145, 0));
                         Brush uncommitedBrush = new SolidBrush(Color.FromArgb(180, 180, 200, 255));
-                        Brush availableBrush = new SolidBrush(Color.FromArgb(180, 100, 100, 255));
-                        Brush spaceBrush = new SolidBrush(Color.FromArgb(180, 255, 255, 100));
+                        Brush availableBrush = new SolidBrush(Color.FromArgb(100, 100, 100, 255));
+                        Brush spaceBrush = new SolidBrush(Color.FromArgb(180, 240, 230, 255));
 
                         int pos = memHistoryHead - 1;
@@ -414 +416 @@
                                 w = 5;
 
-                                h = 30;
+                                h = 100 - border;
                                 y = 0;
                                 g.FillRectangle(spaceBrush, x, y, w, h);
@@ -422 +424 @@
                                 g.FillRectangle(commitedBrush, x, y, w, h);
 
-                                if (h < 70) 
-                                {
-                                        h = 70 - h;
-                                        y = 30;
+                                if (h < border) 
+                                {
+                                        h = border - h;
+                                        y = 100 - border;
                                         g.FillRectangle(uncommitedBrush, x, y, w, h);
                                 }
 
                                 h = (int)(usage.Available * rate);
-                                y = 100-70;
+                                y = 100 - border;
                                 g.FillRectangle(availableBrush, x, y, w, h);
 
@@ -447 +449 @@
                                 pos--;
                         }
-                        g.DrawLine(Pens.Black, 0, 100-70, 300, 100-70);
+                        Pen borderPen = new Pen(Color.Blue);
+                        borderPen.DashStyle = DashStyle.Dash;
+                        g.DrawLine(borderPen, 0, 100-border, 300, 100-border);
 
                         g.Dispose();

trunk/MacFaceLibrary/MemoryUsageCounter.cs

@@ -13 +13 @@
         {
                 private static ulong totalVisibleMemorySize;
+                private static PerformanceCounter commitLimitCounter;
                 
                 private PerformanceCounter availableCounter;
@@ -27 +28 @@
                                 totalVisibleMemorySize = (ulong)mo["TotalVisibleMemorySize"];
                         }
+
+                        commitLimitCounter = new PerformanceCounter();
+                        commitLimitCounter.CategoryName = "Memory";
+                        commitLimitCounter.CounterName = "Commit Limit";
                 }
 
@@ -62 +67 @@
                         get { return totalVisibleMemorySize; }
                 }
+
+                public static ulong CommitLimit 
+                {
+                        get { return (ulong)commitLimitCounter.NextValue(); }
+                }
         }
 }