michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TBF : Output.DB.ProductionMonitoring --> Output.DB.ProductionTracing.

Browse Source
This commit is contained in:
Milan Hanajik 2018-08-28 10:12:39 +02:00
parent fa818c5cf8
commit 6aee0a71ed
11 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
TBF/BenchControl/Output/DB/ProductionMonitoring/Factory.cs
View File

@ -1,26 +0,0 @@
///
/// Copyright (c) 2018 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Output.DB.ProductionMonitoring
{
public class Factory : IComponentFactory
{
public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
public void ResetStaticProperties() { Monitoring.ResetStaticProperties(); }
public IComponent DummyComponent() { return new Monitoring(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Monitoring(cfg); }
public IComponentCfg DefaultConfig() { return new MonitoringCfg(this.GetType().Namespace.Substring(24), this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
return ComponentCfgBase.CreateFromDbEntity(MonitoringCfg.Serializer, component, this);
}
}
}

2
TBF/BenchControl/Output/DB/ProductionMonitoring/Enums.cs → TBF/BenchControl/Output/DB/ProductionTracing/Enums.cs
View File

@ -3,7 +3,7 @@
///
using System;
namespace TBF.BenchControl.Output.DB.ProductionMonitoring
namespace TBF.BenchControl.Output.DB.ProductionTracing
{
public enum CodeType
{

26
TBF/BenchControl/Output/DB/ProductionTracing/Factory.cs Normal file
View File

@ -0,0 +1,26 @@
///
/// Copyright (c) 2018 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Output.DB.ProductionTracing
{
public class Factory : IComponentFactory
{
public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
public void ResetStaticProperties() { Tracing.ResetStaticProperties(); }
public IComponent DummyComponent() { return new Tracing(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Tracing(cfg); }
public IComponentCfg DefaultConfig() { return new TracingCfg(this.GetType().Namespace.Substring(24), this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
return ComponentCfgBase.CreateFromDbEntity(TracingCfg.Serializer, component, this);
}
}
}

14
TBF/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs → TBF/BenchControl/Output/DB/ProductionTracing/Tracing.cs
View File

@ -8,7 +8,7 @@ using NHibernate;
using Config.Entities;
using TracingDB.Entities;
namespace TBF.BenchControl.Output.DB.ProductionMonitoring
namespace TBF.BenchControl.Output.DB.ProductionTracing
{
public enum Retv
{
@ -16,16 +16,16 @@ namespace TBF.BenchControl.Output.DB.ProductionMonitoring
Error,
}
public class Monitoring : ComponentBase, IOperation, GenericDevices.IResultsWriter, Generic.IDevice
public class Tracing : ComponentBase, IOperation, GenericDevices.IResultsWriter, Generic.IDevice
{
private static readonly ILog log = LogManager.GetLogger(typeof(Monitoring));
private static readonly ILog log = LogManager.GetLogger(typeof(Tracing));
public override string ToString() { return string.Format("Monitoring({0})", Cfg.ToString(1)); }
public const string WorkstepName = "Test_bench";
MonitoringCfg monitoringCfg;
TracingCfg monitoringCfg;
string workplace { get { return monitoringCfg.Workplace; } }
enum CurrentOp
@ -49,12 +49,12 @@ namespace TBF.BenchControl.Output.DB.ProductionMonitoring
Dictionary<int, IList<Workstep>> workstepsDictionary;
public Monitoring() {}
public Tracing() {}
public Monitoring(Generic.IComponentCfg cfg)
public Tracing(Generic.IComponentCfg cfg)
: base(cfg)
{
monitoringCfg = cfg as MonitoringCfg;
monitoringCfg = cfg as TracingCfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());

14
TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfg.cs → TBF/BenchControl/Output/DB/ProductionTracing/TracingCfg.cs
View File

@ -4,14 +4,14 @@
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Output.DB.ProductionMonitoring
namespace TBF.BenchControl.Output.DB.ProductionTracing
{
public class MonitoringCfg : ComponentCfgBase, Generic.IComponentCfg
public class TracingCfg : ComponentCfgBase, Generic.IComponentCfg
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(MonitoringCfg) })[0];
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TracingCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new MonitoringCfgCtrl(); }
public IComponentCfgCtrl GetControl() { return new TracingCfgCtrl(); }
public string Workplace;
@ -19,14 +19,14 @@ namespace TBF.BenchControl.Output.DB.ProductionMonitoring
/// Private parameterless constructor invoked by all other (public) constructors
MonitoringCfg()
TracingCfg()
{
ParentName = string.Empty;
Workplace = "WR10";
ConnStr = "SERVER=10.42.128.16; DATABASE=sledovanie2018; UID=vyroba2018; PASSWORD=qwerty; CHARSET=utf8;";
ConnStr = "SERVER=10.42.128.16; DATABASE=st_wr_shared_config; UID=u9305784; PASSWORD=p89344390; CHARSET=utf8;";
}
public MonitoringCfg(string name, IComponentFactory factory)
public TracingCfg(string name, IComponentFactory factory)
: this()
{
this.Name = name;

10
TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.cs → TBF/BenchControl/Output/DB/ProductionTracing/TracingCfgCtrl.cs
View File

@ -6,24 +6,24 @@ using System.Windows.Forms;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Output.DB.ProductionMonitoring
namespace TBF.BenchControl.Output.DB.ProductionTracing
{
public partial class MonitoringCfgCtrl : Configs.ConfigCtrlUtils, IComponentCfgCtrl
public partial class TracingCfgCtrl : Configs.ConfigCtrlUtils, IComponentCfgCtrl
{
public bool ShowMore { get { return false; } }
MonitoringCfg config;
TracingCfg config;
public IComponentCfg Config
{
get { return config as IComponentCfg; }
set
{
config = value as MonitoringCfg;
config = value as TracingCfg;
Redraw();
}
}
public MonitoringCfgCtrl()
public TracingCfgCtrl()
{
InitializeComponent();
}

4
TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.designer.cs → TBF/BenchControl/Output/DB/ProductionTracing/TracingCfgCtrl.designer.cs generated
View File

@ -1,9 +1,9 @@
///
/// Copyright (c) 2018 Sensus Slovensko a.s.
///
namespace TBF.BenchControl.Output.DB.ProductionMonitoring
namespace TBF.BenchControl.Output.DB.ProductionTracing
{
partial class MonitoringCfgCtrl
partial class TracingCfgCtrl
{
/// <summary>
/// Required designer variable.

0
TBF/BenchControl/Output/DB/ProductionMonitoring/MonitoringCfgCtrl.resx → TBF/BenchControl/Output/DB/ProductionTracing/TracingCfgCtrl.resx
View File

2
TBF/BenchControl/Output/DB/ProductionMonitoring/WMPart.cs → TBF/BenchControl/Output/DB/ProductionTracing/WMPart.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using MySql.Data.MySqlClient;
namespace TBF.BenchControl.Output.DB.ProductionMonitoring
namespace TBF.BenchControl.Output.DB.ProductionTracing
{
public class WMPart
{

2
TBF/BenchControl/TbfComponents.cs
View File

@ -99,7 +99,7 @@ namespace TBF.BenchControl
Factories.Add(new Network.Camera.Roi.Factory());
Factories.Add(new Network.Camera.RoiForFixedStart.Factory());
Factories.Add(new Network.Comet.Ambient.Factory());
Factories.Add(new Output.DB.ProductionMonitoring.Factory());
Factories.Add(new Output.DB.ProductionTracing.Factory());
Factories.Add(new Output.DB.SaveFlowmeterCorrections.Factory());
Factories.Add(new Output.FileWriters.Basic.FactorySingle());
Factories.Add(new Output.FileWriters.Basic.FactoryCompound());

20
TBF/TBF.csproj
View File

@ -741,17 +741,17 @@
<Compile Include="BenchControl\Operations\EnduranceDataLoggingOp.cs" />
<Compile Include="BenchControl\Operations\EnthalpyCalculationOp.cs" />
<Compile Include="BenchControl\Operations\ReturnGivenEventOp.cs" />
<Compile Include="BenchControl\Output\DB\ProductionMonitoring\Enums.cs" />
<Compile Include="BenchControl\Output\DB\ProductionMonitoring\Monitoring.cs" />
<Compile Include="BenchControl\Output\DB\ProductionMonitoring\MonitoringCfg.cs" />
<Compile Include="BenchControl\Output\DB\ProductionMonitoring\MonitoringCfgCtrl.cs">
<Compile Include="BenchControl\Output\DB\ProductionTracing\Enums.cs" />
<Compile Include="BenchControl\Output\DB\ProductionTracing\Tracing.cs" />
<Compile Include="BenchControl\Output\DB\ProductionTracing\TracingCfg.cs" />
<Compile Include="BenchControl\Output\DB\ProductionTracing\TracingCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\Output\DB\ProductionMonitoring\MonitoringCfgCtrl.designer.cs">
<DependentUpon>MonitoringCfgCtrl.cs</DependentUpon>
<Compile Include="BenchControl\Output\DB\ProductionTracing\TracingCfgCtrl.designer.cs">
<DependentUpon>TracingCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\Output\DB\ProductionMonitoring\Factory.cs" />
<Compile Include="BenchControl\Output\DB\ProductionMonitoring\WMPart.cs" />
<Compile Include="BenchControl\Output\DB\ProductionTracing\Factory.cs" />
<Compile Include="BenchControl\Output\DB\ProductionTracing\WMPart.cs" />
<Compile Include="BenchControl\Output\DB\SaveFlowmeterCorrections\Factory.cs" />
<Compile Include="BenchControl\Output\DB\SaveFlowmeterCorrections\SaveFlowmeterCorr.cs" />
<Compile Include="BenchControl\Output\DB\SaveFlowmeterCorrections\SaveFlowmeterCorrCfg.cs" />
@ -2380,8 +2380,8 @@
<EmbeddedResource Include="BenchControl\Operations\MessageBoxForm.resx">
<DependentUpon>MessageBoxForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\Output\DB\ProductionMonitoring\MonitoringCfgCtrl.resx">
<DependentUpon>MonitoringCfgCtrl.cs</DependentUpon>
<EmbeddedResource Include="BenchControl\Output\DB\ProductionTracing\TracingCfgCtrl.resx">
<DependentUpon>TracingCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\Output\DB\SaveFlowmeterCorrections\SaveFlowmeterCorrCfgCtrl.resx">
<DependentUpon>SaveFlowmeterCorrCfgCtrl.cs</DependentUpon>