Merge branch 'feature/S7Net' into develop
This commit is contained in:
@@ -17,6 +17,28 @@ namespace CMS_CORE_Library.Models
|
||||
public int Power { get; set; } = 0;
|
||||
public int Vacuum { get; set; } = 0;
|
||||
public int Air { get; set; } = 0;
|
||||
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
// Object is not a DTOProcessDataModel instance
|
||||
if (!(obj is GaugeModel item))
|
||||
return false;
|
||||
|
||||
if (TimeAdv != item.TimeAdv)
|
||||
return false;
|
||||
|
||||
if (Power != item.Power)
|
||||
return false;
|
||||
|
||||
if (Vacuum != item.Vacuum)
|
||||
return false;
|
||||
|
||||
if (Air != item.Air)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -488,6 +488,9 @@ namespace CMS_CORE_Library.S7Net
|
||||
#endif
|
||||
|
||||
var lang = GetCultureFromThreeLetter("eng");
|
||||
if (lang != null)
|
||||
languages.Add(lang);
|
||||
lang = GetCultureFromThreeLetter("ita");
|
||||
if (lang != null)
|
||||
languages.Add(lang);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user