From 0ef9505af1006613c5c97c1f16639bf6c906532c Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 28 Aug 2018 09:28:58 +0200 Subject: [PATCH] MonitoringDB --> TracingDB, TBF ver. 2.18.981 --- .gitignore | 4 ++-- TBF.sln | 2 +- .../Output/DB/ProductionMonitoring/Monitoring.cs | 6 +++--- .../DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs | 2 +- TBF/Properties/AssemblyInfo.cs | 4 ++-- TBF/TBF.csproj | 4 ++-- {MonitoringDB => TracingDB}/BatteryInfo.cs | 4 ++-- {MonitoringDB => TracingDB}/Entities/Option1.cs | 2 +- {MonitoringDB => TracingDB}/Entities/Option2.cs | 2 +- {MonitoringDB => TracingDB}/Entities/Part.cs | 2 +- {MonitoringDB => TracingDB}/Entities/Process.cs | 2 +- {MonitoringDB => TracingDB}/Entities/Record.cs | 2 +- .../Entities/ReferenceRecord.cs | 2 +- {MonitoringDB => TracingDB}/Entities/Workstep.cs | 2 +- {MonitoringDB => TracingDB}/Enums.cs | 2 +- {MonitoringDB => TracingDB}/FluentNH.cs | 4 ++-- {MonitoringDB => TracingDB}/Forms/ListViewEx.cs | 2 +- {MonitoringDB => TracingDB}/Forms/ListViewEx.resx | 0 .../Forms/ModelessForm.Designer.cs | 2 +- {MonitoringDB => TracingDB}/Forms/ModelessForm.cs | 2 +- {MonitoringDB => TracingDB}/Forms/ModelessForm.resx | 0 {MonitoringDB => TracingDB}/Forms/ResultsConfigDlg.cs | 6 +++--- .../Forms/ResultsConfigDlg.designer.cs | 8 ++++---- .../Forms/ResultsConfigDlg.resx | 0 .../Forms/SettingsDlg.Designer.cs | 2 +- {MonitoringDB => TracingDB}/Forms/SettingsDlg.cs | 10 +++++----- {MonitoringDB => TracingDB}/Forms/SettingsDlg.resx | 0 {MonitoringDB => TracingDB}/Forms/TrivialLoginDlg.cs | 2 +- .../Forms/TrivialLoginDlg.designer.cs | 2 +- {MonitoringDB => TracingDB}/Forms/TrivialLoginDlg.resx | 0 {MonitoringDB => TracingDB}/Interfaces/IOption.cs | 2 +- {MonitoringDB => TracingDB}/ItemSpec.cs | 6 +++--- {MonitoringDB => TracingDB}/Mappings/Option1Map.cs | 2 +- {MonitoringDB => TracingDB}/Mappings/Option2Map.cs | 2 +- {MonitoringDB => TracingDB}/Mappings/PartMap.cs | 2 +- {MonitoringDB => TracingDB}/Mappings/ProcessMap.cs | 2 +- {MonitoringDB => TracingDB}/Mappings/RecordMap.cs | 2 +- .../Mappings/ReferenceRecordMap.cs | 2 +- {MonitoringDB => TracingDB}/Mappings/WorkstepMap.cs | 2 +- {MonitoringDB => TracingDB}/Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 4 ++-- {MonitoringDB => TracingDB}/Properties/Resources.resx | 0 {MonitoringDB => TracingDB}/QuitAppException.cs | 2 +- .../Resources/Strings.Designer.cs | 4 ++-- {MonitoringDB => TracingDB}/Resources/Strings.resx | 0 {MonitoringDB => TracingDB}/ScanVerificationInfo.cs | 4 ++-- {MonitoringDB => TracingDB}/SerializableDictionary.cs | 2 +- .../MonitoringDB.csproj => TracingDB/TracingDB.csproj | 4 ++-- {MonitoringDB => TracingDB}/WMPart.cs | 4 ++-- {MonitoringDB => TracingDB}/app.config | 0 {MonitoringDB => TracingDB}/packages.config | 0 clean.bat | 4 ++-- 52 files changed, 66 insertions(+), 66 deletions(-) rename {MonitoringDB => TracingDB}/BatteryInfo.cs (98%) rename {MonitoringDB => TracingDB}/Entities/Option1.cs (98%) rename {MonitoringDB => TracingDB}/Entities/Option2.cs (98%) rename {MonitoringDB => TracingDB}/Entities/Part.cs (98%) rename {MonitoringDB => TracingDB}/Entities/Process.cs (98%) rename {MonitoringDB => TracingDB}/Entities/Record.cs (98%) rename {MonitoringDB => TracingDB}/Entities/ReferenceRecord.cs (98%) rename {MonitoringDB => TracingDB}/Entities/Workstep.cs (98%) rename {MonitoringDB => TracingDB}/Enums.cs (98%) rename {MonitoringDB => TracingDB}/FluentNH.cs (98%) rename {MonitoringDB => TracingDB}/Forms/ListViewEx.cs (99%) rename {MonitoringDB => TracingDB}/Forms/ListViewEx.resx (100%) rename {MonitoringDB => TracingDB}/Forms/ModelessForm.Designer.cs (98%) rename {MonitoringDB => TracingDB}/Forms/ModelessForm.cs (98%) rename {MonitoringDB => TracingDB}/Forms/ModelessForm.resx (100%) rename {MonitoringDB => TracingDB}/Forms/ResultsConfigDlg.cs (99%) rename {MonitoringDB => TracingDB}/Forms/ResultsConfigDlg.designer.cs (96%) rename {MonitoringDB => TracingDB}/Forms/ResultsConfigDlg.resx (100%) rename {MonitoringDB => TracingDB}/Forms/SettingsDlg.Designer.cs (99%) rename {MonitoringDB => TracingDB}/Forms/SettingsDlg.cs (90%) rename {MonitoringDB => TracingDB}/Forms/SettingsDlg.resx (100%) rename {MonitoringDB => TracingDB}/Forms/TrivialLoginDlg.cs (97%) rename {MonitoringDB => TracingDB}/Forms/TrivialLoginDlg.designer.cs (99%) rename {MonitoringDB => TracingDB}/Forms/TrivialLoginDlg.resx (100%) rename {MonitoringDB => TracingDB}/Interfaces/IOption.cs (94%) rename {MonitoringDB => TracingDB}/ItemSpec.cs (99%) rename {MonitoringDB => TracingDB}/Mappings/Option1Map.cs (93%) rename {MonitoringDB => TracingDB}/Mappings/Option2Map.cs (93%) rename {MonitoringDB => TracingDB}/Mappings/PartMap.cs (93%) rename {MonitoringDB => TracingDB}/Mappings/ProcessMap.cs (93%) rename {MonitoringDB => TracingDB}/Mappings/RecordMap.cs (89%) rename {MonitoringDB => TracingDB}/Mappings/ReferenceRecordMap.cs (93%) rename {MonitoringDB => TracingDB}/Mappings/WorkstepMap.cs (93%) rename {MonitoringDB => TracingDB}/Properties/AssemblyInfo.cs (100%) rename {MonitoringDB => TracingDB}/Properties/Resources.Designer.cs (94%) rename {MonitoringDB => TracingDB}/Properties/Resources.resx (100%) rename {MonitoringDB => TracingDB}/QuitAppException.cs (88%) rename {MonitoringDB => TracingDB}/Resources/Strings.Designer.cs (98%) rename {MonitoringDB => TracingDB}/Resources/Strings.resx (100%) rename {MonitoringDB => TracingDB}/ScanVerificationInfo.cs (93%) rename {MonitoringDB => TracingDB}/SerializableDictionary.cs (98%) rename MonitoringDB/MonitoringDB.csproj => TracingDB/TracingDB.csproj (98%) rename {MonitoringDB => TracingDB}/WMPart.cs (96%) rename {MonitoringDB => TracingDB}/app.config (100%) rename {MonitoringDB => TracingDB}/packages.config (100%) diff --git a/.gitignore b/.gitignore index 112130a25..7cf29ff13 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,8 @@ GemCard/bin GemCard/obj GraphLib/bin GraphLib/obj -MonitoringDB/bin -MonitoringDB/obj +TracingDB/bin +TracingDB/obj Results/bin/ Results/obj/ ResultsBrowser/bin/ diff --git a/TBF.sln b/TBF.sln index 2677fa39f..108c3a6ed 100644 --- a/TBF.sln +++ b/TBF.sln @@ -42,7 +42,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphLib", "GraphLib\GraphL {743DF7DB-C7B6-42EB-986D-0F485E5588E4} = {743DF7DB-C7B6-42EB-986D-0F485E5588E4} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonitoringDB", "MonitoringDB\MonitoringDB.csproj", "{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TracingDB", "TracingDB\TracingDB.csproj", "{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GemCard", "GemCard\GemCard.csproj", "{8B10D15A-39DE-4B56-8DD1-710C1EB3A697}" EndProject diff --git a/TBF/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs b/TBF/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs index af83b34bf..ac7ad8e50 100644 --- a/TBF/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs +++ b/TBF/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using log4net; using NHibernate; using Config.Entities; -using MonitoringDB.Entities; +using TracingDB.Entities; namespace TBF.BenchControl.Output.DB.ProductionMonitoring { @@ -70,8 +70,8 @@ namespace TBF.BenchControl.Output.DB.ProductionMonitoring sessionFactory = FluentNHibernate.Cfg.Fluently .Configure() .Database(FluentNHibernate.Cfg.Db.MySQLConfiguration.Standard.ConnectionString(monitoringCfg.ConnStr)) - .Mappings(m => m.FluentMappings.AddFromAssemblyOf()) - .ExposeConfiguration(MonitoringDB.FluentNH.BuildSchema) + .Mappings(m => m.FluentMappings.AddFromAssemblyOf()) + .ExposeConfiguration(TracingDB.FluentNH.BuildSchema) .BuildSessionFactory(); /// /// Read processes and worksteps from the database (this verifies DB connection as well) diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs index 36031f786..1420bd658 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs @@ -8,7 +8,7 @@ using NHibernate; using NHibernate.Criterion; using Config; using Config.Entities; -using MonitoringDB.Entities; +using TracingDB.Entities; using TBF.BenchControl.Generic; using TBF.BenchControl.GenericDevices; diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 9262ea1d4..bdf859f1f 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.980.0")] -[assembly: AssemblyFileVersion("2.18.980.0")] +[assembly: AssemblyVersion("2.18.981.0")] +[assembly: AssemblyFileVersion("2.18.981.0")] diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index e2c5b31a7..defd8156d 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -2946,9 +2946,9 @@ {0C0A1F4D-1363-4544-A7C5-196C76D26CCA} GraphLib - + {EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF} - MonitoringDB + TracingDB {9D0DCC88-DC81-47EB-9FDD-4C3907871BFB} diff --git a/MonitoringDB/BatteryInfo.cs b/TracingDB/BatteryInfo.cs similarity index 98% rename from MonitoringDB/BatteryInfo.cs rename to TracingDB/BatteryInfo.cs index f2bdff51c..0e4051462 100644 --- a/MonitoringDB/BatteryInfo.cs +++ b/TracingDB/BatteryInfo.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using log4net; -using MonitoringDB.Entities; +using TracingDB.Entities; -namespace MonitoringDB +namespace TracingDB { public class BatteryInfo { diff --git a/MonitoringDB/Entities/Option1.cs b/TracingDB/Entities/Option1.cs similarity index 98% rename from MonitoringDB/Entities/Option1.cs rename to TracingDB/Entities/Option1.cs index fc0f91a22..64d72ae5e 100644 --- a/MonitoringDB/Entities/Option1.cs +++ b/TracingDB/Entities/Option1.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MonitoringDB.Entities +namespace TracingDB.Entities { public class Option1 : Interfaces.IOption { diff --git a/MonitoringDB/Entities/Option2.cs b/TracingDB/Entities/Option2.cs similarity index 98% rename from MonitoringDB/Entities/Option2.cs rename to TracingDB/Entities/Option2.cs index 1cddd27be..5cbeb27a7 100644 --- a/MonitoringDB/Entities/Option2.cs +++ b/TracingDB/Entities/Option2.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MonitoringDB.Entities +namespace TracingDB.Entities { public class Option2 : Interfaces.IOption { diff --git a/MonitoringDB/Entities/Part.cs b/TracingDB/Entities/Part.cs similarity index 98% rename from MonitoringDB/Entities/Part.cs rename to TracingDB/Entities/Part.cs index 6368f4bdd..6c740a87b 100644 --- a/MonitoringDB/Entities/Part.cs +++ b/TracingDB/Entities/Part.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MonitoringDB.Entities +namespace TracingDB.Entities { public class Part { diff --git a/MonitoringDB/Entities/Process.cs b/TracingDB/Entities/Process.cs similarity index 98% rename from MonitoringDB/Entities/Process.cs rename to TracingDB/Entities/Process.cs index 121e82cb9..ff34d3ccf 100644 --- a/MonitoringDB/Entities/Process.cs +++ b/TracingDB/Entities/Process.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MonitoringDB.Entities +namespace TracingDB.Entities { public class Process { diff --git a/MonitoringDB/Entities/Record.cs b/TracingDB/Entities/Record.cs similarity index 98% rename from MonitoringDB/Entities/Record.cs rename to TracingDB/Entities/Record.cs index 2880e28e6..a1a083eb5 100644 --- a/MonitoringDB/Entities/Record.cs +++ b/TracingDB/Entities/Record.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MonitoringDB.Entities +namespace TracingDB.Entities { public class Record { diff --git a/MonitoringDB/Entities/ReferenceRecord.cs b/TracingDB/Entities/ReferenceRecord.cs similarity index 98% rename from MonitoringDB/Entities/ReferenceRecord.cs rename to TracingDB/Entities/ReferenceRecord.cs index 00b65eb59..c0bc985b7 100644 --- a/MonitoringDB/Entities/ReferenceRecord.cs +++ b/TracingDB/Entities/ReferenceRecord.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MonitoringDB.Entities +namespace TracingDB.Entities { public class ReferenceRecord { diff --git a/MonitoringDB/Entities/Workstep.cs b/TracingDB/Entities/Workstep.cs similarity index 98% rename from MonitoringDB/Entities/Workstep.cs rename to TracingDB/Entities/Workstep.cs index fb8832532..743b5be68 100644 --- a/MonitoringDB/Entities/Workstep.cs +++ b/TracingDB/Entities/Workstep.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MonitoringDB.Entities +namespace TracingDB.Entities { public class Workstep { diff --git a/MonitoringDB/Enums.cs b/TracingDB/Enums.cs similarity index 98% rename from MonitoringDB/Enums.cs rename to TracingDB/Enums.cs index 3a4092ec3..7683f5ce7 100644 --- a/MonitoringDB/Enums.cs +++ b/TracingDB/Enums.cs @@ -1,4 +1,4 @@ -namespace MonitoringDB +namespace TracingDB { public enum CodeType { diff --git a/MonitoringDB/FluentNH.cs b/TracingDB/FluentNH.cs similarity index 98% rename from MonitoringDB/FluentNH.cs rename to TracingDB/FluentNH.cs index bc798be62..2da67f650 100644 --- a/MonitoringDB/FluentNH.cs +++ b/TracingDB/FluentNH.cs @@ -6,7 +6,7 @@ using NHibernate; using NHibernate.Cfg; using NHibernate.Tool.hbm2ddl; -namespace MonitoringDB +namespace TracingDB { public static class FluentNH { @@ -110,7 +110,7 @@ namespace MonitoringDB { //using (var transaction = session.BeginTransaction()) //{ - // var part1 = new MonitoringDB.Entities.Part("flow tube", CodeType.UniqueNr, CodeForm.QRCode, 0); + // var part1 = new TracingDB.Entities.Part("flow tube", CodeType.UniqueNr, CodeForm.QRCode, 0); // session.SaveOrUpdate(part1); // transaction.Commit(); //} diff --git a/MonitoringDB/Forms/ListViewEx.cs b/TracingDB/Forms/ListViewEx.cs similarity index 99% rename from MonitoringDB/Forms/ListViewEx.cs rename to TracingDB/Forms/ListViewEx.cs index f24176286..c0ca2e2c4 100644 --- a/MonitoringDB/Forms/ListViewEx.cs +++ b/TracingDB/Forms/ListViewEx.cs @@ -9,7 +9,7 @@ using System.Data; using System.Windows.Forms; using System.Runtime.InteropServices; -namespace MonitoringDB.Forms +namespace TracingDB.Forms { /// /// Event Handler for SubItem events diff --git a/MonitoringDB/Forms/ListViewEx.resx b/TracingDB/Forms/ListViewEx.resx similarity index 100% rename from MonitoringDB/Forms/ListViewEx.resx rename to TracingDB/Forms/ListViewEx.resx diff --git a/MonitoringDB/Forms/ModelessForm.Designer.cs b/TracingDB/Forms/ModelessForm.Designer.cs similarity index 98% rename from MonitoringDB/Forms/ModelessForm.Designer.cs rename to TracingDB/Forms/ModelessForm.Designer.cs index 2e5ae7b74..928c05e1a 100644 --- a/MonitoringDB/Forms/ModelessForm.Designer.cs +++ b/TracingDB/Forms/ModelessForm.Designer.cs @@ -1,4 +1,4 @@ -namespace MonitoringDB.Forms +namespace TracingDB.Forms { partial class ModelessForm { diff --git a/MonitoringDB/Forms/ModelessForm.cs b/TracingDB/Forms/ModelessForm.cs similarity index 98% rename from MonitoringDB/Forms/ModelessForm.cs rename to TracingDB/Forms/ModelessForm.cs index 1f6186e39..c5ad2469d 100644 --- a/MonitoringDB/Forms/ModelessForm.cs +++ b/TracingDB/Forms/ModelessForm.cs @@ -2,7 +2,7 @@ using System.Drawing; using System.Windows.Forms; -namespace MonitoringDB.Forms +namespace TracingDB.Forms { public partial class ModelessForm : Form { diff --git a/MonitoringDB/Forms/ModelessForm.resx b/TracingDB/Forms/ModelessForm.resx similarity index 100% rename from MonitoringDB/Forms/ModelessForm.resx rename to TracingDB/Forms/ModelessForm.resx diff --git a/MonitoringDB/Forms/ResultsConfigDlg.cs b/TracingDB/Forms/ResultsConfigDlg.cs similarity index 99% rename from MonitoringDB/Forms/ResultsConfigDlg.cs rename to TracingDB/Forms/ResultsConfigDlg.cs index ed5b67817..4ae0bfb38 100644 --- a/MonitoringDB/Forms/ResultsConfigDlg.cs +++ b/TracingDB/Forms/ResultsConfigDlg.cs @@ -5,10 +5,10 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using log4net; -using MonitoringDB.Entities; -using MonitoringDB.Resources; +using TracingDB.Entities; +using TracingDB.Resources; -namespace MonitoringDB.Forms +namespace TracingDB.Forms { public partial class ResultsConfigDlg : Form { diff --git a/MonitoringDB/Forms/ResultsConfigDlg.designer.cs b/TracingDB/Forms/ResultsConfigDlg.designer.cs similarity index 96% rename from MonitoringDB/Forms/ResultsConfigDlg.designer.cs rename to TracingDB/Forms/ResultsConfigDlg.designer.cs index e99d463b0..8e80e3ff3 100644 --- a/MonitoringDB/Forms/ResultsConfigDlg.designer.cs +++ b/TracingDB/Forms/ResultsConfigDlg.designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2016 Sensus Metering Systems /// -namespace MonitoringDB.Forms +namespace TracingDB.Forms { partial class ResultsConfigDlg { @@ -39,7 +39,7 @@ namespace MonitoringDB.Forms this.removeAllButton = new System.Windows.Forms.Button(); this.removeButton = new System.Windows.Forms.Button(); this.addButton = new System.Windows.Forms.Button(); - this.selectedResultsListViewEx = new MonitoringDB.Forms.ListViewEx(); + this.selectedResultsListViewEx = new TracingDB.Forms.ListViewEx(); this.upButton = new System.Windows.Forms.Button(); this.downButton = new System.Windows.Forms.Button(); this.SuspendLayout(); @@ -133,8 +133,8 @@ namespace MonitoringDB.Forms this.selectedResultsListViewEx.TabIndex = 47; this.selectedResultsListViewEx.UseCompatibleStateImageBehavior = false; this.selectedResultsListViewEx.View = System.Windows.Forms.View.Details; - this.selectedResultsListViewEx.SubItemClicked += new MonitoringDB.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked); - this.selectedResultsListViewEx.SubItemEndEditing += new MonitoringDB.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing); + this.selectedResultsListViewEx.SubItemClicked += new TracingDB.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked); + this.selectedResultsListViewEx.SubItemEndEditing += new TracingDB.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing); // // upButton // diff --git a/MonitoringDB/Forms/ResultsConfigDlg.resx b/TracingDB/Forms/ResultsConfigDlg.resx similarity index 100% rename from MonitoringDB/Forms/ResultsConfigDlg.resx rename to TracingDB/Forms/ResultsConfigDlg.resx diff --git a/MonitoringDB/Forms/SettingsDlg.Designer.cs b/TracingDB/Forms/SettingsDlg.Designer.cs similarity index 99% rename from MonitoringDB/Forms/SettingsDlg.Designer.cs rename to TracingDB/Forms/SettingsDlg.Designer.cs index a4e69e333..8aaabe880 100644 --- a/MonitoringDB/Forms/SettingsDlg.Designer.cs +++ b/TracingDB/Forms/SettingsDlg.Designer.cs @@ -1,4 +1,4 @@ -namespace MonitoringDB.Forms +namespace TracingDB.Forms { partial class SettingsDlg { diff --git a/MonitoringDB/Forms/SettingsDlg.cs b/TracingDB/Forms/SettingsDlg.cs similarity index 90% rename from MonitoringDB/Forms/SettingsDlg.cs rename to TracingDB/Forms/SettingsDlg.cs index ae30c400b..63edec45b 100644 --- a/MonitoringDB/Forms/SettingsDlg.cs +++ b/TracingDB/Forms/SettingsDlg.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -namespace MonitoringDB.Forms +namespace TracingDB.Forms { public partial class SettingsDlg : Form { @@ -48,16 +48,16 @@ namespace MonitoringDB.Forms } } - public MonitoringDB.Mode Mode + public TracingDB.Mode Mode { set { - radioButton1.Checked = (value == MonitoringDB.Mode.Test); - radioButton2.Checked = (value == MonitoringDB.Mode.Production); + radioButton1.Checked = (value == TracingDB.Mode.Test); + radioButton2.Checked = (value == TracingDB.Mode.Production); } get { - return radioButton1.Checked ? MonitoringDB.Mode.Test : MonitoringDB.Mode.Production; + return radioButton1.Checked ? TracingDB.Mode.Test : TracingDB.Mode.Production; } } diff --git a/MonitoringDB/Forms/SettingsDlg.resx b/TracingDB/Forms/SettingsDlg.resx similarity index 100% rename from MonitoringDB/Forms/SettingsDlg.resx rename to TracingDB/Forms/SettingsDlg.resx diff --git a/MonitoringDB/Forms/TrivialLoginDlg.cs b/TracingDB/Forms/TrivialLoginDlg.cs similarity index 97% rename from MonitoringDB/Forms/TrivialLoginDlg.cs rename to TracingDB/Forms/TrivialLoginDlg.cs index 417172f0e..334e53dc6 100644 --- a/MonitoringDB/Forms/TrivialLoginDlg.cs +++ b/TracingDB/Forms/TrivialLoginDlg.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -namespace MonitoringDB.Forms +namespace TracingDB.Forms { public partial class TrivialLoginDlg : Form { diff --git a/MonitoringDB/Forms/TrivialLoginDlg.designer.cs b/TracingDB/Forms/TrivialLoginDlg.designer.cs similarity index 99% rename from MonitoringDB/Forms/TrivialLoginDlg.designer.cs rename to TracingDB/Forms/TrivialLoginDlg.designer.cs index a6ed92a77..31cfc85cf 100644 --- a/MonitoringDB/Forms/TrivialLoginDlg.designer.cs +++ b/TracingDB/Forms/TrivialLoginDlg.designer.cs @@ -1,4 +1,4 @@ -namespace MonitoringDB.Forms +namespace TracingDB.Forms { partial class TrivialLoginDlg { diff --git a/MonitoringDB/Forms/TrivialLoginDlg.resx b/TracingDB/Forms/TrivialLoginDlg.resx similarity index 100% rename from MonitoringDB/Forms/TrivialLoginDlg.resx rename to TracingDB/Forms/TrivialLoginDlg.resx diff --git a/MonitoringDB/Interfaces/IOption.cs b/TracingDB/Interfaces/IOption.cs similarity index 94% rename from MonitoringDB/Interfaces/IOption.cs rename to TracingDB/Interfaces/IOption.cs index c585a3ad1..e3114ded4 100644 --- a/MonitoringDB/Interfaces/IOption.cs +++ b/TracingDB/Interfaces/IOption.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MonitoringDB.Interfaces +namespace TracingDB.Interfaces { public interface IOption { diff --git a/MonitoringDB/ItemSpec.cs b/TracingDB/ItemSpec.cs similarity index 99% rename from MonitoringDB/ItemSpec.cs rename to TracingDB/ItemSpec.cs index 9826e58ba..90864c527 100644 --- a/MonitoringDB/ItemSpec.cs +++ b/TracingDB/ItemSpec.cs @@ -3,12 +3,12 @@ /// using System; using System.Collections.Generic; -using MonitoringDB.Entities; -using MonitoringDB.Resources; +using TracingDB.Entities; +using TracingDB.Resources; using NHibernate; using NHibernate.Criterion; -namespace MonitoringDB +namespace TracingDB { public class ItemSpec { diff --git a/MonitoringDB/Mappings/Option1Map.cs b/TracingDB/Mappings/Option1Map.cs similarity index 93% rename from MonitoringDB/Mappings/Option1Map.cs rename to TracingDB/Mappings/Option1Map.cs index 1b260011e..b631e22e2 100644 --- a/MonitoringDB/Mappings/Option1Map.cs +++ b/TracingDB/Mappings/Option1Map.cs @@ -1,6 +1,6 @@ using FluentNHibernate.Mapping; -namespace MonitoringDB.Mappings +namespace TracingDB.Mappings { class Option1Map : ClassMap { diff --git a/MonitoringDB/Mappings/Option2Map.cs b/TracingDB/Mappings/Option2Map.cs similarity index 93% rename from MonitoringDB/Mappings/Option2Map.cs rename to TracingDB/Mappings/Option2Map.cs index ab0829001..05658b979 100644 --- a/MonitoringDB/Mappings/Option2Map.cs +++ b/TracingDB/Mappings/Option2Map.cs @@ -1,6 +1,6 @@ using FluentNHibernate.Mapping; -namespace MonitoringDB.Mappings +namespace TracingDB.Mappings { class Option2Map : ClassMap { diff --git a/MonitoringDB/Mappings/PartMap.cs b/TracingDB/Mappings/PartMap.cs similarity index 93% rename from MonitoringDB/Mappings/PartMap.cs rename to TracingDB/Mappings/PartMap.cs index 4cb6b7bef..0aeee6251 100644 --- a/MonitoringDB/Mappings/PartMap.cs +++ b/TracingDB/Mappings/PartMap.cs @@ -1,6 +1,6 @@ using FluentNHibernate.Mapping; -namespace MonitoringDB.Mappings +namespace TracingDB.Mappings { class PartMap : ClassMap { diff --git a/MonitoringDB/Mappings/ProcessMap.cs b/TracingDB/Mappings/ProcessMap.cs similarity index 93% rename from MonitoringDB/Mappings/ProcessMap.cs rename to TracingDB/Mappings/ProcessMap.cs index f22129627..997b1bc81 100644 --- a/MonitoringDB/Mappings/ProcessMap.cs +++ b/TracingDB/Mappings/ProcessMap.cs @@ -1,6 +1,6 @@ using FluentNHibernate.Mapping; -namespace MonitoringDB.Mappings +namespace TracingDB.Mappings { class ProcessMap : ClassMap { diff --git a/MonitoringDB/Mappings/RecordMap.cs b/TracingDB/Mappings/RecordMap.cs similarity index 89% rename from MonitoringDB/Mappings/RecordMap.cs rename to TracingDB/Mappings/RecordMap.cs index 558c1557d..43d8242fe 100644 --- a/MonitoringDB/Mappings/RecordMap.cs +++ b/TracingDB/Mappings/RecordMap.cs @@ -1,6 +1,6 @@ using FluentNHibernate.Mapping; -namespace MonitoringDB.Mappings +namespace TracingDB.Mappings { class RecordMap : ClassMap { diff --git a/MonitoringDB/Mappings/ReferenceRecordMap.cs b/TracingDB/Mappings/ReferenceRecordMap.cs similarity index 93% rename from MonitoringDB/Mappings/ReferenceRecordMap.cs rename to TracingDB/Mappings/ReferenceRecordMap.cs index a2115f77b..2fe52e5cd 100644 --- a/MonitoringDB/Mappings/ReferenceRecordMap.cs +++ b/TracingDB/Mappings/ReferenceRecordMap.cs @@ -1,6 +1,6 @@ using FluentNHibernate.Mapping; -namespace MonitoringDB.Mappings +namespace TracingDB.Mappings { class ReferenceRecordMap : ClassMap { diff --git a/MonitoringDB/Mappings/WorkstepMap.cs b/TracingDB/Mappings/WorkstepMap.cs similarity index 93% rename from MonitoringDB/Mappings/WorkstepMap.cs rename to TracingDB/Mappings/WorkstepMap.cs index a9c310962..5c7d11aff 100644 --- a/MonitoringDB/Mappings/WorkstepMap.cs +++ b/TracingDB/Mappings/WorkstepMap.cs @@ -1,6 +1,6 @@ using FluentNHibernate.Mapping; -namespace MonitoringDB.Mappings +namespace TracingDB.Mappings { class WorkstepMap : ClassMap { diff --git a/MonitoringDB/Properties/AssemblyInfo.cs b/TracingDB/Properties/AssemblyInfo.cs similarity index 100% rename from MonitoringDB/Properties/AssemblyInfo.cs rename to TracingDB/Properties/AssemblyInfo.cs diff --git a/MonitoringDB/Properties/Resources.Designer.cs b/TracingDB/Properties/Resources.Designer.cs similarity index 94% rename from MonitoringDB/Properties/Resources.Designer.cs rename to TracingDB/Properties/Resources.Designer.cs index 83868caea..5262d2b40 100644 --- a/MonitoringDB/Properties/Resources.Designer.cs +++ b/TracingDB/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace MonitoringDB.Properties { +namespace TracingDB.Properties { using System; @@ -39,7 +39,7 @@ namespace MonitoringDB.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MonitoringDB.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TracingDB.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/MonitoringDB/Properties/Resources.resx b/TracingDB/Properties/Resources.resx similarity index 100% rename from MonitoringDB/Properties/Resources.resx rename to TracingDB/Properties/Resources.resx diff --git a/MonitoringDB/QuitAppException.cs b/TracingDB/QuitAppException.cs similarity index 88% rename from MonitoringDB/QuitAppException.cs rename to TracingDB/QuitAppException.cs index 4e76e2a85..aa73c0ac9 100644 --- a/MonitoringDB/QuitAppException.cs +++ b/TracingDB/QuitAppException.cs @@ -1,6 +1,6 @@ using System; -namespace MonitoringDB +namespace TracingDB { public class QuitAppException : Exception { diff --git a/MonitoringDB/Resources/Strings.Designer.cs b/TracingDB/Resources/Strings.Designer.cs similarity index 98% rename from MonitoringDB/Resources/Strings.Designer.cs rename to TracingDB/Resources/Strings.Designer.cs index 542428e67..b874b41d5 100644 --- a/MonitoringDB/Resources/Strings.Designer.cs +++ b/TracingDB/Resources/Strings.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace MonitoringDB.Resources { +namespace TracingDB.Resources { using System; @@ -39,7 +39,7 @@ namespace MonitoringDB.Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MonitoringDB.Resources.Strings", typeof(Strings).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TracingDB.Resources.Strings", typeof(Strings).Assembly); resourceMan = temp; } return resourceMan; diff --git a/MonitoringDB/Resources/Strings.resx b/TracingDB/Resources/Strings.resx similarity index 100% rename from MonitoringDB/Resources/Strings.resx rename to TracingDB/Resources/Strings.resx diff --git a/MonitoringDB/ScanVerificationInfo.cs b/TracingDB/ScanVerificationInfo.cs similarity index 93% rename from MonitoringDB/ScanVerificationInfo.cs rename to TracingDB/ScanVerificationInfo.cs index df3ce96c5..6d30196fc 100644 --- a/MonitoringDB/ScanVerificationInfo.cs +++ b/TracingDB/ScanVerificationInfo.cs @@ -1,6 +1,6 @@ -using MonitoringDB.Entities; +using TracingDB.Entities; -namespace MonitoringDB +namespace TracingDB { public class ScanVerificationInfo { diff --git a/MonitoringDB/SerializableDictionary.cs b/TracingDB/SerializableDictionary.cs similarity index 98% rename from MonitoringDB/SerializableDictionary.cs rename to TracingDB/SerializableDictionary.cs index 163e147ea..65b47fa4e 100644 --- a/MonitoringDB/SerializableDictionary.cs +++ b/TracingDB/SerializableDictionary.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Xml.Serialization; -namespace MonitoringDB +namespace TracingDB { [XmlRoot("dictionary")] public class SerializableDictionary diff --git a/MonitoringDB/MonitoringDB.csproj b/TracingDB/TracingDB.csproj similarity index 98% rename from MonitoringDB/MonitoringDB.csproj rename to TracingDB/TracingDB.csproj index 4f436d15f..070ac0517 100644 --- a/MonitoringDB/MonitoringDB.csproj +++ b/TracingDB/TracingDB.csproj @@ -8,8 +8,8 @@ {EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF} Library Properties - MonitoringDB - MonitoringDB + TracingDB + TracingDB v4.0 512 diff --git a/MonitoringDB/WMPart.cs b/TracingDB/WMPart.cs similarity index 96% rename from MonitoringDB/WMPart.cs rename to TracingDB/WMPart.cs index 5b7989212..1f92cacb9 100644 --- a/MonitoringDB/WMPart.cs +++ b/TracingDB/WMPart.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using MonitoringDB.Entities; +using TracingDB.Entities; -namespace MonitoringDB +namespace TracingDB { public class WMPart { diff --git a/MonitoringDB/app.config b/TracingDB/app.config similarity index 100% rename from MonitoringDB/app.config rename to TracingDB/app.config diff --git a/MonitoringDB/packages.config b/TracingDB/packages.config similarity index 100% rename from MonitoringDB/packages.config rename to TracingDB/packages.config diff --git a/clean.bat b/clean.bat index ec7c80f62..a4fabfcc9 100644 --- a/clean.bat +++ b/clean.bat @@ -8,8 +8,8 @@ rmdir /s /q GemCard\bin rmdir /s /q GemCard\obj rmdir /s /q GraphLib\bin rmdir /s /q GraphLib\obj -rmdir /s /q MonitoringDB\bin -rmdir /s /q MonitoringDB\obj +rmdir /s /q TracingDB\bin +rmdir /s /q TracingDB\obj rmdir /s /q Results\bin rmdir /s /q Results\obj rmdir /s /q ResultsBrowser\bin