Merge branch 'develop'

DirectCuts/DirectCutPageUC.xaml

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

DirectCuts/DirectCutPageUC.xaml.vb

@@ -257,7 +257,6 @@ 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
@@ -278,10 +277,6 @@ 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
@@ -518,43 +513,6 @@ 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

NcComm/CNCommunication.vb

@@ -581,7 +581,6 @@ 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)
@@ -608,7 +607,6 @@ 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,9 +1296,6 @@
   <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,7 +208,6 @@
     <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-->