Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'CMS/develop' into develop

Browse Source
This commit is contained in:
=
2020-07-22 09:39:34 +02:00
parent 772aa06eb9 2399cd0a9d
commit cc6ba8f0ef
8 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.Config/Config/userSoftKeyConfig.xml
+4
View File
@@ -24,6 +24,10 @@
</localizedNames>
<visible>true</visible>
<starred>true</starred>
<refCall>
<paramRef>general_sizes_sheet_dim_x</paramRef>
<label>general_sizes_sheet_dim_x_button</label>
</refCall>
</softKey_procedure>
<softKey_toggle>
Thermo.Active.Config/Config/userSoftKeyConfigValidator.xsd
+11
View File
@@ -24,6 +24,14 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<!--gestione refCall-->
<xs:complexType name="refCallType">
<xs:all>
<xs:element name="paramRef" minOccurs="1" maxOccurs="1" type="xs:string"></xs:element>
<xs:element name="label" minOccurs="1" maxOccurs="1" type="xs:string"></xs:element>
</xs:all>
</xs:complexType>
<!-- Group of softkey type-->
<xs:complexType name="groupType">
@@ -31,6 +39,7 @@
<xs:element name="active" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
<xs:element name="visible" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
<xs:element name="starred" minOccurs="0" type="xs:boolean"></xs:element>
<xs:element name="refCall" minOccurs="0" type="refCallType"></xs:element>
<xs:element name="category" type="xs:integer"></xs:element>
<xs:element name="operatorConfirmationNeeded" type="xs:boolean"></xs:element>
<xs:element name="localizedNames">
@@ -66,6 +75,7 @@
<xs:element name="active" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
<xs:element name="visible" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
<xs:element name="starred" minOccurs="0" type="xs:boolean"></xs:element>
<xs:element name="refCall" minOccurs="0" type="refCallType"></xs:element>
<xs:element name="category" type="xs:integer"></xs:element>
<xs:element name="operatorConfirmationNeeded" type="xs:boolean"></xs:element>
<xs:element name="localizedNames">
@@ -86,6 +96,7 @@
<xs:element name="active" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
<xs:element name="visible" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
<xs:element name="starred" minOccurs="0" type="xs:boolean"></xs:element>
<xs:element name="refCall" minOccurs="0" type="refCallType"></xs:element>
<xs:element name="category" type="xs:integer"></xs:element>
<xs:element name="operatorConfirmationNeeded" type="xs:boolean"></xs:element>
<xs:element name="localizedNames">
Thermo.Active.Config/ServerConfigController.cs
+3 -1
View File
@@ -518,6 +518,8 @@ namespace Thermo.Active.Config
IsActive = Convert.ToBoolean(x.Element("active").Value),
IsVisible = Convert.ToBoolean(x.Element("visible").Value),
IsStarred = x.Element("starred") != null ? Convert.ToBoolean(x.Element("starred").Value) : false,
RefCallParam = x.Element("refCallParam") != null ? x.Element("refCallParam").Value : "",
RefCallLabel = x.Element("refCallLabel") != null ? x.Element("refCallLabel").Value : "",
Category = Convert.ToInt32(x.Element("category").Value),
LocalizedNames = x.Element("localizedNames").Elements().ToDictionary( // Read localized names and convert into a dictionary
y => y.Attribute("langKey").Value, y => y.Value
@@ -760,7 +762,7 @@ namespace Thermo.Active.Config
SetpointThermo = 0,
MaxPower = riferimento.Potenza,
NumResist = 1,
CalcIchMin = riferimento.Modello.Contains("Quarzo") || riferimento.Modello.Contains("Alogena")
CalcIchMin = riferimento.Modello.Contains("Quarzo") || riferimento.Modello.Contains("Alogena")
});
}
else
Thermo.Active.Model/ConfigModels/UserSoftKeyConfigModel.cs
+2
View File
@@ -11,6 +11,8 @@ namespace Thermo.Active.Model.ConfigModels
public bool IsActive { get; set; }
public bool IsVisible { get; set; }
public bool IsStarred { get; set; } = false;
public string RefCallParam { get; set; } = "";
public string RefCallLabel { get; set; } = "";
public bool OperatorConfirmationNeeded { get; set; }
public List<SubKeysModel> SubKeys { get; set; }
public int PlcId { get; set; }
Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs
+7
View File
@@ -20,6 +20,8 @@ namespace Thermo.Active.Model.DTOModels
public bool Visible { get; set; }
public bool Starred { get; set; } = false;
public bool Value { get; set; }
public string RefCallParam { get; set; } = "";
public string RefCallLabel { get; set; } = "";
public override bool Equals(object obj)
{
@@ -34,6 +36,10 @@ namespace Thermo.Active.Model.DTOModels
return false;
if (Value != item.Value)
return false;
if (RefCallParam != item.RefCallParam)
return false;
if (RefCallLabel != item.RefCallLabel)
return false;
return true;
}
@@ -43,4 +49,5 @@ namespace Thermo.Active.Model.DTOModels
return base.GetHashCode();
}
}
}
Thermo.Active.NC/NcAdapter.cs
+8
View File
@@ -1011,6 +1011,8 @@ namespace Thermo.Active.NC
Id = subkey.Id,
Active = plcSoftKey.Active,
Starred = softKey.IsStarred,
RefCallParam = softKey.RefCallParam,
RefCallLabel = softKey.RefCallLabel,
Category = softKey.Category,
Value = plcSoftKey.Value
});
@@ -1032,6 +1034,8 @@ namespace Thermo.Active.NC
Id = softKey.Id,
Active = plcSoftKey.Active,
Starred = softKey.IsStarred,
RefCallParam = softKey.RefCallParam,
RefCallLabel = softKey.RefCallLabel,
Category = softKey.Category,
Visible = softKey.IsVisible,
Value = plcSoftKey.Value
@@ -1071,6 +1075,8 @@ namespace Thermo.Active.NC
Id = subkey.Id,
Active = plcSoftKey.Active,
Starred = softKey.IsStarred,
RefCallParam = softKey.RefCallParam,
RefCallLabel = softKey.RefCallLabel,
Category = softKey.Category,
Value = plcSoftKey.Value
});
@@ -1098,6 +1104,8 @@ namespace Thermo.Active.NC
Id = softKey.Id,
Active = plcSoftKey.Active,
Starred = softKey.IsStarred,
RefCallParam = softKey.RefCallParam,
RefCallLabel = softKey.RefCallLabel,
Category = softKey.Category,
Visible = softKey.IsVisible,
Value = plcSoftKey.Value
Thermo.Active/Dict/Labels_italian.txt
+1
View File
@@ -45,6 +45,7 @@ general_sizes_mould_min_height,Altezza minima stampo
general_sizes_mould_base_height,Altezza base stampo
general_sizes_sheet_material,Materiale
general_sizes_sheet_dim_x,Larghezza lastra
general_sizes_sheet_dim_x_button,Muovi
general_sizes_sheet_dim_y,Profondità lastra
general_sizes_sheet_thickness,Spessore lastra
general_sizes_plate_type,Piastrafinestra
Thermo.Active/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.9.47")]
[assembly: AssemblyVersion("0.9.48")]