Changeset 18

Timestamp:

Nov 17, 2004, 2:32:21 PM (19 years ago)

Author:

altba\rryu

Message:

PartListクラスは配列との差が無いので廃止した。

Location:

trunk

Files:

• MacFaceFloat/ConfigurationForm.cs (modified) (1 diff)
• MacFaceFloat/MainForm.cs (modified) (1 diff)
• MacFaceLibrary/FaceDef.cs (modified) (6 diffs)
• MacFaceLibrary/MacFaceLibrary.csproj (modified) (1 diff)
• MacFaceLibrary/PartList.cs (deleted)

trunk/MacFaceFloat/ConfigurationForm.cs

@@ -383 +383 @@
                 private void AddPreviewListItem(string path)
                 {
-                        using (Bitmap tmpImage = new Bitmap(128, 128)) 
-                        {
-                                try 
-                                {
-                                        FaceDef faceDef = new FaceDef(path);
-                                        PartList partList = faceDef.Pattern(FaceDef.PatternSuite.Normal, 10);
-                                        
-                                        using (Graphics g = Graphics.FromImage(tmpImage)) 
-                                        {
-                                                g.Clear(Color.White);
-                                                g.DrawRectangle(new Pen(Color.LightGray), 0, 0, 127, 127);
-                                                foreach (Part part in partList) 
-                                                {
-                                                        g.DrawImage(part.Image,
-                                                                part.Point.X, part.Point.Y,
-                                                                part.Image.Size.Width, part.Image.Size.Height);
-                                                }
-                                        }
-                                        imageListFacePreviews.Images.Add(tmpImage);
-
-                                        ListViewItem item = listViewFaces.Items.Add(faceDef.Title, imageListFacePreviews.Images.Count-1);
-                                        item.SubItems.Add(path);    // 0: ƒpƒX
-                                        item.SubItems.Add(faceDef.Author);  // 1: »ìŽÒ
-                                        item.SubItems.Add(faceDef.Version); // 2: ƒo[ƒWƒ‡ƒ“
-                                        item.SubItems.Add(
-                                                (faceDef.WebSite != null ?
-                                                faceDef.WebSite.ToString() : "")); // 3: ƒEƒFƒuƒTƒCƒg
-                                } 
-                                catch (Exception ex) 
-                                {
-                                        // TODO: Exception ‚©‚ç‚à‚Á‚Æ‹·‚ß‚éB
-                                        MessageBox.Show(ex.ToString(), "MacFace for Windows", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                                }
+                        try 
+                        {
+                                FaceDef faceDef = new FaceDef(path);
+                                Image image = faceDef.PatternImage(FaceDef.PatternSuite.Normal, 10);
+                                imageListFacePreviews.Images.Add(image);
+
+                                ListViewItem item = listViewFaces.Items.Add(faceDef.Title, imageListFacePreviews.Images.Count-1);
+                                item.SubItems.Add(path);    // 0: ƒpƒX
+                                item.SubItems.Add(faceDef.Author);  // 1: »ìŽÒ
+                                item.SubItems.Add(faceDef.Version); // 2: ƒo[ƒWƒ‡ƒ“
+                                item.SubItems.Add(
+                                        (faceDef.WebSite != null ?
+                                        faceDef.WebSite.ToString() : "")); // 3: ƒEƒFƒuƒTƒCƒg
+                        } 
+                        catch (Exception ex) 
+                        {
+                                // TODO: Exception ‚©‚ç‚à‚Á‚Æ‹·‚ß‚éB
+                                MessageBox.Show(ex.ToString(), "MacFace for Windows", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         }
                 }

trunk/MacFaceFloat/MainForm.cs

@@ -211 +211 @@
                                 
                         if (prevUsage/10 != usage/10) {
-                                this.Graphics.Clear(Color.FromArgb(0, 0, 0, 0));
-                                foreach (Part part in _currentFaceDef.Pattern(FaceDef.PatternSuite.Normal, usage/10))
-                                {
-                                        this.Graphics.DrawImage(part.Image,
-                                                part.Point.X, part.Point.Y,
-                                                part.Image.Size.Width, part.Image.Size.Height);
-                                }
+                                Graphics g = this.Graphics;
+                                g.Clear(Color.FromArgb(0, 0, 0, 0));
+                                _currentFaceDef.DrawPattern(g, FaceDef.PatternSuite.Normal, usage/10);
                                 this.Update();
                         }

trunk/MacFaceLibrary/FaceDef.cs

@@ -8 +8 @@
 using System.IO;
 using System.Collections;
+using System.Drawing;
 
 namespace MacFace
@@ -35 +36 @@
                 private const int PatternRows = 3;
 
-                private string _path    = "";
-                private string _title   = "";
-                private string _author  = "";
-                private string _version = ""; /*Version*/
-                private Uri    _webSite = null;
-
-                internal PartList _parts = new PartList();
-                internal PartList[][] _patternSuites;
-                internal PartList _makers = new PartList();
-
-
-                // ctor
+                private string _path;
+                private string _title;
+                private string _author;
+                private string _version;
+                private Uri    _webSite;
+
+                private Part[] _parts;
+                private Part[][][] _patternSuites;
+                private Part[] _makers;
+
+
+                /// <summary>
+                /// ƒRƒ“ƒXƒgƒ‰ƒNƒ^B
+                /// </summary>
+                /// <param name="path">Šçƒpƒ^[ƒ“ƒtƒ@ƒCƒ‹‚̃pƒX</param>
                 public FaceDef(string path)
                 {
@@ -75 +79 @@
                         }
 
+                        _parts = new Part[partDefList.Count];
                         for (int i = 0; i < partDefList.Count; i++)
                         {
@@ -81 +86 @@
                                 int x = (int)partDef["pos x"];
                                 int y = (int)partDef["pos y"];
-                                _parts.Add(new Part(System.IO.Path.Combine(path, filename), x, y));
+                                _parts[i] = new Part(System.IO.Path.Combine(path, filename), x, y);
                         }
 
-                        _patternSuites = new PartList[PatternCols][];
-                        ArrayList patternDefSuites = def["pattern"] as ArrayList;
+                        ArrayList suiteDefList = (ArrayList)def["pattern"];
+                        _patternSuites = new Part[PatternRows][][];
                         for (int i = 0; i < PatternRows; i++) 
                         {
-                                PartList[] suite = new PartList[PatternCols];
-                                ArrayList patternDefList = patternDefSuites[i] as ArrayList;
+                                ArrayList suiteDef = (ArrayList)suiteDefList[i];
+                                Part[][] suite = new Part[PatternCols][];
                                 for (int j = 0; j < PatternCols; j++) 
                                 {
-                                        PartList pattern = new PartList();
-                                        foreach (int partNo in (ArrayList)patternDefList[j]) 
+                                        ArrayList patternDef = (ArrayList)suiteDef[j];
+                                        Part[] pattern = new Part[patternDef.Count];
+                                        for (int k = 0; k < patternDef.Count; k++) 
                                         {
-                                                pattern.Add(_parts[partNo]);
+                                                pattern[k] = _parts[(int)patternDef[k]];
                                         }
                                         suite[j] = pattern;
@@ -103 +109 @@
                 }
 
-                public PartList Markers
-                {
-                        get { return _makers; }
-                }
-
-                public PartList Parts
-                {
-                        get { return _parts; }
-                }
-
                 public Uri WebSite
                 {
@@ -138 +134 @@
                 }
 
-                public PartList Pattern(PatternSuite suite, int no)
-                {
-                        return _patternSuites[(int)suite][no];
+                public void DrawPattern(Graphics g, PatternSuite suite, int no)
+                {
+                        Part[] pattern = _patternSuites[(int)suite][no];
+                        foreach (Part part in pattern)
+                        {
+                                g.DrawImage(part.Image,
+                                        part.Point.X, part.Point.Y,
+                                        part.Image.Size.Width, part.Image.Size.Height);
+                        }
+                }
+
+                public Image PatternImage(PatternSuite suite, int no)
+                {
+                        Bitmap image = new Bitmap(128, 128);
+                        Graphics g = Graphics.FromImage(image);
+                        DrawPattern(g, suite, no);
+                        g.Dispose();
+                        return image;
                 }
         }

trunk/MacFaceLibrary/MacFaceLibrary.csproj

@@ -115 +115 @@
                 />
                 <File
-                    RelPath = "PartList.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
                     RelPath = "PropertyList.cs"
                     SubType = "Code"