| リビジョン | 20cb6e5d68f8818ced96eb21732097025922a660 (tree) |
|---|---|
| 日時 | 2012-10-29 00:53:48 |
| 作者 | konekoneko <jbh03215@hotm...> |
| コミッター | konekoneko |
レタリング方式の選択方法を変更した
D2DBench/Form1.Designer.cs (diff) D2DBench/Form1.cs (diff)| @@ -40,15 +40,15 @@ | ||
| 40 | 40 | this.fillrate = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); |
| 41 | 41 | this.label2 = new System.Windows.Forms.Label(); |
| 42 | 42 | this.comboBox1 = new System.Windows.Forms.ComboBox(); |
| 43 | - this.checkBox1 = new System.Windows.Forms.CheckBox(); | |
| 44 | - this.checkBox2 = new System.Windows.Forms.CheckBox(); | |
| 45 | 43 | this.label1 = new System.Windows.Forms.Label(); |
| 46 | 44 | this.comboBox2 = new System.Windows.Forms.ComboBox(); |
| 45 | + this.comboBox3 = new System.Windows.Forms.ComboBox(); | |
| 46 | + this.label3 = new System.Windows.Forms.Label(); | |
| 47 | 47 | this.SuspendLayout(); |
| 48 | 48 | // |
| 49 | 49 | // button1 |
| 50 | 50 | // |
| 51 | - this.button1.Location = new System.Drawing.Point(153, 249); | |
| 51 | + this.button1.Location = new System.Drawing.Point(150, 232); | |
| 52 | 52 | this.button1.Name = "button1"; |
| 53 | 53 | this.button1.Size = new System.Drawing.Size(64, 20); |
| 54 | 54 | this.button1.TabIndex = 1; |
| @@ -58,7 +58,7 @@ | ||
| 58 | 58 | // |
| 59 | 59 | // button4 |
| 60 | 60 | // |
| 61 | - this.button4.Location = new System.Drawing.Point(222, 249); | |
| 61 | + this.button4.Location = new System.Drawing.Point(219, 232); | |
| 62 | 62 | this.button4.Name = "button4"; |
| 63 | 63 | this.button4.Size = new System.Drawing.Size(76, 20); |
| 64 | 64 | this.button4.TabIndex = 11; |
| @@ -154,26 +154,6 @@ | ||
| 154 | 154 | this.comboBox1.Size = new System.Drawing.Size(104, 20); |
| 155 | 155 | this.comboBox1.TabIndex = 20; |
| 156 | 156 | // |
| 157 | - // checkBox1 | |
| 158 | - // | |
| 159 | - this.checkBox1.AutoSize = true; | |
| 160 | - this.checkBox1.Location = new System.Drawing.Point(12, 206); | |
| 161 | - this.checkBox1.Name = "checkBox1"; | |
| 162 | - this.checkBox1.Size = new System.Drawing.Size(187, 16); | |
| 163 | - this.checkBox1.TabIndex = 21; | |
| 164 | - this.checkBox1.Text = "GDIで行う（未チェックだとDirect2D)"; | |
| 165 | - this.checkBox1.UseVisualStyleBackColor = true; | |
| 166 | - // | |
| 167 | - // checkBox2 | |
| 168 | - // | |
| 169 | - this.checkBox2.AutoSize = true; | |
| 170 | - this.checkBox2.Location = new System.Drawing.Point(12, 227); | |
| 171 | - this.checkBox2.Name = "checkBox2"; | |
| 172 | - this.checkBox2.Size = new System.Drawing.Size(217, 16); | |
| 173 | - this.checkBox2.TabIndex = 22; | |
| 174 | - this.checkBox2.Text = "アンチエイリアシングを行う(Direct2Dのみ）"; | |
| 175 | - this.checkBox2.UseVisualStyleBackColor = true; | |
| 176 | - // | |
| 177 | 157 | // label1 |
| 178 | 158 | // |
| 179 | 159 | this.label1.AutoSize = true; |
| @@ -198,15 +178,36 @@ | ||
| 198 | 178 | this.comboBox2.Size = new System.Drawing.Size(104, 20); |
| 199 | 179 | this.comboBox2.TabIndex = 24; |
| 200 | 180 | // |
| 181 | + // comboBox3 | |
| 182 | + // | |
| 183 | + this.comboBox3.FormattingEnabled = true; | |
| 184 | + this.comboBox3.Items.AddRange(new object[] { | |
| 185 | + "GDI", | |
| 186 | + "Direct2D(エイリアス)", | |
| 187 | + "Direct2D(アンチエイリアス)"}); | |
| 188 | + this.comboBox3.Location = new System.Drawing.Point(110, 206); | |
| 189 | + this.comboBox3.Name = "comboBox3"; | |
| 190 | + this.comboBox3.Size = new System.Drawing.Size(146, 20); | |
| 191 | + this.comboBox3.TabIndex = 26; | |
| 192 | + // | |
| 193 | + // label3 | |
| 194 | + // | |
| 195 | + this.label3.AutoSize = true; | |
| 196 | + this.label3.Location = new System.Drawing.Point(9, 210); | |
| 197 | + this.label3.Name = "label3"; | |
| 198 | + this.label3.Size = new System.Drawing.Size(53, 12); | |
| 199 | + this.label3.TabIndex = 25; | |
| 200 | + this.label3.Text = "実行方式"; | |
| 201 | + // | |
| 201 | 202 | // Form1 |
| 202 | 203 | // |
| 203 | 204 | this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); |
| 204 | 205 | this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; |
| 205 | - this.ClientSize = new System.Drawing.Size(311, 277); | |
| 206 | + this.ClientSize = new System.Drawing.Size(311, 260); | |
| 207 | + this.Controls.Add(this.comboBox3); | |
| 208 | + this.Controls.Add(this.label3); | |
| 206 | 209 | this.Controls.Add(this.comboBox2); |
| 207 | 210 | this.Controls.Add(this.label1); |
| 208 | - this.Controls.Add(this.checkBox2); | |
| 209 | - this.Controls.Add(this.checkBox1); | |
| 210 | 211 | this.Controls.Add(this.comboBox1); |
| 211 | 212 | this.Controls.Add(this.label2); |
| 212 | 213 | this.Controls.Add(this.listView1); |
| @@ -236,11 +237,11 @@ | ||
| 236 | 237 | private System.Windows.Forms.ColumnHeader time; |
| 237 | 238 | private System.Windows.Forms.Label label2; |
| 238 | 239 | private System.Windows.Forms.ComboBox comboBox1; |
| 239 | - private System.Windows.Forms.CheckBox checkBox1; | |
| 240 | 240 | private System.Windows.Forms.ColumnHeader fillrate; |
| 241 | - private System.Windows.Forms.CheckBox checkBox2; | |
| 242 | 241 | private System.Windows.Forms.Label label1; |
| 243 | 242 | private System.Windows.Forms.ComboBox comboBox2; |
| 243 | + private System.Windows.Forms.ComboBox comboBox3; | |
| 244 | + private System.Windows.Forms.Label label3; | |
| 244 | 245 | } |
| 245 | 246 | } |
| 246 | 247 |
| @@ -18,10 +18,9 @@ namespace D2DBench | ||
| 18 | 18 | this.comboBox1.SelectedIndex = 0; |
| 19 | 19 | this.comboBox2.SelectedIndex = 0; |
| 20 | 20 | if (Environment.OSVersion.Version.Major <= 5) |
| 21 | - { | |
| 22 | - this.checkBox1.Checked = true; | |
| 23 | - this.checkBox1.Enabled = false; | |
| 24 | - } | |
| 21 | + this.comboBox3.SelectedIndex = 0; | |
| 22 | + else | |
| 23 | + this.comboBox3.SelectedIndex = 1; | |
| 25 | 24 | } |
| 26 | 25 | |
| 27 | 26 | public const int ExecuteCountPerOneset = 50; |
| @@ -39,24 +38,24 @@ namespace D2DBench | ||
| 39 | 38 | |
| 40 | 39 | List<IBench> methods = new List<IBench>(); |
| 41 | 40 | |
| 42 | - if (this.checkBox1.Checked == false) | |
| 43 | - { | |
| 44 | - methods.Add(new Method1()); | |
| 45 | - methods.Add(new Method2()); | |
| 46 | - methods.Add(new Method3()); | |
| 47 | - methods.Add(new Method4()); | |
| 48 | - } | |
| 49 | - else | |
| 41 | + if (this.comboBox3.SelectedIndex == 0) | |
| 50 | 42 | { |
| 51 | 43 | methods.Add(new Method5()); |
| 52 | 44 | methods.Add(new Method6()); |
| 53 | 45 | methods.Add(new Method7()); |
| 54 | 46 | methods.Add(new Method8()); |
| 55 | 47 | } |
| 48 | + else | |
| 49 | + { | |
| 50 | + methods.Add(new Method1()); | |
| 51 | + methods.Add(new Method2()); | |
| 52 | + methods.Add(new Method3()); | |
| 53 | + methods.Add(new Method4()); | |
| 54 | + } | |
| 56 | 55 | |
| 57 | 56 | foreach (IBench method in methods) |
| 58 | 57 | { |
| 59 | - method.Init(benchFrom,this.checkBox2.Checked); | |
| 58 | + method.Init(benchFrom,this.comboBox3.SelectedIndex == 2); | |
| 60 | 59 | method.loopCount = loopCountAtOneLoop; |
| 61 | 60 | |
| 62 | 61 | Stopwatch watch = new Stopwatch(); |
| @@ -93,7 +92,7 @@ namespace D2DBench | ||
| 93 | 92 | result.AppendFormat("ウィンドウサイズ:{0}×{1}\r\n", this.textBox4.Text, this.textBox5.Text); |
| 94 | 93 | result.AppendFormat("ループ回数:{0}\r\n", (string)this.comboBox1.SelectedItem); |
| 95 | 94 | result.AppendFormat("実行回数/１ループ:{0}\r\n", (string)this.comboBox2.SelectedItem); |
| 96 | - result.AppendFormat("アンチエイリアシング:{0}\r\n", this.checkBox2.Checked.ToString()); | |
| 95 | + result.AppendFormat("実行方式:{0}\r\n", this.comboBox3.SelectedItem.ToString()); | |
| 97 | 96 | foreach (string proc in HWInfo.processorNames) |
| 98 | 97 | result.AppendFormat("CPU:{0}\r\n",proc); |
| 99 | 98 | foreach (string vga in HWInfo.vgaNames) |
Fork