Changeset 92

Timestamp:

Sep 14, 2007, 11:24:52 PM (17 years ago)

Author:

rryu

Message:

• メモリ系のパターン変化条件を変更
• 顔パターンを画像ファイルにダンプする機能を追加(一時的機能)

File:

• trunk/MacFaceFloat/MacFaceApp.cs (modified) (6 diffs)

trunk/MacFaceFloat/MacFaceApp.cs

@@ -144 +144 @@
                         menuItemToggleStatusWindow = new System.Windows.Forms.MenuItem();
                         MenuItem menuItemConfigure = new System.Windows.Forms.MenuItem();
-                        MenuItem menuItemExit = new System.Windows.Forms.MenuItem();
+            MenuItem menuItemPatternList = new System.Windows.Forms.MenuItem();
+            MenuItem menuItemExit = new System.Windows.Forms.MenuItem();
                         MenuItem menuVersionInfo = new System.Windows.Forms.MenuItem();
 
@@ -155 +156 @@
                         menuItemConfigure.Text = "MacFace ‚̐ݒè(&O)...";
                         menuItemConfigure.Click +=new EventHandler(menuItemConfigure_Click);
+
+            menuItemPatternList.Text = "ƒpƒ^[ƒ“ˆê——‚ðƒfƒXƒNƒgƒbƒv‚Ƀ_ƒ“ƒv";
+            menuItemPatternList.Click += new EventHandler(menuItemPatternList_Click);
 
                         menuVersionInfo.Index = 0;
@@ -169 +173 @@
                                         new MenuItem("-"),
                                         menuItemConfigure,
+                    menuItemPatternList,
                                         menuVersionInfo,
                                         new MenuItem("-"),
@@ -288 +293 @@
                         MemoryUsage memUsage = memStats.Latest;
 
-                        pageio_count += memUsage.Pageout;
-                        if (pageio_count > 0) pageio_count += memUsage.Pagein;
-                        pageio_count--;
+                        pageio_count += memUsage.Pageout * (memUsage.Pagein + 1);
+            //if (pageio_count > 0) pageio_count += memUsage.Pagein;
+                        pageio_count -= pageio_count / 50 + 1;
                         if (pageio_count < 0) pageio_count = 0;
 
@@ -303 +308 @@
 
                                 long avilable = (long)memStats.TotalVisibleMemorySize * 1024 - memUsage.Used;
-                                /*if (pageio_count > 100) 
+                if (pageio_count > 100) 
                                 {
                                         suite = FaceDef.PatternSuite.MemoryInsufficient;
                                 }
-                                else */if (avilable < 0) 
-                                {
-                                        suite = FaceDef.PatternSuite.MemoryInsufficient;
-                                } 
-                                else if (avilable < (10 * 1024 *1024)) 
+                else if (avilable < 0) 
                                 {
                                         suite = FaceDef.PatternSuite.MemoryDecline;
@@ -376 +377 @@
                         ExitThread();
                 }
+
+        private void menuItemPatternList_Click(object sender, EventArgs e)
+        {
+            MacFace.FaceDef faceDef = new MacFace.FaceDef(config.FaceDefPath);
+            Bitmap image = new Bitmap(128*11, 128*3);
+            Graphics g = Graphics.FromImage(image);
+            Image patternImg;
+
+
+            for (int suite = 0; suite <= 2; suite++)
+            {
+                for (int no = 0; no <= 10; no++)
+                {
+                    patternImg = faceDef.PatternImage((MacFace.FaceDef.PatternSuite)suite, no, 0);
+                    g.DrawImage(patternImg, 128 * no, 128 * suite);
+                }
+            }
+            
+            g.Dispose();
+
+            image.Save(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory) + "\\facedump.png",
+                        System.Drawing.Imaging.ImageFormat.Png);
+        }
 
                 private void menuItemConfigure_Click(object sender, EventArgs e)