diff --git a/TODO.txt b/TODO.txt index 75589e530..213e01a6d 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,7 +1,9 @@ - dokoncenie process obrazovky + rozsirenie pre 12 a 24 meracov - stranka pre analyzy ------------ -- brat desatinnu bodku aj ciarku +- data all -> po mesiacoch +- selected (confirmed) data -> po mesiacoch +- vsetky logy po dnoch - dat zapamatanie polohy RV do Parametrov - moznost prepinania klapky to Transition sekvencii (aby sa dala kontrolovat tesnost ventilov) - zmenit meno pouzivatela v stavovom riadku ak sa zmeni po LoginDlg alebo spat po opusteni dlg. diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/WMStatesForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/WMStatesForm.cs index 4a82a9e9f..0492aeaad 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard/WMStatesForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard/WMStatesForm.cs @@ -47,7 +47,7 @@ namespace TBF.BenchControl.DataEntry.Standard { Localize(); - Height = 195 + 90 * WaterMetersCount; + Height = 95 + 90 * WaterMetersCount; if (WaterMetersCount < 1) groupBox1.Visible = false; if (WaterMetersCount < 2) groupBox2.Visible = false; diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl.cs index c9fb3b16f..ca8b48ecf 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl.cs @@ -350,7 +350,7 @@ namespace TBF.Screens refPulsesLabel.Text = args.RefPulses.ToString(); refFreqLabel.Text = args.FlowMtrFreq.ToString(); - refFlowLabel.Text = args.Flow.ToString(); + refFlowLabel.Text = Utils.FloatToStr(args.Flow.Val / 1000.0f, 4); refVolumeLabel.Text = args.Volume.ToString(); //regValvePosLabel.Text = args.RegValvePos.ToString(); @@ -457,7 +457,8 @@ namespace TBF.Screens refPulsesLabel.Text = tRes.PulsesMaster.ToString("F0"); //refFreqLabel.Text = tstRslt. - refFlowLabel.Text = (tRes.FlowMass / 1000.0f).ToString("F2"); + refFlowLabel.Text = Utils.FloatToStr(tRes.FlowMass / 1000.0f / 1000.0f, 4); + refVolumeLabel.Text = tRes.VolumeCTV.ToString("F2"); //regValvePosLabel.Text = tstRslt. //massLabel.Text = tstRslt.