diff --git a/MiniPrf/Ui/FrmMainMiniPrf.Designer.cs b/MiniPrf/Ui/FrmMainMiniPrf.Designer.cs index 5039cd5d..6049e127 100644 --- a/MiniPrf/Ui/FrmMainMiniPrf.Designer.cs +++ b/MiniPrf/Ui/FrmMainMiniPrf.Designer.cs @@ -77,7 +77,6 @@ this.tbxActualMeasuredToleranceDutToRef = new System.Windows.Forms.TextBox(); this.lblActualFlowRateCmPerHour = new System.Windows.Forms.Label(); this.tbxActualFlowRateCmPerHour = new System.Windows.Forms.TextBox(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.picFM2014 = new System.Windows.Forms.PictureBox(); this.label1 = new System.Windows.Forms.Label(); @@ -96,6 +95,7 @@ this.tbxRefFlowRateFromRefFrequencyCmPerH = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.tbxRefFrequencyDirectHz = new System.Windows.Forms.TextBox(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.gbxFM2014Setup.SuspendLayout(); this.gbxRegulationSetup.SuspendLayout(); this.gbxManualRefCalibration.SuspendLayout(); @@ -109,6 +109,7 @@ // this.gbxFM2014Setup.Controls.Add(this.lblFM2014SerialNumber); this.gbxFM2014Setup.Controls.Add(this.cbxFM2014TolerancePercent); + this.gbxFM2014Setup.Controls.Add(this.picFM2014); this.gbxFM2014Setup.Controls.Add(this.tbxFM2014SerialNumber); this.gbxFM2014Setup.Controls.Add(this.lblFM2014Tolerance); this.gbxFM2014Setup.Controls.Add(this.cbxFM2014Address); @@ -120,9 +121,9 @@ this.gbxFM2014Setup.Controls.Add(this.lblConnectFM2014); this.gbxFM2014Setup.Controls.Add(this.tbxFM2014FullId); this.gbxFM2014Setup.Controls.Add(this.tbxFM2014ApplicationFwVersion); - this.gbxFM2014Setup.Location = new System.Drawing.Point(78, 27); + this.gbxFM2014Setup.Location = new System.Drawing.Point(8, 26); this.gbxFM2014Setup.Name = "gbxFM2014Setup"; - this.gbxFM2014Setup.Size = new System.Drawing.Size(260, 210); + this.gbxFM2014Setup.Size = new System.Drawing.Size(288, 210); this.gbxFM2014Setup.TabIndex = 84; this.gbxFM2014Setup.TabStop = false; this.gbxFM2014Setup.Text = "FM2014"; @@ -130,7 +131,7 @@ // lblFM2014SerialNumber // this.lblFM2014SerialNumber.AutoSize = true; - this.lblFM2014SerialNumber.Location = new System.Drawing.Point(10, 78); + this.lblFM2014SerialNumber.Location = new System.Drawing.Point(80, 78); this.lblFM2014SerialNumber.Name = "lblFM2014SerialNumber"; this.lblFM2014SerialNumber.Size = new System.Drawing.Size(76, 13); this.lblFM2014SerialNumber.TabIndex = 27; @@ -142,7 +143,7 @@ this.cbxFM2014TolerancePercent.Items.AddRange(new object[] { "3", "5"}); - this.cbxFM2014TolerancePercent.Location = new System.Drawing.Point(150, 150); + this.cbxFM2014TolerancePercent.Location = new System.Drawing.Point(220, 150); this.cbxFM2014TolerancePercent.Name = "cbxFM2014TolerancePercent"; this.cbxFM2014TolerancePercent.Size = new System.Drawing.Size(60, 21); this.cbxFM2014TolerancePercent.TabIndex = 3; @@ -152,16 +153,16 @@ // tbxFM2014SerialNumber // this.tbxFM2014SerialNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxFM2014SerialNumber.Location = new System.Drawing.Point(150, 75); + this.tbxFM2014SerialNumber.Location = new System.Drawing.Point(220, 75); this.tbxFM2014SerialNumber.Name = "tbxFM2014SerialNumber"; this.tbxFM2014SerialNumber.ReadOnly = true; - this.tbxFM2014SerialNumber.Size = new System.Drawing.Size(100, 20); + this.tbxFM2014SerialNumber.Size = new System.Drawing.Size(60, 20); this.tbxFM2014SerialNumber.TabIndex = 29; // // lblFM2014Tolerance // this.lblFM2014Tolerance.AutoSize = true; - this.lblFM2014Tolerance.Location = new System.Drawing.Point(10, 153); + this.lblFM2014Tolerance.Location = new System.Drawing.Point(80, 153); this.lblFM2014Tolerance.Name = "lblFM2014Tolerance"; this.lblFM2014Tolerance.Size = new System.Drawing.Size(112, 13); this.lblFM2014Tolerance.TabIndex = 36; @@ -188,7 +189,7 @@ "15", "16", "22"}); - this.cbxFM2014Address.Location = new System.Drawing.Point(150, 125); + this.cbxFM2014Address.Location = new System.Drawing.Point(220, 125); this.cbxFM2014Address.Name = "cbxFM2014Address"; this.cbxFM2014Address.Size = new System.Drawing.Size(60, 21); this.cbxFM2014Address.TabIndex = 2; @@ -198,7 +199,7 @@ // lblFM2014Address // this.lblFM2014Address.AutoSize = true; - this.lblFM2014Address.Location = new System.Drawing.Point(10, 128); + this.lblFM2014Address.Location = new System.Drawing.Point(80, 128); this.lblFM2014Address.Name = "lblFM2014Address"; this.lblFM2014Address.Size = new System.Drawing.Size(48, 13); this.lblFM2014Address.TabIndex = 34; @@ -207,7 +208,7 @@ // lblFwVersion // this.lblFwVersion.AutoSize = true; - this.lblFwVersion.Location = new System.Drawing.Point(10, 52); + this.lblFwVersion.Location = new System.Drawing.Point(80, 52); this.lblFwVersion.Name = "lblFwVersion"; this.lblFwVersion.Size = new System.Drawing.Size(90, 13); this.lblFwVersion.TabIndex = 25; @@ -215,7 +216,7 @@ // // btnFM2014Connect // - this.btnFM2014Connect.Location = new System.Drawing.Point(10, 179); + this.btnFM2014Connect.Location = new System.Drawing.Point(170, 179); this.btnFM2014Connect.Name = "btnFM2014Connect"; this.btnFM2014Connect.Size = new System.Drawing.Size(110, 25); this.btnFM2014Connect.TabIndex = 0; @@ -226,7 +227,7 @@ // cbxFM2014ComPort // this.cbxFM2014ComPort.FormattingEnabled = true; - this.cbxFM2014ComPort.Location = new System.Drawing.Point(150, 100); + this.cbxFM2014ComPort.Location = new System.Drawing.Point(220, 100); this.cbxFM2014ComPort.Name = "cbxFM2014ComPort"; this.cbxFM2014ComPort.Size = new System.Drawing.Size(60, 21); this.cbxFM2014ComPort.TabIndex = 1; @@ -236,7 +237,7 @@ // lblFM2014SerialPort // this.lblFM2014SerialPort.AutoSize = true; - this.lblFM2014SerialPort.Location = new System.Drawing.Point(10, 103); + this.lblFM2014SerialPort.Location = new System.Drawing.Point(80, 103); this.lblFM2014SerialPort.Name = "lblFM2014SerialPort"; this.lblFM2014SerialPort.Size = new System.Drawing.Size(58, 13); this.lblFM2014SerialPort.TabIndex = 20; @@ -245,28 +246,29 @@ // lblConnectFM2014 // this.lblConnectFM2014.AutoSize = true; - this.lblConnectFM2014.Location = new System.Drawing.Point(10, 28); + this.lblConnectFM2014.Location = new System.Drawing.Point(80, 28); this.lblConnectFM2014.Name = "lblConnectFM2014"; - this.lblConnectFM2014.Size = new System.Drawing.Size(100, 13); + this.lblConnectFM2014.Size = new System.Drawing.Size(13, 13); this.lblConnectFM2014.TabIndex = 23; - this.lblConnectFM2014.Text = "NOT CONNECTED"; + this.lblConnectFM2014.Text = "?"; // // tbxFM2014FullId // - this.tbxFM2014FullId.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxFM2014FullId.Location = new System.Drawing.Point(150, 25); + this.tbxFM2014FullId.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.tbxFM2014FullId.Location = new System.Drawing.Point(183, 28); this.tbxFM2014FullId.Name = "tbxFM2014FullId"; this.tbxFM2014FullId.ReadOnly = true; - this.tbxFM2014FullId.Size = new System.Drawing.Size(100, 20); + this.tbxFM2014FullId.Size = new System.Drawing.Size(94, 13); this.tbxFM2014FullId.TabIndex = 0; + this.tbxFM2014FullId.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // // tbxFM2014ApplicationFwVersion // this.tbxFM2014ApplicationFwVersion.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxFM2014ApplicationFwVersion.Location = new System.Drawing.Point(150, 50); + this.tbxFM2014ApplicationFwVersion.Location = new System.Drawing.Point(220, 50); this.tbxFM2014ApplicationFwVersion.Name = "tbxFM2014ApplicationFwVersion"; this.tbxFM2014ApplicationFwVersion.ReadOnly = true; - this.tbxFM2014ApplicationFwVersion.Size = new System.Drawing.Size(100, 20); + this.tbxFM2014ApplicationFwVersion.Size = new System.Drawing.Size(60, 20); this.tbxFM2014ApplicationFwVersion.TabIndex = 31; // // gbxRegulationSetup @@ -280,16 +282,16 @@ this.gbxRegulationSetup.Controls.Add(this.tbxRefPulsePerCm); this.gbxRegulationSetup.Controls.Add(this.tbxDutPulsePerCm); this.gbxRegulationSetup.Controls.Add(this.tbxScaleRefToDut); - this.gbxRegulationSetup.Location = new System.Drawing.Point(78, 242); + this.gbxRegulationSetup.Location = new System.Drawing.Point(8, 238); this.gbxRegulationSetup.Name = "gbxRegulationSetup"; - this.gbxRegulationSetup.Size = new System.Drawing.Size(260, 161); + this.gbxRegulationSetup.Size = new System.Drawing.Size(289, 161); this.gbxRegulationSetup.TabIndex = 82; this.gbxRegulationSetup.TabStop = false; this.gbxRegulationSetup.Text = "Regulation Setup"; // // btnSaveRegulationSetup // - this.btnSaveRegulationSetup.Location = new System.Drawing.Point(11, 130); + this.btnSaveRegulationSetup.Location = new System.Drawing.Point(170, 128); this.btnSaveRegulationSetup.Name = "btnSaveRegulationSetup"; this.btnSaveRegulationSetup.Size = new System.Drawing.Size(110, 25); this.btnSaveRegulationSetup.TabIndex = 7; @@ -310,7 +312,7 @@ "7", "8", "9"}); - this.cbxAttenuation.Location = new System.Drawing.Point(150, 100); + this.cbxAttenuation.Location = new System.Drawing.Point(220, 101); this.cbxAttenuation.Name = "cbxAttenuation"; this.cbxAttenuation.Size = new System.Drawing.Size(60, 21); this.cbxAttenuation.TabIndex = 6; @@ -357,9 +359,9 @@ // tbxRefPulsePerCm // this.tbxRefPulsePerCm.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxRefPulsePerCm.Location = new System.Drawing.Point(150, 25); + this.tbxRefPulsePerCm.Location = new System.Drawing.Point(220, 26); this.tbxRefPulsePerCm.Name = "tbxRefPulsePerCm"; - this.tbxRefPulsePerCm.Size = new System.Drawing.Size(100, 20); + this.tbxRefPulsePerCm.Size = new System.Drawing.Size(60, 20); this.tbxRefPulsePerCm.TabIndex = 4; this.tbxRefPulsePerCm.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbxRefPulsesPerCm_KeyDown); this.tbxRefPulsePerCm.Leave += new System.EventHandler(this.tbxRefPulsesPerCm_Leave); @@ -367,9 +369,9 @@ // tbxDutPulsePerCm // this.tbxDutPulsePerCm.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxDutPulsePerCm.Location = new System.Drawing.Point(150, 50); + this.tbxDutPulsePerCm.Location = new System.Drawing.Point(220, 51); this.tbxDutPulsePerCm.Name = "tbxDutPulsePerCm"; - this.tbxDutPulsePerCm.Size = new System.Drawing.Size(100, 20); + this.tbxDutPulsePerCm.Size = new System.Drawing.Size(60, 20); this.tbxDutPulsePerCm.TabIndex = 5; this.tbxDutPulsePerCm.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbxDutPulsesPerCm_KeyDown); this.tbxDutPulsePerCm.Leave += new System.EventHandler(this.tbxDutPulsesPerCm_Leave); @@ -377,16 +379,16 @@ // tbxScaleRefToDut // this.tbxScaleRefToDut.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxScaleRefToDut.Location = new System.Drawing.Point(150, 75); + this.tbxScaleRefToDut.Location = new System.Drawing.Point(220, 76); this.tbxScaleRefToDut.Name = "tbxScaleRefToDut"; this.tbxScaleRefToDut.ReadOnly = true; - this.tbxScaleRefToDut.Size = new System.Drawing.Size(100, 20); + this.tbxScaleRefToDut.Size = new System.Drawing.Size(60, 20); this.tbxScaleRefToDut.TabIndex = 66; // // lblUpdateTimeValue // this.lblUpdateTimeValue.AutoSize = true; - this.lblUpdateTimeValue.Location = new System.Drawing.Point(331, 416); + this.lblUpdateTimeValue.Location = new System.Drawing.Point(299, 416); this.lblUpdateTimeValue.Name = "lblUpdateTimeValue"; this.lblUpdateTimeValue.Size = new System.Drawing.Size(28, 13); this.lblUpdateTimeValue.TabIndex = 81; @@ -400,7 +402,7 @@ // lblTimeText // this.lblTimeText.AutoSize = true; - this.lblTimeText.Location = new System.Drawing.Point(259, 416); + this.lblTimeText.Location = new System.Drawing.Point(230, 416); this.lblTimeText.Name = "lblTimeText"; this.lblTimeText.Size = new System.Drawing.Size(66, 13); this.lblTimeText.TabIndex = 79; @@ -410,7 +412,7 @@ // this.lblWaitingForMeterResponse.AutoSize = true; this.lblWaitingForMeterResponse.ForeColor = System.Drawing.Color.Red; - this.lblWaitingForMeterResponse.Location = new System.Drawing.Point(421, 416); + this.lblWaitingForMeterResponse.Location = new System.Drawing.Point(341, 416); this.lblWaitingForMeterResponse.Name = "lblWaitingForMeterResponse"; this.lblWaitingForMeterResponse.Size = new System.Drawing.Size(183, 13); this.lblWaitingForMeterResponse.TabIndex = 76; @@ -420,7 +422,7 @@ // this.barSingleProgressUpdate.Location = new System.Drawing.Point(7, 432); this.barSingleProgressUpdate.Name = "barSingleProgressUpdate"; - this.barSingleProgressUpdate.Size = new System.Drawing.Size(597, 18); + this.barSingleProgressUpdate.Size = new System.Drawing.Size(517, 18); this.barSingleProgressUpdate.TabIndex = 75; this.barSingleProgressUpdate.Visible = false; // @@ -435,7 +437,7 @@ // // btnDutToRefRegulation // - this.btnDutToRefRegulation.Location = new System.Drawing.Point(10, 129); + this.btnDutToRefRegulation.Location = new System.Drawing.Point(100, 129); this.btnDutToRefRegulation.Name = "btnDutToRefRegulation"; this.btnDutToRefRegulation.Size = new System.Drawing.Size(110, 25); this.btnDutToRefRegulation.TabIndex = 11; @@ -452,9 +454,9 @@ this.gbxManualRefCalibration.Controls.Add(this.lblMeasuredRefPulses); this.gbxManualRefCalibration.Controls.Add(this.tbxMeasuredRefPulses); this.gbxManualRefCalibration.Controls.Add(this.btnManualRefCalibration); - this.gbxManualRefCalibration.Location = new System.Drawing.Point(344, 87); + this.gbxManualRefCalibration.Location = new System.Drawing.Point(302, 86); this.gbxManualRefCalibration.Name = "gbxManualRefCalibration"; - this.gbxManualRefCalibration.Size = new System.Drawing.Size(260, 150); + this.gbxManualRefCalibration.Size = new System.Drawing.Size(222, 150); this.gbxManualRefCalibration.TabIndex = 83; this.gbxManualRefCalibration.TabStop = false; this.gbxManualRefCalibration.Text = "Manual REF Calibration"; @@ -474,7 +476,7 @@ this.tbxRefCalibrationResultPulsePerCm.Location = new System.Drawing.Point(150, 75); this.tbxRefCalibrationResultPulsePerCm.Name = "tbxRefCalibrationResultPulsePerCm"; this.tbxRefCalibrationResultPulsePerCm.ReadOnly = true; - this.tbxRefCalibrationResultPulsePerCm.Size = new System.Drawing.Size(100, 20); + this.tbxRefCalibrationResultPulsePerCm.Size = new System.Drawing.Size(60, 20); this.tbxRefCalibrationResultPulsePerCm.TabIndex = 73; // // lblWeightScaleVolume @@ -491,7 +493,7 @@ this.tbxManualInputVolumeLiters.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbxManualInputVolumeLiters.Location = new System.Drawing.Point(150, 50); this.tbxManualInputVolumeLiters.Name = "tbxManualInputVolumeLiters"; - this.tbxManualInputVolumeLiters.Size = new System.Drawing.Size(100, 20); + this.tbxManualInputVolumeLiters.Size = new System.Drawing.Size(60, 20); this.tbxManualInputVolumeLiters.TabIndex = 8; this.tbxManualInputVolumeLiters.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbxManualInputVolumeLiters_KeyStoke); this.tbxManualInputVolumeLiters.Leave += new System.EventHandler(this.tbxManualInputVolumeLiters_Leave); @@ -511,12 +513,12 @@ this.tbxMeasuredRefPulses.Location = new System.Drawing.Point(150, 25); this.tbxMeasuredRefPulses.Name = "tbxMeasuredRefPulses"; this.tbxMeasuredRefPulses.ReadOnly = true; - this.tbxMeasuredRefPulses.Size = new System.Drawing.Size(100, 20); + this.tbxMeasuredRefPulses.Size = new System.Drawing.Size(60, 20); this.tbxMeasuredRefPulses.TabIndex = 69; // // btnManualRefCalibration // - this.btnManualRefCalibration.Location = new System.Drawing.Point(10, 119); + this.btnManualRefCalibration.Location = new System.Drawing.Point(100, 119); this.btnManualRefCalibration.Name = "btnManualRefCalibration"; this.btnManualRefCalibration.Size = new System.Drawing.Size(110, 25); this.btnManualRefCalibration.TabIndex = 9; @@ -534,9 +536,9 @@ this.gbxDutToRefRegulation.Controls.Add(this.lblActualFlowRateCmPerHour); this.gbxDutToRefRegulation.Controls.Add(this.tbxActualFlowRateCmPerHour); this.gbxDutToRefRegulation.Controls.Add(this.btnDutToRefRegulation); - this.gbxDutToRefRegulation.Location = new System.Drawing.Point(344, 243); + this.gbxDutToRefRegulation.Location = new System.Drawing.Point(302, 238); this.gbxDutToRefRegulation.Name = "gbxDutToRefRegulation"; - this.gbxDutToRefRegulation.Size = new System.Drawing.Size(260, 160); + this.gbxDutToRefRegulation.Size = new System.Drawing.Size(222, 161); this.gbxDutToRefRegulation.TabIndex = 84; this.gbxDutToRefRegulation.TabStop = false; this.gbxDutToRefRegulation.Text = "DUT to REF Regulation"; @@ -553,10 +555,10 @@ // tbxRefFrequencyHz // this.tbxRefFrequencyHz.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxRefFrequencyHz.Location = new System.Drawing.Point(150, 50); + this.tbxRefFrequencyHz.Location = new System.Drawing.Point(150, 51); this.tbxRefFrequencyHz.Name = "tbxRefFrequencyHz"; this.tbxRefFrequencyHz.ReadOnly = true; - this.tbxRefFrequencyHz.Size = new System.Drawing.Size(100, 20); + this.tbxRefFrequencyHz.Size = new System.Drawing.Size(60, 20); this.tbxRefFrequencyHz.TabIndex = 78; // // chkUseDampedTolerance @@ -583,10 +585,10 @@ // tbxActualMeasuredToleranceDutToRef // this.tbxActualMeasuredToleranceDutToRef.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxActualMeasuredToleranceDutToRef.Location = new System.Drawing.Point(150, 24); + this.tbxActualMeasuredToleranceDutToRef.Location = new System.Drawing.Point(150, 25); this.tbxActualMeasuredToleranceDutToRef.Name = "tbxActualMeasuredToleranceDutToRef"; this.tbxActualMeasuredToleranceDutToRef.ReadOnly = true; - this.tbxActualMeasuredToleranceDutToRef.Size = new System.Drawing.Size(100, 20); + this.tbxActualMeasuredToleranceDutToRef.Size = new System.Drawing.Size(60, 20); this.tbxActualMeasuredToleranceDutToRef.TabIndex = 77; // // lblActualFlowRateCmPerHour @@ -601,25 +603,17 @@ // tbxActualFlowRateCmPerHour // this.tbxActualFlowRateCmPerHour.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxActualFlowRateCmPerHour.Location = new System.Drawing.Point(150, 76); + this.tbxActualFlowRateCmPerHour.Location = new System.Drawing.Point(150, 77); this.tbxActualFlowRateCmPerHour.Name = "tbxActualFlowRateCmPerHour"; this.tbxActualFlowRateCmPerHour.ReadOnly = true; - this.tbxActualFlowRateCmPerHour.Size = new System.Drawing.Size(100, 20); + this.tbxActualFlowRateCmPerHour.Size = new System.Drawing.Size(60, 20); this.tbxActualFlowRateCmPerHour.TabIndex = 75; // - // menuStrip1 - // - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(610, 24); - this.menuStrip1.TabIndex = 85; - this.menuStrip1.Text = "menuStrip1"; - // // pictureBox1 // this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.pictureBox1.Image = global::Sensus.MiniPrf.Ui.Properties.Resources.Sensus_A; - this.pictureBox1.Location = new System.Drawing.Point(455, 32); + this.pictureBox1.Location = new System.Drawing.Point(375, 34); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(149, 46); this.pictureBox1.TabIndex = 86; @@ -629,7 +623,7 @@ // this.picFM2014.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.picFM2014.Image = global::Sensus.MiniPrf.Ui.Properties.Resources.FM2014_58x172; - this.picFM2014.Location = new System.Drawing.Point(7, 32); + this.picFM2014.Location = new System.Drawing.Point(6, 25); this.picFM2014.Name = "picFM2014"; this.picFM2014.Size = new System.Drawing.Size(60, 176); this.picFM2014.TabIndex = 87; @@ -639,7 +633,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(18, 27); + this.label1.Location = new System.Drawing.Point(10, 25); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(123, 13); this.label1.TabIndex = 83; @@ -648,16 +642,16 @@ // tbxRefFrequencyFromRefPeriodHz // this.tbxRefFrequencyFromRefPeriodHz.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxRefFrequencyFromRefPeriodHz.Location = new System.Drawing.Point(158, 25); + this.tbxRefFrequencyFromRefPeriodHz.Location = new System.Drawing.Point(153, 25); this.tbxRefFrequencyFromRefPeriodHz.Name = "tbxRefFrequencyFromRefPeriodHz"; this.tbxRefFrequencyFromRefPeriodHz.ReadOnly = true; - this.tbxRefFrequencyFromRefPeriodHz.Size = new System.Drawing.Size(100, 20); + this.tbxRefFrequencyFromRefPeriodHz.Size = new System.Drawing.Size(60, 20); this.tbxRefFrequencyFromRefPeriodHz.TabIndex = 82; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(18, 77); + this.label2.Location = new System.Drawing.Point(10, 76); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(130, 13); this.label2.TabIndex = 80; @@ -666,16 +660,16 @@ // tbxRefFlowRateFromRefPeriodCmPerH // this.tbxRefFlowRateFromRefPeriodCmPerH.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxRefFlowRateFromRefPeriodCmPerH.Location = new System.Drawing.Point(158, 74); + this.tbxRefFlowRateFromRefPeriodCmPerH.Location = new System.Drawing.Point(153, 74); this.tbxRefFlowRateFromRefPeriodCmPerH.Name = "tbxRefFlowRateFromRefPeriodCmPerH"; this.tbxRefFlowRateFromRefPeriodCmPerH.ReadOnly = true; - this.tbxRefFlowRateFromRefPeriodCmPerH.Size = new System.Drawing.Size(100, 20); + this.tbxRefFlowRateFromRefPeriodCmPerH.Size = new System.Drawing.Size(60, 20); this.tbxRefFlowRateFromRefPeriodCmPerH.TabIndex = 81; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(18, 125); + this.label3.Location = new System.Drawing.Point(10, 125); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(62, 13); this.label3.TabIndex = 84; @@ -684,16 +678,16 @@ // tbxRefPeriodMs // this.tbxRefPeriodMs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxRefPeriodMs.Location = new System.Drawing.Point(158, 123); + this.tbxRefPeriodMs.Location = new System.Drawing.Point(153, 123); this.tbxRefPeriodMs.Name = "tbxRefPeriodMs"; this.tbxRefPeriodMs.ReadOnly = true; - this.tbxRefPeriodMs.Size = new System.Drawing.Size(100, 20); + this.tbxRefPeriodMs.Size = new System.Drawing.Size(60, 20); this.tbxRefPeriodMs.TabIndex = 85; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(190, 9); + this.label4.Location = new System.Drawing.Point(169, 9); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(28, 13); this.label4.TabIndex = 88; @@ -702,7 +696,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(313, 9); + this.label5.Location = new System.Drawing.Point(232, 9); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(30, 13); this.label5.TabIndex = 89; @@ -711,28 +705,28 @@ // tbxDutPeriodMs // this.tbxDutPeriodMs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxDutPeriodMs.Location = new System.Drawing.Point(285, 123); + this.tbxDutPeriodMs.Location = new System.Drawing.Point(220, 123); this.tbxDutPeriodMs.Name = "tbxDutPeriodMs"; this.tbxDutPeriodMs.ReadOnly = true; - this.tbxDutPeriodMs.Size = new System.Drawing.Size(100, 20); + this.tbxDutPeriodMs.Size = new System.Drawing.Size(60, 20); this.tbxDutPeriodMs.TabIndex = 92; // // tbxDutFrequencyFromDutPeriodHz // this.tbxDutFrequencyFromDutPeriodHz.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxDutFrequencyFromDutPeriodHz.Location = new System.Drawing.Point(285, 25); + this.tbxDutFrequencyFromDutPeriodHz.Location = new System.Drawing.Point(220, 25); this.tbxDutFrequencyFromDutPeriodHz.Name = "tbxDutFrequencyFromDutPeriodHz"; this.tbxDutFrequencyFromDutPeriodHz.ReadOnly = true; - this.tbxDutFrequencyFromDutPeriodHz.Size = new System.Drawing.Size(100, 20); + this.tbxDutFrequencyFromDutPeriodHz.Size = new System.Drawing.Size(60, 20); this.tbxDutFrequencyFromDutPeriodHz.TabIndex = 91; // // tbxDutFlowRateFromDutPeriodCmPerH // this.tbxDutFlowRateFromDutPeriodCmPerH.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxDutFlowRateFromDutPeriodCmPerH.Location = new System.Drawing.Point(285, 74); + this.tbxDutFlowRateFromDutPeriodCmPerH.Location = new System.Drawing.Point(220, 74); this.tbxDutFlowRateFromDutPeriodCmPerH.Name = "tbxDutFlowRateFromDutPeriodCmPerH"; this.tbxDutFlowRateFromDutPeriodCmPerH.ReadOnly = true; - this.tbxDutFlowRateFromDutPeriodCmPerH.Size = new System.Drawing.Size(100, 20); + this.tbxDutFlowRateFromDutPeriodCmPerH.Size = new System.Drawing.Size(60, 20); this.tbxDutFlowRateFromDutPeriodCmPerH.TabIndex = 90; // // grpBoxDebug @@ -752,9 +746,9 @@ this.grpBoxDebug.Controls.Add(this.tbxRefPeriodMs); this.grpBoxDebug.Controls.Add(this.label4); this.grpBoxDebug.Controls.Add(this.label3); - this.grpBoxDebug.Location = new System.Drawing.Point(78, 246); + this.grpBoxDebug.Location = new System.Drawing.Point(8, 238); this.grpBoxDebug.Name = "grpBoxDebug"; - this.grpBoxDebug.Size = new System.Drawing.Size(526, 158); + this.grpBoxDebug.Size = new System.Drawing.Size(288, 160); this.grpBoxDebug.TabIndex = 83; this.grpBoxDebug.TabStop = false; this.grpBoxDebug.Text = "Debug"; @@ -762,7 +756,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(18, 101); + this.label7.Location = new System.Drawing.Point(10, 101); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(128, 13); this.label7.TabIndex = 96; @@ -771,16 +765,16 @@ // tbxRefFlowRateFromRefFrequencyCmPerH // this.tbxRefFlowRateFromRefFrequencyCmPerH.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxRefFlowRateFromRefFrequencyCmPerH.Location = new System.Drawing.Point(158, 99); + this.tbxRefFlowRateFromRefFrequencyCmPerH.Location = new System.Drawing.Point(153, 99); this.tbxRefFlowRateFromRefFrequencyCmPerH.Name = "tbxRefFlowRateFromRefFrequencyCmPerH"; this.tbxRefFlowRateFromRefFrequencyCmPerH.ReadOnly = true; - this.tbxRefFlowRateFromRefFrequencyCmPerH.Size = new System.Drawing.Size(100, 20); + this.tbxRefFlowRateFromRefFrequencyCmPerH.Size = new System.Drawing.Size(60, 20); this.tbxRefFlowRateFromRefFrequencyCmPerH.TabIndex = 95; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(18, 52); + this.label6.Location = new System.Drawing.Point(10, 52); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(117, 13); this.label6.TabIndex = 94; @@ -789,20 +783,28 @@ // tbxRefFrequencyDirectHz // this.tbxRefFrequencyDirectHz.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbxRefFrequencyDirectHz.Location = new System.Drawing.Point(158, 50); + this.tbxRefFrequencyDirectHz.Location = new System.Drawing.Point(153, 50); this.tbxRefFrequencyDirectHz.Name = "tbxRefFrequencyDirectHz"; this.tbxRefFrequencyDirectHz.ReadOnly = true; - this.tbxRefFrequencyDirectHz.Size = new System.Drawing.Size(100, 20); + this.tbxRefFrequencyDirectHz.Size = new System.Drawing.Size(60, 20); this.tbxRefFrequencyDirectHz.TabIndex = 93; // + // menuStrip1 + // + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(536, 24); + this.menuStrip1.TabIndex = 85; + this.menuStrip1.Text = "menuStrip1"; + // // FrmMainMiniPrf // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(610, 462); + this.ClientSize = new System.Drawing.Size(536, 467); + this.Controls.Add(this.grpBoxDebug); this.Controls.Add(this.gbxDutToRefRegulation); this.Controls.Add(this.gbxRegulationSetup); - this.Controls.Add(this.picFM2014); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.gbxFM2014Setup); this.Controls.Add(this.lblUpdateTimeValue); @@ -810,12 +812,12 @@ this.Controls.Add(this.lblTimeText); this.Controls.Add(this.lblWaitingForMeterResponse); this.Controls.Add(this.barSingleProgressUpdate); - this.Controls.Add(this.grpBoxDebug); this.Controls.Add(this.lblActualProcess); this.Controls.Add(this.menuStrip1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; + this.MaximizeBox = false; this.Name = "FrmMainMiniPrf"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "MiniPrf"; @@ -885,7 +887,6 @@ private System.Windows.Forms.TextBox tbxActualFlowRateCmPerHour; private System.Windows.Forms.CheckBox chkUseDampedTolerance; private System.Windows.Forms.Button btnSaveRegulationSetup; - private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.PictureBox picFM2014; private System.Windows.Forms.TextBox tbxRefFrequencyHz; @@ -906,6 +907,7 @@ private System.Windows.Forms.TextBox tbxRefFrequencyDirectHz; private System.Windows.Forms.Label label7; private System.Windows.Forms.TextBox tbxRefFlowRateFromRefFrequencyCmPerH; + private System.Windows.Forms.MenuStrip menuStrip1; } } diff --git a/MiniPrf/Ui/FrmMainMiniPrf.cs b/MiniPrf/Ui/FrmMainMiniPrf.cs index 4cd3dd1c..1206bbed 100644 --- a/MiniPrf/Ui/FrmMainMiniPrf.cs +++ b/MiniPrf/Ui/FrmMainMiniPrf.cs @@ -1151,7 +1151,7 @@ namespace Sensus.MiniPrf.Ui if (Fm2014 != null) Fm2014.RequestDebugInformation = grpBoxDebug.Visible; - gbxDutToRefRegulation.Visible = !grpBoxDebug.Visible; + //gbxDutToRefRegulation.Visible = !grpBoxDebug.Visible; gbxRegulationSetup.Visible = !grpBoxDebug.Visible; } diff --git a/MiniPrf/Ui/FrmMainMiniPrf.resx b/MiniPrf/Ui/FrmMainMiniPrf.resx index ae02cc31..50f923d7 100644 --- a/MiniPrf/Ui/FrmMainMiniPrf.resx +++ b/MiniPrf/Ui/FrmMainMiniPrf.resx @@ -123,6 +123,9 @@ 173, 30 + + 76 +