Aggiunto comando per gestione ExecLua

- migliorati controlli per chiave di rete.

CadCuts/MoveRawPartPage.xaml.vb

@@ -31,7 +31,8 @@ Public Class MoveRawPartPage
    Private m_bRemovedRaw As Boolean = False                 ' flag per rimozione manuale pezzi
    Private m_RawMoveDataList As New List(Of RawMoveData)    ' dati di movimento
    Private m_bRawWithCups As Boolean = False                ' flag per pezzo corrente con ventose
-
+   ' Visibilità comando Scrap
+   Private m_ScrapsVisibility As Visibility = Visibility.Visible
    Private m_CurrRawOnVacuum As Integer = GDB_ID.NULL
 
    Private Sub MoveRawPartPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
@@ -92,7 +93,12 @@ Public Class MoveRawPartPage
          ScrapsVisibility = Visibility.Collapsed
       End If
       ' aggiorno la grafica
-      ScrapsBtn.Visibility = ScrapsVisibility
+      m_ScrapsVisibility = ScrapsVisibility
+      If m_ScrapsVisibility <> Visibility.Visible Then
+         Grid.SetColumnSpan(RemovePartBtn, 3)
+      Else
+         Grid.SetColumnSpan(RemovePartBtn, 2)
+      End If
       '---------------------------- SCRAPS ----------------------------
 
       ' Se movimento pezzi finale, sistemazioni per tavolo ausiliario
@@ -178,7 +184,7 @@ Public Class MoveRawPartPage
          BottomRBtn.Visibility = Windows.Visibility.Hidden
          PauseBtn.Visibility = Windows.Visibility.Hidden
          ResetBtn.Visibility = Windows.Visibility.Hidden
-         ScrapsBtn.Visibility = Windows.Visibility.Visible
+         ScrapsBtn.Visibility = m_ScrapsVisibility
          ' altrimenti per movimento con ventose
       ElseIf Not m_SplitPage.m_bOnAuxTab Then
          UpBtn.Visibility = Windows.Visibility.Visible
@@ -196,7 +202,7 @@ Public Class MoveRawPartPage
          BottomRBtn.Visibility = Windows.Visibility.Hidden
          PauseBtn.Visibility = Windows.Visibility.Hidden
          ResetBtn.Visibility = Windows.Visibility.Hidden
-         ScrapsBtn.Visibility = Windows.Visibility.Visible
+         ScrapsBtn.Visibility = m_ScrapsVisibility
          ' altrimenti per movimento finale dei pezzi
       Else
          UpBtn.Visibility = Windows.Visibility.Hidden
@@ -249,9 +255,6 @@ Public Class MoveRawPartPage
       End If
       EgtZoom(ZM.ALL)
 
-      ' verifico che siano state salvate correttamente le info della tavola di scarico
-      EgtSaveFile("c:\EgtData\OmagCUT\Temp\AuxTab.nge", NGE.BIN)
-
    End Sub
 
    Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
@@ -323,9 +326,9 @@ Public Class MoveRawPartPage
                   MaxDoublePlugger = GetPrivateProfileDouble(S_MACH_RAWMOVE, K_MACH_WEIGHT_DOUBLEPLUGGER, MaxDoublePlugger, m_MainWindow.GetMachIniFile())
                   Dim AverageDensity As Double = 2700
                   AverageDensity = GetPrivateProfileDouble(S_MATERIALS, K_AVERAGEDENSITY, AverageDensity, m_MainWindow.GetMachIniFile())
-                  VacuumCups.GetWeightInformation(AverageDensity, MaxSinglePlugger, MaxDoublePlugger)
+                  VacuumCups.SetWeightInformation(AverageDensity, MaxSinglePlugger, MaxDoublePlugger)
-                  VacuumCups.GetRotationForExtraStrokeY(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEY, 0, m_MainWindow.GetMachIniFile()) <> 0)
+                  VacuumCups.SetRotationForExtraStrokeY(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEY, 0, m_MainWindow.GetMachIniFile()) <> 0)
-                  VacuumCups.GetRotationForExtraStrokeX(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEX, 0, m_MainWindow.GetMachIniFile()) <> 0)
+                  VacuumCups.SetRotationForExtraStrokeX(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEX, 0, m_MainWindow.GetMachIniFile()) <> 0)
                   If PutVacuumCupsOnRaw(nId, rmData) Then
                      ' Visualizzo le ventose
                      EgtSetStatus(GetVacuumId(), GDB_ST.ON_)
@@ -839,9 +842,12 @@ Public Class MoveRawPartPage
 
       ' ricavo l'angolo di posizionamento del grezzo/pezzo sulla tavola
       If Not DispositionRawOnTable(nRawId, dAngRaw, AngRotList) Then Return
+      Dim bb3dRaw As New BBox3d
+      EgtGetRawPartBBox(nRawId, bb3dRaw)
+      Dim ForceToRotate As Boolean = bb3dRaw.DimX < bb3dRaw.DimY
 
       ' provo a verificare di poter depositare il pezzo (senza applicare delle rotazioni)
-      If Not EgtMoveToCornerRawPart(nRawId, ptRef, nCorn) Then
+      If Not EgtMoveToCornerRawPart(nRawId, ptRef, nCorn) Or ForceToRotate Then
          ' se sono impostati degli step di rotazione
          If AngRotList.Count > 0 Then
             Dim bOkRotate As Boolean = False
@@ -1000,6 +1006,8 @@ Public Class MoveRawPartPage
 
       ' recupero disposizione fase corrente
       Dim nDispId As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
+      ' imposto la pausa nella disposizione corrente
+      SetPause(nDispId)
       ' aggiungo al gruppo disposizione dei sottogruppi con i dati di movimento dei grezzi spostati
       SaveMoveInfoInDisposition(nDispId, m_RawMoveDataList)
       ' imposto eventuale movimento pezzi su tavola ausiliaria
@@ -1029,7 +1037,7 @@ Public Class MoveRawPartPage
       End While
 
       Dim nCurrDisposition As Integer = EgtGetPhaseDisposition(nNewPhase)
-      SetPause(nCurrDisposition)
+      'SetPause(nCurrDisposition)
       m_nCurrDisposition = nCurrDisposition
       ' EgtSetStatus(nRawIdSlected, GDB_ST.OFF)
       EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
@@ -1080,7 +1088,7 @@ Public Class MoveRawPartPage
 
       Dim nPrevDispId As Integer = EgtGetPrevOperation(m_nCurrDisposition)
       ' verifico se la fasa precedente è di tipo scarico
-      If IsDispUnloadOnAuxTab(nPrevDispId) Then
+      If IsDispUnloadOnAuxTab(nPrevDispId) <> 0 Then
          EgtSetCurrPhase(m_nCurrPhase - 1)
          m_nCurrDisposition = nPrevDispId
          m_nCurrPhase -= 1
@@ -1117,7 +1125,7 @@ Public Class MoveRawPartPage
       End If
 
       ' se la disposizione corrente è sulla tavola ausiliaria allora lo sarà anche quella successiva
-      If IsDispUnloadOnAuxTab(m_nCurrDisposition) Then
+      If IsDispUnloadOnAuxTab(m_nCurrDisposition) <> 0 Then
          EgtSetCurrPhase(m_nCurrPhase + 1)
          m_nCurrDisposition = EgtGetNextOperation(m_nCurrDisposition)
          m_nCurrPhase += 1
@@ -1174,7 +1182,7 @@ Public Class MoveRawPartPage
    End Sub
 
    ' verifica se la disposizione indicata è uno scarico sulla tavola ausiliaria
-   Public Function IsDispUnloadOnAuxTab(nCurrDispId As Integer)
+   Public Function IsDispUnloadOnAuxTab(nCurrDispId As Integer) As Integer
       ' verifico se la fase precedente è uno scarico su tavola ausiliaria
       Dim bVal As Integer = 0
       EgtGetInfo(nCurrDispId, "Pat", bVal)
@@ -1182,7 +1190,7 @@ Public Class MoveRawPartPage
    End Function
 
    ' recupero la prima disposizione disponibile tra l'elenco delle operazioni presenti
-   Public Function GetNextDisposition(nCurrDisposId As Integer)
+   Public Function GetNextDisposition(nCurrDisposId As Integer) As Integer
       Dim nDispId As Integer = nCurrDisposId
       While nDispId <> GDB_ID.NULL
          If EgtGetOperationType(nDispId) = MCH_OY.DISP Then

CadCuts/NestPageUC.xaml.vb

@@ -2314,6 +2314,11 @@ Public Class NestPageUC
       EgtZoom(ZM.ALL)
    End Sub
 
+   ' ripulisco la lista dei pezzi in parcheggio
+   Friend Sub ResetListOfGruopInPark()
+      m_ListOfGroupInPark.Clear()
+   End Sub
+
    Friend Function StoreOnePart(nId As Integer, Optional ByVal bForced As Boolean = False) As Boolean
       ' Se pezzo in grezzo, metto in parcheggio (sempre possibile)
       If bForced OrElse

CadCuts/VacuumCups.vb

@@ -67,17 +67,17 @@ Module VacuumCups
    End Function
 
    ' carico i dati macchina relativi al peso massimo movimentabile
-   Friend Sub GetWeightInformation(Density As Double, MaxSingle As Double, MaxDouble As Double)
+   Friend Sub SetWeightInformation(Density As Double, MaxSingle As Double, MaxDouble As Double)
       m_RawDensity = Density
       m_MaxWeightSinglePlugger = MaxSingle
       m_MaxWeightDoublePlugger = MaxDouble
    End Sub
 
-   Friend Sub GetRotationForExtraStrokeY(Rotate As Boolean)
+   Friend Sub SetRotationForExtraStrokeY(Rotate As Boolean)
       bRotateVacuumNearExtraStrokeY = Rotate
    End Sub
 
-   Friend Sub GetRotationForExtraStrokeX(Rotate As Boolean)
+   Friend Sub SetRotationForExtraStrokeX(Rotate As Boolean)
       bRotateVacuumNearExtraStrokeX = Rotate
    End Sub
    Friend Function GetVacuumId() As Integer

Constants/ConstIni.vb

@@ -18,6 +18,7 @@ Module ConstIni
    Public Const S_GENERAL As String = "General"
    Public Const K_DEBUG As String = "Debug"
    Public Const K_LICENCE As String = "Licence"
+   Public Const K_NETKEY As String = "NetKey"
    Public Const K_MESSAGESDIR As String = "MessagesDir"
    Public Const K_MESSAGES As String = "Messages"
    Public Const K_SUPPORT As String = "Support"

Constants/ConstMachIni.vb

@@ -46,6 +46,11 @@
    Public Const K_THREADSLEEP As String = "ThreadSleep"
    Public Const K_PHOTODELEY As String = "PhotoDeley"
 
+   Public Const S_EXECLUA As String = "ExecLua"
+   Public Const K_DIRSCRIPT_LUA As String = "DirScript"
+   Public Const K_FILESCRIPT_LUA As String = "FileScript"
+   Public Const K_CALLFUNCTION As String = "CallFunction"
+
    Public Const S_NCDATA As String = "NcData"
    Public Const K_NEWVARIABLE As String = "NewVariable"
    Public Const K_NEWCONSOLE As String = "NewConsole"

DirectCuts/DirectCutPageUC.xaml

@@ -201,7 +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>
@@ -240,8 +241,14 @@
             <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
          </ToggleButton>
 
-         <!--Comando Manula/MDI-->
+         <!--Parking-->
-         <Button Name="ManualModeBtn" Grid.Column="7"
+         <ToggleButton Name="ParkingBtn" Grid.Column="6"
+              Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
+             <Image Source="{DynamicResource ParkingImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+         </ToggleButton>
+
+            <!--Comando Manula/MDI-->
+         <Button Name="ManualModeBtn" Grid.Column="8"
                 Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
              <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </Button>

DirectCuts/DirectCutPageUC.xaml.vb

@@ -257,6 +257,7 @@ Public Class DirectCutPageUC
       ZCBtn.Visibility = Visibility.Collapsed
       ZBBtn.Visibility = Visibility.Collapsed
       RemoteBtn.Visibility = Visibility.Collapsed
+      ParkingBtn.Visibility = Visibility.Collapsed
 
       Dim Item As MachineButton = Nothing
       For Each Item In m_ButtonJogList
@@ -277,6 +278,10 @@ Public Class DirectCutPageUC
                RemoteBtn.Visibility = Visibility.Visible
                RemoteBtn.Foreground = Brushes.White
                RemoteBtn.Content = "Remote"
+            Case K_PARKING
+               ParkingBtn.Visibility = Visibility.Visible
+               ParkingBtn.Foreground = Brushes.White
+               ParkingBtn.ToolTip = "Parking"
          End Select
       Next
    End Sub
@@ -513,6 +518,43 @@ Public Class DirectCutPageUC
       End If
    End Sub
 
+   Private Sub ParkingBtn_Click(sender As Object, e As RoutedEventArgs) Handles ParkingBtn.Click
+      Dim ParkingButton As MachineButton = Nothing
+      Dim ItemButton As MachineButton = Nothing
+      For Each ItemButton In m_ButtonJogList
+         If ItemButton.StateFlag = K_PARKING Then
+            ParkingButton = ItemButton
+            Exit For
+         End If
+      Next
+      If IsNothing(ParkingButton) Then Return
+      ' eseguo lo script lua associato
+      Dim CurrentBtn As Primitives.ToggleButton = e.Source
+      Dim sLuaFileName As String = String.Empty
+      ' verifico lo stato del bottone per avviare il giusto script
+      If CurrentBtn.IsChecked() Then
+         sLuaFileName = ParkingButton.TLuaScriptName
+      Else
+         sLuaFileName = ParkingButton.FLuaScriptName
+      End If
+      ParkingButton.ExecuteMDICommand(sLuaFileName)
+   End Sub
+
+   Friend Sub ParkingStateChanged(bParkingState As Boolean)
+      ' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
+      Dim ParkingButton As TwoStateButton = Nothing
+      For Each MachineButton As MachineButton In m_ButtonJogList
+         If MachineButton.StateFlag.Trim = K_PARKING Then
+            ParkingButton = MachineButton
+            Exit For
+         End If
+      Next
+      If Not IsNothing(ParkingButton) Then
+         ParkingButton.SetIsChecked(bParkingState)
+         ParkingButton.IsChecked = bParkingState
+      End If
+   End Sub
+
    '------------------NUOVI BOTTONI PER GESTIONE JOYSTICK-------------------------------------------------
    Private Sub MachViewModeBtn_Click(sender As Object, e As RoutedEventArgs) Handles MachViewModeBtn.Click
       If m_bShowMachine Then

Machine/AlarmsPageUC.xaml

@@ -801,19 +801,23 @@
             <Grid Grid.Column="0" Grid.Row="8">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="2.5*"/>
-                    <ColumnDefinition Width="5*"/>
+                    <ColumnDefinition Width="2.5*"/>
-                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="4.5*"/>
+                    <ColumnDefinition Width="1.8*"/>
                 </Grid.ColumnDefinitions>
                 <Button x:Name="SawProbingBtn"
-         	   Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+         	         Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
                     <Image Source="{DynamicResource SawProbeImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
                 </Button>
+                <Button x:Name="ExecLuaBtn" Grid.Column="1"
+         	         Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                    <Image Source="{DynamicResource PlayImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+                </Button>
 
-                
+                <TextBlock Name="UseLaserOriginTxBl" Grid.Column="2"
-                <TextBlock Name="UseLaserOriginTxBl" Grid.Column="1"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                <CheckBox Name="UseLaserOriginChBx" Style="{DynamicResource OmagCut_CheckBox_Single}" Grid.Column="2"
+                <CheckBox Name="UseLaserOriginChBx" Style="{DynamicResource OmagCut_CheckBox_Single}" Grid.Column="3"
-                  HorizontalAlignment="Right" Margin="10,0,10,0"/>
+                  HorizontalAlignment="Right" Margin="0,0,10,0"/>
             </Grid>
             
         </Grid>

Machine/AlarmsPageUC.xaml.vb

@@ -45,6 +45,13 @@ Public Class AlarmsPageUC
          SawProbingBtn.Visibility = Windows.Visibility.Hidden
       End If
 
+      ' Se esiste un file lua valido allora mostro il pulsante per l'esecuzione dello script
+      If Not String.IsNullOrEmpty(GetExecLuaFile()) And
+         ExecLuaBtn.Visibility = Visibility.Visible Then
+      Else
+         ExecLuaBtn.Visibility = Visibility.Hidden
+      End If
+
       ' Imposto i messaggi letti dal file dei messaggi
       CurrSawTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 1)
       AuxiliaryToolTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 2)
@@ -1327,4 +1334,53 @@ Public Class AlarmsPageUC
 
    End Sub
 
+   Private Sub ExecLuaBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExecLuaBtn.Click
+      Dim sExecFile As String = GetExecLuaFile()
+      Dim sCallFunction As String = GetCallFunction()
+      ' Recupero file LUA
+      Dim bExec As Boolean = EgtLuaExecFile(sExecFile)
+      ' Lancio l'esecuzione della funzione principale
+      bExec = bExec And EgtLuaCallFunction(sCallFunction)
+      ' Leggo variabili
+      Dim nErr As Integer = 0
+      EgtLuaGetGlobIntVar("CMD.ERR", nErr)
+      ' Reset lua
+      EgtLuaResetGlobVar("CMD")
+      ' Verifico condizioni di errore
+      If nErr <> 0 And bExec Then
+         ' Errore in tastatura lama
+         EgtOutLog("Error in execution file: " & sExecFile & ", calling function: " & sCallFunction & ", CMD.ERR=" & nErr, ToString)
+         Return
+      End If
+   End Sub
+
+   ' Recupero il percorso del file lua da eseguire
+   Private Function GetExecLuaFile() As String
+      Dim sDir As String = String.Empty
+      Dim sFile As String = String.Empty
+      If GetPrivateProfileString(S_EXECLUA, K_DIRSCRIPT_LUA, "", sDir, m_MainWindow.GetMachIniFile()) <> 0 And
+         GetPrivateProfileString(S_EXECLUA, K_FILESCRIPT_LUA, "", sFile, m_MainWindow.GetMachIniFile()) <> 0 Then
+         ' Formatto le stringhe lette
+         sDir = sDir.Trim
+         sFile = sFile.Trim
+         If sDir.EndsWith("\"c) Then
+            sDir = sDir.Remove(sDir.LastIndexOf("\"c))
+         End If
+         If Not sFile.EndsWith(".lua") Then
+            sFile = sFile & ".lua"
+         End If
+         If File.Exists(sDir & "\" & sFile) Then
+            Return sDir & "\" & sFile
+         End If
+      End If
+      Return String.Empty
+   End Function
+
+   ' Recupera il nome della funzione che deve essere chiamata
+   Private Function GetCallFunction() As String
+      Dim sCallFunction As String = "CMD.CmdString"
+      GetPrivateProfileString(S_EXECLUA, K_CALLFUNCTION, sCallFunction, sCallFunction, m_MainWindow.GetMachIniFile())
+      Return sCallFunction
+   End Function
+
 End Class

MainWindow.xaml.vb

@@ -321,11 +321,13 @@ Class MainWindow
       Dim sNestKey As String = ""
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
       EgtSetNestKey(sNestKey)
+      Dim bNetHwKey As Boolean = ( GetPrivateProfileInt(S_GENERAL, K_NETKEY, 0, m_sIniFile) = 1)
+      EgtSetNetHwKey( bNetHwKey)
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2409, 1, m_nKeyLevel) And
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2411, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2409, 1, m_nKeyOptions)
+                            EgtGetKeyOptions(9423, 2411, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Inizializzazione generale di EgtInterface

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.9.4")>
+<Assembly: AssemblyVersion("2.4.11.1")>
-<Assembly: AssemblyFileVersion("2.4.9.4")>
+<Assembly: AssemblyFileVersion("2.4.11.1")>

NcComm/CNCommunication.vb

@@ -581,6 +581,7 @@ Public Class CNCommunication
                m_MainWindow.m_DirectCutPageUC.ZCJogChanged(m_CN.bZCJog)
                m_MainWindow.m_DirectCutPageUC.ZBJogChanged(m_CN.bZBCJog)
                m_MainWindow.m_DirectCutPageUC.RemoteChanged(m_CN.bRemote)
+               m_MainWindow.m_DirectCutPageUC.ParkingStateChanged(m_CN.bParkingState)
             End If
          Else
             m_MainWindow.m_DirectCutPageUC.m_MachineButtons.SpindleStateChanged(m_CN.bSpindleState)
@@ -607,6 +608,7 @@ Public Class CNCommunication
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ZJogChanged(m_CN.bZCJog)
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.BCJogChanged(m_CN.bZBCJog)
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.RemoteChanged(m_CN.bRemote)
+               m_MainWindow.m_DirectCutPageUC.ParkingStateChanged(m_CN.bParkingState)
             End If
 
          End If

OmagCUT.vbproj

@@ -1296,6 +1296,9 @@
   <ItemGroup>
     <Resource Include="Resources\NewIcons\Ponticelli_delete.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Parking.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe

OmagCUTDictionary.xaml

@@ -208,6 +208,7 @@
     <BitmapImage x:Key="XYJogImg" UriSource="Resources/NewIcons/XYJog.png"></BitmapImage>
     <BitmapImage x:Key="ZCJogImg" UriSource="Resources/NewIcons/ZCJog.png"></BitmapImage>
     <BitmapImage x:Key="ZBJogImg" UriSource="Resources/NewIcons/ZBJog.png"></BitmapImage>
+    <BitmapImage x:Key="ParkingImg" UriSource="Resources/NewIcons/Parking.png"></BitmapImage>
 
 
     <!--Frame-->

Project/CurrentProjectPageUC.xaml.vb

@@ -107,7 +107,8 @@ Public Class CurrentProjectPageUC
          Dim nDepthBits As Integer = GetPrivateProfileInt(S_OPENGL, K_DEPTHBITS, 32, m_MainWindow.GetIniFile())
          CurrentProjectScene.SetViewAttributes(nDriver, b2Buff, nColorBits, nDepthBits)
          ' inizializzo la scena (DB geometrico + visualizzazione) e verifico presenza chiave
-         If Not CurrentProjectScene.Init() Then
+         Dim bProd As Boolean = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.CUT_BASE)
+         If Not CurrentProjectScene.Init() Or Not bProd Then
             ' Rimuovo l'host della scena perchè altrimenti rimarrebbe il buco!!
             Me.CurrentProjectPageGrid.Children.Remove(CurrentProjectSceneHost)
             ' Flag per riavvio programma
@@ -158,6 +159,7 @@ Public Class CurrentProjectPageUC
 #End If
             m_MainWindow.Close()
             If bRestart Then Process.Start(Application.ResourceAssembly.Location)
+            Return
          End If
          ' visualizzazione avanzata dei triangoli costituenti le superfici
          Dim bShowTriaAdv As Boolean = (GetPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1, m_MainWindow.GetIniFile()) <> 0)
@@ -168,11 +170,6 @@ Public Class CurrentProjectPageUC
          ' dimensione lineare max in pixel delle textures
          Dim nTxrMaxLinPix As Integer = GetPrivateProfileInt(S_SCENE, K_TEXMAXLINPIX, 4096, m_MainWindow.GetIniFile())
          EgtSetTextureMaxLinPixels(nTxrMaxLinPix)
-         ' Verifico abilitazione prodotto
-         If Not m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.CUT_BASE) Then
-            Dim MissingKeyWnd As New EgtMsgBox(m_MainWindow, EgtMsg(MSG_MISSINGKEYWD + 1), EgtMsg(MSG_MISSINGKEYWD + 5), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 1)
-            m_MainWindow.Close()
-         End If
          ' Recupero e imposto handle finestra principale
          Dim hMainWnd As IntPtr = New WindowInteropHelper(Application.Current.MainWindow).Handle
          EgtSetMainWindowHandle(hMainWnd)
@@ -399,6 +396,8 @@ Public Class CurrentProjectPageUC
       m_MainWindow.m_CadCutPageUC.m_NestPage.CalcRawPart()
       m_dRawHeight = 0
       UpdateHeightTxBx()
+      ' prima di parcheggiare svuoto dei pezzi in parcheggio sia vuota
+      m_MainWindow.m_CadCutPageUC.m_NestPage.ResetListOfGruopInPark()
       ' Parcheggio correttamente i pezzi precedentemente salvati
       Dim nId2 As Integer = EgtGetFirstPart()
       While nId2 <> GDB_ID.NULL
@@ -410,7 +409,7 @@ Public Class CurrentProjectPageUC
          nId2 = EgtGetNextPart(nId2)
       End While
       ' Aggiorno Aree totale e da lavorare dei pezzi
-      SetTotalArea( dTotArea)
+      SetTotalArea(dTotArea)
       UpdateToProduceArea()
       ShowAreas()
       ' Dichiaro progetto non modificato

WorkInProgress/WorkInProgressPageUC.xaml.vb

@@ -309,7 +309,8 @@ Public Class WorkInProgressPageUC
       Dim nDepthBits As Integer = GetPrivateProfileInt(S_OPENGL, K_DEPTHBITS, 32, m_MainWindow.GetIniFile())
       WorkInProgressScene.SetViewAttributes(nDriver, b2Buff, nColorBits, nDepthBits)
       ' inizializzo la scena (DB geometrico + visualizzazione) e verifico presenza chiave
-      If Not WorkInProgressScene.Init() Then
+      Dim bProd As Boolean = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.CUT_BASE)
+      If Not WorkInProgressScene.Init() Or Not bProd Then
          ' Rimuovo l'host della scena perchè altrimenti rimarrebbe il buco!!
          Me.WorkInProgressPageGrid.Children.Remove(WorkInProgressSceneHost)
          ' Flag per riavvio programma
@@ -360,6 +361,7 @@ Public Class WorkInProgressPageUC
 #End If
          m_MainWindow.Close()
          If bRestart Then Process.Start( Application.ResourceAssembly.Location)
+         Return True
       End If
       ' dimensione lineare max in pixel delle textures
       Dim nTxrMaxLinPix As Integer = GetPrivateProfileInt(S_SCENE, K_TEXMAXLINPIX, 4096, m_MainWindow.GetIniFile())