From b0137f9384de95da4d97b71631cb854eed6f6d69 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 2 Jun 2016 15:17:43 +0200 Subject: [PATCH] Munich: resources, SatusP and Route in MainWnd, cleanup, etc., ver.2.7.300 --- .../BenchControl/Elde/ControlBoardDev.cs | 28 ++++++------ .../BenchControl/Elde/ControlComSim.cs | 30 ++++++++++--- .../BenchControl/Elde/ControlComWrap.cs | 45 +++++++++++++------ .../BenchControl/Elde/IControlCom.cs | 2 +- .../Basic/BasicPrintDocument.cs | 10 ++--- .../BenchControl/TestBenchSim.cs | 28 ++++++------ TestBenchFramework/MainWnd.Designer.cs | 22 +++++++-- TestBenchFramework/MainWnd.cs | 12 ++++- TestBenchFramework/ProcedureDlg.cs | 2 +- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +- .../Resources/Strings.Designer.cs | 6 +-- TestBenchFramework/Resources/Strings.cs.resx | 4 +- TestBenchFramework/Resources/Strings.de.resx | 4 +- TestBenchFramework/Resources/Strings.pl.resx | 9 ++-- TestBenchFramework/Resources/Strings.resx | 4 +- TestBenchFramework/Resources/Strings.ro.resx | 4 +- .../Resources/Strings.zh-CN.resx | 4 +- 17 files changed, 135 insertions(+), 83 deletions(-) diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index 9d9e291c2..da4975e02 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -106,7 +106,7 @@ namespace TBF.BenchControl.Elde /// State of valves sent out - buffered by the last SendCommand() - public ulong Route { get { return route; } } + public ulong Route { get { return benchModelRoute; } } ulong valvesToInvert; /// Route = valesToInvert ^ RequiredRouteWithoutInvertedVlaves readonly ulong routeMask; /// This mask masks out virtual valves, routeMask is set in the constructor @@ -138,7 +138,7 @@ namespace TBF.BenchControl.Elde bool sendCommandFlag; Command cmd; int refNr; - ulong route; + ulong benchModelRoute; int totalRefPulses; int massRefPulses; TestMethods testMethods; @@ -253,7 +253,7 @@ namespace TBF.BenchControl.Elde float[] tankCapacities) { this.valvesToInvert = valvesToInvert; - this.route = valvesToInvert; + this.benchModelRoute = valvesToInvert; if (controlBoardCfg.DebugLevel == DebugMode.Simulate) { @@ -379,7 +379,7 @@ namespace TBF.BenchControl.Elde { if (sendCommandFlag) { - controlCom.SendCommand(cmd, refNr, (route & routeMask), + controlCom.SendCommand(cmd, refNr, (benchModelRoute & routeMask), totalRefPulses, massRefPulses, testMethods, filterConstant, FMFreq, regConst, shortImp, stopDevs); } @@ -419,7 +419,7 @@ namespace TBF.BenchControl.Elde { this.cmd = cmd; this.refNr = refFlowmtrNr; - this.route = route; + this.benchModelRoute = route; this.totalRefPulses = totalRefPulses; this.massRefPulses = massRefPulses; this.testMethods = testMethods; @@ -439,12 +439,12 @@ namespace TBF.BenchControl.Elde /// 'ulong' with bits of valves that have changed set to '1' public ulong SetValves(ulong valvesToOpen, ulong valvesToClose, IList extendedValves) { - ulong oldRoute = route; - route = (((route ^ valvesToInvert) | valvesToOpen) & (~valvesToClose)) ^ valvesToInvert; - foreach (var extV in extendedValves) extV.UpdateRoute(ref route); - log.DebugFormat("SetValves(x,x), new route = {0}", Utils.ShowRoute(route)); + ulong oldRoute = benchModelRoute; + benchModelRoute = (((benchModelRoute ^ valvesToInvert) | valvesToOpen) & (~valvesToClose)) ^ valvesToInvert; + foreach (var extV in extendedValves) extV.UpdateRoute(ref benchModelRoute); + log.DebugFormat("SetValves(x,x), new route = {0}", Utils.ShowRoute(benchModelRoute)); sendCommandFlag = true; - return oldRoute ^ route; + return oldRoute ^ benchModelRoute; } /// @@ -453,10 +453,10 @@ namespace TBF.BenchControl.Elde /// 'ulong' with bits of valves that have changed set to '1' public ulong SyncRoute() { - ulong oldRoute = route; - route = (RRoute & routeMask) | (route & (~routeMask)); - log.DebugFormat("SyncRoute(), new route = {0}", Utils.ShowRoute(route)); - return oldRoute ^ route; + ulong oldRoute = benchModelRoute; + benchModelRoute = (RRoute & routeMask) | (benchModelRoute & (~routeMask)); + log.DebugFormat("SyncRoute(), new route = {0}", Utils.ShowRoute(benchModelRoute)); + return oldRoute ^ benchModelRoute; } /// diff --git a/TestBenchFramework/BenchControl/Elde/ControlComSim.cs b/TestBenchFramework/BenchControl/Elde/ControlComSim.cs index f4d05ed69..4c1e8cb1d 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComSim.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComSim.cs @@ -13,7 +13,6 @@ namespace TBF.BenchControl.Elde private static readonly ILog log = LogManager.GetLogger(typeof(ControlComSim)); public override string ToString() { return string.Format("ControlComSim"); } - StatusP statusP; public StatusP StatusP { get { return statusP; } } @@ -47,7 +46,7 @@ namespace TBF.BenchControl.Elde public float Temperature(int tmpNr0) { return (float)(20 + tmpNr0); } public RegulValveState RegulValveState(int rvNr1) { return 0; } - public ulong RRoute { get { return route; } } + public ulong RRoute { get { return simRoute; } } public uint DivTime { get { return 0; } } @@ -86,8 +85,7 @@ namespace TBF.BenchControl.Elde /// Command cmd; int refFlowmtrNr; - ulong route; - public ulong Route { get { return route; } } + ulong simRoute; int totalRefPulses; int massRefPulses; TestMethods testMethods; @@ -184,9 +182,7 @@ namespace TBF.BenchControl.Elde if (bit39) route = route | 0x0000008000000000; log.DebugFormat("SendCommand route = {0}", Utils.ShowRoute(route)); #endif - this.route = route; - - TestBenchSim.RouteSim = route; + TestBenchSim.SimRoute = this.simRoute = route; this.totalRefPulses = totalRefPulses; this.massRefPulses = massRefPulses; this.testMethods = testMethods; @@ -337,8 +333,28 @@ namespace TBF.BenchControl.Elde } } + StatusP lastStatusP; + ulong lastRoute; + public void RunDeviceAfter() { + StatusP bufferedStatusP = StatusP; + if (lastStatusP != bufferedStatusP) + { + string statusPStr = ((ulong)bufferedStatusP).ToString("x16"); + log.InfoFormat("RunDeviceAfter() StatusP = {0}", statusPStr); + Program.MainWnd.UpdateStatusP(statusPStr); + lastStatusP = bufferedStatusP; + } + + ulong bufferedRoute = simRoute; + if (lastRoute != bufferedRoute) + { + string routeStr = bufferedRoute.ToString("x16"); + log.InfoFormat("RunDeviceAfter() Route = {0}", routeStr); + Program.MainWnd.UpdateRoute(routeStr); + lastRoute = bufferedRoute; + } } } } diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index 6b87da62d..fc63da314 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -17,7 +17,6 @@ namespace TBF.BenchControl.Elde /// Properties /// public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } } - private StatusP lastStatusP; #if DN100 || MUNICH || FUZHOU150 public float ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq; } } /// In [Hz] 0..2500, nom.=2000 #else /// all newer benches @@ -69,7 +68,7 @@ namespace TBF.BenchControl.Elde public void SetWeight(int pos, float mass) { ctrlBrdComponent.Weight[pos] = mass; - log.DebugFormat("ControlComWrap.SetWeight(pos={0}, mass={1}", pos, mass); + log.DebugFormat("SetWeight(pos={0}, mass={1}", pos, mass); } @@ -147,7 +146,7 @@ namespace TBF.BenchControl.Elde //TBF.UiBridge.Bridge.OnLog(this, string.Format("{0} SendCalibData(COM{1}) rvCalib[0,0]={2} rvCalib[0,1]={3} rvCalib[1,0]={4} rvCalib[1,1]={5}\r\n", // DateTime.Now.ToLongTimeString(), usedCom, // rvCalib[0,0], rvCalib[0,1], rvCalib[1,0], rvCalib[1,1])); - log.Fatal("ControlComWrap.SendCalibData(...)"); + log.Fatal("SendCalibData(...)"); for (int i = 0; i < rvCalib.GetLength(0); i++) for (int j = 0; j < rvCalib.GetLength(1); j++) log.FatalFormat(" rvCalib[{0},{1}] = {2}", i, j, rvCalib[i,j]); @@ -199,7 +198,7 @@ namespace TBF.BenchControl.Elde // valveMode, // valveValue[0], // valveValue[1])); - log.InfoFormat("ControlComWrap.ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]); + log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]); #if DN100 || MUNICH || FUZHOU150 ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue); #else /// all newer benches @@ -273,7 +272,7 @@ namespace TBF.BenchControl.Elde if (bit39) route = route | 0x0000008000000000; log.DebugFormat("SendCommand route = {0}", Utils.ShowRoute(route)); #endif - log.InfoFormat("ControlComWrap.SendCommand(Cmd={0},Ref#={1},Route={2} {3} {4} {5},TotalPls={6},MassPls={7},TstM={8},filt={9},FM=[{10}{11}{12}{13}{14}{15}],Reg={16},ShrtImp={17},Stop={18})", + log.InfoFormat("SendCommand(Cmd={0},Ref#={1},Route={2} {3} {4} {5},TotalPls={6},MassPls={7},TstM={8},filt={9},FM=[{10}{11}{12}{13}{14}{15}],Reg={16},ShrtImp={17},Stop={18})", cmd, refFlowMeterNr, /// 0, 1 ((route >> 48) & 0xFFFF).ToString("X4"), /// 2 ((route >> 32) & 0xFFFF).ToString("X4"), /// 3 @@ -299,6 +298,16 @@ namespace TBF.BenchControl.Elde ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); #endif + + + ulong bufferedRoute = route; + if (lastRoute != bufferedRoute) + { + string routeStr = bufferedRoute.ToString("x16"); + log.InfoFormat("DoSendCommand() Route = {0}", routeStr); + Program.MainWnd.UpdateRoute(routeStr); + lastRoute = bufferedRoute; + } } @@ -308,17 +317,23 @@ namespace TBF.BenchControl.Elde TxRx, /// Transmit and receive data } + + private StatusP lastStatusP; + private ulong lastRoute; + public void RunDeviceBefore() { object[] args = new object[] { CommType.Rx }; MakeCommDlgt dlgt = MakeComm; Program.MainWnd.Invoke(dlgt, args); /// Invoke MakeExtComm(.) in the UI thread - - StatusP statusP = StatusP; - if (lastStatusP != statusP) + + StatusP bufferedStatusP = StatusP; + if (lastStatusP != bufferedStatusP) { - log.InfoFormat("ControlComWrap.RunDeviceBefore() StatusP = {0:x16}", (ulong)statusP); - lastStatusP = statusP; + string statusPStr = ((ulong)bufferedStatusP).ToString("x16"); + log.InfoFormat("RunDeviceBefore() StatusP = {0}", statusPStr); + Program.MainWnd.UpdateStatusP(statusPStr); + lastStatusP = bufferedStatusP; } } @@ -328,11 +343,13 @@ namespace TBF.BenchControl.Elde MakeCommDlgt dlgt = MakeComm; Program.MainWnd.Invoke(dlgt, args); /// Invoke MakeExtComm(.) in the UI thread - StatusP statusP = StatusP; - if (lastStatusP != statusP) + StatusP bufferedStatusP = StatusP; + if (lastStatusP != bufferedStatusP) { - log.InfoFormat("ControlComWrap.RunDeviceAfter() StatusP = {0:x16}", (ulong)statusP); - lastStatusP = statusP; + string statusPStr = ((ulong)bufferedStatusP).ToString("x16"); + log.InfoFormat("RunDeviceAfter() StatusP = {0}", statusPStr); + Program.MainWnd.UpdateStatusP(statusPStr); + lastStatusP = bufferedStatusP; } } diff --git a/TestBenchFramework/BenchControl/Elde/IControlCom.cs b/TestBenchFramework/BenchControl/Elde/IControlCom.cs index d22e38dce..48f46f855 100644 --- a/TestBenchFramework/BenchControl/Elde/IControlCom.cs +++ b/TestBenchFramework/BenchControl/Elde/IControlCom.cs @@ -7,7 +7,7 @@ namespace TBF.BenchControl.Elde { interface IControlCom { - StatusP StatusP { get; } + StatusP StatusP { get; } float ReferenceFreq { get; } int EtPulses(int wmNr0); UInt16 WMeterPulses(int wmNr0); diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs index 201f1b33f..9402f50c6 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs @@ -164,8 +164,8 @@ namespace TBF.BenchControl.ResultsPrinters.Basic { "Batch number: ", "Date and time: ", - "Procedure:", - Strings.User_, + "Procedure: ", + Strings.User + ": ", "Ambient temperature: ", "Ambient pressure: ", "Ambient humidity: ", @@ -175,11 +175,7 @@ namespace TBF.BenchControl.ResultsPrinters.Basic { batch.BatchNr.ToString(), //batch.EndTime.ToShortDateString() + " " + batch.EndTime.ToShortTimeString(), - string.Format("{0}.{1}.{2} {3}:{4}", batch.EndTime.Year.ToString("D4"), - batch.EndTime.Month.ToString("D2"), - batch.EndTime.Day.ToString("D2"), - batch.EndTime.Hour.ToString("D2"), - batch.EndTime.Minute.ToString("D2")), + string.Format("{0:yyyy.MM.dd HH:mm}", batch.EndTime), batch.ProcedureName, User.CurrentUser.Name, batch.AmbientTempAve().ToString("F1") + " °C", diff --git a/TestBenchFramework/BenchControl/TestBenchSim.cs b/TestBenchFramework/BenchControl/TestBenchSim.cs index fc9946011..6968e7e9e 100644 --- a/TestBenchFramework/BenchControl/TestBenchSim.cs +++ b/TestBenchFramework/BenchControl/TestBenchSim.cs @@ -33,7 +33,7 @@ namespace TBF.BenchControl /// /// Valves and diverters /// - public static ulong RouteSim; + public static ulong SimRoute; public static bool Div1sim; public static bool Div2sim; public static bool Div3sim; @@ -51,7 +51,7 @@ namespace TBF.BenchControl Flow4sim = 0.0f; Flow5sim = 0.0f; Flow6sim = 0.0f; - RouteSim = 0; /// Initialize other valves + SimRoute = 0; /// Initialize other valves Div1sim = false; Div2sim = false; Div3sim = false; @@ -505,31 +505,31 @@ namespace TBF.BenchControl if (Div2sim && (RouteSim & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time); if (Div1sim && (RouteSim & Path5) == Path5) Mass1sim += DiffKg(Flow5sim, time); #elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 - if (Div1sim && (RouteSim & Path1) == Path1) + if (Div1sim && (SimRoute & Path1) == Path1) { float diff = DiffKg(Flow1sim, time); Mass1sim += diff; log.WarnFormat("Path1: Div1, Mass1+={0}kg, flow={1}m3/h, Mass1={2}kg", diff, Flow1sim, Mass1sim); } - if (Div1sim && (RouteSim & Path2) == Path2) + if (Div1sim && (SimRoute & Path2) == Path2) { float diff = DiffKg(Flow2sim, time); Mass1sim += diff; log.WarnFormat("Path2: Div1, Mass1 += {0}kg, flow={1}m3/h, Mass1={2}kg", diff, Flow1sim, Mass1sim); } - if (Div2sim && (RouteSim & Path3) == Path3) + if (Div2sim && (SimRoute & Path3) == Path3) { float diff = DiffKg(Flow3sim, time); Mass2sim += diff; log.WarnFormat("Path3: Div2, Mass2 += {0}kg, flow={1}m3/h, Mass2={2}kg", diff, Flow1sim, Mass2sim); } - if (Div3sim && (RouteSim & Path4) == Path4) + if (Div3sim && (SimRoute & Path4) == Path4) { float diff = DiffKg(Flow4sim, time); Mass2sim += diff; log.WarnFormat("Path4: Div3, Mass2 += {0}kg, flow={1}m3/h, Mass2={2}kg", diff, Flow1sim, Mass2sim); } - if (Div3sim && (RouteSim & Path5) == Path5) + if (Div3sim && (SimRoute & Path5) == Path5) { float diff = DiffKg(Flow5sim, time); Mass2sim += diff; @@ -563,10 +563,10 @@ namespace TBF.BenchControl if (Div2sim && (RouteSim & Path2) == Path2) Mass2sim += DiffKg(Flow2sim, time); #endif - if ((RouteSim & EmptyValve1) == EmptyValve1) Mass1sim -= DiffKg(100.0f, time); + if ((SimRoute & EmptyValve1) == EmptyValve1) Mass1sim -= DiffKg(100.0f, time); if (Mass1sim < 0) Mass1sim = 0; - if ((RouteSim & EmptyValve2) == EmptyValve2) Mass2sim -= DiffKg(10.0f, time); + if ((SimRoute & EmptyValve2) == EmptyValve2) Mass2sim -= DiffKg(10.0f, time); if (Mass2sim < 0) Mass2sim = 0; UiBridge.Bridge.OnLog(null, string.Format("I{1}/RV{2}: q1={3}, q2={4}, q3={5}, q4={6}, q5={7}, D123={8}{9}{10}, m1={11}, m2={12}, S={13}\r\n", @@ -754,11 +754,11 @@ namespace TBF.BenchControl { switch (refFlowmtrNo) { - case 1: return ((RouteSim & Path1) == Path1) ? Flow1sim : 0; - case 2: return ((RouteSim & Path2) == Path2) ? Flow2sim : 0; - case 3: return ((RouteSim & Path3) == Path3) ? Flow3sim : 0; - case 4: return (((RouteSim & Path4) == Path4) ? Flow4sim : 0) + - (((RouteSim & Path5) == Path5) ? Flow5sim : 0); + case 1: return ((SimRoute & Path1) == Path1) ? Flow1sim : 0; + case 2: return ((SimRoute & Path2) == Path2) ? Flow2sim : 0; + case 3: return ((SimRoute & Path3) == Path3) ? Flow3sim : 0; + case 4: return (((SimRoute & Path4) == Path4) ? Flow4sim : 0) + + (((SimRoute & Path5) == Path5) ? Flow5sim : 0); default: return 0; } } diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 5a6d1adb2..e749a7ff7 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -70,6 +70,8 @@ namespace TBF this.MeasurementTabPageCtrl = new TBF.Screens.MeasurementTabPageCtrl(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.userInfoStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.statusPStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.routeStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.activityStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.benchTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.benchComponentsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -390,14 +392,26 @@ namespace TBF resources.ApplyResources(this.statusStrip1, "statusStrip1"); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.userInfoStatusLabel, + this.statusPStatusLabel, + this.routeStatusLabel, this.activityStatusLabel}); this.statusStrip1.Name = "statusStrip1"; - // + // // userInfoStatusLabel // resources.ApplyResources(this.userInfoStatusLabel, "userInfoStatusLabel"); this.userInfoStatusLabel.Name = "userInfoStatusLabel"; - // + // + // statusPStatusLabel + // + resources.ApplyResources(this.statusPStatusLabel, "statusPStatusLabel"); + this.statusPStatusLabel.Name = "statusPStatusLabel"; + // + // routeStatusLabel + // + resources.ApplyResources(this.routeStatusLabel, "routeStatusLabel"); + this.routeStatusLabel.Name = "routeStatusLabel"; + // // activityStatusLabel // resources.ApplyResources(this.activityStatusLabel, "activityStatusLabel"); @@ -621,8 +635,10 @@ namespace TBF private System.Windows.Forms.TabPage logsTabPage; private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.ToolStripStatusLabel userInfoStatusLabel; + private System.Windows.Forms.ToolStripStatusLabel statusPStatusLabel; + private System.Windows.Forms.ToolStripStatusLabel routeStatusLabel; private System.Windows.Forms.ToolStripStatusLabel activityStatusLabel; - public Screens.MeasurementTabPageCtrl MeasurementTabPageCtrl; + public Screens.MeasurementTabPageCtrl MeasurementTabPageCtrl; private Screens.ResultsTabPageCtrl resultsTabPageCtrl; private Screens.LogsTabPageCtrl logsTabPageCtrl; diff --git a/TestBenchFramework/MainWnd.cs b/TestBenchFramework/MainWnd.cs index 3fb7bd4b4..2da6b473e 100644 --- a/TestBenchFramework/MainWnd.cs +++ b/TestBenchFramework/MainWnd.cs @@ -333,7 +333,17 @@ namespace TBF public void UpdateUser() { - userInfoStatusLabel.Text = Strings.User_ + User.CurrentUser.Name + " , "; + userInfoStatusLabel.Text = string.Format("{0}: {1} , ", Strings.User, User.CurrentUser.Name); + } + + public void UpdateStatusP(string statusPStr) + { + statusPStatusLabel.Text = string.Format("S={0} , ", statusPStr); + } + + public void UpdateRoute(string routeStr) + { + routeStatusLabel.Text = string.Format("R={0} , ", routeStr); } /// diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs index e6e9cf5c1..29e383b78 100644 --- a/TestBenchFramework/ProcedureDlg.cs +++ b/TestBenchFramework/ProcedureDlg.cs @@ -464,7 +464,7 @@ namespace TBF historyListViewEx.Columns.Add(Strings.Name, (ls.HistoryColumnCount > 0) ? ls.HistoryColumnWidths[0] : 80); historyListViewEx.Columns.Add(Strings.Revision, (ls.HistoryColumnCount > 0) ? ls.HistoryColumnWidths[0] : 80); historyListViewEx.Columns.Add(Strings.Date_and_time, (ls.HistoryColumnCount > 1) ? ls.HistoryColumnWidths[1] : 120); - historyListViewEx.Columns.Add(Strings.User_, (ls.HistoryColumnCount > 2) ? ls.HistoryColumnWidths[2] : 55); + historyListViewEx.Columns.Add(Strings.User, (ls.HistoryColumnCount > 2) ? ls.HistoryColumnWidths[2] : 55); historyListViewEx.Columns.Add(Strings.DescriptionColHdr, (ls.HistoryColumnCount > 3) ? ls.HistoryColumnWidths[3] : 300); RefreshHistoryTab(); diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index d9e25e205..75d3c8ec9 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.7.299.1")] -[assembly: AssemblyFileVersion("2.7.299.1")] +[assembly: AssemblyVersion("2.7.300.1")] +[assembly: AssemblyFileVersion("2.7.300.1")] diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index b72d2a6a6..9a3511f36 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -3682,11 +3682,11 @@ namespace TBF.Resources { } /// - /// Looks up a localized string similar to User : . + /// Looks up a localized string similar to User. /// - internal static string User_ { + internal static string User { get { - return ResourceManager.GetString("User_", resourceCulture); + return ResourceManager.GetString("User", resourceCulture); } } diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx index 0badd67d2..63487d2f2 100644 --- a/TestBenchFramework/Resources/Strings.cs.resx +++ b/TestBenchFramework/Resources/Strings.cs.resx @@ -1074,8 +1074,8 @@ Nahoru - - Uživatel: + + Uživatel Uživatelský login diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx index a5bd19dc8..c64320ff5 100644 --- a/TestBenchFramework/Resources/Strings.de.resx +++ b/TestBenchFramework/Resources/Strings.de.resx @@ -357,8 +357,8 @@ Metr.Daten - - Benutzer : + + Benutzer Die Prüfstation läuft nicht. Sie können die Einstellungen ändern, um das Problem zu löschen. diff --git a/TestBenchFramework/Resources/Strings.pl.resx b/TestBenchFramework/Resources/Strings.pl.resx index d218ba294..f56678e77 100644 --- a/TestBenchFramework/Resources/Strings.pl.resx +++ b/TestBenchFramework/Resources/Strings.pl.resx @@ -693,12 +693,9 @@ Czyszczenie ({0}: {1} krok / {2}) - + Zamówienie - - Zamówienie: - Q od @@ -987,8 +984,8 @@ W górę - - Użytkownik: + + Użytkownik Login użytkownika diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index e5e8523f8..3a020dbc1 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -441,8 +441,8 @@ Unhandled error occured in - - User : + + User (offline) diff --git a/TestBenchFramework/Resources/Strings.ro.resx b/TestBenchFramework/Resources/Strings.ro.resx index bed9164f7..fea77c1f2 100644 --- a/TestBenchFramework/Resources/Strings.ro.resx +++ b/TestBenchFramework/Resources/Strings.ro.resx @@ -774,8 +774,8 @@ Sus - - Utilizator: + + Utilizator Logare utilizator diff --git a/TestBenchFramework/Resources/Strings.zh-CN.resx b/TestBenchFramework/Resources/Strings.zh-CN.resx index db067cbd7..837730fcc 100644 --- a/TestBenchFramework/Resources/Strings.zh-CN.resx +++ b/TestBenchFramework/Resources/Strings.zh-CN.resx @@ -1071,8 +1071,8 @@ 向上 Up - - 用户： + + 用户 用户登录