diff --git a/TIASshot/Cameras/IScam.cs b/TIASshot/Cameras/IScam.cs index f6e3eef..1652a83 100644 --- a/TIASshot/Cameras/IScam.cs +++ b/TIASshot/Cameras/IScam.cs @@ -55,9 +55,6 @@ ErrorMsg = $"設定ファイル{configFile}の読み込みに失敗しました"; return false; } - //if (!_ic.LoadShowSaveDeviceState(configFile)) { - // return false; - //} _roi = new Rect( Config.GetInt($"{DeviceName}/ROI/X"), Config.GetInt($"{DeviceName}/ROI/Y"), diff --git a/TIASshot/Cameras/Lucam.cs b/TIASshot/Cameras/Lucam.cs index 892364f..ea5b953 100644 --- a/TIASshot/Cameras/Lucam.cs +++ b/TIASshot/Cameras/Lucam.cs @@ -268,15 +268,6 @@ } /// - /// 校正 露光時間とホワイトバランスの自動調整 - /// - public void Calibration() { - Debug.WriteLine("校正前"); - SetSnapParam(); - _calibrating = 30; - } - - /// /// 撮影パラメータの設定 /// private void SetSnapParam() { diff --git a/TIASshot/UI/Form1.Designer.cs b/TIASshot/UI/Form1.Designer.cs index c17a308..cbe6996 100644 --- a/TIASshot/UI/Form1.Designer.cs +++ b/TIASshot/UI/Form1.Designer.cs @@ -32,7 +32,6 @@ this.picPreview = new System.Windows.Forms.PictureBox(); this.picDisplay = new System.Windows.Forms.PictureBox(); this.btnShotMulti = new System.Windows.Forms.Button(); - this.btnCalib = new System.Windows.Forms.Button(); this.txtMessage = new System.Windows.Forms.TextBox(); this.txtSaveFolder = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); @@ -136,18 +135,6 @@ this.btnShotMulti.UseVisualStyleBackColor = true; this.btnShotMulti.Click += new System.EventHandler(this.btnShotMulti_Click); // - // btnCalib - // - this.btnCalib.AllowDrop = true; - this.btnCalib.Location = new System.Drawing.Point(100, 579); - this.btnCalib.Name = "btnCalib"; - this.btnCalib.Size = new System.Drawing.Size(88, 37); - this.btnCalib.TabIndex = 7; - this.btnCalib.Text = "校正"; - this.btnCalib.UseVisualStyleBackColor = true; - this.btnCalib.Visible = false; - this.btnCalib.Click += new System.EventHandler(this.btnCalib_Click); - // // txtMessage // this.txtMessage.BackColor = System.Drawing.Color.LemonChiffon; @@ -332,7 +319,6 @@ this.Controls.Add(this.label3); this.Controls.Add(this.txtSaveFolder); this.Controls.Add(this.txtMessage); - this.Controls.Add(this.btnCalib); this.Controls.Add(this.btnShotMulti); this.Controls.Add(this.picDisplay); this.Controls.Add(this.picPreview); @@ -364,7 +350,6 @@ private System.Windows.Forms.PictureBox picPreview; private System.Windows.Forms.PictureBox picDisplay; private System.Windows.Forms.Button btnShotMulti; - private System.Windows.Forms.Button btnCalib; private System.Windows.Forms.TextBox txtMessage; private System.Windows.Forms.TextBox txtSaveFolder; private System.Windows.Forms.Label label3; diff --git a/TIASshot/UI/Form1.cs b/TIASshot/UI/Form1.cs index accbd62..433df66 100644 --- a/TIASshot/UI/Form1.cs +++ b/TIASshot/UI/Form1.cs @@ -147,15 +147,6 @@ } /// - /// 校正 - /// - /// - /// - private void btnCalib_Click(object sender, EventArgs e) { - //_lucam.Calibration(); - } - - /// /// 画像表示 /// ワーカースレッドから呼び出される ///