diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo index 286124d..45ae4f9 100644 Binary files a/MTC_Sim/.vs/MTC_Sim/v14/.suo and b/MTC_Sim/.vs/MTC_Sim/v14/.suo differ diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs index b1a2d00..03207ae 100644 --- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs +++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs @@ -14,7 +14,7 @@ namespace MTC_Sim /// - /// Singola pompa da vuoto, 0..20 + /// Singola pompa da vuoto, 0..n /// public class VacuumPomp { @@ -44,17 +44,31 @@ namespace MTC_Sim protected string descr; /// - /// target del raffreddamento: mandrino / armadio elettrico + /// ID /// - public string target; + public Event mCoolId; + /// + /// Alias + /// + public Event mCoolAlias; + /// + /// Stato istantaneo (evento aperto/chiuso) + /// + public Event mCoolStatus; + /// + /// Classe refrigeratore con Idx e descrizione + /// + /// Itentificativo misura, salvato in event Cool_{0}_Id dove {0}=ident + /// Alias misura, salvato in event Cool_{0}_alias dove {0}=ident + public Cooler(string ident, string alias) + { + idx = ident; + descr = alias; - public Event Id; - - public Event Status; - - //??? raggrupare con altre temp??? - //public Sample Temperatura; - public Sample Pressione; + mCoolId = new Event(string.Format("Cool_{0}_Id", idx)); + mCoolAlias = new Event(string.Format("Cool_{0}_Alias", idx)); + mCoolStatus = new Event(string.Format("Cool_{0}_Status", idx)); + } } /// /// Singola Pressione rilevata, 0..n @@ -83,10 +97,10 @@ namespace MTC_Sim /// public Sample mPressValIst; /// - /// Classe temperatura con Idx e descrizione + /// Classe pressione con Idx e descrizione /// - /// Itentificativo misura, salvato in event Temp_{0}_Id dove {0}=ident - /// Alias misura, salvato in event Temp_{0}_alias dove {0}=ident + /// Itentificativo misura, salvato in event Press_{0}_Id dove {0}=ident + /// Alias misura, salvato in event Press_{0}_alias dove {0}=ident public Pressione(string ident, string alias) { idx = ident;