Merge branch 'Features/Comando_Parking_CN' into Features/Nuove_variabili_PLC

CadCuts/CadCutPageUC.xaml.vb

@@ -196,7 +196,7 @@ Public Class CadCutPageUC
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       EgtDeselectObj(m_NestPage.m_CurrSelectedCurv)
       m_ProjectMgr.TestBtn.IsChecked = False
-      m_CurrProjPage.m_bSelectCurv = False
+      m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
       Select Case m_CadCutMode
          Case CadCutModes.Nest, CadCutModes.FastGrid
             ' Passo alla pagina Split

CadCuts/NestPageUC.xaml.vb

@@ -12,6 +12,8 @@ Public Class NestPageUC
    Friend m_bRegister As Boolean = False
    ' Flag per pezzi selezionati in tavola o fuori
    Private m_nPartPos As Integer = PART_POS.NONE_TABLE
+   ' Flag per impostata per selezionare di una curva
+   Friend m_bSelectCurv As Boolean = False
 
    Friend m_CurrSelectedCurv As Integer = GDB_ID.NULL
    Friend m_CurrSelectedSawCurv As Integer = GDB_ID.NULL
@@ -124,14 +126,16 @@ Public Class NestPageUC
       End If
    End Sub
 
-   Private Sub OnMyMouseDownSceneSelCurv(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownSceneSelCurv
+   Private Sub OnMyMouseDownSceneSelCurv(sender As Object, e As System.Windows.Forms.MouseEventArgs)
       ' Verifico di essere il gestore attivo e non in modalità registrazione
       If Not m_bActive Or m_bRegister Then Return
       ' Si può selezionare solo con il tasto sinistro e se il bottone TEST Attivo
       If e.Button <> Windows.Forms.MouseButtons.Left Or
-         Not m_CurrProjPage.m_bSelectCurv Then
+         Not m_bSelectCurv Then
          Return
       End If
+      ' Se esiste un elemento selezionato
+      EgtResetMark(m_CurrSelectedSawCurv)
       ' provo a riconoscere il valore medio del segmento 
       ' Verifico se selezionato indicativo di pezzo
       EgtSetObjFilterForSelWin(False, True, False, False, False)
@@ -164,6 +168,7 @@ Public Class NestPageUC
                   m_CurrSelectedSawCurv = nIdSaw
                   m_CurrSelectedCurv = nIdMy
                   EgtSelectObj(nIdSaw)
+                  EgtSetMark(nIdSaw)
                   EgtSelectObj(nIdMy)
                   EgtDraw()
                   Exit While
@@ -184,6 +189,12 @@ Public Class NestPageUC
          Not m_CurrProjPage.CurrentProjectScene.IsStatusNull() Then
          Return
       End If
+      ' se in modalità slezione tagli
+      If m_bSelectCurv Then
+         OnMyMouseDownSceneSelCurv(sender, e)
+         Return
+      End If
+
       ' Per default no drag
       m_bDrag = False
       ' Verifico se selezionato indicativo di pezzo
@@ -402,6 +413,8 @@ Public Class NestPageUC
    Private Sub OnMyMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseUpScene
       ' Verifico di essere il gestore attivo
       If Not m_bActive Then Return
+      ' verifico che non sia attivo il comando Test
+      If m_bSelectCurv Then Return
       ' Se eseguito drag
       If Not m_bDragToStart Then
          ' Se movimento con sola verifica finale

CadCuts/SplitPageUC.xaml.vb

@@ -1191,8 +1191,8 @@ Public Class SplitPageUC
                UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
                bRepeat = Not UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
                If bRepeat Then
-                  EgtSetMachiningParam(MCH_MP.STARTADDLEN, dOrigUeal)
-                  EgtSetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUeal)
+                  EgtSetMachiningParam(MCH_MP.ENDADDLEN, dOrigUeal)
+                  EgtSetInfo(nOperId, INFO_MCH_USER_EAL, dOrigUeal)
                   dUeal = dOrigUeal
                End If
             Loop Until Not bRepeat

Constants/ConstMachIni.vb

@@ -44,6 +44,7 @@
    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"
@@ -76,6 +77,7 @@
    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_HSM As String = "Hsm"
    Public Const K_VACUUMUP As String = "VacuumUp"
    Public Const K_VACUUMDOWN As String = "VacuumDown"
@@ -103,6 +105,8 @@
    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,6 +330,18 @@ 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,
@@ -647,6 +659,7 @@ 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.vb

@@ -133,25 +133,6 @@ Public Class DirectCutPageUC
       ' leggo il numero di assi attivi nella macchina
       Dim AxesNumber = GetPrivateProfileInt(S_AXES, K_AXESNUM, 5, m_MainWindow.GetMachIniFile())
 
-      '' leggo se è stata configurata la nuova conole
-      'If GetPrivateProfileInt(S_NCDATA, K_NEWCONSOLE, 0, m_MainWindow.GetMachIniFile()) = 1 And Not bCollapsedNewBottonsConsole Then
-      '   XYBtn.Content = "X - Y"
-      '   XYBtn.Foreground = Brushes.White
-      '   ZCBtn.Content = "Z - C"
-      '   ZCBtn.Foreground = Brushes.White
-      '   If AxesNumber < 5 Then
-      '      ZBBtn.Visibility = Windows.Visibility.Collapsed
-      '   End If
-      '   ZBBtn.Content = "Z - B"
-      '   ZBBtn.Foreground = Brushes.White
-      '   RemoteBtn.Content = "Remote"
-      '   RemoteBtn.Foreground = Brushes.White
-      'Else
-      '   XYBtn.Visibility = Windows.Visibility.Collapsed
-      '   ZCBtn.Visibility = Windows.Visibility.Collapsed
-      '   ZBBtn.Visibility = Windows.Visibility.Collapsed
-      'End If
-
    End Sub
 
    Private Sub DirectCutPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -228,8 +209,12 @@ Public Class DirectCutPageUC
       ' Se macchina fotografica abilitata
       PhotoBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.MAN_PHOTO)
 
-      ' Attivo le lavorazioni solo se esiste il grezzo
+      ' Attivo le lavorazioni solo se esiste il grezzo e se presente testa H1
       Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
+      Dim bH1Exists As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
+
+      ManualBtn.IsEnabled = bH1Exists
+      ' sviluppo rimasto in sospeso
       If m_bManulaCut Then
          ' anche se non è presente un grezzo mantengo abilitato il bottone
          SingleCutBtn.IsEnabled = True
@@ -238,10 +223,14 @@ Public Class DirectCutPageUC
       End If
       MultipleCutBtn.IsEnabled = bRawOk
       GridCutBtn.IsEnabled = bRawOk
-      SingleDrillBtn.IsEnabled = bRawOk
-      FlatteningCutBtn.IsEnabled = bRawOk
+      SingleDrillBtn.IsEnabled = (bRawOk And bH1Exists)
+      FlatteningCutBtn.IsEnabled = (bRawOk And bH1Exists)
       PolishingBtn.IsEnabled = (bRawOk And m_MainWindow.m_CurrentMachine.bPolishing)
-      SawTestBtn.IsEnabled = bRawOk
+      SawTestBtn.IsEnabled = (bRawOk And bH1Exists)
+      CopyTemplateBtn.IsEnabled = bH1Exists
+
+      ' aggiorno la visualizzazione dei parametri
+      ReloadParam()
 
       ' Nascondo i pezzi in parcheggio
       HideParkedParts()
@@ -249,6 +238,20 @@ Public Class DirectCutPageUC
 
    End Sub
 
+   Public Sub ReloadParam()
+      Dim sCurrSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
+      Dim sCurrSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+      Dim bSaw As Boolean = False
+
+      ' se esiste una lavorazione di lama corrente vuol dire che deve essere preferita
+      If Not String.IsNullOrEmpty(sCurrSaw) And Not String.IsNullOrEmpty(sCurrSawing) Then
+         bSaw = EgtSetCalcTool(sCurrSaw, "H1", 1)
+      End If
+      m_SingleCut.SetEnableParam(bSaw)
+      m_MultipleCut.SetEnableParam(bSaw)
+      m_GridCut.SetEnableParam(bSaw)
+   End Sub
+
    Private Sub SetVisibilityJogButtuns()
       XYBtn.Visibility = Visibility.Collapsed
       ZCBtn.Visibility = Visibility.Collapsed

DirectCuts/GridCut.xaml.vb

@@ -152,6 +152,7 @@ Public Class GridCut
       EgtDraw()
    End Sub
 
+
    Friend Sub GridCut_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
       ' Salvo i dati correnti
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_GRID_DEPTH, DoubleToString( m_dDepth, 2), m_MainWindow.GetIniFile())
@@ -185,6 +186,11 @@ Public Class GridCut
       m_bActive = False
    End Sub
 
+   Public Sub SetEnableParam(ByVal bIsSaw As Boolean)
+      ' se macchina solo WaterJet Disabilito/Nascondo parametri della lama
+      DepthTxBx.IsEnabled = bIsSaw
+   End Sub
+
    Private Sub UpdateSimulOkBtn()
       If m_bCutOk Then
          SimulBtn.IsEnabled = True
@@ -242,6 +248,12 @@ Public Class GridCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
 
@@ -256,12 +268,12 @@ Public Class GridCut
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
             ' Altrimenti da lama
          Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
          End If
@@ -285,10 +297,8 @@ Public Class GridCut
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
       End If
 
       ' Disegno il taglio
@@ -317,6 +327,12 @@ Public Class GridCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
 
@@ -331,12 +347,12 @@ Public Class GridCut
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
             ' Altrimenti da lama
          Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
          End If
@@ -358,10 +374,8 @@ Public Class GridCut
          ' Porto il tip nell'origine tavola
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
       End If
 
       ' Se il secondo punto non coincide con il primo, disegno il taglio

DirectCuts/MachineButtonsUC.xaml.vb

@@ -31,6 +31,7 @@ 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"
 
    Public Sub New(Optional bOnlyLaser As Boolean = False)
       ' This call is required by the designer.
@@ -344,6 +345,7 @@ 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)
@@ -584,6 +586,40 @@ 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
+
    '----------------- 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
@@ -619,6 +655,8 @@ Public Class MachineButtonsUC
 
    '-----------------------------------------------------------------------------------------------------------------
 
+#End Region    ' State changed
+
    Private Function GetToggleButton(ByVal nIndex As Integer) As Primitives.ToggleButton
       Select Case nIndex
       Case 1

DirectCuts/MultipleCut.xaml.vb

@@ -213,6 +213,10 @@ Public Class MultipleCut
       m_bActive = False
    End Sub
 
+   Public Sub SetEnableParam(ByVal bIsSaw As Boolean)
+      DepthTxBx.IsEnabled = bIsSaw
+   End Sub
+
    Private Sub UpdateSimulOkBtn()
       If m_bCutOk Then
          SimulBtn.IsEnabled = True
@@ -270,6 +274,12 @@ Public Class MultipleCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
 
@@ -284,12 +294,14 @@ Public Class MultipleCut
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-         ' Altrimenti da lama
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+
+            ' Altrimenti da lama
          Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
          End If
@@ -312,10 +324,9 @@ Public Class MultipleCut
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
+
       End If
       ' Disegno il taglio
       CreateMultipleCut()
@@ -343,6 +354,12 @@ Public Class MultipleCut
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
 
@@ -357,12 +374,12 @@ Public Class MultipleCut
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-         ' Altrimenti da lama
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+            ' Altrimenti da lama
          Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
          End If
@@ -383,10 +400,9 @@ Public Class MultipleCut
          ' Porto il tip nell'origine tavola
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
+
       End If
 
       ' Se il secondo punto non coincide con il primo, disegno il taglio

DirectCuts/SingleCutUC.xaml.vb

@@ -137,6 +137,9 @@ Public Class SingleCutUC
       Point2Btn.IsEnabled = False
       ' Deseleziono bottone primo punto
       Point1Btn.IsChecked = False
+
+      ' la visualizzazione dei comandi è gestira dalla DirectCutPageUC richiamando la funzione ReloadParam
+
       ' Aggiorno visualizzazione
       EgtDraw()
    End Sub
@@ -172,6 +175,12 @@ Public Class SingleCutUC
       m_bActive = False
    End Sub
 
+   Public Sub SetEnableParam(ByVal bIsSaw As Boolean)
+      ' se macchina solo WaterJet Disabilito/Nascondo parametri della lama
+      DepthTxBx.IsEnabled = bIsSaw
+      SawThChBx.IsEnabled = bIsSaw
+   End Sub
+
    Private Sub UpdateSimulOkBtn()
       If m_bCutOk Then
          SimulBtn.IsEnabled = True
@@ -229,6 +238,12 @@ Public Class SingleCutUC
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
       ' Se acquisizione lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
          ' Recupero la posizione macchina
@@ -242,12 +257,12 @@ Public Class SingleCutUC
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-         ' Altrimenti da lama
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+            ' Altrimenti da lama
          Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP1) Then Return
          End If
@@ -271,10 +286,9 @@ Public Class SingleCutUC
          ' Porto il tip nell'origine tavola
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
+
       End If
 
       ' Disegno il taglio
@@ -303,6 +317,12 @@ Public Class SingleCutUC
       ' Verifico configurazione tavola e grezzo
       If Not m_bRawOk Then Return
 
+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+
       ' Se acquisizone lama o laser
       If PointModeCmBx.SelectedIndex = PT_MODE.SAW Or PointModeCmBx.SelectedIndex = PT_MODE.LASER Then
          ' Recupero la posizione macchina
@@ -316,12 +336,14 @@ Public Class SingleCutUC
             If Not EgtSetCalcTool("", "H3", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
-            ' Ora imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-         ' Altrimenti da lama
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+
+            ' Altrimenti da lama
          Else
-            ' Imposto la lama corrente
-            If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+            ' Reimposto eventuale precedente utensile
+            EgtSetCalcTool(sTool, sHead, nExit)
+
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, m_ptTipP2) Then Return
          End If
@@ -343,10 +365,8 @@ Public Class SingleCutUC
          ' Porto il tip nell'origine tavola
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
-         ' Ricavo dati lama corrente
-         Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
-         ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
+         ' Reimposto eventuale precedente utensile
+         EgtSetCalcTool(sTool, sHead, nExit)
       End If
 
       ' Se il secondo punto non coincide con il primo, disegno il taglio
@@ -559,9 +579,13 @@ Public Class SingleCutUC
       Dim dRawHeight As Double = m_ptRawMax.z - m_ptRawMin.z
       ' Recupero spessore lama corrente
       Dim sSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+      Dim sSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
       EgtTdbSetCurrTool(sSaw)
       Dim dThick As Double = 0
-      EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
+      ' se è impostata una lavorazione di lama
+      If Not String.IsNullOrEmpty(sSawing) Then
+         EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
+      End If
       ' Rimuovo eventuale vecchio pezzo per taglio diretto
       EraseDirectCutPart()
       ' Disattivo eventuali lavorazioni presenti

Machine/CurrentMachine.vb

@@ -1314,7 +1314,6 @@ Public Class CurrentMachine
       Local_MaterialList = EgtWPFLib5.WaterjetDbWindowVM.LoadWjMaterials(sFilePath)
       ' definisco la lista delle qualità (solo se è vuota)
       If m_Qualities.Count < 1 Then
-         m_Qualities.Add("")
          m_Qualities.Add("Q1")
          m_Qualities.Add("Q2")
          m_Qualities.Add("Q3")

Machine/MachiningDbPageUC.xaml.vb

@@ -2375,7 +2375,6 @@ Public Class MachiningDbPageUC
          Case MCH_MY.POCKETING
             LeadInTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(
                                           {New IdNameStruct(MCH_POCK_LI.NONE, EgtMsg(MSG_COMBOBOXPARAM + 42)),
-                                           New IdNameStruct(MCH_POCK_LI.GLIDE, EgtMsg(MSG_COMBOBOXPARAM + 48)),
                                            New IdNameStruct(MCH_POCK_LI.ZIGZAG, EgtMsg(MSG_COMBOBOXPARAM + 38)),
                                            New IdNameStruct(MCH_POCK_LI.HELIX, EgtMsg(MSG_COMBOBOXPARAM + 49))})
             LeadOutTypeCmBx.ItemsSource = New ObservableCollection(Of IdNameStruct)(

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, 2312, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2312, 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
@@ -1140,7 +1140,7 @@ Class MainWindow
       ' Aggiorno interfaccia
       CadCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FRAMES)
       FrameCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FLATS) AndAlso (EgtGetHeadId("H1") <> GDB_ID.NULL)
-      DirectCutBtn.IsEnabled = (EgtGetHeadId("H1") <> GDB_ID.NULL)
+      ' DirectCutBtn.IsEnabled = (EgtGetHeadId("H1") <> GDB_ID.NULL)
    End Sub
 
    ' Nomi dei file per OmagVIEW
@@ -1885,8 +1885,9 @@ Class MainWindow
       ' deseleziono gli oggetti e spengo il bottone
       EgtDeselectObj(m_CadCutPageUC.m_NestPage.m_CurrSelectedCurv)
       EgtDeselectObj(m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
+      EgtResetMark(m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
       m_CadCutPageUC.m_ProjectMgr.TestBtn.IsChecked = False
-      m_CurrentProjectPageUC.m_bSelectCurv = False
+      Me.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
    End Sub
 
 End Class

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.1.2")>
-<Assembly: AssemblyFileVersion("2.4.1.2")>
+<Assembly: AssemblyVersion("2.4.1.3")>
+<Assembly: AssemblyFileVersion("2.4.1.3")>

NcComm/CNCommunication.vb

@@ -281,6 +281,10 @@ 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_VACUUMUP, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.VacuumUp, sVal)
          GetPrivateProfileString(S_NCDATA, K_VACUUMDOWN, "", sVal, m_MainWindow.GetMachIniFile())
@@ -539,6 +543,7 @@ 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_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)
@@ -584,6 +589,7 @@ Public Class CNCommunication
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.FiveAxisStateChanged(False)
             End If
             m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ParkingStateChanged(m_CN.bParkingState)
 
             ' Nuovi bottoni (uso joystick) per Area4
             If m_IsNewConsole Then
@@ -619,6 +625,7 @@ 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)
       End If
 
    End Sub

NcComm/CN_generico.vb

@@ -66,6 +66,8 @@ Public MustInherit Class CN_generico
       ZBJog = 49
       PowerON = 50
       Remote = 51
+
+      Parking = 52
    End Enum
 
 #End Region
@@ -173,6 +175,7 @@ Public MustInherit Class CN_generico
    Public nDoorClosedState As Integer
    Public bLimitZState As Boolean
    Public bPowerOvr As Double
+   Public bParkingState As Boolean
    Public bHsm As Double
    Public bVacuumUp As Boolean
    Public bVacuumDown As Boolean

NcComm/M_Num.vb

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

Project/CicloStartWD.xaml.vb

@@ -18,7 +18,7 @@ Class CicloStartWD
       Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
       Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2
       ' imopposto il messaggio di avvio
-      CicloStartTxbl.Text = "Avvio Ciclo-Start"
+      CicloStartTxbl.Text = EgtMsg(91130)   ' Esegui programma?
    End Sub
 
    ' creo un progetto nuovo

Project/CurrentProjectPageUC.xaml.vb

@@ -6,7 +6,6 @@ Imports EgtWPFLib5
 
 Public Class CurrentProjectPageUC
    ' Dichiarazione eventi
-   Friend Event OnMouseDownSceneSelCurv(sender As Object, e As System.Windows.Forms.MouseEventArgs)
    Friend Event OnMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
    Friend Event OnMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
    Friend Event OnMouseUpScene(sender As Object, e As System.Windows.Forms.MouseEventArgs)
@@ -24,8 +23,8 @@ Public Class CurrentProjectPageUC
    ' Dati del grezzo
    Friend m_nRawId As Integer = GDB_ID.NULL
    Friend m_dRawHeight As Double
-   ' pagina impostata per selezionare una lavorazione
-   Friend m_bSelectCurv As Boolean = False
+   '' Flag per impostata per selezionare di una curva
+   'Friend m_bSelectCurv As Boolean = False
    ' Costanti tipo progetto
    Friend Enum PRJ_TYPE As Integer
       EMPTY = 0
@@ -328,12 +327,7 @@ Public Class CurrentProjectPageUC
    End Sub
 
    Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles CurrentProjectScene.OnMouseDownScene
-      If m_bSelectCurv Then
-         RaiseEvent OnMouseDownSceneSelCurv(sender, e)
-      Else
-         RaiseEvent OnMouseDownScene(sender, e)
-      End If
-
+      RaiseEvent OnMouseDownScene(sender, e)
    End Sub
 
    Private Sub OnMyMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles CurrentProjectScene.OnMouseMoveScene

Project/ProjectMgrUC.xaml.vb

@@ -276,7 +276,7 @@ Public Class ProjectMgrUC
       m_CurrProjPage.SetWarningMessage("Trial Version")
 #Else
       ' se sono in modalità Test allora eseguo solo il posizionamento della lama
-      If m_CurrProjPage.m_bSelectCurv Then
+      If m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv Then
          ' Verifico non sia versione Ufficio
          If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
             m_CurrProjPage.SetWarningMessage("Office Version")
@@ -336,7 +336,7 @@ Public Class ProjectMgrUC
          ' verifica assi lineari
          EgtVerifyOutstroke(dX, dY, dZ, dC1, dB1, nStat)
          If nStat <> 0 Then
-            vtDirT = - vtDirT
+            vtDirT = -vtDirT
             ptMid -= vtDirT * dThick
             EgtGetCalcAngles(vtDirT, Vector3d.Z_AX(), nStat, dC1, dB1, dC2, dB2)
             ' calcolo la posizione degli assi lineari X, Y, Z ( correggere il punto ptMid.z sommando il raggio utensile)
@@ -736,11 +736,11 @@ Public Class ProjectMgrUC
 
    Private Sub TestBtn_Click(sender As Object, e As RoutedEventArgs) Handles TestBtn.Click
       If TestBtn.IsChecked Then
-         m_CurrProjPage.m_bSelectCurv = True
+         m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv = True
          ' deseleziono tutto
          EgtDeselectAll()
       Else
-         m_CurrProjPage.m_bSelectCurv = False
+         m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
          EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedCurv)
          EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
       End If

RawPhoto/Camera.vb

@@ -287,7 +287,6 @@ 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
@@ -308,6 +307,30 @@ 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"

RawPhoto/ChooseMachining.xaml.vb

@@ -639,10 +639,14 @@ Public Class ChooseMachining
 
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
       DialogResult = True
+      ' Aggiorno i parametri dei tagli diretti
+      m_MainWindow.m_DirectCutPageUC.ReloadParam()
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
       DialogResult = False
+      ' Aggiorno i parametri dei tagli diretti
+      m_MainWindow.m_DirectCutPageUC.ReloadParam()
    End Sub
 
 End Class