EgtDOORProbe :

- cambiata icona.
- cambiato aspetto interfaccia.
- aggiunta rimozione sia file cnc che prb.

Constants/ConstGen.vb

@@ -25,20 +25,8 @@ Module ConstGen
 
    ' Abilitazioni licenza
    Friend Enum KEY_OPT As UInteger
-      CUT_BASE = 1                    ' Prodotto OmagCUT
-      MAN_MANIP = 2
-      AUTO_MANIP = 4
-      MAN_PHOTO = 8
-      AUTO_PHOTO = 16
-      AUTO_NESTING = 32
-      ENABLE_MILL = 64
-      PROCUCTION_LINE = 128
-      OFFICE_BASE = 256               ' Prodotto OmagOFFICE
-      VM_MULTI = 512
-      UNDER_CUT = 1024
-      CSV_SIMPLE = 2048
-      PHOTO_BASE = 4096               ' Prodotto OmagPHOTO
-      TRF_IMPORT = 8192
+      BASE = 1                            ' Prodotto EgtCAM5
+      DOORS = 2
    End Enum
 
    ' File di log generale

MainWindow/MainWindowM.vb

@@ -119,10 +119,10 @@ Public Class MainWindowM
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
       EgtSetKey(sKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 19, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 19, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 19, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 19, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
-      Dim bProd As Boolean = GetKeyOption(KEY_OPT.OFFICE_BASE)
+      Dim bProd As Boolean = GetKeyOption(KEY_OPT.BASE) And GetKeyOption(KEY_OPT.DOORS)
       '' Leggo direttorio dei messaggi (se manca uso direttorio di configurazione)
       'Dim sMsgDir As String = String.Empty
       'If GetMainPrivateProfileString(S_GENERAL, K_MESSAGESDIR, "", sMsgDir) = 0 Then

MainWindow/MainWindowVM.vb

@@ -42,6 +42,15 @@ Public Class MainWindowVM
       ' imposto titolo finestra
       m_Title = "EgtDOORProbe"
       NotifyPropertyChanged("Title")
+      If m_MainWindowM.GetKeyOption(KEY_OPT.BASE) And m_MainWindowM.GetKeyOption(KEY_OPT.DOORS) Then
+         Return
+      ElseIf m_MainWindowM.nKeyLevel = -1 Or m_MainWindowM.nKeyLevel = -2 Then
+         MessageBox.Show("Missing dongle. Insert it and restart", "Error")
+         End
+      Else
+         MessageBox.Show("Missing licence. Set it and restart", "Error")
+         End
+      End If
    End Sub
 
 #End Region    ' CONSTRUCTOR

ProbingPanel/ProbingPanelV.xaml

@@ -15,23 +15,27 @@
               Height="30"
               Margin="0,0,0,5"/>
    <UniformGrid Columns="2"
+                Width="200"
                 Margin="0,0,0,5">
       <TextBlock Text="Property:"/>
       <TextBlock Text="{Binding DoorType}"/>
    </UniformGrid>
    <UniformGrid Columns="2"
+                Width="200"
                 Margin="0,0,0,5">
       <TextBlock Text="Width:"/>
       <EgtWpfLib5:EgtTextBox Text="{Binding Width}"
                IsReadOnly="True"/>
    </UniformGrid>
    <UniformGrid Columns="2"
+                Width="200"
                 Margin="0,0,0,5">
       <TextBlock Text="Height:"/>
       <EgtWpfLib5:EgtTextBox Text="{Binding Height}"
                IsReadOnly="True"/>
    </UniformGrid>
    <UniformGrid Columns="2"
+                Width="200"
                 Margin="0,0,0,5">
       <TextBlock Text="Thickness:"/>
       <EgtWpfLib5:EgtTextBox Text="{Binding Thickness}"

ProbingPanel/ProbingPanelVM.vb

@@ -323,7 +323,9 @@ Public Class ProbingPanelVM
          Dim NcFilePath As String = m_CncFilePath & "\" &
                                     m_PartProgFileName &
                                     ".cnc"
-         File.Delete(NcFilePath)
+         File.Delete(Path.ChangeExtension(NcFilePath, ".prb"))
+         File.Delete(Path.ChangeExtension(NcFilePath, ".cnc"))
+         System.Threading.Thread.Sleep(100)
          File.Copy(Path.ChangeExtension(m_DDFPath, ".cnc"), NcFilePath)
          SetStatus("Part program copied to the CNC, activate it and start the machine")
       Catch ex As Exception
@@ -539,7 +541,9 @@ Public Class ProbingPanelVM
          Dim NcFilePath As String = m_CncFilePath & "\" &
                                     m_PartProgFileName &
                                     GenFileExtension
-         File.Delete(NcFilePath)
+         File.Delete(Path.ChangeExtension(NcFilePath, ".prb"))
+         File.Delete(Path.ChangeExtension(NcFilePath, ".cnc"))
+         System.Threading.Thread.Sleep(100)
          File.Copy(Path.ChangeExtension(m_DDFPath, GenFileExtension), NcFilePath)
          SetStatus(sProgramMsg & " copied to the CNC, activate it and start the machine")
       Catch ex As Exception