Added readonly field to NC softkeys

This commit is contained in:
Lucio Maranta
2018-03-22 16:17:23 +01:00
parent 25fa366171
commit ca272f4515
5 changed files with 34 additions and 4 deletions
+28 -1
View File
@@ -3,114 +3,141 @@
<auto>
<active>true</active>
<visualizedName>Auto</visualizedName>
<readOnly>false</readOnly>
</auto>
<edit>
<active>true</active>
<visualizedName>Edit</visualizedName>
<readOnly>false</readOnly>
</edit>
<mdi>
<active>true</active>
<visualizedName>Mdi</visualizedName>
<readOnly>false</readOnly>
</mdi>
<dnc>
<active>true</active>
<visualizedName>Dnc</visualizedName>
<readOnly>false</readOnly>
</dnc>
<ref>
<active>true</active>
<visualizedName>Ref</visualizedName>
<readOnly>false</readOnly>
</ref>
<jog>
<active>true</active>
<visualizedName>Jog</visualizedName>
<readOnly>false</readOnly>
</jog>
<jogInc>
<active>true</active>
<visualizedName>Jog Inc</visualizedName>
<readOnly>false</readOnly>
</jogInc>
<restart>
<active>true</active>
<visualizedName>Restart</visualizedName>
<readOnly>false</readOnly>
</restart>
<teach>
<active>true</active>
<visualizedName>Teach</visualizedName>
<readOnly>false</readOnly>
</teach>
<retract>
<active>true</active>
<visualizedName>Restract</visualizedName>
<readOnly>false</readOnly>
</retract>
<wcsMcs>
<active>true</active>
<visualizedName>Wcs Mcs</visualizedName>
<readOnly>false</readOnly>
</wcsMcs>
<handle>
<active>true</active>
<visualizedName>Handle</visualizedName>
<readOnly>true</readOnly>
</handle>
<reset>
<active>true</active>
<visualizedName>Reset</visualizedName>
<readOnly>false</readOnly>
</reset>
<!-- Sub Menu -->
<blk>
<active>true</active>
<visualizedName>Blk/Blk</visualizedName>
<readOnly>false</readOnly>
</blk>
<blkDel>
<active>true</active>
<visualizedName>Blk Del</visualizedName>
<readOnly>false</readOnly>
</blkDel>
<opStop>
<active>true</active>
<visualizedName>OpStop</visualizedName>
<readOnly>false</readOnly>
</opStop>
<dryRun>
<active>true</active>
<visualizedName>DryRun</visualizedName>
<readOnly>false</readOnly>
</dryRun>
<prgTest>
<active>true</active>
<visualizedName>PrgTest</visualizedName>
<readOnly>false</readOnly>
</prgTest>
<manualHandleInterrupt>
<active>true</active>
<visualizedName>Manual Handle Interrupt</visualizedName>
<readOnly>false</readOnly>
</manualHandleInterrupt>
<teachIn>
<active>true</active>
<visualizedName>Teach In</visualizedName>
<readOnly>false</readOnly>
</teachIn>
<incPlane>
<active>true</active>
<visualizedName>Inc Plane</visualizedName>
<visualizedName>Inc Plane</visualizedName><readOnly>false</readOnly>
</incPlane>
<plus>
<active>true</active>
<visualizedName>+</visualizedName>
<readOnly>false</readOnly>
</plus>
<minus>
<active>true</active>
<visualizedName>-</visualizedName>
<readOnly>false</readOnly>
</minus>
<rapid>
<active>true</active>
<visualizedName>Rapid</visualizedName>
<readOnly>false</readOnly>
</rapid>
<xOne>
<active>true</active>
<visualizedName>x1</visualizedName>
<readOnly>false</readOnly>
</xOne>
<xTen>
<active>true</active>
<visualizedName>x10</visualizedName>
<readOnly>false</readOnly>
</xTen>
<xHundred>
<active>true</active>
<visualizedName>x10</visualizedName>
<readOnly>false</readOnly>
</xHundred>
<xThousand>
<active>true</active>
<visualizedName>x10</visualizedName>
<readOnly>false</readOnly>
</xThousand>
</ncSoftKeys>
@@ -8,7 +8,8 @@
<xs:complexType name="ncSoftKeyType">
<xs:all>
<xs:element name="active" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
<xs:element name="visualizedName" type="xs:string"></xs:element>
<xs:element name="visualizedName" type="xs:string" minOccurs="1" maxOccurs="1"></xs:element>
<xs:element name="readOnly" type="xs:boolean" minOccurs="1" maxOccurs="1"></xs:element>
</xs:all>
</xs:complexType>
+2 -1
View File
@@ -221,7 +221,8 @@ namespace Step.Config
Id = GetPlcIdFromNcSoftKey(x.Name.ToString()),
Name = x.Name.ToString(),
VisualizedName = x.Element("visualizedName").Value,
IsActive = Convert.ToBoolean(x.Element("active").Value)
IsActive = Convert.ToBoolean(x.Element("active").Value),
IsReadOnly = Convert.ToBoolean(x.Element("readOnly").Value)
})
.ToList();
}
@@ -4,6 +4,7 @@
{
public int Id;
public bool IsActive;
public bool IsReadOnly;
public string Name;
public string VisualizedName;
}
@@ -51,7 +51,7 @@ namespace Step.Controllers.WebApi
}
[Route("softKeys"), HttpGet]
public IHttpActionResult GetSoftKeysConfig()
public IHttpActionResult GetUserSoftKeysConfig()
{
Dictionary<int, List<DTOUserSoftKeyConfigModel>> output = new Dictionary<int, List<DTOUserSoftKeyConfigModel>>();
foreach (var softKey in SoftKeysConfig)