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

OmagCUT :

Browse Source 
- aggiunta gestione svuotature (manca scelta lavorazione da interfaccia)
- ora compilazione richiede dichiarazione delle variabili, modificati di conseguenza i diversi sorgenti.
This commit is contained in:
DarioS
2021-06-22 11:09:47 +02:00
parent 2ced024979
commit 2eacaff301
39 changed files with 274 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DirectCuts/ControlsMachineButtonUC.xaml.vb
+17 -17
View File
@@ -78,7 +78,7 @@ Public Class ControlsMachineButtonUC
Friend Sub SpindleStateChanged(SpindleState As Boolean)
Dim SpindleButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_SPINDLE Then
SpindleButton = MachineButton
End If
@@ -90,7 +90,7 @@ Public Class ControlsMachineButtonUC
Friend Sub LaserStateChanged(LaserState As Boolean)
Dim LaserButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_LASER Then
LaserButton = MachineButton
End If
@@ -102,7 +102,7 @@ Public Class ControlsMachineButtonUC
Friend Sub FeedHoldChanged(FeedHoldState As Boolean)
Dim FeedHoldButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_FEEDHOLD Then
FeedHoldButton = MachineButton
End If
@@ -114,7 +114,7 @@ Public Class ControlsMachineButtonUC
Friend Sub SpeedHoldChanged(SpeedHoldState As Boolean)
Dim SpeedHoldButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_SPEEDHOLD Then
SpeedHoldButton = MachineButton
End If
@@ -126,7 +126,7 @@ Public Class ControlsMachineButtonUC
Friend Sub LaserTracStateChanged(LaserTracState As Boolean)
Dim LaserTracButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_LASERTRAC Then
LaserTracButton = MachineButton
End If
@@ -138,7 +138,7 @@ Public Class ControlsMachineButtonUC
Friend Sub CoolantStateChanged(CoolantState As Boolean)
Dim CoolantButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_COOLANT Then
CoolantButton = MachineButton
End If
@@ -150,7 +150,7 @@ Public Class ControlsMachineButtonUC
Friend Sub InternalCoolantStateChanged(InternalCoolantState As Boolean)
Dim IntCoolantButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_INTERNALCOOLANT Then
IntCoolantButton = MachineButton
End If
@@ -162,7 +162,7 @@ Public Class ControlsMachineButtonUC
Friend Sub ExternCoolantStateChanged(ExternCoolantState As Boolean)
Dim ExtCoolantButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_EXTERNCOOLANT Then
ExtCoolantButton = MachineButton
End If
@@ -175,7 +175,7 @@ Public Class ControlsMachineButtonUC
Friend Sub CBAxesStateChanged(CBAxesState As Boolean)
Dim CAxesButton As TwoStateButton = Nothing
Dim BAxesButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_CAXES Then
CAxesButton = MachineButton
ElseIf MachineButton.StateFlag = K_BAXES Then
@@ -192,7 +192,7 @@ Public Class ControlsMachineButtonUC
Friend Sub AirBlowStateChanged(AirBlowState As Boolean)
Dim AirBlowButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_AIRBLOW Then
AirBlowButton = MachineButton
End If
@@ -204,7 +204,7 @@ Public Class ControlsMachineButtonUC
Friend Sub HomeStateChanged(HomeState As Boolean)
Dim HomeButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_HOME Then
HomeButton = MachineButton
End If
@@ -216,7 +216,7 @@ Public Class ControlsMachineButtonUC
Friend Sub TableUpChanged(TableUpState As Boolean)
Dim TableUpButton As PressedCommandButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_TABLEUP Then
TableUpButton = MachineButton
End If
@@ -228,7 +228,7 @@ Public Class ControlsMachineButtonUC
Friend Sub TableDownChanged(TableDownState As Boolean)
Dim TableDownButton As PressedCommandButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_TABLEDOWN Then
TableDownButton = MachineButton
End If
@@ -240,7 +240,7 @@ Public Class ControlsMachineButtonUC
Friend Sub HSMChanged(HsmState As Boolean)
Dim HsmButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_HSM Then
HsmButton = MachineButton
End If
@@ -253,7 +253,7 @@ Public Class ControlsMachineButtonUC
Friend Sub DoorClosedChanged(DoorClosedState As Integer)
Dim DoorClosedButton As ThreeStateButton = Nothing
Dim DoorOpenedButton As ThreeStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_DOORCLOSED Then
'If TypeOf MachineButton Is NoStateButton Then
' DoorClosedButton = DirectCast(MachineButton, NoStateButton)
@@ -295,7 +295,7 @@ Public Class ControlsMachineButtonUC
Friend Sub LimitZChanged(LimitZState As Boolean)
Dim TwoLimitZButton As TwoStateButton = Nothing
Dim DoubleLimitZButton As DoubleCommandButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_LIMITZ Then
If TypeOf MachineButton Is DoubleCommandButton Then
DoubleLimitZButton = MachineButton
@@ -315,7 +315,7 @@ Public Class ControlsMachineButtonUC
Friend Sub FiveAxisStateChanged(FiveAxisState As Boolean)
Dim ThreeAxesButton As TwoStateButton = Nothing
Dim FiveAxesButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_THREEAXES Then
ThreeAxesButton = MachineButton
ElseIf MachineButton.StateFlag = K_FIVEAXES Then
DirectCuts/DirectCutPageUC.xaml.vb
+3 -3
View File
@@ -324,7 +324,7 @@ Public Class DirectCutPageUC
Friend Sub XYJogChanged(bXYAxes As Boolean)
' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
Dim XYJogButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonJogList
For Each MachineButton As MachineButton In m_ButtonJogList
' elimino gli spazi ad inizio e fine della stringa
If MachineButton.StateFlag.Trim = K_XYJOG Then
XYJogButton = MachineButton
@@ -346,7 +346,7 @@ Public Class DirectCutPageUC
Friend Sub ZJogChanged(bZAxes As Boolean)
' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
Dim ZJogButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonJogList
For Each MachineButton As MachineButton In m_ButtonJogList
If MachineButton.StateFlag.Trim = K_ZJOG Then
ZJogButton = MachineButton
Exit For
@@ -367,7 +367,7 @@ Public Class DirectCutPageUC
Friend Sub BCJogChanged(bBCAxes As Boolean)
' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
Dim BCJogButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonJogList
For Each MachineButton As MachineButton In m_ButtonJogList
If MachineButton.StateFlag.Trim = K_BCJOG Then
BCJogButton = MachineButton
Exit For
DirectCuts/SingleCutAuto.xaml.vb
+1 -1
View File
@@ -161,7 +161,7 @@ Public Class SingleCutAuto
ShowCoord()
' carico la lista dei materiali lavorabili in macchina
m_MaterialsList.Clear()
For Each Material In m_MainWindow.m_CurrentMachine.Materials
For Each Material As Material In m_MainWindow.m_CurrentMachine.Materials
m_MaterialsList.Add(New MachiningMaterial(Material.nId, Material.sName))
Next
' Carico l'elenco dei materiali presenti in macchina per l'assegnata lavorazione
DirectCuts/VacuumMachineButtonUC.xaml.vb
+24 -24
View File
@@ -77,7 +77,7 @@ Public Class VacuumMachineButtonUC
Friend Sub VacuumUpChanged(VacuumUpState As Boolean)
Dim VacuumUpButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUMUP Then
VacuumUpButton = MachineButton
End If
@@ -89,7 +89,7 @@ Public Class VacuumMachineButtonUC
Friend Sub VacuumDownChanged(VacuumDownState As Boolean)
Dim VacuumDownButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUMDOWN Then
VacuumDownButton = MachineButton
End If
@@ -101,7 +101,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum2UpChanged(Vacuum2UpState As Boolean)
Dim Vacuum2UpButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM2UP Then
Vacuum2UpButton = MachineButton
End If
@@ -113,7 +113,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum2DownChanged(Vacuum2DownState As Boolean)
Dim Vacuum2DownButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM2DOWN Then
Vacuum2DownButton = MachineButton
End If
@@ -125,7 +125,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum0Changed(Vacuum0State As Boolean)
Dim Vacuum0Button As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM0 Then
Vacuum0Button = MachineButton
End If
@@ -137,7 +137,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum90Changed(Vacuum90State As Boolean)
Dim VacuumRotButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM90 Then
VacuumRotButton = MachineButton
End If
@@ -149,7 +149,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum1Changed(Vacuum1State As Boolean)
Dim Vacuum1StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM1STATE Then
Vacuum1StateButton = MachineButton
End If
@@ -161,7 +161,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum2Changed(Vacuum2State As Boolean)
Dim Vacuum2StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM2STATE Then
Vacuum2StateButton = MachineButton
End If
@@ -173,7 +173,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum3Changed(Vacuum3State As Boolean)
Dim Vacuum3StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM3STATE Then
Vacuum3StateButton = MachineButton
End If
@@ -185,7 +185,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum4Changed(Vacuum4State As Boolean)
Dim Vacuum4StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM4STATE Then
Vacuum4StateButton = MachineButton
End If
@@ -197,7 +197,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum5Changed(Vacuum5State As Boolean)
Dim Vacuum5StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM5STATE Then
Vacuum5StateButton = MachineButton
End If
@@ -209,7 +209,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum6Changed(Vacuum6State As Boolean)
Dim Vacuum6StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM6STATE Then
Vacuum6StateButton = MachineButton
End If
@@ -221,7 +221,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum135Changed(Vacuum135State As Boolean)
Dim Vacuum135StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM135STATE Then
Vacuum135StateButton = MachineButton
End If
@@ -233,7 +233,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Vacuum246Changed(Vacuum246State As Boolean)
Dim Vacuum246StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUM246STATE Then
Vacuum246StateButton = MachineButton
End If
@@ -245,7 +245,7 @@ Public Class VacuumMachineButtonUC
Friend Sub OpenAllChanged(OpenAllState As Boolean)
Dim OpenAllStateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_OPENALLSTATE Then
OpenAllStateButton = MachineButton
End If
@@ -257,7 +257,7 @@ Public Class VacuumMachineButtonUC
Friend Sub CloseAllChanged(CloseAllState As Boolean)
Dim CloseAllStateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_CLOSEALLSTATE Then
CloseAllStateButton = MachineButton
End If
@@ -269,7 +269,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Open123Changed(Open123State As Boolean)
Dim Open123StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_OPEN123STATE Then
Open123StateButton = MachineButton
End If
@@ -281,7 +281,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Open456Changed(Open456State As Boolean)
Dim Open456StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_OPEN456STATE Then
Open456StateButton = MachineButton
End If
@@ -293,7 +293,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Close123Changed(Close123State As Boolean)
Dim Close123StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_CLOSE123STATE Then
Close123StateButton = MachineButton
End If
@@ -305,7 +305,7 @@ Public Class VacuumMachineButtonUC
Friend Sub Close456Changed(Close456State As Boolean)
Dim Close456StateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_CLOSE456STATE Then
Close456StateButton = MachineButton
End If
@@ -317,7 +317,7 @@ Public Class VacuumMachineButtonUC
Friend Sub BlowChanged(BlowState As Boolean)
Dim BlowStateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_BLOWSTATE Then
BlowStateButton = MachineButton
End If
@@ -329,7 +329,7 @@ Public Class VacuumMachineButtonUC
Friend Sub VacuumOnChanged(VacuumState As Boolean)
Dim VacuumOnButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUMON Then
VacuumOnButton = MachineButton
End If
@@ -341,7 +341,7 @@ Public Class VacuumMachineButtonUC
Friend Sub VacuumOffChanged(VacuumState As Boolean)
Dim VacuumOffButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_VACUUMOFF Then
VacuumOffButton = MachineButton
End If
@@ -354,7 +354,7 @@ Public Class VacuumMachineButtonUC
Friend Sub BypassChanged(BypassState As Boolean)
Dim PressedBypassStateButton As PressedCommandButton = Nothing
Dim TwoBypassStateButton As TwoStateButton = Nothing
For Each MachineButton In m_ButtonList
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_BYPASSTATE Then
If TypeOf MachineButton Is TwoStateButton Then
TwoBypassStateButton = MachineButton