diff --git a/ISCamRecorder/MainForm.Designer.cs b/ISCamRecorder/MainForm.Designer.cs index 9fcaf6a..2218ccc 100644 --- a/ISCamRecorder/MainForm.Designer.cs +++ b/ISCamRecorder/MainForm.Designer.cs @@ -69,6 +69,8 @@ this.BtnOpenSubjList = new System.Windows.Forms.Button(); this.BtnNextSubject = new System.Windows.Forms.Button(); this.BtnPrevSubject = new System.Windows.Forms.Button(); + this.TxtCounter = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -410,7 +412,7 @@ this.TxtRecodingDulation.Name = "TxtRecodingDulation"; this.TxtRecodingDulation.Size = new System.Drawing.Size(34, 19); this.TxtRecodingDulation.TabIndex = 8; - this.TxtRecodingDulation.Text = "3"; + this.TxtRecodingDulation.Text = "30"; this.TxtRecodingDulation.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.TxtRecodingDulation.TextChanged += new System.EventHandler(this.TxtRecodingDulation_TextChanged); this.TxtRecodingDulation.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.NumberKeyOnly); @@ -585,7 +587,7 @@ // this.TxtSubjectName.Location = new System.Drawing.Point(836, 34); this.TxtSubjectName.Name = "TxtSubjectName"; - this.TxtSubjectName.Size = new System.Drawing.Size(168, 19); + this.TxtSubjectName.Size = new System.Drawing.Size(123, 19); this.TxtSubjectName.TabIndex = 24; this.TxtSubjectName.Text = "テスト"; // @@ -619,11 +621,32 @@ this.BtnPrevSubject.UseVisualStyleBackColor = true; this.BtnPrevSubject.Click += new System.EventHandler(this.BtnPrevSubject_Click); // + // TxtCounter + // + this.TxtCounter.Location = new System.Drawing.Point(965, 34); + this.TxtCounter.Name = "TxtCounter"; + this.TxtCounter.Size = new System.Drawing.Size(23, 19); + this.TxtCounter.TabIndex = 28; + this.TxtCounter.Text = "1"; + this.TxtCounter.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.TxtCounter.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.NumberKeyOnly); + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(987, 37); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(17, 12); + this.label9.TabIndex = 29; + this.label9.Text = "回"; + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1016, 555); + this.Controls.Add(this.label9); + this.Controls.Add(this.TxtCounter); this.Controls.Add(this.BtnPrevSubject); this.Controls.Add(this.BtnNextSubject); this.Controls.Add(this.BtnOpenSubjList); @@ -734,6 +757,8 @@ private System.Windows.Forms.Button BtnOpenSubjList; private System.Windows.Forms.Button BtnNextSubject; private System.Windows.Forms.Button BtnPrevSubject; + private System.Windows.Forms.TextBox TxtCounter; + private System.Windows.Forms.Label label9; } } diff --git a/ISCamRecorder/MainForm.cs b/ISCamRecorder/MainForm.cs index ebbd200..d41f3fd 100644 --- a/ISCamRecorder/MainForm.cs +++ b/ISCamRecorder/MainForm.cs @@ -58,7 +58,7 @@ public DateTime RecodingTime { get; private set; } = DateTime.Now; // 録画開始時間 public string RecodingTimeStr { get { return RecodingTime.ToString("yyyyMMdd_HHmmss"); } } // 録画開始時間文字列 public string OutputBaseDir { get { return TxtOutputDir.Text; } } // データ保存親フォルダ - public string OutputDir { get { return Path.Combine(OutputBaseDir, $"rec{RecodingTimeStr}_{TxtSubjectName.Text}"); } } // データ保存フォルダ + public string OutputDir { get { return Path.Combine(OutputBaseDir, $"rec{RecodingTimeStr}_{TxtSubjectName.Text}_{TxtCounter.Text}"); } } // データ保存フォルダ public string ImageType { get; private set; } // 画像保存形式 public int MovieRate { get; private set; } // 動画レート public bool SwitchEnabled { get; private set; } @@ -102,6 +102,7 @@ SwitchEnabled = ChkStartSW.Checked; #if DEBUG TxtSubjectName.Text = "デバッグ"; + TxtRecodingDulation.Text = "3"; #endif State = STATE.Idle; @@ -322,6 +323,7 @@ BtnRecodeMovie.BackColor = originalButtonColor; BtnRecodeMovie.Enabled = true; BtnSetProperty.Enabled = true; + TxtCounter.Text = (int.Parse(TxtCounter.Text) + 1).ToString(); }); State = STATE.Idle; } @@ -441,6 +443,7 @@ /// private void BtnNextSubject_Click(object sender, EventArgs e) { TxtSubjectName.Text = _SubjectList.Next(TxtSubjectName.Text); + TxtCounter.Text = "1"; } /// @@ -450,6 +453,7 @@ /// private void BtnPrevSubject_Click(object sender, EventArgs e) { TxtSubjectName.Text = _SubjectList.Previous(TxtSubjectName.Text); + TxtCounter.Text = "1"; } } }