diff --git a/TBF/BenchControl/Output/FileWriters/ImageArchiver/Archiver.cs b/TBF/BenchControl/Output/FileWriters/ImageArchiver/Archiver.cs index 843b5ea97..5b436f220 100644 --- a/TBF/BenchControl/Output/FileWriters/ImageArchiver/Archiver.cs +++ b/TBF/BenchControl/Output/FileWriters/ImageArchiver/Archiver.cs @@ -1,18 +1,17 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Sensus Slovensko a.s. /// using System; -using System.Collections.Generic; -using System.Globalization; using System.IO; -using System.Threading; using log4net; -using Config.Entities; -using TBF.BenchControl; -using TBF.Resources; namespace TBF.BenchControl.Output.FileWriters.ImageArchiver { + /// + /// Implements an operation 'WriteResultsOp(batch)' that copies files from folder + /// Path.Combine(Program.ImagesDir, batch.BatchNr.ToString(), wm.WMPosition.ToString()) + /// for each water meter in the batch to a destination folder specified by the component properties. + /// public class Archiver : ComponentBase, IOperation, GenericDevices.IResultsWriter { private static readonly ILog log = LogManager.GetLogger(typeof(Archiver)); diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 8c0b9e350..6b3f98013 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -4,10 +4,7 @@ using System; using System.Collections.Generic; using System.IO; -using System.Text; using log4net; -using TBF.BenchControl; -using TBF.Boxes; using TBF.Resources; using TBF.UiBridge; diff --git a/TBF/Forms/PreviousResultsDlg.cs b/TBF/Forms/PreviousResultsDlg.cs index 155e45238..0aa52af97 100644 --- a/TBF/Forms/PreviousResultsDlg.cs +++ b/TBF/Forms/PreviousResultsDlg.cs @@ -80,7 +80,7 @@ namespace TBF.Forms { TBF.UiBridge.Bridge.BatchNr = batch.BatchNr; - Program.MainWnd.ReloadProcedures(batch.ProcedureName); + Program.MainWnd.ReloadProcedureComboBoxItems(batch.ProcedureName); TBF.UiBridge.Bridge.Ui2Bench(TBF.UiBridge.UI2BenchCmd.ReloadBatch); break; } diff --git a/TBF/MainWnd.cs b/TBF/MainWnd.cs index 66df07287..40e5183d8 100644 --- a/TBF/MainWnd.cs +++ b/TBF/MainWnd.cs @@ -256,7 +256,7 @@ namespace TBF } } - procedureComboBox.Text = string.Format("{0} {1}", Program.LocalSettings.LastProcedureNr, Program.LocalSettings.LastProcedureName); + procedureComboBox.Text = string.Format("{0}{1}{2}", Program.LocalSettings.LastProcedureNr, ProcSeparator, Program.LocalSettings.LastProcedureName); ProcedureName = Program.LocalSettings.LastProcedureName; rightHorizSplitContainer.SplitterDistance = Program.LocalSettings.RightPaneHorizSplitterDistance; topVerticalSplitContainer.SplitterDistance = Program.LocalSettings.TopPaneVerticalSplitterDistance; @@ -286,7 +286,7 @@ namespace TBF new System.ComponentModel.ComponentResourceManager(typeof(MainWnd)).ApplyResources(BenchControlPanel, "benchControlPanel"); BenchControlPanel.Name = "benchControlPanel"; rightHorizSplitContainer.Panel2.Controls.Add(BenchControlPanel); - ReloadProcedures(); + ReloadProcedureComboBoxItems(); /// Select the initial tab page mainTabControl.SelectTab((int)MainTabPageId.Process); /// This is to load the 'Process screen' @@ -387,7 +387,7 @@ namespace TBF if (!CycleRunning && ProceduresUpdated) { - ReloadProcedures(); + ReloadProcedureComboBoxItems(); } } @@ -445,13 +445,14 @@ namespace TBF /// Read the database and re-initialize procedureComboBox items. /// Try to preserve the original selection. /// - public void ReloadProcedures() + public void ReloadProcedureComboBoxItems() { int separPos = procedureComboBox.Text.IndexOf(ProcSeparator); - ReloadProcedures((separPos >= 0) ? procedureComboBox.Text.Substring(separPos + ProcSeparator.Length) : string.Empty); + ReloadProcedureComboBoxItems((separPos >= 0) ? procedureComboBox.Text.Substring(separPos + ProcSeparator.Length) : string.Empty); } - public void ReloadProcedures(string procedureNameToSelect) + + public void ReloadProcedureComboBoxItems(string procedureNameToSelect) { if (procedureComboBox.Enabled) { @@ -464,7 +465,7 @@ namespace TBF procedureComboBox.Items.Clear(); foreach (var proc in procedures) { - string itemText = string.Format("{0} {1}", proc.ItemNr + 1, proc.Name); + string itemText = string.Format("{0}{1}{2}", proc.ItemNr + 1, ProcSeparator, proc.Name); procedureComboBox.Items.Add(itemText); if (procedureNameToSelect == proc.Name) { @@ -478,7 +479,7 @@ namespace TBF { if (procedures.Count > 0) { - procedureComboBox.Text = string.Format("{0} {1}", procedures[0].ItemNr + 1, procedures[0].Name); + procedureComboBox.Text = string.Format("{0}{1}{2}", procedures[0].ItemNr + 1, ProcSeparator, procedures[0].Name); ProcedureName = procedures[0].Name; } else diff --git a/TBF/MainWnd.resx b/TBF/MainWnd.resx index ba62053b0..c4903f1e1 100644 --- a/TBF/MainWnd.resx +++ b/TBF/MainWnd.resx @@ -125,6 +125,25 @@ 0, 0 + + + True + + + Verdana, 15.75pt + + + NoControl + + + 6, 68 + + + 0, 25 + + + 1 + messageLabel @@ -137,6 +156,24 @@ 0 + + True + + + Verdana, 15.75pt + + + NoControl + + + 6, 28 + + + 0, 25 + + + 0 + activityLabel @@ -161,7 +198,6 @@ 335, 115 - 18 @@ -216,6 +252,27 @@ 0, 0 + + Fill + + + False + + + Verdana, 15.75pt + + + 13, 23 + + + 23, 3, 3, 3 + + + 389, 33 + + + 6 + procedureComboBox @@ -273,6 +330,18 @@ 0 + + NoControl + + + 6, 23 + + + 237, 33 + + + 0 + mainProgressBar @@ -360,6 +429,21 @@ 0 + + True + + + NoControl + + + 8, 15 + + + 0, 13 + + + 0 + descriptionLabel @@ -465,150 +549,6 @@ 0 - - True - - - Verdana, 15.75pt - - - NoControl - - - 6, 68 - - - 0, 25 - - - 1 - - - messageLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - activityGroupBox - - - 0 - - - True - - - Verdana, 15.75pt - - - NoControl - - - 6, 28 - - - 0, 25 - - - 0 - - - activityLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - activityGroupBox - - - 1 - - - Fill - - - False - - - Verdana, 15.75pt - - - 13, 23 - - - 23, 3, 3, 3 - - - 389, 33 - - - 6 - - - procedureComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - procedureGroupBox - - - 0 - - - NoControl - - - 6, 23 - - - 237, 33 - - - 0 - - - mainProgressBar - - - System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - progressGroupBox - - - 0 - - - True - - - NoControl - - - 8, 15 - - - 0, 13 - - - 0 - - - descriptionLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - descriptionGroupBox - - - 0 - Fill @@ -642,6 +582,42 @@ 0 + + Fill + + + 0, 0 + + + 1012, 523 + + + 1 + + + ctrlBrdComponent + + + ControlComponent_Torino2015.UserControl1, ControlComponent3U, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + homeTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 29 + + + Hydraulics + homeTabPage @@ -654,6 +630,48 @@ 0 + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 4, 4, 4, 4 + + + 1012, 523 + + + 1 + + + processTabPageCtrl + + + TBF.Screens.ProcessTabPageCtrl48, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null + + + processTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 30 + + + Process + processTabPage @@ -666,6 +684,18 @@ 1 + + 4, 5 + + + 1012, 523 + + + 22 + + + Insert + insertTabPage @@ -678,6 +708,48 @@ 2 + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 4, 4, 4, 4 + + + 1012, 523 + + + 0 + + + resultsTabPageCtrl + + + TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null + + + resultsTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 15 + + + Results + resultsTabPage @@ -690,6 +762,45 @@ 3 + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 1012, 523 + + + 0 + + + graphsTabPageCtrl + + + TBF.Screens.GraphsTabPageCtrl, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null + + + graphsTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 32 + + + Graphs + graphsTabPage @@ -702,6 +813,48 @@ 4 + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 4, 4, 4, 4 + + + 1012, 523 + + + 0 + + + logsTabPageCtrl + + + TBF.Screens.LogsTabPageCtrl, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null + + + logsTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 21 + + + Logs + logsTabPage @@ -714,6 +867,45 @@ 5 + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 1012, 523 + + + 0 + + + picturesTabPageCtrl + + + TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null + + + picturesTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 31 + + + Pictures + picturesTabPage @@ -918,419 +1110,29 @@ 0 - - ctrlBrdComponent - - - ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - homeTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 29 - - - Hydraulics - - - homeTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 0 - - + Fill - + + Verdana, 11.25pt + + 0, 0 - - 1012, 523 - - - 1 - - - ctrlBrdComponent - - - ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - homeTabPage - - - 0 - - - processTabPageCtrl - - - TBF.Screens.ProcessTabPageCtrl6, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null - - - processTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 30 - - - Process - - - processTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 1 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - + 4, 4, 4, 4 - + 1012, 523 - - 1 - - - processTabPageCtrl - - - TBF.Screens.ProcessTabPageCtrl6, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null - - - processTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 22 - - - Insert - - - insertTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 2 - - - resultsTabPageCtrl - - - TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null - - - resultsTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 15 - - - Results - - - resultsTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 3 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 4, 4, 4, 4 - - - 1012, 523 - - - 0 - - - resultsTabPageCtrl - - - TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null - - - resultsTabPage - - - 0 - - - graphsTabPageCtrl - - - TBF.Screens.GraphsTabPageCtrl, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null - - - graphsTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 32 - - - Graphs - - - graphsTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 4 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 1012, 523 - - - 0 - - - graphsTabPageCtrl - - - TBF.Screens.GraphsTabPageCtrl, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null - - - graphsTabPage - - - 0 - - - logsTabPageCtrl - - - TBF.Screens.LogsTabPageCtrl, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null - - - logsTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 21 - - - Logs - - - logsTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 5 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 4, 4, 4, 4 - - - 1012, 523 - - - 0 - - - logsTabPageCtrl - - - TBF.Screens.LogsTabPageCtrl, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null - - - logsTabPage - - - 0 - - - picturesTabPageCtrl - - - TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null - - - picturesTabPage - - - 0 - - - 4, 5 - - - 1012, 523 - - - 31 - - - Pictures - - - picturesTabPage - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mainTabControl - - - 6 - - - Fill - - - Microsoft Sans Serif, 8.25pt - - - 0, 0 - - - 1012, 523 - - - 0 - - - picturesTabPageCtrl - - - TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null - - - picturesTabPage - - + 0 MeasurementTabPageCtrl - TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null + TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null measurementTabPage @@ -1356,39 +1158,21 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill - - - Verdana, 11.25pt - - - 0, 0 - - - 4, 4, 4, 4 - - - 1012, 523 - - - 0 - - - MeasurementTabPageCtrl - - - TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.17.722.1, Culture=neutral, PublicKeyToken=null - - - measurementTabPage - - - 0 - 152, 17 + + 0, 17 + + + 0, 17 + + + 0, 17 + + + 0, 17 + 0, 680 @@ -1413,24 +1197,6 @@ 1 - - 0, 17 - - - 0, 17 - - - 0, 17 - - - 0, 17 - - - 52, 20 - - - Bench - 143, 22 @@ -1464,6 +1230,12 @@ Exit + + 52, 20 + + + Bench + 52, 20 @@ -1483,37 +1255,37 @@ Logs - 152, 22 + 133, 22 Users - 152, 22 + 133, 22 Language - 152, 22 + 133, 22 Database - 152, 22 + 133, 22 Password - 152, 22 + 133, 22 Upgrade - 152, 22 + 133, 22 iPerl Heads @@ -1524,18 +1296,18 @@ Settings - - 44, 20 - - - Help - 107, 22 About + + 44, 20 + + + Help + 17, 17 @@ -1722,6 +1494,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + iPerlHeadsToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + helpTSMenuItem @@ -1758,12 +1536,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - iPerlHeadsToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MainWnd diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 461cc7a8f..06c23b72b 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.931.0")] -[assembly: AssemblyFileVersion("2.18.931.0")] +[assembly: AssemblyVersion("2.18.933.0")] +[assembly: AssemblyFileVersion("2.18.933.0")] diff --git a/TBF/Screens/GraphsTabPageCtrl.cs b/TBF/Screens/GraphsTabPageCtrl.cs index 5ebaed374..12332a3b1 100644 --- a/TBF/Screens/GraphsTabPageCtrl.cs +++ b/TBF/Screens/GraphsTabPageCtrl.cs @@ -45,16 +45,21 @@ namespace TBF.Screens Localize(); UpdateCheckBoxesVisibility(); - checkBox1.Checked = Program.LocalSettings.Graph1_On; - checkBox2.Checked = Program.LocalSettings.Graph2_On; - checkBox3.Checked = Program.LocalSettings.Graph3_On; - checkBox4.Checked = Program.LocalSettings.Graph4_On; - checkBox5.Checked = Program.LocalSettings.Graph5_On; - checkBox6.Checked = Program.LocalSettings.Graph6_On; - checkBox7.Checked = Program.LocalSettings.Graph7_On; - checkBox8.Checked = Program.LocalSettings.Graph8_On; - layoutMode = Program.LocalSettings.GraphsLayoutMode; + layoutMode = GraphLib.PlotterGraphPaneEx.LayoutMode.NORMAL; /// Default value + if (Program.LocalSettings != null) + { + checkBox1.Checked = Program.LocalSettings.Graph1_On; + checkBox2.Checked = Program.LocalSettings.Graph2_On; + checkBox3.Checked = Program.LocalSettings.Graph3_On; + checkBox4.Checked = Program.LocalSettings.Graph4_On; + checkBox5.Checked = Program.LocalSettings.Graph5_On; + checkBox6.Checked = Program.LocalSettings.Graph6_On; + checkBox7.Checked = Program.LocalSettings.Graph7_On; + checkBox8.Checked = Program.LocalSettings.Graph8_On; + layoutMode = Program.LocalSettings.GraphsLayoutMode; /// Override the default value + } + layoutModeComboBox.Text = layoutMode.ToString(); for (PlotterGraphPaneEx.LayoutMode mode = 0; mode <= PlotterGraphPaneEx.LayoutMode.TILES_HOR; mode++) { diff --git a/TBF/UiControls/ProceduresCtrl.cs b/TBF/UiControls/ProceduresCtrl.cs index 345404ea6..fee6e353c 100644 --- a/TBF/UiControls/ProceduresCtrl.cs +++ b/TBF/UiControls/ProceduresCtrl.cs @@ -133,7 +133,7 @@ namespace TBF.UiControls } Program.LocalSettings.Save(); - Program.MainWnd.ReloadProcedures(); + Program.MainWnd.ReloadProcedureComboBoxItems(); } public void AddOne()