Aggiunti comandi viste in Simula e InLavoro

CadCuts/VacuumCups.vb

@@ -8,8 +8,6 @@ Module VacuumCups
    Private m_nVacId As Integer = GDB_ID.NULL
    Private m_nRefId As Integer = GDB_ID.NULL
    Private m_dPreferredRot As Double = 0
-   Private m_dPrefVertRotXMinus As Double = 0
-   Private m_dPrefVertRotXPlus As Double = 0
    Private m_dDripRefAng As Double = 0
 
    ' Nome del gruppo temporaneo per le ventose
@@ -76,9 +74,6 @@ Module VacuumCups
       If m_nVacId = GDB_ID.NULL Then Return False
       ' Angolo di rotazione preferito
       EgtGetInfo( m_nVacId, KEY_VACLAY_PREFROT, m_dPreferredRot)
-      ' Angoli di rotazione preferiti per ventosa in verticale (lungo Y) a sinistra e a destra del centro tavola
-      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFVROTXMINUS, m_dPrefVertRotXMinus)
-      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFVROTXPLUS, m_dPrefVertRotXPlus)
       ' Direzione di riferimento per tagli Drip
       EgtGetInfo( m_nVacId, KEY_VACLAY_DRIPREFDIR, m_dDripRefAng)
       ' Nascondo il gruppo ma rendo visibili le curve di contorno delle ventose
@@ -368,9 +363,6 @@ Module VacuumCups
       If b3Vac.IsEmpty() Then Return INFINITO
       ' Se box maggiore di quello del pezzo, scarto soluzione
       If b3Vac.Radius() > b3Raw.Radius() Then Return INFINITO
-      ' Recupero l'area della tavola
-      Dim b3Tab As New BBox3d
-      EgtGetTableArea(1, b3Tab)
       ' Determino il movimento
       vtMove = ptRawCen - b3Vac.Center()
       b3Vac.Move(vtMove)
@@ -382,19 +374,11 @@ Module VacuumCups
          frMinRect.VersX().ToSpherical(dLen, dAngVertDeg, dAngOrizzDeg)
          dRotAngDeg = dAngOrizzDeg
          If b3Vac.DimY() > b3Vac.DimX() + EPS_SMALL Then dRotAngDeg -= 90
-         Dim dPreferredRot As Double = m_dPreferredRot
-         If Math.Abs( dRotAngDeg - 90) < 45  Or  Math.Abs( dRotAngDeg - 270) < 45 Then
-            If frMinRect.Orig().x < b3Tab.Center().x Then
-               dPreferredRot = m_dPrefVertRotXMinus
-            else
-               dPreferredRot = m_dPrefVertRotXPlus
-            End If
-         End If 
          Dim dAngDelta As Double = If( Math.Abs( b3Vac.DimY() - b3Vac.DimX()) < 10 * EPS_SMALL, 90, 180)
-         While dRotAngDeg - dPreferredRot >= dAngDelta / 2 
+         While dRotAngDeg - m_dPreferredRot >= dAngDelta / 2 
             dRotAngDeg -= dAngDelta
          End While
-         While dRotAngDeg - dPreferredRot <= -dAngDelta / 2
+         While dRotAngDeg - m_dPreferredRot <= -dAngDelta / 2
             dRotAngDeg += dAngDelta
          End While
       Else
@@ -447,6 +431,8 @@ Module VacuumCups
       ptRef.Move(vtMove)
       ptRef.Rotate(ptRotCen, Vector3d.Z_AX(), dRotAngDeg)
       ' Ne calcolo la distanza dal centro della tavola
+      Dim b3Tab As New BBox3d
+      EgtGetTableArea(1, b3Tab)
       Dim dDist As Double = Point3d.DistXY(ptRef, b3Tab.Center())
       Return dDist
    End Function

Constants/ConstGen.vb

@@ -92,8 +92,6 @@ Module ConstGen
    Public Const KEY_VACLAY_SEL As String = "Sel"
    ' Info in gruppo layout per angolo di rotazione preferito
    Public Const KEY_VACLAY_PREFROT As String = "PreferredRot"
-   Public Const KEY_VACLAY_PREFVROTXMINUS As String = "PrefVertRotXMinus"
-   Public Const KEY_VACLAY_PREFVROTXPLUS As String = "PrefVertRotXPlus"
    ' Info in gruppo layout per direzione di riferimento ventose per tagli da sotto
    Public Const KEY_VACLAY_DRIPREFDIR As String = "DripRefDir"
    ' Info in asse rotante ventosa per step discreti

Constants/ConstKitData.vb

@@ -26,5 +26,6 @@
    Public Const K_LILEN As String = "LiLen"
    Public Const K_LIHEIGHT As String = "LiHeight"
    Public Const K_LILOAD As String = "LiLoad"
+   
 
 End Module

Constants/ConstMachIni.vb

@@ -44,7 +44,6 @@
    Public Const S_NCNUM As String = "NcNUM"
    Public Const K_RESETSENDDELAY As String = "ResetSendDelay"
    Public Const K_THREADSLEEP As String = "ThreadSleep"
-   Public Const K_PHOTODELEY As String = "PhotoDeley"
 
    Public Const S_NCDATA As String = "NcData"
    Public Const K_NEWVARIABLE As String = "NewVariable"
@@ -77,9 +76,6 @@
    Public Const K_DOORCLOSED As String = "DoorClosed"
    Public Const K_LIMITZ As String = "LimitZ"
    Public Const K_POWEROVR As String = "PowerOvr"
-   Public Const K_PARKING As String = "Parking"
-   Public Const K_ENABLEZONE As String = "EnableZone"
-   Public Const K_ENABLEPC As String = "EnablePC"
    Public Const K_HSM As String = "Hsm"
    Public Const K_VACUUMUP As String = "VacuumUp"
    Public Const K_VACUUMDOWN As String = "VacuumDown"
@@ -107,8 +103,6 @@
    Public Const K_VACUUMOFF As String = "VacuumOff"
    Public Const K_BYPASSTATE As String = "BypassState"
    Public Const K_FEEDHOLD As String = "FeedHold"
-   Public Const K_SPOTLIGHT1 As String = "SpotLight1"
-   Public Const K_SPOTLIGHT2 As String = "SpotLight2"
    ' Nuove variabili
    Public Const K_SPEEDHOLD As String = "SpeedHold"
    Public Const K_XYJOG As String = "XYJog"

DirectCuts/ControlsMachineButtonUC.xaml.vb

@@ -330,18 +330,6 @@ Public Class ControlsMachineButtonUC
       End If
    End Sub
 
-   Friend Sub ParkingStateChanged(ParkingState As Boolean)
-      Dim ParkingButton As TwoStateButton = Nothing
-      For Each MachineButton As MachineButton In m_ButtonList
-         If MachineButton.StateFlag = K_PARKING Then
-            ParkingButton = MachineButton
-         End If
-      Next
-      If Not IsNothing(ParkingButton) Then
-         ParkingButton.SetIsChecked(ParkingState)
-      End If
-   End Sub
-
    Public Function GetPrivateProfileMachineButtons(
                          ByVal lpAppName As String,
                          ByVal lpKeyName As String,
@@ -659,7 +647,6 @@ Public Class TwoStateButton
          Return m_IsChecked
       End Get
       Set(value As Boolean)
-         ' accendo il comando, anche se dovrei aspettare di leggere lo stato da PLC
          m_IsChecked = value
          If value Then
             ExecuteMDICommand(TLuaScriptName)

DirectCuts/DirectCutPageUC.xaml

@@ -201,8 +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>
 
@@ -239,11 +239,9 @@
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
             <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
          </ToggleButton>
-
-         <!--Comando Manula/MDI-->
-         <Button Name="ManualModeBtn" Grid.Column="7"
-                Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-             <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+         <Button Name="ManualModeBtn" Grid.Column="8"
+               Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+            <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </Button>
 
       </Grid>

DirectCuts/MachineButtonsUC.xaml

@@ -19,8 +19,7 @@
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-        </Grid.ColumnDefinitions>
+      </Grid.ColumnDefinitions>
 
       <ToggleButton Name="MachineButton1" Grid.Column="0" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
          <Image Name="ImageButton1" Style="{StaticResource OmagCut_ButtonIcon}"/>
@@ -62,10 +61,6 @@
          <Image Name="ImageButton10" Style="{StaticResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton11" Grid.Column="10" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-            <Image Name="ImageButton11" Style="{StaticResource OmagCut_ButtonIcon}"/>
-        </ToggleButton>
-
-    </Grid>
+   </Grid>
 
 </UserControl>

DirectCuts/MachineButtonsUC.xaml.vb

@@ -10,8 +10,7 @@ Public Class MachineButtonsUC
    Private m_bOnlyLaser As Boolean = False
    Private m_bFirst As Boolean = True
 
-   ' 9/2 aggiunto spazio per un nuovo bottone
-   Private Const MAX_BUTTONS As Integer = 11
+   Private Const MAX_BUTTONS As Integer = 10
    Private m_nCount As Integer = 0
    Private ImageArrayY(MAX_BUTTONS - 1) As String
    Private ImageArrayN(MAX_BUTTONS - 1) As String
@@ -32,10 +31,6 @@ Public Class MachineButtonsUC
    Private Const BTN_STATE_NOTHING As String = "Nothing"
    Private Const BTN_STATE_DOOR_OPENED As String = "DoorOpened"
    Private Const BTN_STATE_DOOR_CLOSED As String = "DoorClosed"
-   Private Const BTN_STATE_PARKING As String = "Parking"
-   Private Const BTN_ENABLE_ZONE_1 As String = "EnableZone1"
-   Private Const BTN_ENABLE_ZONE_2 As String = "EnableZone2"
-   Private Const BTN_ENABLE_PC As String = "EnablePC"
 
    Public Sub New(Optional bOnlyLaser As Boolean = False)
       ' This call is required by the designer.
@@ -80,10 +75,7 @@ Public Class MachineButtonsUC
       For nIndex As Integer = 0 To m_nCount - 1
          If StateFlagArray(nIndex) = BTN_STATE_NOTHING OrElse
             StateFlagArray(nIndex) = BTN_STATE_DOOR_OPENED OrElse
-            StateFlagArray(nIndex) = BTN_STATE_DOOR_CLOSED OrElse
-            StateFlagArray(nIndex) = BTN_ENABLE_PC OrElse
-            StateFlagArray(nIndex) = BTN_ENABLE_ZONE_1 OrElse
-            StateFlagArray(nIndex) = BTN_ENABLE_ZONE_2 Then
+            StateFlagArray(nIndex) = BTN_STATE_DOOR_CLOSED Then
             ' mostra immagine fissa
             Try
                Dim s As String
@@ -142,8 +134,7 @@ Public Class MachineButtonsUC
    End Sub
 
    Private Sub MachineButton_Click(sender As Object, e As RoutedEventArgs) Handles MachineButton1.Click, MachineButton2.Click, MachineButton3.Click, MachineButton4.Click, MachineButton5.Click,
-                                                                                   MachineButton6.Click, MachineButton7.Click, MachineButton8.Click, MachineButton9.Click, MachineButton10.Click,
-                                                                                   MachineButton11.Click
+                                                                                   MachineButton6.Click, MachineButton7.Click, MachineButton8.Click, MachineButton9.Click, MachineButton10.Click
       Dim CurrentBtn As Primitives.ToggleButton = e.Source
       ' recupero l'inidce del bottone selezionato
       Dim nIndex As Integer = GetToggleButtonIndex(CurrentBtn) - 1
@@ -162,18 +153,6 @@ Public Class MachineButtonsUC
          Return
       End If
 
-      ' Se il bottone chiamantè quello per la selezione del pannello di controllo
-      If nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_PC) Then
-         Dim sTLuaFile As String = sBaseDir & CommandArrayY(nIndex)
-         Dim sFLuaFile As String = sBaseDir & CommandArrayN(nIndex)
-         If m_CN.nEnablePc = 1 Then
-            ExecuteMDICommand(CurrentBtn, sTLuaFile)
-         ElseIf m_CN.nEnablePc = 2 Then
-            ExecuteMDICommand(CurrentBtn, sFLuaFile)
-         End If
-         Return
-      End If
-
       If CurrentBtn.IsChecked() Then
          'EgtLuaExecFile(sBaseDir & CommandArrayY(nIndex))
          sLuaFileName = sBaseDir & CommandArrayY(nIndex)
@@ -365,7 +344,6 @@ Public Class MachineButtonsUC
                 " EType2=" & If(Not String.IsNullOrEmpty(EType2), CInt(EType2).ToString, ""))
    End Sub
 
-#Region "STATE CHANGED"
 
    Friend Sub SpindleStateChanged(SpindleState As Boolean)
       Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_SPINDLE)
@@ -606,135 +584,6 @@ Public Class MachineButtonsUC
       End If
    End Sub
 
-   Friend Sub ParkingStateChanged(ParkingState As Boolean)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_PARKING)
-      If nIndex = -1 Then Return
-      If ParkingState Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
-         End Try
-      Else
-         GetToggleButton(nIndex + 1).IsChecked = False
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
-         End Try
-      End If
-   End Sub
-
-   Friend Sub EnableZoneStateChanged(ZoneState As Integer)
-      Dim sFlag As String = String.Empty
-      If ZoneState = 1 Then
-         sFlag = BTN_ENABLE_ZONE_1
-      ElseIf ZoneState = 2 Then
-         sFlag = BTN_ENABLE_ZONE_2
-      End If
-      ' recupero il bottone che deve essere acceso (quindi spengo l'altro)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, sFlag)
-
-      ' se non trovo nessun riferimento allora spengo entrambi i comandi
-      If nIndex = -1 Then
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_1)
-         GetToggleButton(nIndex + 1).IsChecked = False
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_2)
-         GetToggleButton(nIndex + 1).IsChecked = False
-         Return
-      End If
-
-      If ZoneState = 1 Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
-         End Try
-         ' spengo l'altro bottone (lo stato dei due bottoni sono gestiti da una sola variabile)
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_2)
-         GetToggleButton(nIndex + 1).IsChecked = False
-
-      ElseIf ZoneState = 2 Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
-         End Try
-         ' spengo l'altro bottone (lo stato dei due bottoni sono gestiti da una sola variabile)
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_1)
-         GetToggleButton(nIndex + 1).IsChecked = False
-      End If
-   End Sub
-
-   Friend Sub EnablePcStateChanged(PcState As Integer)
-      ' il comando ButtonY accendo il Pannello_1, il comando ButtonN accendo il Pannello_2 (uno è la negazione dell'altro)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_ENABLE_PC)
-      If nIndex = -1 Then Return
-      If PcState = 1 Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
-         End Try
-      ElseIf PcState = 2 Then
-         GetToggleButton(nIndex + 1).IsChecked = True
-         Try
-            Dim s As String
-            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayN(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayN(nIndex)
-            End If
-            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
-            GetImage(nIndex + 1).Source = sButtonImageSource
-         Catch ex As Exception
-            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
-         End Try
-      Else
-         ' nessuno dei due pannelli attivo
-         GetToggleButton(nIndex + 1).IsChecked = False
-      End If
-   End Sub
-
    '----------------- Queste funzioni determina lo stato del bottone direttamente dalla lettura delle variabili CN
    Friend Sub XYJogChanged(ByVal bXYAxes As Boolean)
       ' recupero le asscociazioni con i bottoni
@@ -770,86 +619,78 @@ Public Class MachineButtonsUC
 
    '-----------------------------------------------------------------------------------------------------------------
 
-#End Region    ' State changed
-
    Private Function GetToggleButton(ByVal nIndex As Integer) As Primitives.ToggleButton
       Select Case nIndex
-         Case 1
-            Return MachineButton1
-         Case 2
-            Return MachineButton2
-         Case 3
-            Return MachineButton3
-         Case 4
-            Return MachineButton4
-         Case 5
-            Return MachineButton5
-         Case 6
-            Return MachineButton6
-         Case 7
-            Return MachineButton7
-         Case 8
-            Return MachineButton8
-         Case 9
-            Return MachineButton9
-         Case 10
-            Return MachineButton10
-         Case Else
-            Return MachineButton11
+      Case 1
+         Return MachineButton1
+      Case 2
+         Return MachineButton2
+      Case 3
+         Return MachineButton3
+      Case 4
+         Return MachineButton4
+      Case 5
+         Return MachineButton5
+      Case 6
+         Return MachineButton6
+      Case 7
+         Return MachineButton7
+      Case 8
+         Return MachineButton8
+      Case 9
+         Return MachineButton9
+      Case Else
+         Return MachineButton10
       End Select
    End Function
 
    Private Function GetToggleButtonIndex(ByVal nBtnName As Primitives.ToggleButton) As Integer
       Select Case nBtnName.Name
-         Case MachineButton1.Name
-            Return 1
-         Case MachineButton2.Name
-            Return 2
-         Case MachineButton3.Name
-            Return 3
-         Case MachineButton4.Name
-            Return 4
-         Case MachineButton5.Name
-            Return 5
-         Case MachineButton6.Name
-            Return 6
-         Case MachineButton7.Name
-            Return 7
-         Case MachineButton8.Name
-            Return 8
-         Case MachineButton9.Name
-            Return 9
-         Case MachineButton10.Name
-            Return 10
-         Case Else
-            Return 11
+      Case MachineButton1.Name
+         Return 1
+      Case MachineButton2.Name
+         Return 2
+      Case MachineButton3.Name
+         Return 3
+      Case MachineButton4.Name
+         Return 4
+      Case MachineButton5.Name
+         Return 5
+      Case MachineButton6.Name
+         Return 6
+      Case MachineButton7.Name
+         Return 7
+      Case MachineButton8.Name
+         Return 8
+      Case MachineButton9.Name
+         Return 9
+      Case Else
+         Return 10
       End Select
    End Function
 
    Private Function GetImage(ByVal nInd As Integer) As Image
       Select Case nInd
-         Case 1
-            Return ImageButton1
-         Case 2
-            Return ImageButton2
-         Case 3
-            Return ImageButton3
-         Case 4
-            Return ImageButton4
-         Case 5
-            Return ImageButton5
-         Case 6
-            Return ImageButton6
-         Case 7
-            Return ImageButton7
-         Case 8
-            Return ImageButton8
-         Case 9
-            Return ImageButton9
-         Case 10
-            Return ImageButton10
-         Case Else
-            Return ImageButton11
+      Case 1
+         Return ImageButton1
+      Case 2
+         Return ImageButton2
+      Case 3
+         Return ImageButton3
+      Case 4
+         Return ImageButton4
+      Case 5
+         Return ImageButton5
+      Case 6
+         Return ImageButton6
+      Case 7
+         Return ImageButton7
+      Case 8
+         Return ImageButton8
+      Case 9
+         Return ImageButton9
+      Case Else
+         Return ImageButton10
       End Select
    End Function
 

Machine/PolishingsPageUC.xaml

@@ -203,15 +203,15 @@
                     <EgtWPFLib:EgtTextBox Name="ZigZagXTxBx" Grid.Row="2" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                     <EgtWPFLib:EgtTextBox Name="StepXTxBx" Grid.Row="2" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                     <EgtWPFLib:EgtTextBox Name="OffZigZagXTxBx" Grid.Row="2" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="RadiusXTxBx" Grid.Row="2" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
-                    <EgtWPFLib:EgtTextBox Name="DistanceXTxBx" Grid.Row="2" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
+                    <EgtWPFLib:EgtTextBox Name="RadiusXTxBx" Grid.Row="2" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="DistanceXTxBx" Grid.Row="2" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                             
                     <!--Cammino verticale Y-->
                     <EgtWPFLib:EgtTextBox Name="ZigZagYTxBx" Grid.Row="3" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                     <EgtWPFLib:EgtTextBox Name="StepYTxBx" Grid.Row="3" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                     <EgtWPFLib:EgtTextBox Name="OffZigZagYTxBx" Grid.Row="3" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="RadiusYTxBx" Grid.Row="3" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
-                    <EgtWPFLib:EgtTextBox Name="DistanceYTxBx" Grid.Row="3" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
+                    <EgtWPFLib:EgtTextBox Name="RadiusYTxBx" Grid.Row="3" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="DistanceYTxBx" Grid.Row="3" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                             
                     <!--Cammino a spirale-->
                     <EgtWPFLib:EgtTextBox Name="SpiralTxBx" Grid.Row="4" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>

MainWindow.xaml.vb

@@ -323,8 +323,8 @@ Class MainWindow
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2402, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2402, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2401, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2401, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -567,6 +567,7 @@ Class MainWindow
 
    Private Sub WorkInProgressBtn_Click(sender As Object, e As RoutedEventArgs) Handles WorkInProgressBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
+
       ' disbilito Test
       TestOff()
       Select Case m_ActivePage

My Project/AssemblyInfo.vb

@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.2.2")>
-<Assembly: AssemblyFileVersion("2.4.2.2")>
+<Assembly: AssemblyVersion("2.4.2.1")>
+<Assembly: AssemblyFileVersion("2.4.2.1")>

NcComm/CNCommunication.vb

@@ -281,14 +281,6 @@ Public Class CNCommunication
          m_CN.SetCnDataVar(CN_generico.CnData.LimitZ, sVal)
          GetPrivateProfileString(S_NCDATA, K_POWEROVR, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.PowerOvr, sVal)
-
-         GetPrivateProfileString(S_NCDATA, K_PARKING, "", sVal, m_MainWindow.GetMachIniFile())
-         m_CN.SetCnDataVar(CN_generico.CnData.Parking, sVal)
-         GetPrivateProfileString(S_NCDATA, K_ENABLEZONE, "", sVal, m_MainWindow.GetMachIniFile())
-         m_CN.SetCnDataVar(CN_generico.CnData.EnableZone, sVal)
-         GetPrivateProfileString(S_NCDATA, K_ENABLEPC, "", sVal, m_MainWindow.GetMachIniFile())
-         m_CN.SetCnDataVar(CN_generico.CnData.EnablePC, sVal)
-
          GetPrivateProfileString(S_NCDATA, K_VACUUMUP, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.VacuumUp, sVal)
          GetPrivateProfileString(S_NCDATA, K_VACUUMDOWN, "", sVal, m_MainWindow.GetMachIniFile())
@@ -547,8 +539,6 @@ Public Class CNCommunication
             m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.DoorClosedChanged(m_CN.nDoorClosedState)
             m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.LimitZChanged(m_CN.bLimitZState)
             m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.FiveAxisStateChanged(m_CN.Is_G24_active())
-            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.ParkingStateChanged(m_CN.bParkingState)
-            'm_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.ZoneStateChanged(m_CN.nEnableZone)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumUpChanged(m_CN.bVacuumUp)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumDownChanged(m_CN.bVacuumDown)
             m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum2UpChanged(m_CN.bVacuum2Up)
@@ -593,10 +583,7 @@ Public Class CNCommunication
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ThreeAxisStateChanged(True)
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.FiveAxisStateChanged(False)
             End If
-            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
-            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ParkingStateChanged(m_CN.bParkingState)
-            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnableZoneStateChanged(m_CN.nEnableZone)
-            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnablePcStateChanged(m_CN.nEnablePc)
+            m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
 
             ' Nuovi bottoni (uso joystick) per Area4
             If m_IsNewConsole Then
@@ -632,9 +619,6 @@ Public Class CNCommunication
             m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.FiveAxisStateChanged(False)
          End If
          m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
-         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.ParkingStateChanged(m_CN.bParkingState)
-         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.EnableZoneStateChanged(m_CN.nEnableZone)
-         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.EnablePcStateChanged(m_CN.nEnablePc)
       End If
 
    End Sub

NcComm/CN_generico.vb

@@ -8,7 +8,7 @@ Public MustInherit Class CN_generico
    Public Const MAX_VAR As Short = 100
    Public Const MAX_VALUES As Short = 9           ' Max. index to read the data from the FXServer array
    Public Const MAX_TOOLS As Short = 100
-   Public Const NUM_DATA = 55                     ' Numero di dati del CN (Speed,Feed,...)
+   Public Const NUM_DATA = 52                     ' Numero di dati del CN (Speed,Feed,...)
 
    Public m_NewVariable As Boolean = False        ' per scrittura delle vairbaili Apllication del PLC
 
@@ -66,10 +66,6 @@ Public MustInherit Class CN_generico
       ZBJog = 49
       PowerON = 50
       Remote = 51
-
-      Parking = 52
-      EnableZone = 53
-      EnablePC = 54
    End Enum
 
 #End Region
@@ -177,9 +173,6 @@ Public MustInherit Class CN_generico
    Public nDoorClosedState As Integer
    Public bLimitZState As Boolean
    Public bPowerOvr As Double
-   Public bParkingState As Boolean
-   Public nEnableZone As Integer
-   Public nEnablePc As Integer
    Public bHsm As Double
    Public bVacuumUp As Boolean
    Public bVacuumDown As Boolean

NcComm/M_Num.vb

@@ -1077,24 +1077,17 @@ Namespace Num
                Case CnData.VacuumOff     ' (45) Stato aspirazione ventose spento
                   bVacuumOff = CBool(values(n))
 
-               Case CnData.XYJog     ' (47) 
+               Case CnData.XYJog     ' (46) 
                   bXYJog = CBool(values(n))
-               Case CnData.ZCJog     ' (48)
+               Case CnData.ZCJog     ' (47)
                   bZCJog = CBool(values(n))
-               Case CnData.ZBJog     ' (49)
+               Case CnData.ZBJog     ' (48)
                   bZBCJog = CBool(values(n))
-               Case CnData.PowerON     ' (50)
+               Case CnData.PowerON     ' (49)
                   bPowerON = CBool(values(n))
-               Case CnData.Remote     ' (51)
+               Case CnData.Remote     ' (50)
                   bRemote = CBool(values(n))
 
-               Case CnData.Parking     ' (52)
-                  bParkingState = CBool(values(n))
-               Case CnData.EnableZone     ' (53)
-                  nEnableZone = CInt(values(n))
-               Case CnData.EnablePC     ' (54)
-                  nEnablePc = CInt(values(n))
-
             End Select
          Next
 

Project/CurrentProjectPageUC.xaml.vb

@@ -49,7 +49,7 @@ Public Class CurrentProjectPageUC
       m_MainWindow.m_FrameCutPageUC.SetValue(Grid.ColumnSpanProperty, 2)
 
       'Assegno SceneButtons alla pagina
-      UpperButtonGrid.Children.Add(m_SceneButtons)
+      Me.UpperButtonGrid.Children.Add(m_SceneButtons)
 
       'Assegnazione scena all'host e posizionamento nella PlacePageGrid
       CurrentProjectSceneHost.Child = CurrentProjectScene
@@ -66,6 +66,7 @@ Public Class CurrentProjectPageUC
    End Sub
 
    Private Sub CurrentProjectPage_Loaded(sender As Object, e As RoutedEventArgs)
+
       ' Impostazioni MruLists: carico la lista degli ultimi file caricati/aperti
       m_MruFiles.Init(S_MRUFILES, 8)
       If m_bFirst Then

Project/ProjectMgrUC.xaml.vb

@@ -33,6 +33,7 @@ Public Class ProjectMgrUC
    End Sub
 
    Private Sub ProjectMgrUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+
       ' Impostazioni
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
       m_CurrMachine = m_MainWindow.m_CurrentMachine
@@ -269,6 +270,7 @@ Public Class ProjectMgrUC
       End If
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
       m_MainWindow.m_ActivePage = MainWindow.Pages.Simulation
+
    End Sub
 
    Private Sub WorkBtn_Click(sender As Object, e As RoutedEventArgs) Handles WorkBtn.Click

Project/SceneButtonsUC.xaml

@@ -4,7 +4,7 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
    mc:Ignorable="d" 
-   d:DesignHeight="85.3" d:DesignWidth="597.1">
+   d:DesignHeight="85.3">
 
    <!-- Definizione del controllo SceneButton -->
    <Grid Name="SceneButtonsGrid">
@@ -16,7 +16,9 @@
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
 
         <ToggleButton Name="MeasureBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
          <Image Source="{DynamicResource MeasureImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
@@ -39,7 +41,15 @@
       <Button Name="TopViewBtn" Grid.Column="6" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
          <Image Source="{DynamicResource LookFromTOPImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
       </Button>
-      
-   </Grid>
+
+        <Button Name="FrontViewBtn" Grid.Column="7" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource LookFromTOPImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+        </Button>
+        <Button Name="LeftViewBtn" Grid.Column="8" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource LookFromTOPImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+        </Button>
+
+
+    </Grid>
 
 </UserControl>

Project/SceneButtonsUC.xaml.vb

@@ -72,25 +72,56 @@ Public Class SceneButtonsUC
       EgtSetView(VT.TOP)
    End Sub
 
+   Private Sub LeftViewBtn_Click(sender As Object, e As RoutedEventArgs) Handles LeftViewBtn.Click
+      EgtSetView(VT.LEFT)
+   End Sub
+
+   Private Sub FrontViewBtn_Click(sender As Object, e As RoutedEventArgs) Handles FrontViewBtn.Click
+      EgtSetView(VT.FRONT)
+   End Sub
+
    Private Function GetCurrScene() As EgtUILib.Scene
-   Select Case m_MainWindow.m_ActivePage
-      Case MainWindow.Pages.WorkInProgress
-         Return m_MainWindow.m_WorkInProgressPageUC.WorkInProgressScene
-      Case MainWindow.Pages.DirectCut
-         Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
-      Case MainWindow.Pages.CadCut
-         Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
-      Case MainWindow.Pages.Open
-         Return m_MainWindow.m_OpenPage.OpenScene
-      Case MainWindow.Pages.FrameCut
-         Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
-      Case MainWindow.Pages.Draw
-         Return m_MainWindow.m_DrawPageUC.DrawScene
-      Case MainWindow.Pages.Import
-         Return m_MainWindow.m_ImportPageUC.ImportScene
-      Case Else
-         Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
-   End Select
+      Select Case m_MainWindow.m_ActivePage
+         Case MainWindow.Pages.WorkInProgress
+            Return m_MainWindow.m_WorkInProgressPageUC.WorkInProgressScene
+         Case MainWindow.Pages.DirectCut
+            Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
+         Case MainWindow.Pages.CadCut
+            Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
+         Case MainWindow.Pages.Open
+            Return m_MainWindow.m_OpenPage.OpenScene
+         Case MainWindow.Pages.FrameCut
+            Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
+         Case MainWindow.Pages.Draw
+            Return m_MainWindow.m_DrawPageUC.DrawScene
+         Case MainWindow.Pages.Import
+            Return m_MainWindow.m_ImportPageUC.ImportScene
+         Case Else
+            Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
+      End Select
    End Function
 
+   Sub New(Optional ByVal bActiveViewBtn As Boolean = False)
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+      If bActiveViewBtn Then
+         If Not SceneButtonsGrid.Children.Contains(LeftViewBtn) Then
+            Dim Row As New RowDefinition
+            SceneButtonsGrid.RowDefinitions.Add(Row)
+            SceneButtonsGrid.Children.Add(FrontViewBtn)
+            SceneButtonsGrid.Children.Add(LeftViewBtn)
+         End If
+      Else
+         If SceneButtonsGrid.Children.Contains(LeftViewBtn) Then
+            SceneButtonsGrid.Children.RemoveAt(7)
+            SceneButtonsGrid.Children.RemoveAt(7)
+            SceneButtonsGrid.Width = 721.2
+         End If
+      End If
+
+   End Sub
+
+
 End Class

RawPhoto/Camera.vb

@@ -287,6 +287,7 @@ Public Class Camera
    Public Function CameraClick() As Boolean
       ' Verifiche preliminari
       Dim nInd As Integer = PrepareCamera()
+      If nInd = 0 Then Return False
       ' Visualizzo progressbar
       m_bBusy = True
       m_MainWindow.m_CurrentProjectPageUC.PhotoProgress.Visibility = Visibility.Visible
@@ -307,30 +308,6 @@ Public Class Camera
          End If
       Catch ex As Exception
       End Try
-
-      ' ------------------------------------ accensione riflettori ------------------------------------
-      Dim sPLCVarSpotLight1 As String = String.Empty
-      GetPrivateProfileString(S_NCDATA, K_SPOTLIGHT1, "", sPLCVarSpotLight1, m_MainWindow.GetMachIniFile())
-      Dim sPLCVarSpotLight2 As String = String.Empty
-      GetPrivateProfileString(S_NCDATA, K_SPOTLIGHT2, "", sPLCVarSpotLight2, m_MainWindow.GetMachIniFile())
-      Dim nPhotoDeley As Integer = GetPrivateProfileInt(S_NCNUM, K_PHOTODELEY, "100", m_MainWindow.GetMachIniFile())
-
-      Select Case m_MainWindow.m_CNCommunication.m_nNCType
-         Case 1, 2
-            If m_MainWindow.m_CNCommunication.m_nNCType = 2 Then
-               ' solo per Flexium
-               m_MainWindow.m_CNCommunication.m_CN.DPlcVariables_WriteVariables(If(nInd <> 2, sPLCVarSpotLight1, sPLCVarSpotLight2), "1")
-               ' altrimenti scrittura delle variabili E
-            Else
-               m_MainWindow.m_CNCommunication.m_CN.DVariables_WriteVariables2(If(nInd <> 2, sPLCVarSpotLight1, sPLCVarSpotLight2), "1")
-            End If
-            System.Threading.Thread.Sleep(nPhotoDeley)
-         Case 3
-            ' SIEMENS
-      End Select
-
-      ' ------------------------------------ accensione riflettori ------------------------------------
-
       ' Scatto una foto con eventuale riconoscimento del contorno (il programma deve essere già attivo)
       Dim bOk As Boolean = False
       Dim sArgs As String = "2 0"

Simulation/SimulationPageUC.xaml

@@ -22,9 +22,9 @@
       <!-- Definizione della Grid superiore -->
       <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="2*"/>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="7*"/>
+            <ColumnDefinition Width="9*"/>
          </Grid.ColumnDefinitions>
 
          <Button Name="MachViewModeBtn" Grid.Column="1"

Simulation/SimulationPageUC.xaml.vb

@@ -5,7 +5,8 @@ Public Class SimulationPageUC
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private m_CurrProjPage As CurrentProjectPageUC
-
+   ' Dichiarazione delle Page UserControl
+   Friend m_SceneButtons As SceneButtonsUC
    ' Funzioni di callback per output in interfaccia da LUA
    Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
    Private m_OutTextCallback As New OutTextCallback(AddressOf ProcessOutText)
@@ -48,6 +49,12 @@ Public Class SimulationPageUC
    End Sub
 
    Private Sub SimulationPage_Initialized(sender As Object, e As EventArgs)
+      'Creazione delle Page UserControl
+      m_SceneButtons = New SceneButtonsUC(True)
+
+      'Posizionemento nella griglia delle Page UserControl
+      m_SceneButtons.SetValue(Grid.ColumnProperty, 5)
+
       ' Impostazioni box stime
       m_bEstim = (GetPrivateProfileInt(S_MACH_ESTIMATIONS, K_ENABLEEST, 0, m_MainWindow.GetMachIniFile()) <> 0)
       If Not m_bEstim Then EstimGrid.Visibility = Windows.Visibility.Hidden
@@ -74,12 +81,16 @@ Public Class SimulationPageUC
          StopBtn.SetValue(Grid.RowProperty, 4)
          SpeedSlider.SetValue(Grid.RowProperty, 5)
       End If
+
+      Me.UpperButtonGrid.Children.Add(m_SceneButtons)
+
       ' Pulsante Play
       PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Play.png", UriKind.Relative))
    End Sub
 
    Private Sub SimulationPage_Loaded(sender As Object, e As RoutedEventArgs)
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+
       Dim bOk As Boolean = True
       ' Elimino eventuale attrezzaggio da OmagOFFICE
       EgtEraseCurrSetup()

WorkInProgress/WorkInProgressPageUC.xaml

@@ -17,9 +17,9 @@
    
       <Grid Name="UpperButtonsGrid">
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="7*"/>
+            <ColumnDefinition Width="5*"/>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="7*"/>
+            <ColumnDefinition Width="9*"/>
          </Grid.ColumnDefinitions>
 
          <Button Name="MachViewModeBtn" Grid.Column="1"

WorkInProgress/WorkInProgressPageUC.xaml.vb

@@ -31,7 +31,7 @@ Public Class WorkInProgressPageUC
    Private Sub WorkInProgressPage_Initialized(sender As Object, e As EventArgs)
 
       ' Creazione delle Page UserControl
-      m_SceneButtons = New SceneButtonsUC
+      m_SceneButtons = New SceneButtonsUC(True)
       m_MachineButtons = New MachineButtonsUC
 
       ' Posizionemento nella griglia dei bottoni di vista