Aggiunto comando per gestione ExecLua

Constants/ConstMachIni.vb

@@ -46,6 +46,11 @@
    Public Const K_THREADSLEEP As String = "ThreadSleep"
    Public Const K_PHOTODELEY As String = "PhotoDeley"
 
+   Public Const S_EXECLUA As String = "ExecLua"
+   Public Const K_DIRSCRIPT_LUA As String = "DirScript"
+   Public Const K_FILESCRIPT_LUA As String = "FileScript"
+   Public Const K_CALLFUNCTION As String = "CallFunction"
+
    Public Const S_NCDATA As String = "NcData"
    Public Const K_NEWVARIABLE As String = "NewVariable"
    Public Const K_NEWCONSOLE As String = "NewConsole"

DirectCuts/DirectCutPageUC.xaml

@@ -201,7 +201,8 @@
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="4*"/>
             <!--<ColumnDefinition Width="1*"/>-->
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
@@ -240,8 +241,14 @@
             <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
          </ToggleButton>
 
-         <!--Comando Manula/MDI-->
-         <Button Name="ManualModeBtn" Grid.Column="7"
+         <!--Parking-->
+         <ToggleButton Name="ParkingBtn" Grid.Column="6"
+              Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
+             <Image Source="{DynamicResource ParkingImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+         </ToggleButton>
+
+            <!--Comando Manula/MDI-->
+         <Button Name="ManualModeBtn" Grid.Column="8"
                 Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
              <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </Button>

DirectCuts/DirectCutPageUC.xaml.vb

@@ -257,6 +257,7 @@ Public Class DirectCutPageUC
       ZCBtn.Visibility = Visibility.Collapsed
       ZBBtn.Visibility = Visibility.Collapsed
       RemoteBtn.Visibility = Visibility.Collapsed
+      ParkingBtn.Visibility = Visibility.Collapsed
 
       Dim Item As MachineButton = Nothing
       For Each Item In m_ButtonJogList
@@ -277,6 +278,10 @@ Public Class DirectCutPageUC
                RemoteBtn.Visibility = Visibility.Visible
                RemoteBtn.Foreground = Brushes.White
                RemoteBtn.Content = "Remote"
+            Case K_PARKING
+               ParkingBtn.Visibility = Visibility.Visible
+               ParkingBtn.Foreground = Brushes.White
+               ParkingBtn.ToolTip = "Parking"
          End Select
       Next
    End Sub
@@ -513,6 +518,43 @@ Public Class DirectCutPageUC
       End If
    End Sub
 
+   Private Sub ParkingBtn_Click(sender As Object, e As RoutedEventArgs) Handles ParkingBtn.Click
+      Dim ParkingButton As MachineButton = Nothing
+      Dim ItemButton As MachineButton = Nothing
+      For Each ItemButton In m_ButtonJogList
+         If ItemButton.StateFlag = K_PARKING Then
+            ParkingButton = ItemButton
+            Exit For
+         End If
+      Next
+      If IsNothing(ParkingButton) Then Return
+      ' eseguo lo script lua associato
+      Dim CurrentBtn As Primitives.ToggleButton = e.Source
+      Dim sLuaFileName As String = String.Empty
+      ' verifico lo stato del bottone per avviare il giusto script
+      If CurrentBtn.IsChecked() Then
+         sLuaFileName = ParkingButton.TLuaScriptName
+      Else
+         sLuaFileName = ParkingButton.FLuaScriptName
+      End If
+      ParkingButton.ExecuteMDICommand(sLuaFileName)
+   End Sub
+
+   Friend Sub ParkingStateChanged(bParkingState As Boolean)
+      ' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
+      Dim ParkingButton As TwoStateButton = Nothing
+      For Each MachineButton As MachineButton In m_ButtonJogList
+         If MachineButton.StateFlag.Trim = K_PARKING Then
+            ParkingButton = MachineButton
+            Exit For
+         End If
+      Next
+      If Not IsNothing(ParkingButton) Then
+         ParkingButton.SetIsChecked(bParkingState)
+         ParkingButton.IsChecked = bParkingState
+      End If
+   End Sub
+
    '------------------NUOVI BOTTONI PER GESTIONE JOYSTICK-------------------------------------------------
    Private Sub MachViewModeBtn_Click(sender As Object, e As RoutedEventArgs) Handles MachViewModeBtn.Click
       If m_bShowMachine Then

Machine/AlarmsPageUC.xaml

@@ -801,19 +801,23 @@
             <Grid Grid.Column="0" Grid.Row="8">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="2.5*"/>
-                    <ColumnDefinition Width="5*"/>
-                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="2.5*"/>
+                    <ColumnDefinition Width="4.5*"/>
+                    <ColumnDefinition Width="1.8*"/>
                 </Grid.ColumnDefinitions>
                 <Button x:Name="SawProbingBtn"
-         	   Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+         	         Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
                     <Image Source="{DynamicResource SawProbeImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
                 </Button>
+                <Button x:Name="ExecLuaBtn" Grid.Column="1"
+         	         Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                    <Image Source="{DynamicResource PlayImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+                </Button>
 
-                
-                <TextBlock Name="UseLaserOriginTxBl" Grid.Column="1"
+                <TextBlock Name="UseLaserOriginTxBl" Grid.Column="2"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                <CheckBox Name="UseLaserOriginChBx" Style="{DynamicResource OmagCut_CheckBox_Single}" Grid.Column="2"
-                  HorizontalAlignment="Right" Margin="10,0,10,0"/>
+                <CheckBox Name="UseLaserOriginChBx" Style="{DynamicResource OmagCut_CheckBox_Single}" Grid.Column="3"
+                  HorizontalAlignment="Right" Margin="0,0,10,0"/>
             </Grid>
             
         </Grid>

Machine/AlarmsPageUC.xaml.vb

@@ -45,6 +45,13 @@ Public Class AlarmsPageUC
          SawProbingBtn.Visibility = Windows.Visibility.Hidden
       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
+      Else
+         ExecLuaBtn.Visibility = Visibility.Hidden
+      End If
+
       ' Imposto i messaggi letti dal file dei messaggi
       CurrSawTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 1)
       AuxiliaryToolTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 2)
@@ -1327,4 +1334,53 @@ Public Class AlarmsPageUC
 
    End Sub
 
+   Private Sub ExecLuaBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExecLuaBtn.Click
+      Dim sExecFile As String = GetExecLuaFile()
+      Dim sCallFunction As String = GetCallFunction()
+      ' Recupero file LUA
+      Dim bExec As Boolean = EgtLuaExecFile(sExecFile)
+      ' Lancio l'esecuzione della funzione principale
+      bExec = bExec And EgtLuaCallFunction(sCallFunction)
+      ' Leggo variabili
+      Dim nErr As Integer = 0
+      EgtLuaGetGlobIntVar("CMD.ERR", nErr)
+      ' Reset lua
+      EgtLuaResetGlobVar("CMD")
+      ' Verifico condizioni di errore
+      If nErr <> 0 And bExec Then
+         ' Errore in tastatura lama
+         EgtOutLog("Error in execution file: " & sExecFile & ", calling function: " & sCallFunction & ", CMD.ERR=" & nErr, ToString)
+         Return
+      End If
+   End Sub
+
+   ' Recupero il percorso del file lua da eseguire
+   Private Function GetExecLuaFile() As String
+      Dim sDir As String = String.Empty
+      Dim sFile As String = String.Empty
+      If GetPrivateProfileString(S_EXECLUA, K_DIRSCRIPT_LUA, "", sDir, m_MainWindow.GetMachIniFile()) <> 0 And
+         GetPrivateProfileString(S_EXECLUA, K_FILESCRIPT_LUA, "", sFile, m_MainWindow.GetMachIniFile()) <> 0 Then
+         ' Formatto le stringhe lette
+         sDir = sDir.Trim
+         sFile = sFile.Trim
+         If sDir.EndsWith("\"c) Then
+            sDir = sDir.Remove(sDir.LastIndexOf("\"c))
+         End If
+         If Not sFile.EndsWith(".lua") Then
+            sFile = sFile & ".lua"
+         End If
+         If File.Exists(sDir & "\" & sFile) Then
+            Return sDir & "\" & sFile
+         End If
+      End If
+      Return String.Empty
+   End Function
+
+   ' Recupera il nome della funzione che deve essere chiamata
+   Private Function GetCallFunction() As String
+      Dim sCallFunction As String = "CMD.CmdString"
+      GetPrivateProfileString(S_EXECLUA, K_CALLFUNCTION, sCallFunction, sCallFunction, m_MainWindow.GetMachIniFile())
+      Return sCallFunction
+   End Function
+
 End Class

NcComm/CNCommunication.vb

@@ -581,6 +581,7 @@ Public Class CNCommunication
                m_MainWindow.m_DirectCutPageUC.ZCJogChanged(m_CN.bZCJog)
                m_MainWindow.m_DirectCutPageUC.ZBJogChanged(m_CN.bZBCJog)
                m_MainWindow.m_DirectCutPageUC.RemoteChanged(m_CN.bRemote)
+               m_MainWindow.m_DirectCutPageUC.ParkingStateChanged(m_CN.bParkingState)
             End If
          Else
             m_MainWindow.m_DirectCutPageUC.m_MachineButtons.SpindleStateChanged(m_CN.bSpindleState)
@@ -607,6 +608,7 @@ Public Class CNCommunication
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ZJogChanged(m_CN.bZCJog)
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.BCJogChanged(m_CN.bZBCJog)
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.RemoteChanged(m_CN.bRemote)
+               m_MainWindow.m_DirectCutPageUC.ParkingStateChanged(m_CN.bParkingState)
             End If
 
          End If

OmagCUT.vbproj

@@ -1296,6 +1296,9 @@
   <ItemGroup>
     <Resource Include="Resources\NewIcons\Ponticelli_delete.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Parking.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe

OmagCUTDictionary.xaml

@@ -208,6 +208,7 @@
     <BitmapImage x:Key="XYJogImg" UriSource="Resources/NewIcons/XYJog.png"></BitmapImage>
     <BitmapImage x:Key="ZCJogImg" UriSource="Resources/NewIcons/ZCJog.png"></BitmapImage>
     <BitmapImage x:Key="ZBJogImg" UriSource="Resources/NewIcons/ZBJog.png"></BitmapImage>
+    <BitmapImage x:Key="ParkingImg" UriSource="Resources/NewIcons/Parking.png"></BitmapImage>
 
 
     <!--Frame-->