diff --git a/ISCamRecorder/App.config b/ISCamRecorder/App.config index 7d84477..a58a46e 100644 --- a/ISCamRecorder/App.config +++ b/ISCamRecorder/App.config @@ -1,14 +1,14 @@ - + - + - - + + - \ No newline at end of file + diff --git a/ISCamRecorder/ISCamRecorder.csproj b/ISCamRecorder/ISCamRecorder.csproj index 965f723..203d441 100644 --- a/ISCamRecorder/ISCamRecorder.csproj +++ b/ISCamRecorder/ISCamRecorder.csproj @@ -9,12 +9,13 @@ WinExe ISCamRecorder ISCamRecorder - v4.7.2 + v4.8 512 true true + AnyCPU @@ -139,6 +140,7 @@ True Resources.resx + True diff --git a/ISCamRecorder/MainForm.Designer.cs b/ISCamRecorder/MainForm.Designer.cs index 3b1c05e..a256948 100644 --- a/ISCamRecorder/MainForm.Designer.cs +++ b/ISCamRecorder/MainForm.Designer.cs @@ -64,6 +64,8 @@ this.label7 = new System.Windows.Forms.Label(); this.CboImageType = new System.Windows.Forms.ComboBox(); this.ChkStartSW = new System.Windows.Forms.CheckBox(); + this.label8 = new System.Windows.Forms.Label(); + this.TxtSubjectName = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -129,7 +131,7 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer1.Size = new System.Drawing.Size(892, 496); + this.splitContainer1.Size = new System.Drawing.Size(980, 496); this.splitContainer1.SplitterDistance = 248; this.splitContainer1.TabIndex = 7; // @@ -147,8 +149,8 @@ // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer2.Size = new System.Drawing.Size(892, 248); - this.splitContainer2.SplitterDistance = 296; + this.splitContainer2.Size = new System.Drawing.Size(980, 248); + this.splitContainer2.SplitterDistance = 325; this.splitContainer2.TabIndex = 0; // // TxtCvCamera @@ -159,7 +161,7 @@ this.TxtCvCamera.Location = new System.Drawing.Point(3, 3); this.TxtCvCamera.Name = "TxtCvCamera"; this.TxtCvCamera.ReadOnly = true; - this.TxtCvCamera.Size = new System.Drawing.Size(290, 19); + this.TxtCvCamera.Size = new System.Drawing.Size(319, 19); this.TxtCvCamera.TabIndex = 3; this.TxtCvCamera.Text = "追加カメラ"; // @@ -170,7 +172,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.PicCvCamera.Location = new System.Drawing.Point(3, 28); this.PicCvCamera.Name = "PicCvCamera"; - this.PicCvCamera.Size = new System.Drawing.Size(290, 218); + this.PicCvCamera.Size = new System.Drawing.Size(319, 218); this.PicCvCamera.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.PicCvCamera.TabIndex = 0; this.PicCvCamera.TabStop = false; @@ -190,8 +192,8 @@ // this.splitContainer3.Panel2.Controls.Add(this.TxtSensor); this.splitContainer3.Panel2.Controls.Add(this.chart1); - this.splitContainer3.Size = new System.Drawing.Size(592, 248); - this.splitContainer3.SplitterDistance = 296; + this.splitContainer3.Size = new System.Drawing.Size(651, 248); + this.splitContainer3.SplitterDistance = 325; this.splitContainer3.TabIndex = 0; // // TxtTop @@ -202,7 +204,7 @@ this.TxtTop.Location = new System.Drawing.Point(4, 3); this.TxtTop.Name = "TxtTop"; this.TxtTop.ReadOnly = true; - this.TxtTop.Size = new System.Drawing.Size(288, 19); + this.TxtTop.Size = new System.Drawing.Size(317, 19); this.TxtTop.TabIndex = 2; // // icTop @@ -217,7 +219,7 @@ this.icTop.LiveDisplayPosition = new System.Drawing.Point(0, 0); this.icTop.Location = new System.Drawing.Point(4, 28); this.icTop.Name = "icTop"; - this.icTop.Size = new System.Drawing.Size(290, 218); + this.icTop.Size = new System.Drawing.Size(319, 218); this.icTop.TabIndex = 1; // // TxtSensor @@ -228,7 +230,7 @@ this.TxtSensor.Location = new System.Drawing.Point(3, 3); this.TxtSensor.Name = "TxtSensor"; this.TxtSensor.ReadOnly = true; - this.TxtSensor.Size = new System.Drawing.Size(288, 19); + this.TxtSensor.Size = new System.Drawing.Size(318, 19); this.TxtSensor.TabIndex = 3; this.TxtSensor.Text = "逆血センサー"; // @@ -280,7 +282,7 @@ this.chart1.Series.Add(series1); this.chart1.Series.Add(series2); this.chart1.Series.Add(series3); - this.chart1.Size = new System.Drawing.Size(286, 220); + this.chart1.Size = new System.Drawing.Size(316, 220); this.chart1.TabIndex = 0; this.chart1.Text = "chart1"; // @@ -298,8 +300,8 @@ // splitContainer4.Panel2 // this.splitContainer4.Panel2.Controls.Add(this.splitContainer5); - this.splitContainer4.Size = new System.Drawing.Size(892, 244); - this.splitContainer4.SplitterDistance = 296; + this.splitContainer4.Size = new System.Drawing.Size(980, 244); + this.splitContainer4.SplitterDistance = 325; this.splitContainer4.TabIndex = 0; // // TxtLeft @@ -310,7 +312,7 @@ this.TxtLeft.Location = new System.Drawing.Point(3, 3); this.TxtLeft.Name = "TxtLeft"; this.TxtLeft.ReadOnly = true; - this.TxtLeft.Size = new System.Drawing.Size(288, 19); + this.TxtLeft.Size = new System.Drawing.Size(317, 19); this.TxtLeft.TabIndex = 4; // // icLeft @@ -325,7 +327,7 @@ this.icLeft.LiveDisplayPosition = new System.Drawing.Point(0, 0); this.icLeft.Location = new System.Drawing.Point(3, 28); this.icLeft.Name = "icLeft"; - this.icLeft.Size = new System.Drawing.Size(291, 213); + this.icLeft.Size = new System.Drawing.Size(320, 213); this.icLeft.TabIndex = 3; // // splitContainer5 @@ -343,8 +345,8 @@ // this.splitContainer5.Panel2.Controls.Add(this.TxtRight); this.splitContainer5.Panel2.Controls.Add(this.icRight); - this.splitContainer5.Size = new System.Drawing.Size(592, 244); - this.splitContainer5.SplitterDistance = 296; + this.splitContainer5.Size = new System.Drawing.Size(651, 244); + this.splitContainer5.SplitterDistance = 325; this.splitContainer5.TabIndex = 0; // // TxtFront @@ -355,7 +357,7 @@ this.TxtFront.Location = new System.Drawing.Point(3, 3); this.TxtFront.Name = "TxtFront"; this.TxtFront.ReadOnly = true; - this.TxtFront.Size = new System.Drawing.Size(288, 19); + this.TxtFront.Size = new System.Drawing.Size(317, 19); this.TxtFront.TabIndex = 10; // // icFront @@ -370,7 +372,7 @@ this.icFront.LiveDisplayPosition = new System.Drawing.Point(0, 0); this.icFront.Location = new System.Drawing.Point(3, 28); this.icFront.Name = "icFront"; - this.icFront.Size = new System.Drawing.Size(289, 213); + this.icFront.Size = new System.Drawing.Size(318, 213); this.icFront.TabIndex = 9; // // TxtRight @@ -381,7 +383,7 @@ this.TxtRight.Location = new System.Drawing.Point(1, 3); this.TxtRight.Name = "TxtRight"; this.TxtRight.ReadOnly = true; - this.TxtRight.Size = new System.Drawing.Size(288, 19); + this.TxtRight.Size = new System.Drawing.Size(318, 19); this.TxtRight.TabIndex = 11; // // icRight @@ -396,7 +398,7 @@ this.icRight.LiveDisplayPosition = new System.Drawing.Point(0, 0); this.icRight.Location = new System.Drawing.Point(1, 28); this.icRight.Name = "icRight"; - this.icRight.Size = new System.Drawing.Size(288, 213); + this.icRight.Size = new System.Drawing.Size(318, 213); this.icRight.TabIndex = 5; // // TxtRecodingDulation @@ -567,11 +569,30 @@ this.ChkStartSW.UseVisualStyleBackColor = true; this.ChkStartSW.CheckedChanged += new System.EventHandler(this.ChkStartSW_CheckedChanged); // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(834, 11); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(53, 12); + this.label8.TabIndex = 23; + this.label8.Text = "被測定者"; + // + // TxtSubjectName + // + this.TxtSubjectName.Location = new System.Drawing.Point(836, 34); + this.TxtSubjectName.Name = "TxtSubjectName"; + this.TxtSubjectName.Size = new System.Drawing.Size(143, 19); + this.TxtSubjectName.TabIndex = 24; + this.TxtSubjectName.Text = "person1"; + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(892, 555); + this.ClientSize = new System.Drawing.Size(980, 555); + this.Controls.Add(this.TxtSubjectName); + this.Controls.Add(this.label8); this.Controls.Add(this.ChkStartSW); this.Controls.Add(this.CboImageType); this.Controls.Add(this.TxtMovieRate); @@ -672,6 +693,8 @@ private System.Windows.Forms.PictureBox PicCvCamera; private System.Windows.Forms.TextBox TxtCvCamera; private System.Windows.Forms.CheckBox ChkStartSW; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.TextBox TxtSubjectName; } } diff --git a/ISCamRecorder/MainForm.cs b/ISCamRecorder/MainForm.cs index e617f4b..683a22e 100644 --- a/ISCamRecorder/MainForm.cs +++ b/ISCamRecorder/MainForm.cs @@ -57,7 +57,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}"); } } // データ保存フォルダ + public string OutputDir { get { return Path.Combine(OutputBaseDir, $"rec{RecodingTimeStr}_{TxtSubjectName.Text}"); } } // データ保存フォルダ public string ImageType { get; private set; } // 画像保存形式 public int MovieRate { get; private set; } // 動画レート public bool SwitchEnabled { get; private set; } diff --git a/ISCamRecorder/Properties/Resources.Designer.cs b/ISCamRecorder/Properties/Resources.Designer.cs index 881d722..5b63775 100644 --- a/ISCamRecorder/Properties/Resources.Designer.cs +++ b/ISCamRecorder/Properties/Resources.Designer.cs @@ -4,47 +4,48 @@ // ランタイム バージョン:4.0.30319.42000 // // このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 -// コードが再生成されるときに損失したりします +// コードが再生成されるときに損失したりします。 // //------------------------------------------------------------------------------ namespace ISCamRecorder.Properties { - - + using System; + + /// /// ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。 /// // このクラスは StronglyTypedResourceBuilder クラスが ResGen // または Visual Studio のようなツールを使用して自動生成されました。 // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に - // ResGen を実行し直すか、または VS プロジェクトをリビルドします。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// - /// このクラスで使用されるキャッシュされた ResourceManager インスタンスを返します。 + /// このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { - if ((resourceMan == null)) { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ISCamRecorder.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// すべてについて、現在のスレッドの CurrentUICulture プロパティをオーバーライドします /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 diff --git a/ISCamRecorder/Properties/Settings.Designer.cs b/ISCamRecorder/Properties/Settings.Designer.cs index 8b279f8..c0ed724 100644 --- a/ISCamRecorder/Properties/Settings.Designer.cs +++ b/ISCamRecorder/Properties/Settings.Designer.cs @@ -1,22 +1,22 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// このコードはツールによって生成されました。 +// ランタイム バージョン:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 +// コードが再生成されるときに損失したりします。 // //------------------------------------------------------------------------------ namespace ISCamRecorder.Properties { - - + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - + public static Settings Default { get { return defaultInstance;