OSDN -- オープンソース・ソフトウェアの開発とダウンロード
日本語の翻訳状況 translation status for ja
  • R/O
  • SSH
  • HTTPS

shoginextmove: コミット


コミットメタ情報

リビジョン53 (tree)
日時2014-09-12 11:13:59
作者bellyoshi

ログメッセージ

変更サマリ

差分

--- ShogiNextMove/frmMain.Designer.vb (revision 52)
+++ ShogiNextMove/frmMain.Designer.vb (revision 53)
@@ -22,7 +22,7 @@
2222 'コード エディターを使って変更しないでください。
2323 <System.Diagnostics.DebuggerStepThrough()> _
2424 Private Sub InitializeComponent()
25- Dim Kyokumen4 As ShogiNextMove.Board.Kyokumen = New ShogiNextMove.Board.Kyokumen()
25+ Dim Kyokumen1 As ShogiNextMove.Board.Kyokumen = New ShogiNextMove.Board.Kyokumen()
2626 Me.btnAnswer = New System.Windows.Forms.Button()
2727 Me.btnNextQuestion = New System.Windows.Forms.Button()
2828 Me.gbMode = New System.Windows.Forms.GroupBox()
@@ -33,16 +33,17 @@
3333 Me.gbEditMode = New System.Windows.Forms.GroupBox()
3434 Me.rbNextMove = New System.Windows.Forms.RadioButton()
3535 Me.rbFirstKyokumen = New System.Windows.Forms.RadioButton()
36- Me.Viewer = New ShogiNextMove.Control.Board.BoardViewer()
3736 Me.KifuSavefileDaialog = New System.Windows.Forms.SaveFileDialog()
3837 Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
3938 Me.FirstKyokumenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
4039 Me.HirateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
4140 Me.TsumeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
41+ Me.lblPoint = New System.Windows.Forms.Label()
42+ Me.Viewer = New ShogiNextMove.Control.Board.BoardViewer()
4243 Me.gbMode.SuspendLayout()
4344 Me.gbEditMode.SuspendLayout()
45+ Me.MenuStrip1.SuspendLayout()
4446 CType(Me.Viewer, System.ComponentModel.ISupportInitialize).BeginInit()
45- Me.MenuStrip1.SuspendLayout()
4647 Me.SuspendLayout()
4748 '
4849 'btnAnswer
@@ -67,7 +68,7 @@
6768 '
6869 Me.gbMode.Controls.Add(Me.rbPlay)
6970 Me.gbMode.Controls.Add(Me.rbEdit)
70- Me.gbMode.Location = New System.Drawing.Point(619, 173)
71+ Me.gbMode.Location = New System.Drawing.Point(620, 237)
7172 Me.gbMode.Name = "gbMode"
7273 Me.gbMode.Size = New System.Drawing.Size(73, 71)
7374 Me.gbMode.TabIndex = 4
@@ -115,7 +116,7 @@
115116 '
116117 Me.gbEditMode.Controls.Add(Me.rbNextMove)
117118 Me.gbEditMode.Controls.Add(Me.rbFirstKyokumen)
118- Me.gbEditMode.Location = New System.Drawing.Point(619, 260)
119+ Me.gbEditMode.Location = New System.Drawing.Point(620, 324)
119120 Me.gbEditMode.Name = "gbEditMode"
120121 Me.gbEditMode.Size = New System.Drawing.Size(111, 71)
121122 Me.gbEditMode.TabIndex = 4
@@ -144,18 +145,6 @@
144145 Me.rbFirstKyokumen.Text = "初期画面編集"
145146 Me.rbFirstKyokumen.UseVisualStyleBackColor = True
146147 '
147- 'Viewer
148- '
149- Me.Viewer.IsBoardViewRotated = False
150- Me.Viewer.KomabakoVisible = False
151- Kyokumen4.Comment = Nothing
152- Me.Viewer.kyokumen = Kyokumen4
153- Me.Viewer.Location = New System.Drawing.Point(0, 33)
154- Me.Viewer.Name = "Viewer"
155- Me.Viewer.Size = New System.Drawing.Size(585, 546)
156- Me.Viewer.TabIndex = 3
157- Me.Viewer.TabStop = False
158- '
159148 'MenuStrip1
160149 '
161150 Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FirstKyokumenToolStripMenuItem})
@@ -175,20 +164,41 @@
175164 'HirateToolStripMenuItem
176165 '
177166 Me.HirateToolStripMenuItem.Name = "HirateToolStripMenuItem"
178- Me.HirateToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
167+ Me.HirateToolStripMenuItem.Size = New System.Drawing.Size(124, 22)
179168 Me.HirateToolStripMenuItem.Text = "平手"
180169 '
181170 'TsumeToolStripMenuItem
182171 '
183172 Me.TsumeToolStripMenuItem.Name = "TsumeToolStripMenuItem"
184- Me.TsumeToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
173+ Me.TsumeToolStripMenuItem.Size = New System.Drawing.Size(124, 22)
185174 Me.TsumeToolStripMenuItem.Text = "詰め将棋"
186175 '
176+ 'lblPoint
177+ '
178+ Me.lblPoint.Location = New System.Drawing.Point(624, 171)
179+ Me.lblPoint.Name = "lblPoint"
180+ Me.lblPoint.Size = New System.Drawing.Size(100, 23)
181+ Me.lblPoint.TabIndex = 7
182+ Me.lblPoint.Text = "得点："
183+ '
184+ 'Viewer
185+ '
186+ Me.Viewer.IsBoardViewRotated = False
187+ Me.Viewer.KomabakoVisible = False
188+ Kyokumen1.Comment = Nothing
189+ Me.Viewer.kyokumen = Kyokumen1
190+ Me.Viewer.Location = New System.Drawing.Point(0, 33)
191+ Me.Viewer.Name = "Viewer"
192+ Me.Viewer.Size = New System.Drawing.Size(585, 546)
193+ Me.Viewer.TabIndex = 3
194+ Me.Viewer.TabStop = False
195+ '
187196 'frmMain
188197 '
189198 Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
190199 Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
191200 Me.ClientSize = New System.Drawing.Size(755, 589)
201+ Me.Controls.Add(Me.lblPoint)
192202 Me.Controls.Add(Me.Label1)
193203 Me.Controls.Add(Me.lblDecision)
194204 Me.Controls.Add(Me.gbEditMode)
@@ -204,9 +214,9 @@
204214 Me.gbMode.PerformLayout()
205215 Me.gbEditMode.ResumeLayout(False)
206216 Me.gbEditMode.PerformLayout()
207- CType(Me.Viewer, System.ComponentModel.ISupportInitialize).EndInit()
208217 Me.MenuStrip1.ResumeLayout(False)
209218 Me.MenuStrip1.PerformLayout()
219+ CType(Me.Viewer, System.ComponentModel.ISupportInitialize).EndInit()
210220 Me.ResumeLayout(False)
211221 Me.PerformLayout()
212222
@@ -227,5 +237,6 @@
227237 Friend WithEvents FirstKyokumenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
228238 Friend WithEvents HirateToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
229239 Friend WithEvents TsumeToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
240+ Friend WithEvents lblPoint As System.Windows.Forms.Label
230241
231242 End Class
--- ShogiNextMove/frmMain.vb (revision 52)
+++ ShogiNextMove/frmMain.vb (revision 53)
@@ -6,21 +6,18 @@
66
77 Private _editKifu As Board.Kifu.Kifu
88
9+ Dim closePoint As Integer = 0
10+
11+ Private _isLoaded As Boolean = False
12+
913 Private Sub frmMain_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
1014 Viewer.IsBoardViewRotated = False
1115 Viewer.Initialize()
12-
13- _kifuDataDirectoryReader = New KifuDataDirectoryReader
14- If _kifuDataDirectoryReader.hasNextFile Then
15- _kifuDataDirectoryReader.readNextFile()
16- viewer.kyokumen = _kifuDataDirectoryReader.CurrentKyokumen
17- viewer.DrawCurrentBitmap()
18- Else
19- viewer.kyokumen = New Board.Kyokumen
20- viewer.DrawCurrentBitmap()
21- End If
16+ Initialize()
17+
2218 EnabledControl()
2319 VisibleControl()
20+ _isLoaded = True
2421 End Sub
2522
2623 Private Sub btnAnswer_Click(sender As System.Object, e As System.EventArgs) Handles btnAnswer.Click
@@ -92,8 +89,22 @@
9289
9390 Private Sub rbPlay_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles rbPlay.CheckedChanged
9491 VisibleControl()
92+ If rbPlay.Checked AndAlso _isLoaded Then
93+ Initialize()
94+ End If
9595 End Sub
9696
97+ Private Sub Initialize()
98+ _kifuDataDirectoryReader = New KifuDataDirectoryReader
99+ If _kifuDataDirectoryReader.hasNextFile Then
100+ _kifuDataDirectoryReader.readNextFile()
101+ Viewer.kyokumen = _kifuDataDirectoryReader.CurrentKyokumen
102+ Viewer.DrawCurrentBitmap()
103+ Else
104+ Viewer.kyokumen = New Board.Kyokumen
105+ Viewer.DrawCurrentBitmap()
106+ End If
107+ End Sub
97108 Private Sub rbFirstKyokumen_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles rbFirstKyokumen.CheckedChanged
98109 VisibleControl()
99110 EnabledControl()
@@ -141,6 +152,8 @@
141152
142153 If e.MovingValue.Equals(_kifuDataDirectoryReader.Moving) Then
143154 lblDecision.Text = "正解"
155+ closePoint += 1
156+ lblPoint.Text = String.Format("得点:{0}/{1}", closePoint, _kifuDataDirectoryReader.Count)
144157 _kifuDataDirectoryReader.NextKyokumen()
145158 Else
146159 lblDecision.Text = "不正解"
@@ -176,4 +189,6 @@
176189 Viewer.kyokumen = New Board.Kyokumen(New Board.Haichi.Tsume)
177190 Viewer.DrawCurrentBitmap()
178191 End Sub
192+
193+
179194 End Class
--- ShogiNextMove/KifuDataDirectoryReader.vb (revision 52)
+++ ShogiNextMove/KifuDataDirectoryReader.vb (revision 53)
@@ -27,7 +27,13 @@
2727 End Get
2828 End Property
2929
30+ Public ReadOnly Property Count As Integer
31+ Get
32+ Return _file.Count
33+ End Get
34+ End Property
3035
36+
3137 Public Sub New()
3238
3339 Dim exeName As String = System.Reflection.Assembly.GetEntryAssembly().Location
旧リポジトリブラウザで表示