Gestione doppia fotocamera (rulliera-tavolo)

- migliorie varie alla gestione spostamento pezzi con due teste su macchine di linea
- disabilitati attese di comunicazione in modalità demo.

CadCuts/CadCutPageUC.xaml

@@ -30,7 +30,7 @@
          </Grid.ColumnDefinitions>
 
          <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                <Image Name="PhotoIMG" Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
          </Button>
             <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
             <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>

CadCuts/MoveRawPartPage.xaml.vb

@@ -370,7 +370,15 @@ Public Class MoveRawPartPage
                   VacuumCups.SetWeightInformation(AverageDensity, MaxSinglePlugger, MaxDoublePlugger)
                   VacuumCups.SetRotationForExtraStrokeY(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEY, 0, m_MainWindow.GetMachIniFile()) <> 0)
                   VacuumCups.SetRotationForExtraStrokeX(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEX, 0, m_MainWindow.GetMachIniFile()) <> 0)
-                  If PutVacuumCupsOnRaw(nId, rmData) Then
+
+                  VacuumCups.ResetHeadName()
+                  Dim bPutVacuum As Boolean = PutVacuumCupsOnRaw(nId, rmData)
+                  If Not bPutVacuum Then
+                     Dim bTwoHeadVac As Boolean = ( EgtGetHeadId( VACUUM_HEAD_2) <> GDB_ID.NULL)
+                     If bTwoHeadVac Then bPutVacuum = PutVacuumCupsOnRaw(nId, rmData)
+                  End If
+
+                  If bPutVacuum Then
                      ' Visualizzo le ventose
                      EgtSetStatus(GetVacuumId(), GDB_ST.ON_)
                      ' Aggiorno i dati
@@ -392,6 +400,8 @@ Public Class MoveRawPartPage
                         m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
                      End If
                   End If
+
+
                End If
             End If
             EgtDraw()

CadCuts/NestPageUC.xaml.vb

@@ -2482,8 +2482,11 @@ Public Class NestPageUC
       Const STORE_LARGH As Double = 6000
       Const STORE_DIST As Double = 200
       Const STORE_OFFS As Double = 20 + 40 + 20
-      Dim dStXmin As Double = b3Tab.Min().x - 0.5 * (STORE_LARGH - b3Tab.DimX())
+      Dim dStoreLarg As Double = GetPrivateProfileDouble("Store", "StoreLargh", STORE_LARGH, m_MainWindow.GetMachIniFile())
-      Return EgtPackBox(nId, dStXmin, -INFINITO, dStXmin + STORE_LARGH, b3Tab.Min().y - STORE_DIST, STORE_OFFS, False)
+      Dim dStoreDist As Double = GetPrivateProfileDouble("Store", "StoreDist", STORE_DIST, m_MainWindow.GetMachIniFile())
+      Dim dStoreOffs As Double = GetPrivateProfileDouble("Store", "StoreOffs", STORE_OFFS, m_MainWindow.GetMachIniFile())
+      Dim dStXmin As Double = b3Tab.Min().x - 0.5 * (dStoreLarg - b3Tab.DimX())
+      Return EgtPackBox(nId, dStXmin, -INFINITO, dStXmin + dStoreLarg, b3Tab.Min().y - dStoreDist, dStoreOffs, False)
    End Function
 
    Private Sub RemovePartBtn_Click(sender As Object, e As RoutedEventArgs) Handles RemovePartBtn.Click

CadCuts/SplitAuto.vb

@@ -1,4 +1,5 @@
-Imports System.Windows.Forms.Integration
+Imports System.Net
+Imports System.Windows.Forms.Integration
 Imports EgtUILib
 
 Public Module SplitAuto
@@ -119,6 +120,9 @@ Public Module SplitAuto
                                            Mach.m_dStartFreeLen > FREELEN_INF And Mach.m_bIsLine
                      Mach.m_bCanEndAll = (dEndAddLen > -EPS_SMALL And (nRes And CAR_RES.LO_OK) <> 0) And
                                          Mach.m_dEndFreeLen > FREELEN_INF And Mach.m_bIsLine
+                     If nRes = 0 Then
+                        EgtOutLog("Operation ID " & nOperId.ToString & " isn't split cut! verify depth machining.")
+                     End If
                   End If
                   ' se trasformabile in taglio di separazione, verifico se lo è
                   If Mach.m_bCanStartAll Or Mach.m_bCanEndAll Then
@@ -795,21 +799,29 @@ Public Module SplitAuto
 
    Private Function ExecMove(nDispId As Integer, vNewRaws As List(Of Integer),
                              vtMove As Vector3d, dMinMove As Double) As Boolean
-      Dim vtMove2 As Vector3d = -vtMove
+      Dim bTwoHeadVac As Boolean = ( EgtGetHeadId( VACUUM_HEAD_2) <> GDB_ID.NULL)
       Dim rmData As New RawMoveData
-      If PutVacuumCupsOnRaw(vNewRaws(1), rmData) AndAlso
+      Dim vtMove2 As Vector3d = -vtMove
-                        SafeMoveRawPart(vNewRaws(1), vtMove, dMinMove) Then
+
+      VacuumCups.ResetHeadName()
+      Dim bPutVacuum As Boolean = PutVacuumCupsOnRaw(vNewRaws(1), rmData)
+      If Not bPutVacuum And bTwoHeadVac Then bPutVacuum= PutVacuumCupsOnRaw(vNewRaws(1), rmData)
+      If bPutVacuum AndAlso SafeMoveRawPart(vNewRaws(1), vtMove, dMinMove) Then
          rmData.m_vtRawMove = vtMove
          SaveOneMoveInfoInDisposition(nDispId, rmData)
          Return True
-      ElseIf PutVacuumCupsOnRaw(vNewRaws(0), rmData) AndAlso
+      End If
-                        SafeMoveRawPart(vNewRaws(0), vtMove2, dMinMove) Then
+
+      VacuumCups.ResetHeadName()
+      Dim bPut2Vacuum As Boolean = PutVacuumCupsOnRaw(vNewRaws(0), rmData)
+      If Not bPut2Vacuum And bTwoHeadVac Then bPutVacuum = PutVacuumCupsOnRaw(vNewRaws(0), rmData)
+      If bPut2Vacuum AndAlso SafeMoveRawPart(vNewRaws(0), vtMove2, dMinMove) Then
          rmData.m_vtRawMove = vtMove2
          SaveOneMoveInfoInDisposition(nDispId, rmData)
          Return True
-      Else
-         Return False
       End If
+
+      Return False
    End Function
 
    Private Function SafeMoveRawPart(nRawId As Integer, ByRef vtMove As Vector3d, dMindist As Double) As Boolean

CadCuts/VacuumCups.vb

@@ -1,5 +1,6 @@
 Imports EgtUILib
 Imports System.Text.RegularExpressions
+Imports System.Threading
 
 Module VacuumCups
    ' Tipo manipolatore con ventosa (0=assente, 1=dietro, 2=laterale)
@@ -31,6 +32,19 @@ Module VacuumCups
    ' Nome del gruppo temporaneo per le ventose
    Private Const VACTMP_GRP As String = "VacTmp"
 
+   Private m_sHeadName As String = VACUUM_HEAD
+   Public Sub ResetHeadName()
+      Dim bReload As Boolean = (m_sHeadName <> VACUUM_HEAD)
+      m_sHeadName = VACUUM_HEAD
+      If bReload Then LoadVacuumCups()
+   End Sub
+   Public Function ChangeHeadName() As Boolean
+      If EgtGetHeadId( VACUUM_HEAD_2) = GDB_ID.NULL Then Return False
+      m_sHeadName = If( m_sHeadName = VACUUM_HEAD, VACUUM_HEAD_2, VACUUM_HEAD) 
+      LoadVacuumCups()
+      Return True
+   End Function
+
    '-----------------------------------------------------------------------------------------------
    Friend Class RawMoveData
 
@@ -87,17 +101,17 @@ Module VacuumCups
    Friend Function LoadVacuumCups() As Boolean
       ' Leggo tipo manipolatore con ventosa
       m_nVacType = 0
-      EgtGetInfo(EgtGetHeadId(VACUUM_HEAD), KEY_VAC_TYPE, m_nVacType)
+      EgtGetInfo(EgtGetHeadId(m_sHeadName), KEY_VAC_TYPE, m_nVacType)
       ' Cancello eventuali vecchie ventose
       RemoveVacuumCups()
       ' Identificativo ventose nella macchina
-      Dim nLayId As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(VACUUM_HEAD), VACUUM_HEAD_LAYOUT)
+      Dim nLayId As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(m_sHeadName), VACUUM_HEAD_LAYOUT)
       If nLayId = GDB_ID.NULL Then Return False
       ' Identificativo riferimento della testa nella macchina
-      Dim nT1Id As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(VACUUM_HEAD), HEAD_FIRST_EXIT)
+      Dim nT1Id As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(m_sHeadName), HEAD_FIRST_EXIT)
       If nT1Id = GDB_ID.NULL Then Return False
       ' imposto la l'uscita della ventosa come fosse l'uscita di un utensile
-      EgtSetCalcTool("", "H4", 1)
+      EgtSetCalcTool("", m_sHeadName, 1)
       ' Creo gruppo temporaneo in cui copiarli
       m_nTempId = EgtCreateGroup(GDB_ID.ROOT)
       If m_nTempId = GDB_ID.NULL Then Return False
@@ -152,7 +166,7 @@ Module VacuumCups
    Friend Function ResetVacuumCups() As Boolean
       ' Ripristino posizione e rotazione originali
       Dim frOriRef As New Frame3d
-      EgtFrame(EgtGetFirstNameInGroup(EgtGetHeadId(VACUUM_HEAD), HEAD_FIRST_EXIT), GDB_ID.ROOT, frOriRef)
+      EgtFrame(EgtGetFirstNameInGroup(EgtGetHeadId(m_sHeadName), HEAD_FIRST_EXIT), GDB_ID.ROOT, frOriRef)
       Dim frCurrRef As New Frame3d
       EgtFrame(m_nRefId, GDB_ID.ROOT, frCurrRef)
       EgtMove(m_nVacId, frOriRef.Orig() - frCurrRef.Orig(), GDB_RT.GLOB)
@@ -207,14 +221,17 @@ Module VacuumCups
       EgtSurfFrGrossArea(nRKerfId, RawArea)
       ' volume calcolato in mmc
       Dim RawVolume As Double = RawArea * b3Raw.DimZ()
-      ' peso calolato in kg
+      ' peso calcolato in kg
       m_RawWeight = RawVolume * m_RawDensity / Math.Pow(10, 9)
       '-------------------- FINE CALCOLO PESO --------------------
 
       ' Eseguo ricerca
       If FindVacuumCupsOnRaw(nRawId, ptRawCen, b3Kerf, ptKerfCen, nKerfId, nRKerfId, rmData) Then
          Return True
+      Else
+         If ChangeHeadName() Then Return False
       End If
+
       ' In caso di fallimento, provo riducendo con offset la regione di kerf
       ' (così si simula la proiezione del centro sul MAT - medial axis transform)
       Dim bOkFind As Boolean = False
@@ -250,7 +267,7 @@ Module VacuumCups
          nDripLineId = EgtGetNext(nDripLineId)
       End While
       Dim vtDir As New Vector3d
-      if EgtStartVector( nDripLineId, GDB_ID.ROOT, vtDir) Then
+      If EgtStartVector(nDripLineId, GDB_ID.ROOT, vtDir) Then
          Dim dLen, dAngV, dAngH As Double
          vtDir.ToSpherical(dLen, dAngV, dAngH)
          Dim dOffsAng = dAngH - m_dDripRefAng
@@ -388,7 +405,7 @@ Module VacuumCups
 
    Private Function GetVacRotAxisSteps(ByRef vAngRot As List(Of Double)) As Boolean
       ' Recupero l'asse rotante della testa ventosa
-      Dim nRotAxId As Integer = EgtGetParent(EgtGetHeadId(VACUUM_HEAD))
+      Dim nRotAxId As Integer = EgtGetParent(EgtGetHeadId(m_sHeadName))
       ' Verifico se contiene info con STEPS
       Dim sSteps As String = ""
       If Not EgtGetInfo(nRotAxId, KEY_ROTVAC_STEPS, sSteps) Then Return False
@@ -548,25 +565,43 @@ Module VacuumCups
 
    ' assegnate le posizioni del centro delle ventose e l'angolo di posizionamento orizzontale verifica che la posizione sia raggiungibile
    Public Function VerifyOutOfStrokes(ptRef As Point3d, dRotAngDeg As Double) As Integer
+      Dim sAxisName As String = "C"
+      ' verifico che il nome dell'asse impostato sia corretto
+      If Not EgtGetAxisId(sAxisName) Then
+         If m_sHeadName = VACUUM_HEAD Then
+            sAxisName = "C1"
+         Else
+            sAxisName = "C2"
+         End If
+      End If
       ' Posizione Home dell'asse rotante
       Dim dCHome As Double
-      EgtGetAxisHomePos("C", dCHome)
+      EgtGetAxisHomePos(sAxisName, dCHome)
       ' Corse dell'asse
       Dim dCMin As Double
-      EgtGetAxisMin("C", dCMin)
+      EgtGetAxisMin(sAxisName, dCMin)
       Dim dCMax As Double
-      EgtGetAxisMax("C", dCMax)
+      EgtGetAxisMax(sAxisName, dCMax)
       ' Porto l'angolo nel range
       Dim dRotAngMachDeg As Double = dRotAngDeg + dCHome
       AdjustAngleInRange(dRotAngMachDeg, dCMin, dCMax)
       ' Imposto la ventosa come fosse un utensile
-      EgtSetCalcTool("", "H4", 1)
+      EgtSetCalcTool("", m_sHeadName, 1)
       ' Calcolo gli assi macchina
       Dim dX, dY, dZ As Double
       Dim nStat As Integer
+      If EgtGetAxisId("A") Then
+         ' Asse tavola rotante (movimenti solo con A0)
+         EgtGetCalcPositions(ptRef, 0, dRotAngMachDeg, nStat, dX, dY, dZ)
+         ' Verifico le corse
+         EgtVerifyOutstroke(dX, dY, dZ, 0, dRotAngMachDeg, nStat)
+      Else
          EgtGetCalcPositions(ptRef, dRotAngMachDeg, 0, nStat, dX, dY, dZ)
          ' Verifico le corse
          EgtVerifyOutstroke(dX, dY, dZ, dRotAngMachDeg, 0, nStat)
+      End If
+
+
       Return nStat
    End Function
 

Constants/ConstGen.vb

@@ -84,6 +84,11 @@ Module ConstGen
 
    ' Nome testa con ventose per spostamento pezzi
    Public Const VACUUM_HEAD As String = "H4"
+   Public Const VACUUM_HEAD_2 As String = "H104"
+   ' Nome teste laser
+   Public Const LASER_HEAD As String = "H3"
+   Public Const LASER_HEAD_2 As String = "H103"
+
    ' Info tipo ventosa
    Public Const KEY_VAC_TYPE As String = "VacType"
    ' Nome gruppo layout in testa con ventose

Constants/ConstMachIni.vb

@@ -5,6 +5,7 @@
 
    Public Const S_PARTPROGRAM As String = "PartProgram"
    Public Const K_EXTENSION As String = "Extension"
+   Public Const K_EXTFILECN As String = "ExtFileCN"
 
    Public Const S_AXES As String = "Axes"
    Public Const K_AXESNUM As String = "AxesNum"
@@ -56,6 +57,10 @@
    Public Const S_EXECLUA As String = "ExecLua"
    Public Const K_FILESCRIPT_LUA As String = "FileScript"
 
+   Public Const S_CAMERAHQ As String = "CameraHQ"
+   Public Const K_CAMERAHQ_ENABLE As String = "EnableHQ"
+   Public Const K_CAMERAHQ_ACTIVATE As String = "ActivateHQ"
+
    Public Const S_NCDATA As String = "NcData"
    Public Const K_NEWVARIABLE As String = "NewVariable"
    Public Const K_NEWCONSOLE As String = "NewConsole"

Machine/CurrentMachine.vb

@@ -54,6 +54,8 @@ Public Class CurrentMachine
    Private m_sProdLiSawDiameter2Var As String = ""
    Private m_sClickState As String = "E80028"
    Private m_sClickDir As String = ""
+   ' Gestione speciale per canali CN
+   Private m_sExtFileCN As String = ".0"
 
    ' Numero e tipo di utensili correntemente disponibili sulla macchina
    Private m_MountedToolConfig As MountedToolConfigs = MountedToolConfigs.SAW
@@ -339,6 +341,12 @@ Public Class CurrentMachine
       End Get
    End Property
 
+   Friend ReadOnly Property sExtFileCN As String
+      Get
+         Return m_sExtFileCN
+      End Get
+   End Property
+
    Friend Function sProdLiProbingStateVar(nI As Integer) As String
       If nI = 1 Then Return m_sProdLiProbingStateVar
       If nI = 2 Then Return m_sProdLiProbingState2Var
@@ -1135,6 +1143,8 @@ Public Class CurrentMachine
       m_sMachIniFile = m_MainWindow.GetMachinesRootDir & "\" & sMachineName & "\" & sMachineName & ".ini"
       ' Leggo estensione del file programma pezzo
       GetPrivateProfileString(S_PARTPROGRAM, K_EXTENSION, "xpi", m_sIsoFileExt, sMachIniFile)
+      ' per gestione canali separati (macchina NUM con più di 5 Assi) ver. 2.5g1
+      GetPrivateProfileString(S_PARTPROGRAM, K_EXTFILECN, ".0", m_sExtFileCN, sMachIniFile)
       If m_sIsoFileExt(0) <> "." Then m_sIsoFileExt = "." & m_sIsoFileExt
       ' Leggo flag incremento asse C
       m_dDeltaC = GetPrivateProfileDouble(S_AXES, K_DELTA_C, 0.0, sMachIniFile)

Machine/MachineCNPageUC.xaml

@@ -87,6 +87,19 @@
 
             </GroupBox>
 
+            <GroupBox Name="CameraHQ" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
+                    <ToggleButton Name="CameraHQBtn" Grid.Column="2"
+                                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
+                                  Foreground="White"/>
+                </Grid>
+            </GroupBox>
+
             <GroupBox Name="PartProgTransferGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="2"
             Grid.ColumnSpan="3">
                 <Grid>

Machine/MachineCNPageUC.xaml.vb

@@ -29,6 +29,7 @@ Public Class MachineCNPageUC
       MDICommandGpBx.Header = EgtMsg(MSG_MACHINECNPAGEUC + 16)
       PartProgTransferGpBx.Header = EgtMsg(MSG_MACHINECNPAGEUC + 17)
       ErrorLstGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 12)
+
       ' Attivo gruppo PartProgTransferGpBx leggendo la variabile nel file ini
       If GetPrivateProfileInt(S_GENERAL, K_TESTINGPAGE, 0, m_MainWindow.GetIniFile()) = 1 Then
          PartProgTransferGpBx.Visibility = Windows.Visibility.Visible
@@ -44,6 +45,27 @@ Public Class MachineCNPageUC
       Else
          PowerGpBx.Visibility = Visibility.Collapsed
       End If
+
+      ' verifico che sia attiva la modalità per l'uso di due fotocamere
+      If GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ENABLE, 0, m_MainWindow.GetMachIniFile()) = 1 Then
+         CameraHQ.Header = "Photo on table"
+         CameraHQBtn.Content = "HQ"
+         ' verifico quale camera è impostata
+         If GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ACTIVATE, 0, m_MainWindow.GetMachIniFile()) = 1 Then
+            CameraHQBtn.IsChecked = True
+            If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+               m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1HQ.png", UriKind.Relative))
+            End If
+         Else
+            CameraHQBtn.IsChecked = False
+            If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+               m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1.png", UriKind.Relative))
+            End If
+         End If
+      Else
+         CameraHQ.Visibility = Visibility.Collapsed
+      End If
+
    End Sub
 
    Private Sub TestingPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -203,6 +225,20 @@ Public Class MachineCNPageUC
       m_CN.DGeneralFunctions_WriteCncMode(8)
    End Sub
 
+   Private Sub CameraHQBtn_Click(sender As Object, e As RoutedEventArgs) Handles CameraHQBtn.Click
+      Dim sEnableHQ As String = If(CameraHQBtn.IsChecked, "1", "0")
+      WritePrivateProfileString(S_CAMERAHQ, K_CAMERAHQ_ENABLE, sEnableHQ, m_MainWindow.GetMachIniFile())
+      If CameraHQBtn.IsChecked Then
+         If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+            m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1HQ.png", UriKind.Relative))
+         End If
+      Else
+         If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+            m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1.png", UriKind.Relative))
+         End If
+      End If
+   End Sub
+
    Private Sub MDITxBx_KeyDown(sender As Object, e As KeyEventArgs) Handles MDITxBx.KeyDown
       If e.Key = Key.Return Then
          ' leggo se stato reset

MainWindow.xaml.vb

@@ -329,8 +329,8 @@ Class MainWindow
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2506, 1, m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2507, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2506, 1, m_nKeyOptions)
+                            EgtGetKeyOptions(9423, 2507, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -998,6 +998,16 @@ Class MainWindow
       ' Se già visualizzato errore, lo nascondo
       If m_CurrentProjectPageUC.OutMessageBrd.IsMouseOver Then
          m_CurrentProjectPageUC.ClearMessage()
+         ' se è premuto il pulsante Shift allora provvedo ad aprire il file di Log
+         If Keyboard.Modifiers And ModifierKeys.Shift Then
+            ' Genero file CNC (lancio anche se errore in precedenza)
+            Dim sTemoDirect As String = GetTempDir() & "\OmagCUTLog.txt"
+            Try
+               Process.Start("Notepad.exe", sTemoDirect)
+            Catch ex As Exception
+               EgtOutLog(ex.ToString)
+            End Try
+         End If
       End If
       ' Condizioni che impediscono di clickare fuori dalla calcolatrice o tastiera quando una di queste è aperta
       If EgtWPFLib.EgtCalculator.GetbIsActive Then
@@ -1088,9 +1098,9 @@ Class MainWindow
          m_CurrentProjectPageUC.SaveNamedProject()
          m_CurrentProjectPageUC.SaveProject()
       End If
-      ' Inizio la chiusura del programma (verifico di aver terminato il processo DripFeed)
+      ' Inizio la chiusura del programma (se NUM_OLD verifico di aver terminato il processo DripFeed)
       EgtOutLog("Iniziato processo di chiusura programma")
-      m_IsClosingApplication = 1
+      m_IsClosingApplication = If( m_CNCommunication.m_nNCType = 1, 1, 2)
       Dim nCount As Integer = 0
       While m_IsClosingApplication <> 2
          If nCount > 5 Then
@@ -1294,7 +1304,9 @@ Class MainWindow
          m_CNCommunication.m_CN.ReadEls_Add_Parameter(m_CurrentMachine.sVarProjFinished, 1)
          Dim nVarFin As Integer = 0
          For I As Integer = 1 To 4
+            If Not m_CurrentMachine.bDemo Then
                System.Threading.Thread.Sleep(50)
+            End If
             If m_CNCommunication.m_CN.n_DReadELS_handle = 1 Then
                nVarFin = CInt(m_CNCommunication.m_CN.d_DReadELS_value)
                Exit For
@@ -1356,7 +1368,9 @@ Class MainWindow
       m_CNCommunication.m_CN.ReadEls_Add_Parameter(m_CurrentMachine.sVarProjCopy, 1)
       Dim nVarCopy As Integer = 0
       For I As Integer = 1 To 10
+         If Not m_CurrentMachine.bDemo Then
             System.Threading.Thread.Sleep(50)
+         End If
          If m_CNCommunication.m_CN.n_DReadELS_handle = 1 Then
             nVarCopy = CInt(m_CNCommunication.m_CN.d_DReadELS_value)
             Exit For

My Project/AssemblyInfo.vb

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

NcComm/CNCommunication.vb

@@ -515,7 +515,9 @@ Public Class CNCommunication
             If nClickState = 1 Then
                ' procedo a costruire un nuovo file nella cartella indicata in configurazione
                Try
-                  File.Create(m_MainWindow.m_CurrentMachine.sClickDir & "\NewClick.txt")
+                  Dim fs As FileStream = File.Create(m_MainWindow.m_CurrentMachine.sClickDir & "\NewClick.txt")
+                  ' chiudo il file creato
+                  fs.Close()
                   ' Dichiaro di aver provveduto a comunicare di scattare la foto
                   m_CN.DVariables_WriteVariables2(m_MainWindow.m_CurrentMachine.sClickState, "0")
                Catch ex As Exception
@@ -1165,7 +1167,8 @@ Public Class CNCommunication
          bOk = (m_nNCType > 0)
          Dim sNumProg As String = String.Empty
          If m_nNCType = 1 Or m_nNCType = 2 Then
-            sNumProg = "%" & nNumProg.ToString() & ".0"
+            Dim sExtFileCN As String = m_MainWindow.m_CurrentMachine.sExtFileCN
+            sNumProg = "%" & nNumProg.ToString() & sExtFileCN
          Else
             sNumProg = nNumProg.ToString()
          End If

NcComm/CN_Siemens.vb

@@ -144,7 +144,7 @@ Public Class CN_Siemens
          End Select
       Else
          ' per verificare che la comunicazione funzioni correttamente
-         EgtOutLog("Modo -read_active_mode-: " & M_MMFiles.SiemensRet.n_param2.ToString)
+         ' EgtOutLog("Modo -read_active_mode-: " & M_MMFiles.SiemensRet.n_param2.ToString)
          Return M_MMFiles.read_active_mode()
          'Return CShort(M_MMFiles.SiemensRet.n_param2)
       End If

OmagCUT.vbproj

@@ -1340,6 +1340,12 @@
   <ItemGroup>
     <Resource Include="Resources\NewIcons\RefTab.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\PhotoHQ.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\icone-tagli-1HQ.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe

Project/CurrentProjectPageUC.xaml.vb

@@ -1400,7 +1400,8 @@ Public Class CurrentProjectPageUC
 
    Friend Sub ClearMessage()
       OutMessageBrd.Background = Brushes.Transparent
-      OutMessageBrd.Visibility = Windows.Visibility.Hidden
+      OutMessageTxBl.Text = ""
+      'OutMessageBrd.Visibility = Windows.Visibility.Hidden
    End Sub
 
 End Class

RawPhoto/Camera.vb

@@ -205,6 +205,12 @@ Public Class Camera
       Dim nInd As Integer = 1
       If m_nCameraCount = 2 Then
          nInd = GetCurrentTable()
+         ' verifico se la macchina è configurata per fotocamera sulla tavola di lavoro
+         If (GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ENABLE, 0, m_MainWindow.GetMachIniFile()) <> 0) AndAlso
+            (GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ACTIVATE, 0, m_MainWindow.GetMachIniFile()) <> 0) Then
+            ' forzo l'utilizzo della seconda camera (sopra alla tavola di lavoro)
+            nInd = 2
+         End If
          If nInd <> 1 And nInd <> 2 Then Return 0
       End If
       ' Se gestore macchina non attivo, lo lancio in modo cieco

RawPhoto/RawPartPageUC.xaml.vb

@@ -1420,7 +1420,7 @@ Public Class RawPartPageUC
       Dim nExit As Integer = 0
       EgtGetCalcTool(sTool, sHead, nExit)
       ' Imposto come testa corrente il laser (senza utensile ovviamente)
-      If Not EgtSetCalcTool("", "H3", 1) Then
+      If Not EgtSetCalcTool("", LASER_HEAD, 1) Then
          Return False
       End If
       ' Trasformo in posizione punta utensile in basso
@@ -1432,6 +1432,10 @@ Public Class RawPartPageUC
       ' Porto il tip nell'origine tavola
       ptAcquired = ptTipP1
       ptAcquired.ToLoc(New Frame3d(m_ptTableMin))
+      EgtOutLog("Actual axis laser H3: L1=" & dL1.ToString & ", L2=" & dL2.ToString & ", L3=" & dL3.ToString &
+                   ", R1=" & dR1.ToString & ", R2=" & dR2.ToString)
+      EgtOutLog("Actual pos  laser H3: " & ptTipP1.x.ToString & "," & ptTipP1.y.ToString & "," & ptTipP1.z.ToString &
+                "; on table: " & ptAcquired.x.ToString & "," & ptAcquired.y.ToString & "," & ptAcquired.z.ToString)
       Return True
    End Function
 
@@ -1449,6 +1453,8 @@ Public Class RawPartPageUC
       EgtGetCalcTool(sTool, sHead, nExit)
       ' Trasformo in posizione punta utensile in basso
       If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, ptTipP1) Then
+         EgtOutLog("Actual pos " & sHead & ": L1=" & dL1.ToString & ", L2=" & dL2.ToString & ", L3=" & dL3.ToString &
+                   ", R1=" & dR1.ToString & ", R2=" & dR2.ToString)
          Return False
       End If
       ' Porto il tip nell'origine tavola