Ricavo contorno da codice python

CadCuts/CSVPage.xaml

@@ -27,7 +27,7 @@
          </Grid.ColumnDefinitions>
 
          <!--Griglia per oscurare i bottoni della pagina sottostante-->
-         <Grid Background="{DynamicResource OmagCut_Gray}">
+            <Grid Background="{DynamicResource OmagCut_Gray}">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="1*"/>
                <ColumnDefinition Width="1*"/>
@@ -49,7 +49,7 @@
 
          <Label Name="CsvPathTxBl" Grid.Row="1" Background="White" FontSize="16" VerticalAlignment="Center" Padding="2,5,0,5"/>
 
-         <TreeView Name="PartsTreeView" Grid.Row="2" Background="{StaticResource OmagCut_TreeViewGradientGray}">
+            <TreeView Name="PartsTreeView" Grid.Row="2" Background="{DynamicResource OmagCut_TreeViewBackGroundColor}">
             <TreeView.Resources>
                <!--Modifico HierarchicalDataTemplate del CathegoryItem per poter inserire immagine e testo e per -->
                <!--renderlo apribile con un solo click -->
@@ -62,7 +62,7 @@
                      </Grid.ColumnDefinitions>
 
                      <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />
-                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" Foreground="Black" />
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" />
 
                   </Grid>
 
@@ -123,10 +123,7 @@
                         </Setter>
                         <Style.Triggers>
                            <DataTrigger Binding="{Binding bIsActive}" Value="False">
-                              <Setter Property="Foreground" Value="{StaticResource OmagCut_White}"/>
-                           </DataTrigger>
-                           <DataTrigger Binding="{Binding bIsActive}" Value="True">
-                              <Setter Property="Foreground" Value="Black"/>
+                              <Setter Property="Foreground" Value="{StaticResource OmagCut_LightGray}"/>
                            </DataTrigger>
                         </Style.Triggers>
                      </Style>
@@ -134,25 +131,18 @@
                </HierarchicalDataTemplate>
                <!--Modifico DataTemplate del ToolItem per poter inserire immagine e testo-->
                <DataTemplate DataType="{x:Type self:PartCustomItem}">
-                  <Grid Width="234.8" Margin="0,5,0,5" HorizontalAlignment="Right">
+                  <Grid Width="246" Margin="0,5,0,5" HorizontalAlignment="Right">
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="1*"/>
                      </Grid.ColumnDefinitions>
 
-                     <TextBlock x:Name="TbName"  Grid.Column="0" Text="{Binding Name}" Height="18" FontSize="14" HorizontalAlignment="Right"/>
-                     <TextBlock x:Name="TbText1" Grid.Column="1" Text="{Binding sText1}" Height="18" FontSize="14" HorizontalAlignment="Center"/>
-                     <TextBlock x:Name="TbText2" Grid.Column="2" Text="{Binding sText2}" Height="18" FontSize="14" HorizontalAlignment="Left"/>
+                     <TextBlock Grid.Column="0" Text="{Binding Name}" Height="18" FontSize="14" HorizontalAlignment="Right"/>
+                     <TextBlock Grid.Column="1" Text="{Binding sText1}" Height="18" FontSize="14" HorizontalAlignment="Center"/>
+                     <TextBlock Grid.Column="2" Text="{Binding sText2}" Height="18" FontSize="14" HorizontalAlignment="Left"/>
 
                   </Grid>
-                  <DataTemplate.Triggers>
-                     <DataTrigger Binding="{Binding bIsActive}" Value="False">
-                        <Setter TargetName="TbName" Property="TextDecorations" Value="Strikethrough" />
-                        <Setter TargetName="TbText1" Property="TextDecorations" Value="Strikethrough" />
-                        <Setter TargetName="TbText2" Property="TextDecorations" Value="Strikethrough" />
-                     </DataTrigger>
-                  </DataTemplate.Triggers>
                </DataTemplate>
             </TreeView.Resources>
 

CadCuts/MoveRawPartPage.xaml.vb

@@ -127,10 +127,11 @@ Public Class MoveRawPartPage
          UnloadPartsBtn.Content = "Go to MOVE part"
          ' altrimenti, aggiorno visualizzazione
       ElseIf Not m_SplitPage.m_bOnAuxTab And m_SplitPage.m_bEnableOnAuxTab Then
+         EgtDraw()
          UnloadPartsBtn.Content = "Go to UNLOAD part"
       End If
       '---------------------------- AUX TABLE ---------------------------- 
-      EgtDraw()
+
       ' Carico i parametri di movimento
       m_dStep = GetPrivateProfileDouble(S_RAWMOVE, K_RAWSTEP, 50, m_MainWindow.GetIniFile())
       ' Ricavo la lunghezza del baffo di taglio 
@@ -859,12 +860,6 @@ Public Class MoveRawPartPage
       Return bOk
    End Function
 
-   Private Sub RemovePart_KeyCancel(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles m_CurrProjPage.OnKeyCancelDownScene
-      If e.KeyCode = System.Windows.Forms.Keys.Delete Then
-         RemovePartBtn_Click(Nothing, Nothing)
-      End If
-   End Sub
-
    Private Sub RemovePartBtn_Click(sender As Object, e As RoutedEventArgs) Handles RemovePartBtn.Click
       Dim nRawId As Integer = EgtGetFirstSelectedObj()
       While nRawId <> GDB_ID.NULL
@@ -932,7 +927,6 @@ Public Class MoveRawPartPage
       ' Mantengo la fase che è stata creata e passo a gestire solo la visualizzazione dei bottoni
       RefreshVisibility()
       EgtZoom(ZM.ALL, True)
-
    End Sub
 
    Private Sub StepMoveTxBx_EgtClosed(sender As Object, e As EventArgs) Handles StepMoveTxBx.EgtClosed
@@ -1368,7 +1362,7 @@ Public Class MoveRawPartPage
          Return
       End If
 
-      ' ------- VISUALIZZAZIONE (navigazione tra le fasi) -------
+      ' ------- VISUALIZZAZIONE -------
       If m_SplitPage.m_bShow Then
          ' verifico se la fase successiva è uno scarico frontale
          If NextOperationIsUnloading(m_nCurrDisposition) Then

CadCuts/SplitPageUC.xaml.vb

@@ -457,7 +457,21 @@ Public Class SplitPageUC
 #End Region    ' Bridge
 
    Private Sub OnMyMouseDownScene_DoubleClick(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene_DoubleClick
-      OnOffCut()
+      If MachiningLsBx.SelectedItems.Count = 1 Then
+         OnMyMouseDownScene(sender, e)
+         Dim x As NameIdLsBxItem = DirectCast(MachiningLsBx.SelectedItems(0), NameIdLsBxItem)
+         Dim nI As Integer = x.Ind
+         If m_MachiningList(nI).m_bEnabled Then
+            m_MachiningList(nI).m_bEnabled = False
+            x.bIsActive = False
+         Else
+            m_MachiningList(nI).m_bEnabled = True
+            x.bIsActive = True
+         End If
+         ColorMachining(m_MachiningList(nI))
+         ColorNumberArrow(nI)
+         EgtDraw()
+      End If
    End Sub
 
    Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
@@ -571,11 +585,6 @@ Public Class SplitPageUC
          m_nDragInd = -1
          m_nDragType = 0
          m_nSelected = GDB_ID.NULL
-         If Not IsNothing(MachiningLsBx.SelectedItem) Then
-            MarkMachining(MachiningLsBx.SelectedItem.Ind, False)
-            EgtDraw()
-         End If
-         MachiningLsBx.SelectedIndex = -1
       End If
    End Sub
 
@@ -705,11 +714,6 @@ Public Class SplitPageUC
    End Sub
 
    Private Sub MachiningLsBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles MachiningLsBx.SelectionChanged
-      ' se non attiva la modifica allora esco
-      If m_bShow Then
-         MachiningLsBx.SelectedIndex = -1
-         Return
-      End If
       If MachiningLsBx.SelectedItems.Count = 0 Then Return
       If MachiningLsBx.SelectedItems.Count = 1 Then m_bAreHomogeneous = True
       ' creo lista ordinata dei selezionati
@@ -751,10 +755,21 @@ Public Class SplitPageUC
    End Sub
 
    Private Sub MachiningLsBx_MouseDoubleClick(sender As Object, e As MouseEventArgs) Handles MachiningLsBx.MouseDoubleClick
-      ' se disabilitata la modifica allora esco
-      If m_bShow Then Return
       If m_IsCtrlKeyDown Or m_IsShiftKeyDown Then Return
-      OnOffCut()
+      If MachiningLsBx.SelectedItems.Count = 1 Then
+         Dim x As NameIdLsBxItem = DirectCast(MachiningLsBx.SelectedItems(0), NameIdLsBxItem)
+         Dim nI As Integer = x.Ind
+         If m_MachiningList(nI).m_bEnabled Then
+            m_MachiningList(nI).m_bEnabled = False
+            x.bIsActive = False
+         Else
+            m_MachiningList(nI).m_bEnabled = True
+            x.bIsActive = True
+         End If
+         ColorMachining(m_MachiningList(nI))
+         ColorNumberArrow(nI)
+         EgtDraw()
+      End If
    End Sub
 
    Private Sub MoveUpBtn_Click(sender As Object, e As RoutedEventArgs) Handles MoveUpBtn.Click
@@ -1875,7 +1890,7 @@ Public Class SplitPageUC
    End Sub
 
    Private Sub NextBtn_Click(sender As Object, e As RoutedEventArgs) Handles NextBtn.Click
-      ' ------- VISUALIZZAZIONE (navigazione tra le fasi) -------
+      ' ------- VISUALIZZAZIONE -------
       If m_bShow Then
          Dim CurrDisposition As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
          ' recupero l'operazione successiva
@@ -1958,22 +1973,22 @@ Public Class SplitPageUC
          NumberDirectionMachining(nI)
       Next
 
-      ' -------------------- Recupero le lavorazioni indicate come attive -- INIZIO --------------------
+      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
       Dim ActiveMachLst As New List(Of Integer)
       For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
-         If ItemSplitMach.bIsActive Then ActiveMachLst.Add(ItemSplitMach.Ind)
+         ActiveMachLst.Add(ItemSplitMach.Ind)
       Next
-      ' -------------------- Recupero le lavorazioni indicate come attive --  FINE  --------------------
+      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
 
       ' Preparo la lista degli Item
       ShowMachiningList()
 
-      ' -------------------- Riattivo le lavorazioni precedenti -- INIZIO --------------------
+      ' -------------------- Riattivo le lavorazioni precedenti --------------------
+
       For Each Item As SplitMach In m_MachiningList
-         ' spengo tutte le lavorazioni disponibili
          EgtSetInfo(Item.m_nId, INFO_MCH_USER_OFF, True)
       Next
-      ' riattivo solo quelle indicate come attive
+
       For nIndex As Integer = 0 To ActiveMachLst.Count - 1
          For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
             If ItemSplitMach.Ind = ActiveMachLst(nIndex) Then
@@ -1986,7 +2001,7 @@ Public Class SplitPageUC
             End If
          Next
       Next
-      ' -------------------- Riattivo le lavorazioni precedenti --  FINE  --------------------
+      ' -------------------- Riattivo le lavorazioni precedenti --------------------
 
       ' Aggiorno visualizzazione
       EgtDraw()
@@ -2184,35 +2199,6 @@ Public Class SplitPageUC
 
    End Sub
 
-   Private Sub OnOffCut()
-      If MachiningLsBx.SelectedItems.Count = 1 Then
-         Dim x As NameIdLsBxItem = DirectCast(MachiningLsBx.SelectedItems(0), NameIdLsBxItem)
-         Dim nI As Integer = x.Ind
-         If m_MachiningList(nI).m_bEnabled Then
-            m_MachiningList(nI).m_bEnabled = False
-            x.bIsActive = False
-         Else
-            m_MachiningList(nI).m_bEnabled = True
-            x.bIsActive = True
-         End If
-         ColorMachining(m_MachiningList(nI))
-         ColorNumberArrow(nI)
-         EgtDraw()
-         ' Imposto flag di modifica
-         m_bModified = True
-         ' recupero l'elenco degli elementi selezionati
-         Dim ItemList As New List(Of NameIdLsBxItem)
-         For Each Item As NameIdLsBxItem In MachiningLsBx.SelectedItems
-            ItemList.Add(Item)
-         Next
-         VerifyHomogenousMachining(ItemList)
-         ' Abilitazione bottone Next
-         EnableButtons()
-      Else
-
-      End If
-   End Sub
-
    Private Sub VerifyHomogenousMachining(ItemList As List(Of NameIdLsBxItem))
       If IsNothing(ItemList) OrElse ItemList.Count = 0 Then
          m_MainWindow.m_CurrentProjectPageUC.ClearMessage()

Constants/ConstMachIni.vb

@@ -129,7 +129,6 @@
    Public Const K_SPOTLIGHT1 As String = "SpotLight1"
    Public Const K_SPOTLIGHT2 As String = "SpotLight2"
    Public Const K_NAXES As String = "nAxes"
-   Public Const K_RESETSTATUS As String = "ResetStatus"
    ' Nuove variabili
    Public Const K_SPEEDHOLD As String = "SpeedHold"
    Public Const K_XYJOG As String = "XYJog"

DirectCuts/ManualAxesMoveUC.xaml.vb

@@ -53,43 +53,14 @@ Public Class ManualAxesMoveUC
       ' Imposto check per considerare spessore lama
       L1SawThChBx.IsChecked = m_MainWindow.m_CurrentMachine.bAddSawThTo5AxMove
       L2SawThChBx.IsChecked = m_MainWindow.m_CurrentMachine.bAddSawThTo5AxMove
-
-      ' Aggiorno visualizzazione
-      SetMachineInCurrPos()
-      EgtDraw()
-      m_MainWindow.m_DirectCutPageUC.m_bShowMachine = True
    End Sub
 
    Private Sub ManualAxesMove_UnLoaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
       m_Timer.Stop()
       m_MainWindow.m_CurrentMachine.bAddSawThTo5AxMove = (L1SawThChBx.IsEnabled And L1SawThChBx.IsChecked) Or
                                                          (L2SawThChBx.IsEnabled And L2SawThChBx.IsChecked)
-      ' Nascondo la macchina
-      m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
-      EgtSetMachineLook(MCH_LOOK.TAB)
-      EgtDraw()
    End Sub
 
-   Private Function SetMachineInCurrPos() As Boolean
-      ' Recupero la posizione macchina
-      Dim dL1, dL2, dL3, dR1, dR2 As Double
-      If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return False
-      ' Recupero il nome degli assi macchina
-      Dim sL1 As String = String.Empty
-      Dim sL2 As String = String.Empty
-      Dim sL3 As String = String.Empty
-      Dim sR1 As String = String.Empty
-      Dim sR2 As String = String.Empty
-      If Not m_MainWindow.m_CNCommunication.GetAxesNames(sL1, sL2, sL3, sR1, sR2) Then Return False
-      ' Visualizzo macchina in posizione
-      EgtSetAxisPos(sL1, dL1)
-      EgtSetAxisPos(sL2, dL2)
-      EgtSetAxisPos(sL3, dL3)
-      EgtSetAxisPos(sR1, dR1)
-      EgtSetAxisPos(sR2, dR2)
-      Return True
-   End Function
-
    Private Sub UpdateAxesNames()
       Dim sL1 As String = String.Empty
       Dim sL2 As String = String.Empty
@@ -154,16 +125,11 @@ Public Class ManualAxesMoveUC
    Private Sub Timer_tick()
       UpdateAxesNames()
       UpdateUseSawThickness()
-      ' Aggiorno posizione macchina in disegno
-      SetMachineInCurrPos()
-      ' Aggiorno il disegno
-      EgtDraw()
    End Sub
 
    Private m_MoveClicked As Boolean = False
    Private Sub XXBtn_Click(sender As Object, e As MouseButtonEventArgs) Handles L1Btn.PreviewMouseDown, L2Btn.PreviewMouseDown, L3Btn.PreviewMouseDown, R1Btn.PreviewMouseDown, R2Btn.PreviewMouseDown
       If e.ClickCount > 1 OrElse m_MoveClicked Then
-         EgtOutLog(" → Hold on! Do not click compulsively.")
          Return
       End If
       m_MoveClicked = True
@@ -250,7 +216,6 @@ Public Class ManualAxesMoveUC
    Private Sub SiemensMoveAxis(CurrentBtn As Button)
       ' leggo se stato reset
       If Not m_CN.bResetState Then
-         EgtOutLog("Reset status is 'False', is denied to execute file '\DirectCmd\AxesMove.lua'.")
          m_MoveClicked = False
          Return
       End If

Machine/CurrentMachine.vb

@@ -1663,7 +1663,7 @@ Public Class CurrentMachine
       EgtTdbGetCurrToolParam(MCH_TP.DIAM, dToolDiam)
       ' Confronto con massimo ammesso
       Dim bOk As Boolean = dToolDiam <= dMaxSawDiamForProbe
-      If Not bOk Then EgtOutLog("WARNING: Saw diameter to big for probing")
+      If Not bOk Then EgtOutLog("WARNING: Saw diameter to big for porbing")
       Return bOk
    End Function
 

MainWindow.xaml.vb

@@ -343,8 +343,8 @@ Class MainWindow
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2610, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2610, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2607, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2607, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Impostazione per programma OnlyFrame: solo se CUT_BASE non attivo

My Project/AssemblyInfo.vb

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

NcComm/CNCommunication.vb

@@ -389,9 +389,6 @@ Public Class CNCommunication
          m_CN.SetCnDataVar(CN_generico.CnData.VacuumOff, sVal)
          GetPrivateProfileString(S_NCDATA, K_BYPASSTATE, "", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.BypassState, sVal)
-         ' ver 2.6i1 : nuova gestione SiemensONE
-         GetPrivateProfileString(S_NCDATA, K_RESETSTATUS, "", sVal, m_MainWindow.GetMachIniFile())
-         m_CN.SetCnDataVar(CN_generico.CnData.ResetStatus, sVal)
 
          ' nuove variabili: stato dei nuovi pulsanti
          nVal = GetPrivateProfileInt(S_NCDATA, K_NEWCONSOLE, 0, m_MainWindow.GetMachIniFile())
@@ -488,12 +485,7 @@ Public Class CNCommunication
                                        End If
                                        nVarType = VarType.TBoolean
                                        m_CN.DVariables_Read_Subscription(sItem(1), nVarType, nIndexArrayBool)
-                                       Dim NewRefFlafSiemens As RefereceFlagSimens = New RefereceFlagSimens(nIndexArrayBool, ItemIndex, nVarType)
-                                       If sItem.Count = 3 Then
-                                          ' forzo la lettura della variabile di default (ignoro lo stato letto da CN)
-                                          NewRefFlafSiemens.DefaultValue = sItem(2)
-                                       End If
-                                       ListReferenceIndex.Add(NewRefFlafSiemens)
+                                       ListReferenceIndex.Add(New RefereceFlagSimens(nIndexArrayBool, ItemIndex, nVarType))
                                        nIndexArrayBool += 1
                                     Case 1
                                        If nIndexArrayInt > 14 Then
@@ -548,12 +540,7 @@ Public Class CNCommunication
                                           Next
                                           nVarType = VarType.TInteger
                                           m_CN.DVariables_Read_Subscription(sVarName, nVarType, nIndexArrayInt_1)
-                                          Dim NewRefFlafSiemens As RefereceFlagSimens = New RefereceFlagSimens(nIndexArrayInt_1, ItemIndex, nVarType, sIndexBit)
-                                          If sItem.Count = 3 Then
-                                             ' forzo la lettura della variabile di default (ignoro lo stato letto da CN)
-                                             NewRefFlafSiemens.DefaultValue = sItem(2)
-                                          End If
-                                          ListReferenceIndex.Add(NewRefFlafSiemens)
+                                          ListReferenceIndex.Add(New RefereceFlagSimens(nIndexArrayInt_1, ItemIndex, nVarType, sIndexBit))
                                           If Not bFound Then
                                              nIndexArrayInt += 1
                                              ListIndexToVar.Add(New IndexArrayToBit(nIndexArrayInt_1, sVarName.Trim))
@@ -1227,7 +1214,6 @@ Public Class CNCommunication
             Dim nFlag As Integer = ListReferenceIndex(IndxLst).FlagIndex
             Dim nIndex As Integer = ListReferenceIndex(IndxLst).SiemnesArrayIndex
             Dim nIndexBit As Integer = ListReferenceIndex(IndxLst).IndexBit
-            Dim sDefaultValue As String = ListReferenceIndex(IndxLst).DefaultValue
             Dim b_temp As Boolean = False
             Dim n_temp As Integer = 0
             Dim l_temp As Long = 0.0
@@ -1235,31 +1221,11 @@ Public Class CNCommunication
             ' leggo il valore caricato 
             Select Case nType
                Case VarType.TBoolean
-                  If Not String.IsNullOrEmpty(sDefaultValue) Then
-                     ' ver 2.6i1
-                     Try
-                        b_temp = CBool(sDefaultValue)
-                     Catch ex As Exception
-                        EgtOutLog("Default boolean value of flag " & nFlag.ToString & " is not Boolean, verify the form: True or true or 1, False or false or 0")
-                        b_temp = m_CN.b_data(nIndex)
-                     End Try
-                  Else
-                     b_temp = m_CN.b_data(nIndex)
-                  End If
+                  b_temp = m_CN.b_data(nIndex)
                Case VarType.TInteger
                   n_temp = m_CN.n_data(nIndex)
                   ' VENTOSE: lettura dato da intero Bit a Bit (ver_2.6h1), ritorno un Boolean
-                  If Not String.IsNullOrEmpty(sDefaultValue) Then
-                     ' ver 2.6i1
-                     Try
-                        b_temp = CBool(sDefaultValue)
-                     Catch ex As Exception
-                        EgtOutLog("Default bit value of flag " & nFlag.ToString & " is not Boolean, verify the form: True or true or 1, False or false or 0")
-                        b_temp = ReadBit(nIndexBit, n_temp)
-                     End Try
-                  Else
-                     b_temp = ReadBit(nIndexBit, n_temp)
-                  End If
+                  b_temp = ReadBit(nIndexBit, n_temp)
                Case VarType.TLong
                   l_temp = m_CN.l_data(nIndex)
                Case VarType.TDouble
@@ -1377,8 +1343,6 @@ Public Class CNCommunication
                Case CN_generico.CnData.nAxes     ' (55)
                   m_CN.n_index_is_G24_active = nIndex
                   m_CN.b5AxesState = b_temp
-               Case CN_generico.CnData.ResetStatus     ' (56)
-                  m_CN.bResetState = b_temp
 
             End Select
          Next
@@ -1709,7 +1673,6 @@ Public Class RefereceFlagSimens
    Private m_TypeArray As Integer
    ' Opzionale
    Private m_IndexBit As Integer = -1
-   Private m_DefaultValue As String = ""
 
    Public Property SiemnesArrayIndex As Integer
       Get
@@ -1747,15 +1710,6 @@ Public Class RefereceFlagSimens
       End Set
    End Property
 
-   Public Property DefaultValue As String
-      Get
-         Return m_DefaultValue
-      End Get
-      Set(value As String)
-         m_DefaultValue = value
-      End Set
-   End Property
-
    Sub New(IndArray As Integer, Flag As Integer, nType As Integer)
       m_SiemnesArrayIndex = IndArray
       m_FlagIndex = Flag

NcComm/CN_generico.vb

@@ -8,7 +8,7 @@ Public MustInherit Class CN_generico
    Public Const MAX_VAR As Short = 100
    Public Const MAX_VALUES As Short = 9           ' Max. index to read the data from the FXServer array
    Public Const MAX_TOOLS As Short = 100
-   Public Const NUM_DATA = 57                     ' Numero di dati del CN (Speed,Feed,...)
+   Public Const NUM_DATA = 56                     ' Numero di dati del CN (Speed,Feed,...)
 
    Public m_NewVariable As Boolean = False        ' per scrittura delle vairbaili Apllication del PLC
 
@@ -72,8 +72,6 @@ Public MustInherit Class CN_generico
       EnablePC = 54
 
       nAxes = 55
-
-      ResetStatus = 56
    End Enum
 
    Public Enum Type As Short

Project/CurrentProjectPageUC.xaml.vb

@@ -10,7 +10,6 @@ Public Class CurrentProjectPageUC
    Friend Event OnMouseDownScene_DoubleClick(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)
-   Friend Event OnKeyCancelDownScene(sender As Object, e As System.Windows.Forms.KeyEventArgs)
    ' Riferimento alla MainWindow
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    ' Dichiarazione delle Page UserControl
@@ -354,10 +353,6 @@ Public Class CurrentProjectPageUC
       SetInfoMessage(DistToString(vtDist))
    End Sub
 
-   Private Sub OnMyKeyCancelDownScene(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles CurrentProjectScene.KeyDown
-      RaiseEvent OnKeyCancelDownScene(sender, e)
-   End Sub
-
    ' Gestione progetto
 
    Friend Sub SetNextProjectIndex()
@@ -523,7 +518,7 @@ Public Class CurrentProjectPageUC
       ' Sistemazioni finali
       If nAddTabId = GDB_ID.NULL Then Return False
       EgtSetName(nAddTabId, MACH_ADD_TABLE)
-      If nRefAddTabId = GDB_ID.NULL Then EgtSetColor(nAddTabId, New Color3d(150, 75, 0, 100), True)
+      EgtSetColor(nAddTabId, New Color3d(150, 75, 0, 100), True)
       EgtSetInfo(nAddTabId, KEY_ADD_TABLE, dAddTable)
       Return True
    End Function

Project/ProjectMgrUC.xaml.vb

@@ -333,10 +333,6 @@ Public Class ProjectMgrUC
             EgtTdbGetCurrToolParam(MCH_TP.DIAM, dHeight)
             ' Raggio lama
             dHeight = dHeight / 2
-         ElseIf CurrTestTool.ToolIsLaser Then
-            ' Raggio
-            dThick = 0
-            dHeight = 0
          Else
             ' Diametro FRESA/FORETTO (l'altezza non serve: posizione calcolata tiene conto del Tip Tool)
             EgtTdbGetCurrToolParam(MCH_TP.DIAM, dThick)
@@ -403,10 +399,6 @@ Public Class ProjectMgrUC
             EgtGetCalcAngles(vtDirT, vtPrefAuxDir, nStat, dC1, dB1, dC2, dB2)
             ' Forzo B90
             dB1 = 90
-            ' Forzo la pozione in Z alla quota di Home (per evitare l'errore di fine corsa asse Z)
-            Dim dHomeZ As Double = 0
-            EgtGetAxisHomePos("Z", dHomeZ)
-            ptMid.z = dHomeZ
          Else
             ' Se utensile speciale
             If CurrTestTool.ToolType = MCH_TY.MILL_STD Or CurrTestTool.ToolType = MCH_TY.DRILL_STD Then
@@ -432,7 +424,6 @@ Public Class ProjectMgrUC
          ' verifica assi lineari
          EgtVerifyOutstroke(dX, dY, dZ, dC1, dB1, nStat)
          If nStat <> 0 Then
-            EgtOutLog("Out of stroke: " & nStat)
             vtDirT = -vtDirT
             ptMid -= vtDirT * dThick
             If CurrTestTool.ToolIsSaw Then
@@ -464,12 +455,6 @@ Public Class ProjectMgrUC
             End If
             ' calcolo la posizione degli assi lineari X, Y, Z ( correggere il punto ptMid.z sommando il raggio utensile)
             EgtGetCalcPositions(ptMid, dC1, dB1, nStat, dX, dY, dZ)
-
-            ' verifica assi lineari
-            EgtVerifyOutstroke(dX, dY, dZ, dC1, dB1, nStat)
-            If nStat <> 0 Then
-               EgtOutLog("2nd attemp out of stroke: " & nStat)
-            End If
          End If
 
          '--------------------------- Comunico i movimenti in origine macchina al CN ----------------------------------------
@@ -1012,8 +997,7 @@ Public Class ProjectMgrUC
       'EgtLuaSetGlobNumVar("CMD.SAWTH", dThick)
 
       EgtTdbSetCurrTool(SelTestTool.ToolName)
-      EgtLuaSetGlobStringVar("CMD.TLNAME", SelTestTool.ToolName)
-      EgtLuaSetGlobStringVar("CMD.TLALIAS", SelTestTool.ToolAlias)
+      EgtLuaSetGlobStringVar("CMD.TLNAME", SelTestTool.ToolAlias)
       Dim dThick As Double = 0
       EgtTdbGetCurrToolParam(MCH_TP.THICK, dThick)
       EgtLuaSetGlobNumVar("CMD.SAWTH", dThick)

RawPhoto/PhotoPageUC.xaml.vb

@@ -142,8 +142,33 @@ Public Class PhotoPageUC
          Dim sPhoto As String = m_sCurrDir & "\" & m_sCurrFile
          Dim sContour As String = String.Empty
          If m_MainWindow.m_Camera.GetCalcContour() Then
+
+            ' ----------------------- LANCIO file Batch per eseguire codice Python -----------------------
+            Dim FileBatch As String = "C:\EgtData\OmagCUT\Temp\PostPhotoTemplate.bat"
+            If File.Exists(FileBatch) Then
+               Dim FileBatchCopy As String = "C:\EgtData\OmagCUT\Temp\PostPhoto.bat"
+               Try
+                  IO.File.Delete(FileBatchCopy)
+               Catch ex As Exception
+               End Try
+               IO.File.Copy(FileBatch, FileBatchCopy)
+               Dim sFilePhoto As String = Path.GetDirectoryName(sPhoto) & "\" & Path.GetFileNameWithoutExtension(sPhoto)
+               IO.File.WriteAllText(FileBatchCopy, IO.File.ReadAllText(FileBatchCopy).Replace("£_FILE_IMAGE_£", sFilePhoto))
+               ' Creo file Dxf del contorno
+               Dim RunPython As Process = Process.Start(FileBatchCopy)
+               While Not RunPython.HasExited
+                  ' Attendo che il processo sia terminato
+                  System.Threading.Thread.Sleep(1000)
+               End While
+               Try
+                  IO.File.Delete(FileBatchCopy)
+               Catch ex As Exception
+               End Try
+            End If
+            ' ----------------------- LANCIO file Batch per eseguire codice Python -----------------------
+
             sContour = Path.ChangeExtension(sPhoto, "dxf")
-         End If
+            End If
          m_MainWindow.m_CadCutPageUC.PostPhoto(sPhoto, sContour)
       End If
    End Sub