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

Eliminato ancora ultimi riferimenti, compilazione OK!!!

Browse Source
This commit is contained in:
Samuele Locatelli
2020-04-22 17:35:40 +02:00
parent b87ef29ed3
commit fbcf1b9fb3
3 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.Config/Config/userSoftKeyConfig.xml
+12 -12
View File
@@ -205,7 +205,7 @@
<visible>true</visible>
</softKey_procedure>
<softKey_toggle>
<!--<softKey_toggle>
<active>false</active>
<category>6</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -227,7 +227,7 @@
<lang langKey="it">Protezione magazzino 2</lang>
</localizedNames>
<visible>true</visible>
</softKey_toggle>
</softKey_toggle>-->
<softKey_group>
<active>true</active>
@@ -348,7 +348,7 @@
<visible>true</visible>
</softKey_procedure>
<softKey_procedure>
<!--<softKey_procedure>
<active>false</active>
<category>6</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -358,9 +358,9 @@
<lang langKey="it">Attrezzaggio macchina</lang>
</localizedNames>
<visible>true</visible>
</softKey_procedure>
</softKey_procedure>-->
<softKey_procedure>
<!--<softKey_procedure>
<active>true</active>
<category>5</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -370,7 +370,7 @@
<lang langKey="it">Ripristino cambio utensile</lang>
</localizedNames>
<visible>true</visible>
</softKey_procedure>
</softKey_procedure>-->
<softKey_toggle>
<active>false</active>
@@ -399,7 +399,7 @@
<visible>true</visible>
</softKey_group>
<softKey_toggle>
<!--<softKey_toggle>
<active>true</active>
<category>3</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -409,9 +409,9 @@
<lang langKey="it">Soffiatore esterno utensile</lang>
</localizedNames>
<visible>true</visible>
</softKey_toggle>
</softKey_toggle>-->
<softKey_toggle>
<!--<softKey_toggle>
<active>false</active>
<category>3</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -421,7 +421,7 @@
<lang langKey="it">Soffiatore interno utensile</lang>
</localizedNames>
<visible>true</visible>
</softKey_toggle>
</softKey_toggle>-->
<softKey_toggle>
<active>false</active>
@@ -435,7 +435,7 @@
<visible>true</visible>
</softKey_toggle>
<softKey_toggle>
<!--<softKey_toggle>
<active>false</active>
<category>3</category>
<operatorConfirmationNeeded>false</operatorConfirmationNeeded>
@@ -457,7 +457,7 @@
<lang langKey="it">Nebulizzatore interno utensile</lang>
</localizedNames>
<visible>true</visible>
</softKey_toggle>
</softKey_toggle>-->
<softKey_toggle>
<active>false</active>
Thermo.Active.Model/DTOModels/DTOHeadModel.cs
-4
View File
@@ -61,7 +61,6 @@ namespace Thermo.Active.Model.DTOModels
{
public int ActualSpeed;
public short Load;
public ushort MountedTool;
public bool Configured;
public ROTATION Rotation;
public bool FixedHead;
@@ -79,9 +78,6 @@ namespace Thermo.Active.Model.DTOModels
if (Load != item.Load)
return false;
if (MountedTool != item.MountedTool)
return false;
if (Configured != item.Configured)
return false;
Thermo.Active.NC/NcAdapter.cs
-24
View File
@@ -870,7 +870,6 @@ namespace Thermo.Active.NC
OverrideEditable = head.OverrideEditable,
ActualSpeed = head.ActualSpeed_Pressure,
Load = head.Load_Abrasive,
MountedTool = (ushort)head.MountedTool_Vacum,
Override = head.Override,
IsActive = head.IsActive,
IsSelected = head.IsSelected,
@@ -882,29 +881,6 @@ namespace Thermo.Active.NC
}
break;
case HEAD_TYPE.AWJ:
{
float vacumValue = (float)head.MountedTool_Vacum / 100;
heads.Add(new DTOAbrasiveWaterJet()
{
Id = head.Id,
Process = head.Process,
Type = configuredHead.Type.ToString(),
FixedHead = configuredHead.FixedHead,
inWarning = vacumValue >= configuredHead.WarningLimit,
inAlarm = vacumValue >= configuredHead.AlarmLimit,
OverrideEditable = head.OverrideEditable,
ActualPressure = head.ActualSpeed_Pressure,
Abrasive = Convert.ToUInt16(head.Load_Abrasive),
Vacum = vacumValue,
Override = head.Override,
IsActive = head.IsActive,
IsSelected = head.IsSelected,
AbrasiveIsActive = head.AbrasiveIsActive,
WorkedTime = head.WorkedTime
});
}
break;
case HEAD_TYPE.WJ:
{