OmagCUT :

- aggiunto flag opzionale Blocco Asse B (da Ini macchina [Nest] UseBAxisLock=0/1).
This commit is contained in:
Dario Sassi
2026-05-04 06:39:46 +02:00
parent 88ff42a8c6
commit dbcd4ca7a0
3 changed files with 36 additions and 4 deletions
+2 -1
View File
@@ -193,6 +193,7 @@
Public Const K_ALLTABORIGTAB1 As String = "AllTabOrigTab1"
Public Const K_TABX As String = "TabX"
Public Const K_TABY As String = "TabY"
Public Const K_USELASERORIGIN As String = "UseLaserOrigin"
Public Const S_PHOTO As String = "Photo"
Public Const K_PHOTO_CAMERACOUNTER As String = "CameraCounter"
@@ -273,8 +274,8 @@
Public Const K_MACH_CUTFSEVENABLE As String = "CutFsevEnable"
Public Const K_MACH_CUTFSEVLEN As String = "CutFsevLen"
Public Const K_MACH_CUTFSEVPERC As String = "CutFsevPerc"
Public Const K_USELASERORIGIN As String = "UseLaserOrigin"
Public Const K_MACH_DRILL_MILL_C90 As String = "DrillMillC90"
Public Const K_USEBAXISLOCK As String = "UseBAxisLock"
Public Const S_MACH_FRAME As String = "Frame"
Public Const K_MACH_PAUSE As String = "Pause"
+12
View File
@@ -533,6 +533,18 @@
HorizontalAlignment="Right" Margin="0,0,10,0"/>
</Grid>
<Grid Grid.Column="3" Grid.Row="8" Margin="0,0,5,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="4.5*"/>
<ColumnDefinition Width="1.8*"/>
</Grid.ColumnDefinitions>
<TextBlock Name="UseBAxisLockTxBl" Grid.Column="0"
Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
<CheckBox Name="UseBAxisLockChBx"
Style="{DynamicResource OmagCut_CheckBox_Single}" Grid.Column="1"
HorizontalAlignment="Right" Margin="0,0,10,0"/>
</Grid>
</Grid>
</Border>
+22 -3
View File
@@ -48,8 +48,8 @@ Public Class AlarmsPageUC
End If
' Se esiste un file lua valido allora mostro il pulsante per l'esecuzione dello script
If Not String.IsNullOrEmpty(GetExecLuaFile()) And
ExecLuaBtn.Visibility = Visibility.Visible Then
If Not String.IsNullOrWhiteSpace(GetExecLuaFile()) Then
ExecLuaBtn.Visibility = Visibility.Visible
Else
ExecLuaBtn.Visibility = Visibility.Hidden
End If
@@ -108,6 +108,7 @@ Public Class AlarmsPageUC
WashingTxBl.Text = EgtMsg(90941) ' Lavaggio
FinalSawCutGpBx.Header = EgtMsg(91254) ' Taglio Finale
EnableFinalSawCutTxBl.Text = EgtMsg(91255) ' Abilita
UseBAxisLockTxBl.Text = EgtMsg(91257) ' Blocca Asse B
AutoRawImageParamGpBx.Visibility = Windows.Visibility.Hidden
End Sub
@@ -389,7 +390,7 @@ Public Class AlarmsPageUC
CfrLenTxBx.Text = LenToString(m_CurrentMachine.dFsevLength, 3)
CfrPercTxBx.Text = DoubleToString(m_CurrentMachine.dFsevPerc, 0)
' leggo flag per tavola definita da laser
' leggo flag per origine pezzo definita da laser ( o lama)
Dim nUseLaserOrigin As Integer = GetPrivateProfileInt(S_TABLE, K_USELASERORIGIN, -1, m_MainWindow.GetMachIniFile())
If nUseLaserOrigin = -1 Then
UseLaserOriginTxBl.Visibility = Visibility.Hidden
@@ -399,6 +400,16 @@ Public Class AlarmsPageUC
UseLaserOriginChBx.IsChecked = (nUseLaserOrigin <> 0)
End If
' leggo flag per bloccaggio asse B con pistone o similare
Dim nUseBAxisLock As Integer = GetPrivateProfileInt(S_MACH_NEST, K_USEBAXISLOCK, -1, m_MainWindow.GetMachIniFile())
If nUseBAxisLock = -1 Then
UseBAxisLockTxBl.Visibility = Visibility.Hidden
UseBAxisLockChBx.Visibility = Visibility.Hidden
Else
UseBAxisLockTxBl.Visibility = Visibility.Visible
UseBAxisLockChBx.IsChecked = (nUseBAxisLock <> 0)
End If
' Taglio finale
If m_CurrentMachine.bSawing Then
FinalSawCutGpBx.Visibility = Visibility.Visible
@@ -1058,6 +1069,14 @@ Public Class AlarmsPageUC
End If
End Sub
Private Sub UseBAxisLockChBx_Click() Handles UseBAxisLockChBx.Click
If UseBAxisLockChBx.IsChecked() Then
WritePrivateProfileString(S_MACH_NEST, K_USEBAXISLOCK, "1", m_MainWindow.GetMachIniFile())
Else
WritePrivateProfileString(S_MACH_NEST, K_USEBAXISLOCK, "0", m_MainWindow.GetMachIniFile())
End If
End Sub
Private Sub WashingChBx_Click(sender As Object, e As RoutedEventArgs) Handles WashingChBx.Click
If WashingChBx.IsChecked() Then
WritePrivateProfileString(S_MACH_NEST, K_MACH_WASHING, "1", m_MainWindow.GetMachIniFile())