１ループあたりの実行回数を指定できるようにした

[d2dbench/d2dbench.git] / D2DBench / Form1.cs

diff --git a/D2DBench/Form1.cs b/D2DBench/Form1.cs
index f6e0b36..e528ca1 100644 (file)
--- a/D2DBench/Form1.cs
+++ b/D2DBench/Form1.cs
@@ -16,6 +16,7 @@ namespace D2DBench
             this.textBox4.Text = Screen.GetBounds(this).Size.Width.ToString();\r
             this.textBox5.Text = Screen.GetBounds(this).Size.Height.ToString();\r
             this.comboBox1.SelectedIndex = 0;\r
+            this.comboBox2.SelectedIndex = 0;\r
             if (Environment.OSVersion.Version.Major <= 5)\r
             {\r
                 this.checkBox1.Checked = true;\r
@@ -28,6 +29,9 @@ namespace D2DBench
         private void button1_Click(object sender, EventArgs e)\r
         {\r
             int maxcount = Int32.Parse(this.comboBox1.SelectedItem.ToString());\r
+            int loopCountAtOneLoop = ExecuteCountPerOneset;\r
+            if(this.comboBox2.SelectedItem != null)\r
+                loopCountAtOneLoop = Int32.Parse(this.comboBox2.SelectedItem.ToString());\r
 \r
             this.listView1.Items.Clear();\r
 \r
@@ -53,6 +57,7 @@ namespace D2DBench
             foreach (IBench method in methods)\r
             {\r
                 method.Init(benchFrom,this.checkBox2.Checked);\r
+                method.loopCount = loopCountAtOneLoop;\r
 \r
                 Stopwatch watch = new Stopwatch();\r
                 watch.Start();\r
@@ -86,7 +91,8 @@ namespace D2DBench
             StringBuilder result = new StringBuilder();\r
             result.AppendFormat("OS:{0}\r\n", Environment.OSVersion.VersionString);\r
             result.AppendFormat("ウィンドウサイズ:{0}×{1}\r\n", this.textBox4.Text, this.textBox5.Text);\r
-            result.AppendFormat("実行回数:{0}\r\n", (string)this.comboBox1.SelectedItem);\r
+            result.AppendFormat("ループ回数:{0}\r\n", (string)this.comboBox1.SelectedItem);\r
+            result.AppendFormat("実行回数/１ループ:{0}\r\n", (string)this.comboBox2.SelectedItem);\r
             result.AppendFormat("アンチエイリアシング:{0}\r\n", this.checkBox2.Checked.ToString());\r
             foreach (string proc in HWInfo.processorNames)\r
                 result.AppendFormat("CPU:{0}\r\n",proc);\r