MonitoringDB --> TracingDB, TBF ver. 2.18.981

This commit is contained in:
Milan Hanajik 2018-08-28 09:28:58 +02:00
parent bf69524fd8
commit 0ef9505af1
52 changed files with 66 additions and 66 deletions

4
.gitignore vendored
View File

@ -8,8 +8,8 @@ GemCard/bin
GemCard/obj GemCard/obj
GraphLib/bin GraphLib/bin
GraphLib/obj GraphLib/obj
MonitoringDB/bin TracingDB/bin
MonitoringDB/obj TracingDB/obj
Results/bin/ Results/bin/
Results/obj/ Results/obj/
ResultsBrowser/bin/ ResultsBrowser/bin/

View File

@ -42,7 +42,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphLib", "GraphLib\GraphL
{743DF7DB-C7B6-42EB-986D-0F485E5588E4} = {743DF7DB-C7B6-42EB-986D-0F485E5588E4} {743DF7DB-C7B6-42EB-986D-0F485E5588E4} = {743DF7DB-C7B6-42EB-986D-0F485E5588E4}
EndProjectSection EndProjectSection
EndProject 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 EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GemCard", "GemCard\GemCard.csproj", "{8B10D15A-39DE-4B56-8DD1-710C1EB3A697}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GemCard", "GemCard\GemCard.csproj", "{8B10D15A-39DE-4B56-8DD1-710C1EB3A697}"
EndProject EndProject

View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using log4net; using log4net;
using NHibernate; using NHibernate;
using Config.Entities; using Config.Entities;
using MonitoringDB.Entities; using TracingDB.Entities;
namespace TBF.BenchControl.Output.DB.ProductionMonitoring namespace TBF.BenchControl.Output.DB.ProductionMonitoring
{ {
@ -70,8 +70,8 @@ namespace TBF.BenchControl.Output.DB.ProductionMonitoring
sessionFactory = FluentNHibernate.Cfg.Fluently sessionFactory = FluentNHibernate.Cfg.Fluently
.Configure() .Configure()
.Database(FluentNHibernate.Cfg.Db.MySQLConfiguration.Standard.ConnectionString(monitoringCfg.ConnStr)) .Database(FluentNHibernate.Cfg.Db.MySQLConfiguration.Standard.ConnectionString(monitoringCfg.ConnStr))
.Mappings(m => m.FluentMappings.AddFromAssemblyOf<MonitoringDB.Entities.Process>()) .Mappings(m => m.FluentMappings.AddFromAssemblyOf<TracingDB.Entities.Process>())
.ExposeConfiguration(MonitoringDB.FluentNH.BuildSchema) .ExposeConfiguration(TracingDB.FluentNH.BuildSchema)
.BuildSessionFactory(); .BuildSessionFactory();
/// ///
/// Read processes and worksteps from the database (this verifies DB connection as well) /// Read processes and worksteps from the database (this verifies DB connection as well)

View File

@ -8,7 +8,7 @@ using NHibernate;
using NHibernate.Criterion; using NHibernate.Criterion;
using Config; using Config;
using Config.Entities; using Config.Entities;
using MonitoringDB.Entities; using TracingDB.Entities;
using TBF.BenchControl.Generic; using TBF.BenchControl.Generic;
using TBF.BenchControl.GenericDevices; using TBF.BenchControl.GenericDevices;

View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.18.980.0")] [assembly: AssemblyVersion("2.18.981.0")]
[assembly: AssemblyFileVersion("2.18.980.0")] [assembly: AssemblyFileVersion("2.18.981.0")]

View File

@ -2946,9 +2946,9 @@
<Project>{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}</Project> <Project>{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}</Project>
<Name>GraphLib</Name> <Name>GraphLib</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\MonitoringDB\MonitoringDB.csproj"> <ProjectReference Include="..\TracingDB\TracingDB.csproj">
<Project>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</Project> <Project>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</Project>
<Name>MonitoringDB</Name> <Name>TracingDB</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Results\Results.csproj"> <ProjectReference Include="..\Results\Results.csproj">
<Project>{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}</Project> <Project>{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}</Project>

View File

@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using log4net; using log4net;
using MonitoringDB.Entities; using TracingDB.Entities;
namespace MonitoringDB namespace TracingDB
{ {
public class BatteryInfo public class BatteryInfo
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace MonitoringDB.Entities namespace TracingDB.Entities
{ {
public class Option1 : Interfaces.IOption public class Option1 : Interfaces.IOption
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace MonitoringDB.Entities namespace TracingDB.Entities
{ {
public class Option2 : Interfaces.IOption public class Option2 : Interfaces.IOption
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace MonitoringDB.Entities namespace TracingDB.Entities
{ {
public class Part public class Part
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace MonitoringDB.Entities namespace TracingDB.Entities
{ {
public class Process public class Process
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace MonitoringDB.Entities namespace TracingDB.Entities
{ {
public class Record public class Record
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace MonitoringDB.Entities namespace TracingDB.Entities
{ {
public class ReferenceRecord public class ReferenceRecord
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace MonitoringDB.Entities namespace TracingDB.Entities
{ {
public class Workstep public class Workstep
{ {

View File

@ -1,4 +1,4 @@
namespace MonitoringDB namespace TracingDB
{ {
public enum CodeType public enum CodeType
{ {

View File

@ -6,7 +6,7 @@ using NHibernate;
using NHibernate.Cfg; using NHibernate.Cfg;
using NHibernate.Tool.hbm2ddl; using NHibernate.Tool.hbm2ddl;
namespace MonitoringDB namespace TracingDB
{ {
public static class FluentNH public static class FluentNH
{ {
@ -110,7 +110,7 @@ namespace MonitoringDB
{ {
//using (var transaction = session.BeginTransaction()) //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); // session.SaveOrUpdate(part1);
// transaction.Commit(); // transaction.Commit();
//} //}

View File

@ -9,7 +9,7 @@ using System.Data;
using System.Windows.Forms; using System.Windows.Forms;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace MonitoringDB.Forms namespace TracingDB.Forms
{ {
/// <summary> /// <summary>
/// Event Handler for SubItem events /// Event Handler for SubItem events

View File

@ -1,4 +1,4 @@
namespace MonitoringDB.Forms namespace TracingDB.Forms
{ {
partial class ModelessForm partial class ModelessForm
{ {

View File

@ -2,7 +2,7 @@
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
namespace MonitoringDB.Forms namespace TracingDB.Forms
{ {
public partial class ModelessForm : Form public partial class ModelessForm : Form
{ {

View File

@ -5,10 +5,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Windows.Forms; using System.Windows.Forms;
using log4net; using log4net;
using MonitoringDB.Entities; using TracingDB.Entities;
using MonitoringDB.Resources; using TracingDB.Resources;
namespace MonitoringDB.Forms namespace TracingDB.Forms
{ {
public partial class ResultsConfigDlg : Form public partial class ResultsConfigDlg : Form
{ {

View File

@ -1,7 +1,7 @@
/// ///
/// Copyright (c) 2016 Sensus Metering Systems /// Copyright (c) 2016 Sensus Metering Systems
/// ///
namespace MonitoringDB.Forms namespace TracingDB.Forms
{ {
partial class ResultsConfigDlg partial class ResultsConfigDlg
{ {
@ -39,7 +39,7 @@ namespace MonitoringDB.Forms
this.removeAllButton = new System.Windows.Forms.Button(); this.removeAllButton = new System.Windows.Forms.Button();
this.removeButton = new System.Windows.Forms.Button(); this.removeButton = new System.Windows.Forms.Button();
this.addButton = 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.upButton = new System.Windows.Forms.Button();
this.downButton = new System.Windows.Forms.Button(); this.downButton = new System.Windows.Forms.Button();
this.SuspendLayout(); this.SuspendLayout();
@ -133,8 +133,8 @@ namespace MonitoringDB.Forms
this.selectedResultsListViewEx.TabIndex = 47; this.selectedResultsListViewEx.TabIndex = 47;
this.selectedResultsListViewEx.UseCompatibleStateImageBehavior = false; this.selectedResultsListViewEx.UseCompatibleStateImageBehavior = false;
this.selectedResultsListViewEx.View = System.Windows.Forms.View.Details; this.selectedResultsListViewEx.View = System.Windows.Forms.View.Details;
this.selectedResultsListViewEx.SubItemClicked += new MonitoringDB.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked); this.selectedResultsListViewEx.SubItemClicked += new TracingDB.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked);
this.selectedResultsListViewEx.SubItemEndEditing += new MonitoringDB.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing); this.selectedResultsListViewEx.SubItemEndEditing += new TracingDB.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing);
// //
// upButton // upButton
// //

View File

@ -1,4 +1,4 @@
namespace MonitoringDB.Forms namespace TracingDB.Forms
{ {
partial class SettingsDlg partial class SettingsDlg
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;
namespace MonitoringDB.Forms namespace TracingDB.Forms
{ {
public partial class SettingsDlg : Form public partial class SettingsDlg : Form
{ {
@ -48,16 +48,16 @@ namespace MonitoringDB.Forms
} }
} }
public MonitoringDB.Mode Mode public TracingDB.Mode Mode
{ {
set set
{ {
radioButton1.Checked = (value == MonitoringDB.Mode.Test); radioButton1.Checked = (value == TracingDB.Mode.Test);
radioButton2.Checked = (value == MonitoringDB.Mode.Production); radioButton2.Checked = (value == TracingDB.Mode.Production);
} }
get get
{ {
return radioButton1.Checked ? MonitoringDB.Mode.Test : MonitoringDB.Mode.Production; return radioButton1.Checked ? TracingDB.Mode.Test : TracingDB.Mode.Production;
} }
} }

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;
namespace MonitoringDB.Forms namespace TracingDB.Forms
{ {
public partial class TrivialLoginDlg : Form public partial class TrivialLoginDlg : Form
{ {

View File

@ -1,4 +1,4 @@
namespace MonitoringDB.Forms namespace TracingDB.Forms
{ {
partial class TrivialLoginDlg partial class TrivialLoginDlg
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace MonitoringDB.Interfaces namespace TracingDB.Interfaces
{ {
public interface IOption public interface IOption
{ {

View File

@ -3,12 +3,12 @@
/// ///
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using MonitoringDB.Entities; using TracingDB.Entities;
using MonitoringDB.Resources; using TracingDB.Resources;
using NHibernate; using NHibernate;
using NHibernate.Criterion; using NHibernate.Criterion;
namespace MonitoringDB namespace TracingDB
{ {
public class ItemSpec public class ItemSpec
{ {

View File

@ -1,6 +1,6 @@
using FluentNHibernate.Mapping; using FluentNHibernate.Mapping;
namespace MonitoringDB.Mappings namespace TracingDB.Mappings
{ {
class Option1Map : ClassMap<Entities.Option1> class Option1Map : ClassMap<Entities.Option1>
{ {

View File

@ -1,6 +1,6 @@
using FluentNHibernate.Mapping; using FluentNHibernate.Mapping;
namespace MonitoringDB.Mappings namespace TracingDB.Mappings
{ {
class Option2Map : ClassMap<Entities.Option2> class Option2Map : ClassMap<Entities.Option2>
{ {

View File

@ -1,6 +1,6 @@
using FluentNHibernate.Mapping; using FluentNHibernate.Mapping;
namespace MonitoringDB.Mappings namespace TracingDB.Mappings
{ {
class PartMap : ClassMap<Entities.Part> class PartMap : ClassMap<Entities.Part>
{ {

View File

@ -1,6 +1,6 @@
using FluentNHibernate.Mapping; using FluentNHibernate.Mapping;
namespace MonitoringDB.Mappings namespace TracingDB.Mappings
{ {
class ProcessMap : ClassMap<Entities.Process> class ProcessMap : ClassMap<Entities.Process>
{ {

View File

@ -1,6 +1,6 @@
using FluentNHibernate.Mapping; using FluentNHibernate.Mapping;
namespace MonitoringDB.Mappings namespace TracingDB.Mappings
{ {
class RecordMap : ClassMap<Entities.Record> class RecordMap : ClassMap<Entities.Record>
{ {

View File

@ -1,6 +1,6 @@
using FluentNHibernate.Mapping; using FluentNHibernate.Mapping;
namespace MonitoringDB.Mappings namespace TracingDB.Mappings
{ {
class ReferenceRecordMap : ClassMap<Entities.ReferenceRecord> class ReferenceRecordMap : ClassMap<Entities.ReferenceRecord>
{ {

View File

@ -1,6 +1,6 @@
using FluentNHibernate.Mapping; using FluentNHibernate.Mapping;
namespace MonitoringDB.Mappings namespace TracingDB.Mappings
{ {
class WorkstepMap : ClassMap<Entities.Workstep> class WorkstepMap : ClassMap<Entities.Workstep>
{ {

View File

@ -8,7 +8,7 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace MonitoringDB.Properties { namespace TracingDB.Properties {
using System; using System;
@ -39,7 +39,7 @@ namespace MonitoringDB.Properties {
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { 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; resourceMan = temp;
} }
return resourceMan; return resourceMan;

View File

@ -1,6 +1,6 @@
using System; using System;
namespace MonitoringDB namespace TracingDB
{ {
public class QuitAppException : Exception public class QuitAppException : Exception
{ {

View File

@ -8,7 +8,7 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace MonitoringDB.Resources { namespace TracingDB.Resources {
using System; using System;
@ -39,7 +39,7 @@ namespace MonitoringDB.Resources {
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { 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; resourceMan = temp;
} }
return resourceMan; return resourceMan;

View File

@ -1,6 +1,6 @@
using MonitoringDB.Entities; using TracingDB.Entities;
namespace MonitoringDB namespace TracingDB
{ {
public class ScanVerificationInfo public class ScanVerificationInfo
{ {

View File

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
namespace MonitoringDB namespace TracingDB
{ {
[XmlRoot("dictionary")] [XmlRoot("dictionary")]
public class SerializableDictionary<TKey, TValue> public class SerializableDictionary<TKey, TValue>

View File

@ -8,8 +8,8 @@
<ProjectGuid>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</ProjectGuid> <ProjectGuid>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MonitoringDB</RootNamespace> <RootNamespace>TracingDB</RootNamespace>
<AssemblyName>MonitoringDB</AssemblyName> <AssemblyName>TracingDB</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>

View File

@ -2,9 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using MonitoringDB.Entities; using TracingDB.Entities;
namespace MonitoringDB namespace TracingDB
{ {
public class WMPart public class WMPart
{ {

View File

@ -8,8 +8,8 @@ rmdir /s /q GemCard\bin
rmdir /s /q GemCard\obj rmdir /s /q GemCard\obj
rmdir /s /q GraphLib\bin rmdir /s /q GraphLib\bin
rmdir /s /q GraphLib\obj rmdir /s /q GraphLib\obj
rmdir /s /q MonitoringDB\bin rmdir /s /q TracingDB\bin
rmdir /s /q MonitoringDB\obj rmdir /s /q TracingDB\obj
rmdir /s /q Results\bin rmdir /s /q Results\bin
rmdir /s /q Results\obj rmdir /s /q Results\obj
rmdir /s /q ResultsBrowser\bin rmdir /s /q ResultsBrowser\bin