Changeset 73

Timestamp:

Jul 12, 2006, 12:16:33 AM (18 years ago)

Author:

mayuki

Message:

• PSAPIパッチをとりあえず取り込んでしまった
• リサイズ時にバイキュービックを使うようにした
• 前回起動時のパターンが存在しない場合、エラーとなったのを修正した
• デフォルトパターンのパスを修正した

Location:

trunk

Files:

• MacFaceFloat/AssemblyInfo.cs (modified) (2 diffs)
• MacFaceFloat/MacFaceApp.cs (modified) (5 diffs)
• MacFaceFloat/PatternWindow.cs (modified) (1 diff)
• MacFaceLibrary/CPUStatistics.cs (modified) (2 diffs)
• MacFaceLibrary/CPUStatisticsGetSystemTime.cs (added)
• MacFaceLibrary/MacFaceLibrary.csproj (modified) (2 diffs)
• MacFaceLibrary/MemoryStatistics.cs (modified) (3 diffs)
• MacFaceLibrary/MemoryStatisticsPSAPI.cs (added)
• MacFaceLibrary/PropertyList.cs (modified) (1 diff)

trunk/MacFaceFloat/AssemblyInfo.cs

@@ -12 +12 @@
 [assembly: AssemblyCompany("Team MacFace")]
 [assembly: AssemblyProduct("MacFace for Windows")]
-[assembly: AssemblyCopyright("c 2005 Team MacFace, All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright c 2005-2006 Team MacFace, All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]         
@@ -27 +27 @@
 // ƒrƒ‹ƒh‚¨‚æ‚уŠƒrƒWƒ‡ƒ“”ԍ†‚ðŠù’è’l‚É‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B
 
-[assembly: AssemblyInformationalVersion("ƒAƒ‹ƒtƒ@”Å(2005-09-09)")]
+[assembly: AssemblyInformationalVersion("ƒAƒ‹ƒtƒ@”Å(2005-09-09)+p3")]
 [assembly: AssemblyVersion("1.0.*")]
 

trunk/MacFaceFloat/MacFaceApp.cs

@@ -39 +39 @@
                 private MenuItem menuItemTogglePatternWindow;
                 private MenuItem menuItemToggleStatusWindow;
+                private MacFace.FaceDef curFaceDef;
 
                 [STAThread]
@@ -51 +52 @@
                         config = Configuration.GetInstance();
                         config.Load();
-
+                        
                         cpuStats = new CPUStatistics(81);
                         memStats = new MemoryStatistics(81);
                         pageio_count = 0;
+                        // XXX: ‘Ώˆ•û–@‚ªƒAƒŒ‚·‚¬‚È‚Ì‚ð‰½‚Æ‚©‚·‚é
+                        try 
+                        {
+                                // ŽŽ‚µ‚ɃJƒEƒ“ƒ^‚ðŽÀs‚µ‚Ä‚Ý‚é
+                                cpuStats.Update();
+                        } 
+                        catch (System.ComponentModel.Win32Exception e) 
+                        {
+                                // ƒ_ƒ‚¾‚Á‚½‚̂ŃpƒtƒH[ƒ}ƒ“ƒXƒJƒEƒ“ƒ^‚ðŽg‚í‚È‚¢•û–@‚Ö
+                                cpuStats = new CPUStatisticsGetSystemTime(61);
+                                memStats = new MemoryStatisticsPSAPI(61);
+                        }
 
                         updateTimer = new System.Windows.Forms.Timer();
@@ -125 +138 @@
                         if (!result)
                         {
-                                string path = Path.Combine(Application.StartupPath, "default.plist");
+                                string path = Path.Combine(Application.StartupPath, "default.mcface");
 
                                 if (!LoadFaceDefine(path))
@@ -190 +203 @@
                                 return false;
                         }
+                        
+                        curFaceDef = newFaceDef;
 
                         if (patternWindow != null) 
@@ -269 +284 @@
                         patternWindow.TransparentMouseMessage = config.TransparentMouseMessage;
 
-                        LoadFaceDefine(config.FaceDefPath);
+                        //LoadFaceDefine(config.FaceDefPath);
+                        patternWindow.FaceDef = curFaceDef;
 
                         patternWindow.Show();

trunk/MacFaceFloat/PatternWindow.cs

@@ -80 +80 @@
                         Graphics g = this.Graphics;
                         g.Clear(Color.FromArgb(0, 0, 0, 0));
+                        g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
                         curFaceDef.DrawPatternImage(g, curSuite, curPattern, curMarkers, patternSize);
                         base.Refresh();

trunk/MacFaceLibrary/CPUStatistics.cs

@@ -5 +5 @@
 {
         /// <summary>
-        /// CPUStats ‚ÌŠT—v‚Ìà–¾‚Å‚·B
+        /// CPUStats nngY
         /// </summary>
         public class CPUStatistics
@@ -71 +71 @@
                 }
 
-                protected CPUUsage NextValue()
+                protected virtual CPUUsage NextValue()
                 {
                         int user   = (int)userCounter.NextValue();

trunk/MacFaceLibrary/MacFaceLibrary.csproj

@@ -105 +105 @@
                 />
                 <File
+                    RelPath = "CPUStatisticsGetSystemTime.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "CPUUsage.cs"
                     SubType = "Code"
@@ -121 +126 @@
                 <File
                     RelPath = "MemoryStatistics.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "MemoryStatisticsPSAPI.cs"
                     SubType = "Code"
                     BuildAction = "Compile"

trunk/MacFaceLibrary/MemoryStatistics.cs

@@ -5 +5 @@
 {
         /// <summary>
-        /// MemoryStatistics ‚ÌŠT—v‚Ìà–¾‚Å‚·B
+        /// MemoryStatistics nngY
         /// </summary>
         public class MemoryStatistics
@@ -110 +110 @@
                 }
 
-                public ulong CommitLimit 
+                public virtual ulong CommitLimit 
                 {
                         get { return (ulong)commitLimitCounter.NextValue(); }
@@ -124 +124 @@
                 }
 
-                protected MemoryUsage NextValue()
+                protected virtual MemoryUsage NextValue()
                 {
                         int available      = (int)availableCounter.NextValue();

trunk/MacFaceLibrary/PropertyList.cs

@@ -25 +25 @@
                         reader.XmlResolver = null;
                         doc.Load(reader);
+                        reader.Close();
 
                         return ReadDictionary(doc.DocumentElement.FirstChild);