From 60f7fbe4c3c1e01099e81a59278f22ac7dce8489 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 17 Apr 2018 15:02:49 +0200 Subject: [PATCH] More logging, Italian, quantities with units in many languages, etc., ver. 2.18.880 --- Config/Entities/Enums.cs | 3 + TBF/BenchControl/Elde/ControlComWrap.cs | 11 +- TBF/BenchControl/Output/Enums.cs | 9 +- .../Various/ErrorFlags/TestParams.cs | 8 +- TBF/Properties/AssemblyInfo.cs | 4 +- TBF/Resources/Strings.Designer.cs | 164 +++++------------- TBF/Resources/Strings.cs.resx | 21 +-- TBF/Resources/Strings.de.resx | 46 +---- TBF/Resources/Strings.it.resx | 68 ++------ TBF/Resources/Strings.pl.resx | 52 ++---- TBF/Resources/Strings.resx | 48 ++--- TBF/Resources/Strings.ro.resx | 24 +-- TBF/Resources/Strings.ru.resx | 50 ++---- TBF/Resources/Strings.zh-CN.resx | 24 +-- TBF/Screens/ProcessTabPageCtrl6.cs | 24 +-- TBF/Strings.Designer.cs | 9 - TBF/UiControls/MetrologyDlgBalanceTab.cs | 10 +- TBF/UiControls/MetrologyDlgFlowMeterTab.cs | 4 +- TBF/UiControls/MetrologyDlgPressMeterTab.cs | 4 +- 19 files changed, 165 insertions(+), 418 deletions(-) diff --git a/Config/Entities/Enums.cs b/Config/Entities/Enums.cs index f9f482c55..393142198 100644 --- a/Config/Entities/Enums.cs +++ b/Config/Entities/Enums.cs @@ -84,6 +84,9 @@ namespace Config.Entities #if LANG_PL [Description("zimna")] ColdWater, [Description("ciepła")] HotWater, +#elif LANG_IT + [Description("freddo")] ColdWater, + [Description("caldo")] HotWater, #else [Description("cold")] ColdWater, [Description("hot")] HotWater, diff --git a/TBF/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs index cc3da501f..d093a8533 100644 --- a/TBF/BenchControl/Elde/ControlComWrap.cs +++ b/TBF/BenchControl/Elde/ControlComWrap.cs @@ -257,17 +257,12 @@ namespace TBF.BenchControl.Elde /// private void DoValveMove(int valveNo, RegulValveMode valveMode, float[] valveValue, int stableTime) { - //TBF.UiBridge.Bridge.OnLog(this, string.Format("{0} ValveMove({1}, {2}, [{3}, {4}])\r\n", - // DateTime.Now.ToLongTimeString(), - // valveNo, - // valveMode, - // valveValue[0], - // valveValue[1])); - log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]); #if DN100 || MUNICH || FUZHOU150 + log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]); ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue); #else /// all newer benches - ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue, stableTime); + log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}], {4})", valveNo, valveMode, valveValue[0], valveValue[1], stableTime); + ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue, stableTime); #endif } diff --git a/TBF/BenchControl/Output/Enums.cs b/TBF/BenchControl/Output/Enums.cs index 4c1c2f372..8e0688159 100644 --- a/TBF/BenchControl/Output/Enums.cs +++ b/TBF/BenchControl/Output/Enums.cs @@ -1,17 +1,18 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017-2018 Sensus Slovensko a.s. /// namespace TBF.BenchControl.Output { public enum Culture { system, - EN, - DE, - SK, CS, + DE, + EN, + IT, PL, RU, + SK, Count } } diff --git a/TBF/BenchControl/Various/ErrorFlags/TestParams.cs b/TBF/BenchControl/Various/ErrorFlags/TestParams.cs index 2965404ff..ceb002206 100644 --- a/TBF/BenchControl/Various/ErrorFlags/TestParams.cs +++ b/TBF/BenchControl/Various/ErrorFlags/TestParams.cs @@ -130,10 +130,10 @@ namespace TBF.BenchControl.Various.ErrorFlags "max. Abs(Tup - Tdn) [°C]", string.Format("min. {0}", Strings.Test_time_s_chdr), string.Format("max. {0}", Strings.Test_time_s_chdr), - string.Format("min. {0}", Strings.Ambient_temp_C_), - string.Format("max. {0}", Strings.Ambient_temp_C_), - string.Format("min. {0}", Strings.Pressure_bar), - string.Format("max. {0}", Strings.Pressure_bar), + string.Format("min. {0} [°C]", Strings.Air_temperature), + string.Format("max. {0} [°C]", Strings.Air_temperature), + string.Format("min. {0} [bar]", Strings.Pressure), + string.Format("max. {0} [bar]", Strings.Pressure), "Coef.E9", "Coef.E10", diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index c40157b61..a47239040 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.878.0")] -[assembly: AssemblyFileVersion("2.18.878.0")] +[assembly: AssemblyVersion("2.18.880.0")] +[assembly: AssemblyFileVersion("2.18.880.0")] diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs index d956edbb6..ced246a13 100644 --- a/TBF/Resources/Strings.Designer.cs +++ b/TBF/Resources/Strings.Designer.cs @@ -213,6 +213,33 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Air humidity. + /// + internal static string Air_humidity { + get { + return ResourceManager.GetString("Air_humidity", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Air pressure. + /// + internal static string Air_pressure { + get { + return ResourceManager.GetString("Air_pressure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Air temperature. + /// + internal static string Air_temperature { + get { + return ResourceManager.GetString("Air_temperature", resourceCulture); + } + } + /// /// Looks up a localized string similar to All tests must be completed. /// @@ -222,15 +249,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to Air humidity [%]:. - /// - internal static string Ambient_humi_pct_ { - get { - return ResourceManager.GetString("Ambient_humi_pct_", resourceCulture); - } - } - /// /// Looks up a localized string similar to Ambient humidity. /// @@ -240,15 +258,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to Air pressure [mbar]:. - /// - internal static string Ambient_press_bar_ { - get { - return ResourceManager.GetString("Ambient_press_bar_", resourceCulture); - } - } - /// /// Looks up a localized string similar to Ambient pressure. /// @@ -258,15 +267,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to Air temperature [°C]:. - /// - internal static string Ambient_temp_C_ { - get { - return ResourceManager.GetString("Ambient_temp_C_", resourceCulture); - } - } - /// /// Looks up a localized string similar to Ambient temperature. /// @@ -933,33 +933,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to Correction [g]. - /// - internal static string Correction_g { - get { - return ResourceManager.GetString("Correction_g", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Correction [l/h]. - /// - internal static string Correction_lph { - get { - return ResourceManager.GetString("Correction_lph", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Correction [mbar]. - /// - internal static string Correction_mbar { - get { - return ResourceManager.GetString("Correction_mbar", resourceCulture); - } - } - /// /// Looks up a localized string similar to Counterclockwise. /// @@ -1689,15 +1662,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to Flow [m3/h]. - /// - internal static string Flow_m3h { - get { - return ResourceManager.GetString("Flow_m3h", resourceCulture); - } - } - /// /// Looks up a localized string similar to Flow meter temperature range does not fit this test conditions. /// @@ -2175,6 +2139,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Mass. + /// + internal static string Mass { + get { + return ResourceManager.GetString("Mass", resourceCulture); + } + } + /// /// Looks up a localized string similar to Mass diff. [kg]:. /// @@ -2184,24 +2157,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to Mass [kg]. - /// - internal static string Mass_kg { - get { - return ResourceManager.GetString("Mass_kg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Mass [kg]:. - /// - internal static string Mass_kg_ { - get { - return ResourceManager.GetString("Mass_kg_", resourceCulture); - } - } - /// /// Looks up a localized string similar to Mass method. /// @@ -2877,15 +2832,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to Pressure [bar]. - /// - internal static string Pressure_bar { - get { - return ResourceManager.GetString("Pressure_bar", resourceCulture); - } - } - /// /// Looks up a localized string similar to Pressure Hi [bar]. /// @@ -4209,6 +4155,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to . + /// + internal static string String1 { + get { + return ResourceManager.GetString("String1", resourceCulture); + } + } + /// /// Looks up a localized string similar to Supress WM trills. /// @@ -4282,7 +4237,7 @@ namespace TBF.Resources { } /// - /// Looks up a localized string similar to T div.. + /// Looks up a localized string similar to T div. /// internal static string T_div { get { @@ -4290,15 +4245,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to T div [°C]:. - /// - internal static string T_div_C_ { - get { - return ResourceManager.GetString("T_div_C_", resourceCulture); - } - } - /// /// Looks up a localized string similar to T hot cooling. /// @@ -4326,15 +4272,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to T in [°C]:. - /// - internal static string T_in_C_ { - get { - return ResourceManager.GetString("T_in_C_", resourceCulture); - } - } - /// /// Looks up a localized string similar to T inlet. /// @@ -4353,15 +4290,6 @@ namespace TBF.Resources { } } - /// - /// Looks up a localized string similar to T out [°C]:. - /// - internal static string T_out_C_ { - get { - return ResourceManager.GetString("T_out_C_", resourceCulture); - } - } - /// /// Looks up a localized string similar to T outlet. /// diff --git a/TBF/Resources/Strings.cs.resx b/TBF/Resources/Strings.cs.resx index fb544334f..ede51e3e8 100644 --- a/TBF/Resources/Strings.cs.resx +++ b/TBF/Resources/Strings.cs.resx @@ -285,15 +285,6 @@ Opraveno - - Korekce [g] - - - Korekce [l/h] - - - Korekce [mbar] - Vytvořit DB @@ -435,9 +426,6 @@ Dokončit - - Průtok [m3 / h] - Výběr průtoku @@ -507,8 +495,8 @@ Vyprázdnit nádrž - - Hmotnost [kg] + + Hmotnost Změřte hmotnost @@ -666,9 +654,6 @@ Výkon [%] - - Tlak [bar] - Tlak max. [bar] @@ -922,7 +907,7 @@ Spínací body - T div. + T div T in diff --git a/TBF/Resources/Strings.de.resx b/TBF/Resources/Strings.de.resx index 9f3b2fe24..4a615d7c3 100644 --- a/TBF/Resources/Strings.de.resx +++ b/TBF/Resources/Strings.de.resx @@ -366,15 +366,6 @@ Korrigiert - - Korrektur [g] - - - Korrektur [l/h] - - - Korrektur [mbar] - Die Datenbank wurde erfolgreich erstellt. @@ -396,17 +387,14 @@ Beenden - - Durchfluss [m³/h] - Ungültiges Passwort Abschließen - - Masse [kg] + + Masse Gemessen @@ -426,9 +414,6 @@ Bitte ändern Sie die folgenden Einstellungen: - - Druck [bar] - Eigenschaften @@ -1020,14 +1005,14 @@ Gültig bis - - Luftfeuchtigkeit [%]: + + Luftfeuchtigkeit - - Umgebungsdruck [mbar]: + + Umgebungsdruck - - Umgebungstemperatur [°C]: + + Umgebungstemperatur Verbundwasserzähler {0} @@ -1038,9 +1023,6 @@ Masse dif. [kg]: - - Masse [kg]: - Wasserzähler {0} @@ -1083,15 +1065,6 @@ Prüfvolumen [l]: - - T div [°C]: - - - T ein [°C]: - - - T aus [°C]: - Speichern @@ -1185,9 +1158,6 @@ Dichte - - Dichte [kg/m3] - Ende diff --git a/TBF/Resources/Strings.it.resx b/TBF/Resources/Strings.it.resx index fa064201f..c1aae44e7 100644 --- a/TBF/Resources/Strings.it.resx +++ b/TBF/Resources/Strings.it.resx @@ -208,7 +208,7 @@ sensore - T div. + T div T dentro @@ -249,14 +249,11 @@ - Copia - - correzione [g] - numero - - massa [kg] + + massa Aggiunta @@ -279,17 +276,11 @@ ok - - correzione [l/h] + + flusso - - correzione [mbar] - - - flusso [m3/h] - - - pressione [bar] + + pressione Username o password non validi @@ -993,9 +984,6 @@ @temperatura [°C] - - densità [kg/m3] - densità @@ -1011,9 +999,6 @@ Comunicazione - - aux: - principale: @@ -1023,12 +1008,6 @@ Qt - - freddo - - - caldo - acqua @@ -1221,14 +1200,14 @@ valido fino a - - umidità dell'aria [%]: + + umidità dell'aria - - pressione dell'aria [mbar]: + + pressione dell'aria - - Temperatura dell'aria [°C]: + + Temperatura dell'aria misuratore composto {0} @@ -1242,9 +1221,6 @@ mass diff [kg]: - - massa [kg]: - metri {0} @@ -1287,15 +1263,6 @@ target volume [l]: - - T div [°C]: - - - T dentro [°C]: - - - T fuori [°C]: - salva larghezza colonne @@ -1347,9 +1314,6 @@ stampare i risultati dei contatori - - ancora - inviato @@ -1776,4 +1740,10 @@ correzione + + Fotocamera + + + Finire la misurazione perfavore + \ No newline at end of file diff --git a/TBF/Resources/Strings.pl.resx b/TBF/Resources/Strings.pl.resx index b3493adbd..2d8ac1049 100644 --- a/TBF/Resources/Strings.pl.resx +++ b/TBF/Resources/Strings.pl.resx @@ -142,7 +142,7 @@ Wilgotność otoczenia - Ciśnienie pracy + Ciśnienie otoczenia Temperatura otoczenia @@ -258,15 +258,6 @@ Poprawiono - - Korekta [g] - - - Korekta [l / h] - - - Korekta [mbar] - Tworzenie bazy danych @@ -288,9 +279,6 @@ Gęstość - - Gęstość [kg / m3] - Opis @@ -405,8 +393,8 @@ Koniec - - Przepływ [m3 / h] + + Przepływ Wybór przepływu @@ -462,8 +450,8 @@ Opróżnianie zbiornika - - Masa [kg] + + Masa Pomiar masy @@ -621,8 +609,8 @@ Moc [%] - - Ciśnienie [bar] + + Ciśnienie Ciśnienie Hi [bar] @@ -1236,14 +1224,14 @@ Ważny do - - Wilgotność otoczenia [%]: + + Wilgotność otoczenia - - Ciśnienie otoczenia [mBar]: + + Ciśnienie otoczenia - - Temperatura otoczenia [°C]: + + Temperatura otoczenia Licznik sprzężony {0} @@ -1254,9 +1242,6 @@ Różnica masy [kg]: - - Masa [kg] - Wodomierz {0} @@ -1299,15 +1284,6 @@ Zadana objętość [l] - - T odchylenie [°C]: - - - T wejściowa [°C]: - - - T wyjściowa [°C]: - Zachować szerokość kolumn @@ -1318,7 +1294,7 @@ Dodatkowy - Główny: + Główny Zamknięcie programu diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx index bfd3acbac..f0fc58aef 100644 --- a/TBF/Resources/Strings.resx +++ b/TBF/Resources/Strings.resx @@ -205,7 +205,7 @@ Sensor - T div. + T div T in @@ -246,15 +246,9 @@ - Copy - - Correction [g] - Nr. - - Mass [kg] - Add @@ -276,18 +270,6 @@ OK - - Correction [l/h] - - - Correction [mbar] - - - Flow [m3/h] - - - Pressure [bar] - Invalid username or password @@ -1219,14 +1201,14 @@ Valid until - - Air humidity [%]: + + Air humidity - - Air pressure [mbar]: + + Air pressure - - Air temperature [°C]: + + Air temperature Compound meter {0} @@ -1237,8 +1219,8 @@ Mass diff. [kg]: - - Mass [kg]: + + Mass Meter {0} @@ -1282,15 +1264,6 @@ Target volume [l]: - - T div [°C]: - - - T in [°C]: - - - T out [°C]: - Save column widths @@ -1858,4 +1831,7 @@ Pressure + + + \ No newline at end of file diff --git a/TBF/Resources/Strings.ro.resx b/TBF/Resources/Strings.ro.resx index 3afe315a4..d3a5a96b6 100644 --- a/TBF/Resources/Strings.ro.resx +++ b/TBF/Resources/Strings.ro.resx @@ -219,15 +219,6 @@ Copiere - - Corectii [g] - - - Corrctii [l/h] - - - Corectii [mbar] - Creare BD @@ -252,9 +243,6 @@ Densitate - - Densitate [kg/m3] - Descriere @@ -342,8 +330,8 @@ Sfarsit - - Debit [m3/h] + + Debit Selectare debit @@ -399,8 +387,8 @@ Goliti vasul - - Masa [kg] + + Masa (max. _X_ caractere alfanumerice) @@ -486,8 +474,8 @@ Putere [%] - - Presiune [bar] + + Presiune Presiune max [bar] diff --git a/TBF/Resources/Strings.ru.resx b/TBF/Resources/Strings.ru.resx index 3da5d9c77..f4464f556 100644 --- a/TBF/Resources/Strings.ru.resx +++ b/TBF/Resources/Strings.ru.resx @@ -202,7 +202,7 @@ Датчик - T разн. + T разн T вх @@ -243,14 +243,11 @@ - Копировать - - Коррекция [г] - № - - Масса [кг] + + Масса Добавить @@ -273,17 +270,11 @@ OK - - Коррекция [л/ч] + + Расход - - Коррекция [мбар] - - - Расход [м3/ч] - - - Давление [бар] + + Давление Имя пользователя @@ -984,9 +975,6 @@ температура [°C] - - Плотность [кг/м3] - Плотность @@ -1203,14 +1191,14 @@ Годен до - - Влажность воздуха [%]: + + Влажность воздуха - - Давление воздуха [мбар]: + + Давление воздуха - - Температура воздуха [°C]: + + Температура воздуха Комбинированный счетчик {0} @@ -1221,9 +1209,6 @@ Mass diff. [kg]: - - Масса [кг]: - Счетчик {0} @@ -1266,15 +1251,6 @@ Заданный объем [л]: - - T откл [°C]: - - - T вх [°C]: - - - T вых [°C]: - Сохранить ширину столбцов diff --git a/TBF/Resources/Strings.zh-CN.resx b/TBF/Resources/Strings.zh-CN.resx index 172639497..c954521a5 100644 --- a/TBF/Resources/Strings.zh-CN.resx +++ b/TBF/Resources/Strings.zh-CN.resx @@ -285,15 +285,6 @@ 更正 - - 更正[g] - - - 更正[l/h] - - - 更正[mbar] - 创建数据库 @@ -318,9 +309,6 @@ 密度 - - 密度[kg/m3] - 描述 @@ -438,8 +426,8 @@ 完成 Finish - - 流量[m3/h] + + 流量 流量选择 @@ -510,8 +498,8 @@ 排空水箱 - - 质量[kg] + + 质量 测量质量 @@ -669,8 +657,8 @@ 功率[％] - - 压力[bar] + + 压力 压力高值[bar] diff --git a/TBF/Screens/ProcessTabPageCtrl6.cs b/TBF/Screens/ProcessTabPageCtrl6.cs index 123ca4919..8f697d46f 100644 --- a/TBF/Screens/ProcessTabPageCtrl6.cs +++ b/TBF/Screens/ProcessTabPageCtrl6.cs @@ -127,9 +127,9 @@ namespace TBF.Screens void Localize() { - airTempCapLabel.Text = Strings.Ambient_temp_C_; - airPressCapLabel.Text = Strings.Ambient_press_bar_; - airHumiCapLabel.Text = Strings.Ambient_humi_pct_; + airTempCapLabel.Text = string.Format("{0} [°C]:", Strings.Air_temperature); + airPressCapLabel.Text = string.Format("{0} [mbar]:", Strings.Air_pressure); + airHumiCapLabel.Text = string.Format("{0} [%]:", Strings.Air_humidity); targetFlowLowCapLabel.Text = Strings.Target_flow_lo_m3h_; targetFlowHighCapLabel.Text = Strings.Target_flow_hi_m3h_; @@ -139,9 +139,9 @@ namespace TBF.Screens prUpCapLabel.Text = string.Format("{0} [bar]:", Strings.Pr_up); prDownCapLabel.Text = string.Format("{0} [bar]:", Strings.Pr_down); - tInCapLabel.Text = Strings.T_in_C_; - tOutCapLabel.Text = Strings.T_out_C_; - tDivCapLabel.Text = Strings.T_div_C_; + tInCapLabel.Text = string.Format("{0} [°C]:", Strings.T_in); + tOutCapLabel.Text = string.Format("{0} [°C]:", Strings.T_out); + tDivCapLabel.Text = string.Format("{0} [°C]:", Strings.T_div); regValvePosCapLabel.Text = Strings.Reg_valve_pos_; refPulsesCapLabel.Text = Strings.Ref_pulses_; @@ -149,9 +149,9 @@ namespace TBF.Screens refFlowCapLabel.Text = Strings.Ref_flow_m3h_; refVolumeCapLabel.Text = Strings.Ref_volume_l_; - massCapLabel.Text = Strings.Mass_kg_; + massCapLabel.Text = string.Format("{0} [kg]:", Strings.Mass); massDiffCapLabel.Text = Strings.Mass_diff_kg_; - volumeCtvCapLabel.Text = Strings.Volume + " [l]:"; + volumeCtvCapLabel.Text = string.Format("{0} [l]:", Strings.Volume); refErrorCapLabel.Text = Strings.Ref_error_pct_; GroupBox[] groupBoxes = new GroupBox[] { groupBox1, groupBox2, groupBox3, groupBox4, groupBox5, groupBox6 }; @@ -452,16 +452,16 @@ namespace TBF.Screens /// /// Always available /// - airTempLabel.Text = ProcessData.AmbTemp.ToString(); + airTempLabel.Text = Config.Units.ConvertTo(Config.Unit.C, ProcessData.AmbTemp.Val).ToString("F1"); airPressLabel.Text = Config.Units.ConvertTo(Config.Unit.mbar, ProcessData.AmbPress.Val).ToString("F0"); - airHumiLabel.Text = ProcessData.AmbHumi.ToString(); + airHumiLabel.Text = Config.Units.ConvertTo(Config.Unit.RPct, ProcessData.AmbHumi.Val).ToString("F1"); tInLabel.Text = ProcessData.TempUp.ToString(); tOutLabel.Text = ProcessData.TempDown.ToString(); tDivLabel.Text = ProcessData.TempDiv.ToString(); - prUpLabel.Text = ProcessData.PressUp.ToString(); - prDownLabel.Text = ProcessData.PressDown.ToString(); + prUpLabel.Text = Config.Units.ConvertTo(Config.Unit.bar, ProcessData.PressUp.Val).ToString(); + prDownLabel.Text = Config.Units.ConvertTo(Config.Unit.bar, ProcessData.PressDown.Val).ToString(); massLabel.Text = ProcessData.Mass.ToString(); diff --git a/TBF/Strings.Designer.cs b/TBF/Strings.Designer.cs index 7f8895db7..3215c3c44 100644 --- a/TBF/Strings.Designer.cs +++ b/TBF/Strings.Designer.cs @@ -672,15 +672,6 @@ namespace Config.Resources { } } - /// - /// Looks up a localized string similar to Density [kg/m3]. - /// - internal static string Density_kg_m3 { - get { - return ResourceManager.GetString("Density_kg_m3", resourceCulture); - } - } - /// /// Looks up a localized string similar to Description. /// diff --git a/TBF/UiControls/MetrologyDlgBalanceTab.cs b/TBF/UiControls/MetrologyDlgBalanceTab.cs index b9d3f3014..b01d7ae7e 100644 --- a/TBF/UiControls/MetrologyDlgBalanceTab.cs +++ b/TBF/UiControls/MetrologyDlgBalanceTab.cs @@ -77,8 +77,8 @@ namespace TBF.UiControls listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); - listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Mass_kg, Width = 100 }); - listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Correction_g, Width = 100 }); + listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [kg]", Strings.Mass), Width = 100 }); + listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [g]", Strings.Correction), Width = 100 }); RefreshAll(); } @@ -92,9 +92,9 @@ namespace TBF.UiControls calibDateLabel.Text = Strings.Date; calibValidDateLabel.Text = Strings.Valid_until; - buoyancyTempLabel.Text = Strings.Ambient_temperature + " [°C]"; - buoyancyPressLabel.Text = Strings.Ambient_pressure + " [mbar]"; - buoyancyHumiLabel.Text = Strings.Ambient_humidity + " [%]"; + buoyancyTempLabel.Text = string.Format("{0} [°C]", Strings.Ambient_temperature); + buoyancyPressLabel.Text = string.Format("{0} [mbar]", Strings.Ambient_pressure); + buoyancyHumiLabel.Text = string.Format("{0} [%]", Strings.Ambient_humidity); airDensityLabel.Text = Strings.Air_density_kg_m3; weightStandardDensityLabel.Text = Strings.Ref_mass_dens_kg_m3; diff --git a/TBF/UiControls/MetrologyDlgFlowMeterTab.cs b/TBF/UiControls/MetrologyDlgFlowMeterTab.cs index 4f0d2d587..31570403a 100644 --- a/TBF/UiControls/MetrologyDlgFlowMeterTab.cs +++ b/TBF/UiControls/MetrologyDlgFlowMeterTab.cs @@ -94,8 +94,8 @@ namespace TBF.UiControls listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); - listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Flow_m3h, Width = 100 }); - listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Correction_lph, Width = 100 }); + listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [m3/h]", Strings.Flow), Width = 100 }); + listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [l/h]", Strings.Correction), Width = 100 }); RefreshAll(rangeIx); } diff --git a/TBF/UiControls/MetrologyDlgPressMeterTab.cs b/TBF/UiControls/MetrologyDlgPressMeterTab.cs index d37f8aac7..f4823e583 100644 --- a/TBF/UiControls/MetrologyDlgPressMeterTab.cs +++ b/TBF/UiControls/MetrologyDlgPressMeterTab.cs @@ -74,8 +74,8 @@ namespace TBF.UiControls listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); - listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Pressure_bar, Width = 100 }); - listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Correction_mbar, Width = 100 }); + listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [bar]", Strings.Pressure), Width = 100 }); + listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [mbar]", Strings.Correction), Width = 100 }); RefreshAll(); }