diff --git a/ISCamRecorder/MainForm.Designer.cs b/ISCamRecorder/MainForm.Designer.cs index 594832e..fa3e59d 100644 --- a/ISCamRecorder/MainForm.Designer.cs +++ b/ISCamRecorder/MainForm.Designer.cs @@ -89,7 +89,8 @@ // // BtnSetProperty // - this.BtnSetProperty.Location = new System.Drawing.Point(976, 11); + this.BtnSetProperty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BtnSetProperty.Location = new System.Drawing.Point(970, 11); this.BtnSetProperty.Name = "BtnSetProperty"; this.BtnSetProperty.Size = new System.Drawing.Size(62, 34); this.BtnSetProperty.TabIndex = 5; @@ -114,8 +115,8 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer1.Size = new System.Drawing.Size(1050, 496); - this.splitContainer1.SplitterDistance = 248; + this.splitContainer1.Size = new System.Drawing.Size(1044, 582); + this.splitContainer1.SplitterDistance = 291; this.splitContainer1.TabIndex = 7; this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.SplitterMoved); // @@ -134,8 +135,8 @@ // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer2.Size = new System.Drawing.Size(1050, 248); - this.splitContainer2.SplitterDistance = 347; + this.splitContainer2.Size = new System.Drawing.Size(1044, 291); + this.splitContainer2.SplitterDistance = 345; this.splitContainer2.TabIndex = 0; this.splitContainer2.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.SplitterMoved); // @@ -147,7 +148,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(339, 19); + this.TxtCvCamera.Size = new System.Drawing.Size(337, 19); this.TxtCvCamera.TabIndex = 3; this.TxtCvCamera.Text = "近接カメラ"; // @@ -158,7 +159,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(339, 216); + this.PicCvCamera.Size = new System.Drawing.Size(337, 259); this.PicCvCamera.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.PicCvCamera.TabIndex = 0; this.PicCvCamera.TabStop = false; @@ -179,8 +180,8 @@ // this.splitContainer3.Panel2.Controls.Add(this.TxtSensor); this.splitContainer3.Panel2.Controls.Add(this.chart1); - this.splitContainer3.Size = new System.Drawing.Size(699, 248); - this.splitContainer3.SplitterDistance = 348; + this.splitContainer3.Size = new System.Drawing.Size(695, 291); + this.splitContainer3.SplitterDistance = 346; this.splitContainer3.TabIndex = 0; this.splitContainer3.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.SplitterMoved); // @@ -192,7 +193,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(338, 19); + this.TxtTop.Size = new System.Drawing.Size(336, 19); this.TxtTop.TabIndex = 2; // // icTop @@ -207,7 +208,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(340, 216); + this.icTop.Size = new System.Drawing.Size(338, 259); this.icTop.TabIndex = 1; // // TxtSensor @@ -218,7 +219,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(341, 19); + this.TxtSensor.Size = new System.Drawing.Size(339, 19); this.TxtSensor.TabIndex = 3; this.TxtSensor.Text = "逆血センサー"; // @@ -277,7 +278,7 @@ this.chart1.Series.Add(series1); this.chart1.Series.Add(series2); this.chart1.Series.Add(series3); - this.chart1.Size = new System.Drawing.Size(339, 218); + this.chart1.Size = new System.Drawing.Size(337, 261); this.chart1.TabIndex = 0; this.chart1.Text = "chart1"; // @@ -296,8 +297,8 @@ // splitContainer4.Panel2 // this.splitContainer4.Panel2.Controls.Add(this.splitContainer5); - this.splitContainer4.Size = new System.Drawing.Size(1050, 244); - this.splitContainer4.SplitterDistance = 347; + this.splitContainer4.Size = new System.Drawing.Size(1044, 287); + this.splitContainer4.SplitterDistance = 345; this.splitContainer4.TabIndex = 0; this.splitContainer4.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.SplitterMoved); // @@ -309,7 +310,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(337, 19); + this.TxtLeft.Size = new System.Drawing.Size(335, 19); this.TxtLeft.TabIndex = 4; // // icLeft @@ -324,7 +325,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(340, 211); + this.icLeft.Size = new System.Drawing.Size(338, 254); this.icLeft.TabIndex = 3; // // splitContainer5 @@ -343,8 +344,8 @@ // this.splitContainer5.Panel2.Controls.Add(this.TxtRight); this.splitContainer5.Panel2.Controls.Add(this.icRight); - this.splitContainer5.Size = new System.Drawing.Size(699, 244); - this.splitContainer5.SplitterDistance = 348; + this.splitContainer5.Size = new System.Drawing.Size(695, 287); + this.splitContainer5.SplitterDistance = 346; this.splitContainer5.TabIndex = 0; this.splitContainer5.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.SplitterMoved); // @@ -356,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(338, 19); + this.TxtFront.Size = new System.Drawing.Size(336, 19); this.TxtFront.TabIndex = 10; // // icFront @@ -371,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(339, 211); + this.icFront.Size = new System.Drawing.Size(337, 254); this.icFront.TabIndex = 9; // // TxtRight @@ -382,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(341, 19); + this.TxtRight.Size = new System.Drawing.Size(339, 19); this.TxtRight.TabIndex = 11; // // icRight @@ -397,14 +398,14 @@ 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(341, 211); + this.icRight.Size = new System.Drawing.Size(339, 254); this.icRight.TabIndex = 5; // // BtnRecodeMovie // - this.BtnRecodeMovie.Location = new System.Drawing.Point(175, 12); + this.BtnRecodeMovie.Location = new System.Drawing.Point(175, 7); this.BtnRecodeMovie.Name = "BtnRecodeMovie"; - this.BtnRecodeMovie.Size = new System.Drawing.Size(75, 34); + this.BtnRecodeMovie.Size = new System.Drawing.Size(88, 42); this.BtnRecodeMovie.TabIndex = 15; this.BtnRecodeMovie.Text = "録画"; this.BtnRecodeMovie.UseVisualStyleBackColor = true; @@ -412,9 +413,9 @@ // // BtnSnapImage // - this.BtnSnapImage.Location = new System.Drawing.Point(256, 12); + this.BtnSnapImage.Location = new System.Drawing.Point(269, 7); this.BtnSnapImage.Name = "BtnSnapImage"; - this.BtnSnapImage.Size = new System.Drawing.Size(75, 34); + this.BtnSnapImage.Size = new System.Drawing.Size(62, 42); this.BtnSnapImage.TabIndex = 18; this.BtnSnapImage.Text = "撮影"; this.BtnSnapImage.UseVisualStyleBackColor = true; @@ -431,18 +432,21 @@ // // TxtSubjectName // + this.TxtSubjectName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.TxtSubjectName.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); this.TxtSubjectName.Location = new System.Drawing.Point(487, 14); this.TxtSubjectName.Name = "TxtSubjectName"; - this.TxtSubjectName.Size = new System.Drawing.Size(319, 31); + this.TxtSubjectName.Size = new System.Drawing.Size(326, 31); this.TxtSubjectName.TabIndex = 24; this.TxtSubjectName.Text = "テスト"; // // BtnSetting // - this.BtnSetting.Location = new System.Drawing.Point(876, 12); + this.BtnSetting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BtnSetting.Location = new System.Drawing.Point(889, 12); this.BtnSetting.Name = "BtnSetting"; - this.BtnSetting.Size = new System.Drawing.Size(94, 34); + this.BtnSetting.Size = new System.Drawing.Size(75, 34); this.BtnSetting.TabIndex = 25; this.BtnSetting.Text = "設定"; this.BtnSetting.UseVisualStyleBackColor = true; @@ -470,8 +474,9 @@ // // TxtCounter // + this.TxtCounter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TxtCounter.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128))); - this.TxtCounter.Location = new System.Drawing.Point(812, 14); + this.TxtCounter.Location = new System.Drawing.Point(819, 14); this.TxtCounter.Name = "TxtCounter"; this.TxtCounter.Size = new System.Drawing.Size(29, 31); this.TxtCounter.TabIndex = 28; @@ -481,8 +486,9 @@ // // label9 // + this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(847, 25); + this.label9.Location = new System.Drawing.Point(854, 23); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(29, 12); this.label9.TabIndex = 29; @@ -512,7 +518,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1050, 555); + this.ClientSize = new System.Drawing.Size(1044, 641); this.Controls.Add(this.PnlState); this.Controls.Add(this.label9); this.Controls.Add(this.TxtCounter); @@ -526,7 +532,7 @@ this.Controls.Add(this.BtnRecodeMovie); this.Controls.Add(this.splitContainer1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(1032, 594); + this.MinimumSize = new System.Drawing.Size(850, 500); this.Name = "MainForm"; this.Text = "マルチカメラ撮影ソフトウェア by 千葉大学フロンティア医工学センター"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); diff --git a/ISCamRecorder/MainForm.cs b/ISCamRecorder/MainForm.cs index 9ebd4b5..dd3d226 100644 --- a/ISCamRecorder/MainForm.cs +++ b/ISCamRecorder/MainForm.cs @@ -188,7 +188,7 @@ case STATE.Idle: LblState.Text = "待機中"; PnlState.BackColor = Color.MediumSpringGreen; - BtnRecodeMovie.Text = $"{ButtonSymbol(Setting.ACTION.movie)}録画"; + BtnRecodeMovie.Text = $"{ButtonSymbol(Setting.ACTION.movie)}録画 {Setting.RecodingLimit:0}s"; BtnRecodeMovie.Enabled = true; BtnSnapImage.Enabled = true; BtnSetProperty.Enabled = true;