Aggiunti comandi viste in Simula e InLavoro

CadCuts/CadCutPageUC.xaml.vb

@@ -107,7 +107,6 @@ Public Class CadCutPageUC
 
    Private Sub PhotoBtn_Click(sender As Object, e As RoutedEventArgs) Handles PhotoBtn.Click
       m_MainWindow.TestOff()
-      m_MainWindow.DragRettangleOff()
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
       ' Se macchina fotografica collegata, faccio una foto
@@ -141,7 +140,6 @@ Public Class CadCutPageUC
 
    Private Sub RawPartBtn_Click(sender As Object, e As RoutedEventArgs) Handles RawPartBtn.Click
       m_MainWindow.TestOff()
-      m_MainWindow.DragRettangleOff()
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_RawPartPage)
@@ -167,7 +165,6 @@ Public Class CadCutPageUC
 
    Private Sub DrawBtn_Click(sender As Object, e As RoutedEventArgs) Handles DrawBtn.Click
       m_MainWindow.TestOff()
-      m_MainWindow.DragRettangleOff()
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_CurrentProjectPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_DrawPageUC)
       m_MainWindow.m_ActivePage = MainWindow.Pages.Draw
@@ -175,7 +172,6 @@ Public Class CadCutPageUC
 
    Private Sub ImportBtn_Click(sender As Object, e As RoutedEventArgs) Handles ImportBtn.Click
       m_MainWindow.TestOff()
-      m_MainWindow.DragRettangleOff()
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_CurrentProjectPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_ImportPageUC)
       m_MainWindow.m_ActivePage = MainWindow.Pages.Import
@@ -197,7 +193,6 @@ Public Class CadCutPageUC
    End Sub
 
    Private Sub SplitBtn_Click(sender As Object, e As RoutedEventArgs) Handles SplitBtn.Click
-      m_MainWindow.DragRettangleOff()
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       EgtDeselectObj(m_NestPage.m_CurrSelectedCurv)
       m_ProjectMgr.TestBtn.IsChecked = False
@@ -211,9 +206,9 @@ Public Class CadCutPageUC
                SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Nest.png", UriKind.Relative))
             End If
             If m_CadCutMode = CadCutModes.Nest Then
-               CadCutPageGrid.Children.Remove(m_NestPage)
-            Else
-               CadCutPageGrid.Children.Remove(m_FastGridSlabManager)
+                  CadCutPageGrid.Children.Remove(m_NestPage)
+               Else
+                  CadCutPageGrid.Children.Remove(m_FastGridSlabManager)
             End If
             CadCutPageGrid.Children.Add(m_SplitPage)
             m_CadCutMode = CadCutModes.Split

CadCuts/NestPageUC.xaml

@@ -109,14 +109,9 @@
                 </Button>
             </UniformGrid>
 
-            <UniformGrid Name ="UG1"  Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="2" >
-                <Button Name="RemovePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
-                    <Image Source="{DynamicResource Elimina-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </Button>
-                <ToggleButton Name="DragRettanleBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
-                    <Image Source="{DynamicResource Drag_RettangleImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-                </ToggleButton>
-            </UniformGrid>
+            <Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="6" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Elimina-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
 
             <UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
                 <Button Name="SelectAllBtn" Style="{DynamicResource OmagCut_YellowIconButton}">

CadCuts/NestPageUC.xaml.vb

@@ -14,25 +14,10 @@ Public Class NestPageUC
    Private m_nPartPos As Integer = PART_POS.NONE_TABLE
    ' Flag per impostata per selezionare di una curva
    Friend m_bSelectCurv As Boolean = False
-   ' dati per DragRettangoli (estensio/accorciamento dei rettangoli trascinando un lato)
-   Private m_bIsVisibleDragRettangle As Boolean = False
-   Friend m_bIsCheckedDragRettangle As Boolean = False
 
-   ' Id della curva e del taglio selezionati per eseguire il test
    Friend m_CurrSelectedCurv As Integer = GDB_ID.NULL
    Friend m_CurrSelectedSawCurv As Integer = GDB_ID.NULL
 
-   ' Id del rettangolo, del traglio e della curva da modificare tramite Drag
-   Private m_nIdSelectedOutLoopRettangle As Integer = GDB_ID.NULL
-   Private m_nIdSelectedRegionRettangle As Integer = GDB_ID.NULL
-   Private m_nIdSelectedSawRettangle As Integer = GDB_ID.NULL
-   Private m_nIdSelectedCurvRettangle As Integer = GDB_ID.NULL
-   Private m_nIdSelectedTextRettangle As Integer = GDB_ID.NULL
-   Private m_nIdSelectedTextTopRettangle As Integer = GDB_ID.NULL
-   Private m_nIdSelectedFlatSurfRettangle As Integer = GDB_ID.NULL
-   Private m_SideListRettangle(4) As Integer
-   Private m_sTextContent As String = String.Empty
-
    Enum PART_POS As Integer
       IN_TABLE = -1
       NONE_TABLE = 0
@@ -78,14 +63,6 @@ Public Class NestPageUC
       RemovePartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 3)            'Remove part - Elimina pezzo
       SelectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 4)             'Select All - Seleziona Tutto
       DeselectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 5)           'Deselect All - Deseleziona Tutto
-
-      ' gestisco la visualizzazione del comando PAN (per il drag dei rettangoli)
-      m_bIsVisibleDragRettangle = (GetPrivateProfileInt(S_NEST, K_DRAG_RETTANGLE, 0, m_MainWindow.GetIniFile()) <> 0)
-      If Not m_bIsVisibleDragRettangle Then
-         UG1.Columns = 1
-         DragRettanleBtn.Visibility = Visibility.Collapsed
-      End If
-
    End Sub
 
    Private Sub NestPage_Loaded(sender As Object, e As RoutedEventArgs)
@@ -133,7 +110,6 @@ Public Class NestPageUC
       m_dRegStep = GetPrivateProfileDouble(S_REG, K_REGSTEP, 10, m_MainWindow.GetIniFile())
       m_dRegAngStep = GetPrivateProfileDouble(S_REG, K_REGANGSTEP, 1, m_MainWindow.GetIniFile())
       m_dMaxRegAng = GetPrivateProfileDouble(S_MACH_REG, K_MACH_MAX_ROT_ANG, 10, m_MainWindow.GetMachIniFile())
-
       ' Garantisco visibilità pezzi parcheggiati
       ShowParkedParts()
       ' Garantisco visibilità eventuale contorno da foto
@@ -150,7 +126,6 @@ Public Class NestPageUC
       End If
    End Sub
 
-   ' funzione utilizzata per la selezione dei tagli quando il comando TEST è attivo
    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
@@ -181,6 +156,7 @@ Public Class NestPageUC
                Dim ptE As Point3d
                EgtEndPoint(nIdMy, ptE)
                If m_CurrSelectedCurv <> GDB_ID.NULL Or m_CurrSelectedCurv = nIdMy Then
+                  EgtDeselectObj(m_CurrSelectedSawCurv)
                   EgtDeselectObj(m_CurrSelectedCurv)
                End If
                ' recupero il gruppo della lavorazione associata
@@ -188,8 +164,10 @@ Public Class NestPageUC
                Dim nIdPV As Integer = EgtGetFirstNameInGroup(nIdParentPart, "PV")
                Dim nIdSaw As Integer = EgtGetFirstNameInGroup(nIdPV, "Saw" & nIdMy.ToString)
                If Not EgtGetGroupObjs(nIdSaw) Then
+                  EgtSelectObj(nIdSaw)
                   m_CurrSelectedSawCurv = nIdSaw
                   m_CurrSelectedCurv = nIdMy
+                  EgtSelectObj(nIdSaw)
                   EgtSetMark(nIdSaw)
                   EgtSelectObj(nIdMy)
                   EgtDraw()
@@ -203,293 +181,6 @@ Public Class NestPageUC
       Return
    End Sub
 
-#Region "DRAG RETTANGLE"
-
-   ' funzione chiamata da OnMyMouseMoveScene: verifica che la selezione sia corretta (deve essere il lato di una figura rettangolare)
-   Private Sub OnMyMouseDownSceneSelSideRettangle(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 then
-         Return
-      End If
-      ' Verifico se selezionato indicativo di pezzo
-      EgtSetObjFilterForSelWin(False, True, False, False, False)
-      Dim nSelMy As Integer
-      EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSelMy)
-      Dim nIdMy As Integer = EgtGetFirstObjInSelWin()
-      While nIdMy <> GDB_ID.NULL
-         Dim sLayer As String = String.Empty
-         ' layer di origine
-         Dim nIdParent As Integer = EgtGetParent(nIdMy)
-         ' recupero il nome del Layer
-         EgtGetName(nIdParent, sLayer)
-         ' solo se il nome del layer è quello associato ad un lato esterno allora procedo con l'evidenziazione
-         If sLayer = NAME_OUTLOOP Then
-            If EgtGetType(nIdMy) = GDB_TY.CRV_LINE Then
-               ' -------------------------------- INIZIO VERIFICHE --------------------------------
-               m_nIdSelectedOutLoopRettangle = nIdParent
-               If Not IsRettangle(m_SideListRettangle) Then
-                  m_CurrProjPage.ClearMessage()
-                  m_CurrProjPage.SetWarningMessage("Non è un rettangolo (0)")
-                  Return
-               End If
-               ' recupero il gruppo della lavorazione associata
-               Dim nIdParentPart As Integer = EgtGetParent(nIdParent)
-               Dim nIdPV As Integer = EgtGetFirstNameInGroup(nIdParentPart, "PV")
-               ' se non esiste un gruppo di lavorazione associato allora esco
-               If nIdPV = GDB_ID.NULL Then
-                  m_CurrProjPage.ClearMessage()
-                  m_CurrProjPage.SetWarningMessage("Pezzo in parcheggio (1)")
-                  Return
-               End If
-               ' se esiste ma è vuoto (pezzo scaricato da tavola)
-               If EgtGetFirstInGroup(nIdPV) = GDB_ID.NULL Then
-                  m_CurrProjPage.ClearMessage()
-                  m_CurrProjPage.SetWarningMessage("Pezzo in parcheggio (2)")
-                  Return
-               End If
-               ' Devo verificare che sia una lavorazione solo di lama?
-               Dim nIdSaw As Integer = EgtGetFirstNameInGroup(nIdPV, "Saw" & nIdMy.ToString)
-               ' -------------------------------- FINE VERIFICHE --------------------------------
-
-               If Not EgtGetGroupObjs(nIdSaw) Then
-                  m_nIdSelectedSawRettangle = nIdSaw
-                  m_nIdSelectedCurvRettangle = nIdMy
-
-                  m_nIdSelectedRegionRettangle = EgtGetFirstNameInGroup(nIdParentPart, NAME_REGION)
-                  ' recupero i testi cintenuti nel layer Region
-                  If m_nIdSelectedRegionRettangle <> GDB_ID.NULL Then
-                     Dim nCurrId As Integer = EgtGetFirstInGroup(m_nIdSelectedRegionRettangle)
-                     While nCurrId <> GDB_ID.NULL
-                        If EgtGetType(nCurrId) = GDB_TY.EXT_TEXT Then
-                           Dim sVal As String = String.Empty
-                           EgtTextGetContent(nCurrId, sVal)
-                           If sVal = "*TOP*" Then
-                              m_nIdSelectedTextTopRettangle = nCurrId
-                           Else
-                              m_nIdSelectedTextRettangle = nCurrId
-                              m_sTextContent = GetMyRettangleText(sVal)
-                           End If
-                        ElseIf EgtGetType(nCurrId) = GDB_TY.SRF_FRGN Then
-                           m_nIdSelectedFlatSurfRettangle = nCurrId
-                        End If
-                        nCurrId = EgtGetNext(nCurrId)
-                     End While
-                  End If
-                  ' seleziono ed evidenzio il lato selezionato
-                  EgtSelectObj(nIdSaw)
-                  EgtSetMark(nIdSaw)
-                  EgtSelectObj(nIdMy)
-                  EgtDraw()
-                  Exit While
-               End If
-            End If
-            ' se le'elemto corrente non è una linea
-         End If
-         ' se le'elemto corrente non appartiene al layer OutLoop passo al prossimo elemento dell'elenco
-         nIdMy = EgtGetNextObjInSelWin()
-      End While
-   End Sub
-
-   ' restituisce il valore del Text ripulito dalle dimensioni
-   Private Function GetMyRettangleText(sTextPz As String) As String
-      ' da DrawPageUC.xaml.vb/MultipleInsert
-      Dim sText As String = String.Empty
-      If sTextPz.Contains("<br/>") Then
-         Dim nLastIndex As Integer = sTextPz.LastIndexOf(">")
-         sText = sTextPz.Remove(nLastIndex + 1)
-         Return sText
-      End If
-      If sTextPz.Contains("  ") Then
-         Dim sInfo() As String = sTextPz.Split(" ")
-         If sInfo.Count > 3 Then
-            Return sText = sInfo(0) & "  " & sInfo(1) & "  "
-         End If
-      End If
-      Return sText
-   End Function
-
-   ' verifico che la figura selezionata sia realmente un rettangolo
-   Private Function IsRettangle(ByRef IdSideList() As Integer) As Boolean
-      ' creo una lista con i lati del rettangolo
-      Dim nCounter As Integer = 0
-      ' recupero i lati dal leyer "OutLoop"
-      Dim IdSideRettangle As Integer = EgtGetFirstInGroup(m_nIdSelectedOutLoopRettangle)
-      While IdSideRettangle <> GDB_ID.NULL And nCounter < 4
-         Dim sVal As String = String.Empty
-         Dim dPrevAng As Double = 0
-         EgtGetInfo(IdSideRettangle, "PrevAng", sVal)
-         StringToDouble(sVal, dPrevAng)
-         Dim dNextAng As Double = 0
-         EgtGetInfo(IdSideRettangle, "NextAng", sVal)
-         StringToDouble(sVal, dNextAng)
-         ' se gli angoli non sono retti allora esco senza caricare il lato corrente
-         If Math.Abs(dPrevAng - 90) > EPS_ANG_SMALL OrElse Math.Abs(dNextAng - 90) > EPS_ANG_SMALL Then
-            Exit While
-         End If
-         IdSideList(nCounter) = IdSideRettangle
-         nCounter += 1
-         IdSideRettangle = EgtGetNext(IdSideRettangle)
-      End While
-      ' verifico che siano solo quattro lati
-      If IdSideRettangle = GDB_ID.NULL And nCounter = 4 Then
-         ' solo se la figura ha 4 lati ortogonali
-         Return True
-      End If
-
-      m_nIdSelectedOutLoopRettangle = GDB_ID.NULL
-      ' la figura presenta più/meno di 4 lati    
-      Return False
-   End Function
-
-   ' recupero le informazioni correnti per sapere se la figura è mdificabile
-   Private Function GetRettangleInfoScale(ByRef frFixed As Frame3d, ByRef MaxLen As Double, ByRef MinLen As Double) As Vector3d
-      ' determino la direzione del lato selezionato
-      Dim vtDirSelectedCurv As New Vector3d
-      EgtStartVector(m_nIdSelectedCurvRettangle, GDB_ID.ROOT, vtDirSelectedCurv)
-
-      ' recupero il lato successivo a quello selezionato 
-      Dim Index As Integer = 0
-      Dim Len As Double = 0
-      For Ind As Integer = 0 To 3
-         If m_SideListRettangle(Ind) = m_nIdSelectedCurvRettangle Then
-            ' verifico se esiste un lato Precedente altrimenti recupero l'ultimo della lista
-            If Ind = 0 Then
-               Index = 3
-            Else
-               Index = Ind - 1
-            End If
-         End If
-      Next
-      ' recupero la dimensione del lato
-      EgtCurveLength(m_SideListRettangle(Index), MaxLen)
-      EgtCurveLength(m_nIdSelectedCurvRettangle, MinLen)
-
-      ' verifico che il lato selezionato sia il maggiore
-      If MinLen > MaxLen Then Return Nothing
-
-      ' determimo il versore dal lato appena calcolato
-      Dim vtDir As New Vector3d
-
-      EgtStartVector(m_SideListRettangle(Index), GDB_ID.ROOT, vtDir)
-      vtDir.Normalize()
-      Dim dProjectionBaseX As Double = vtDir * Vector3d.X_AX
-      Dim ptFixed As New Point3d
-      EgtStartPoint(m_SideListRettangle(Index), GDB_ID.ROOT, ptFixed)
-
-      Dim vtPerp As New Vector3d(vtDir.x, vtDir.y, vtDir.z)
-      vtPerp.Rotate(Vector3d.Z_AX, 90)
-
-      ' determino il Frame corrente
-      frFixed = New Frame3d(ptFixed, vtDir, vtPerp, Vector3d.Z_AX)
-
-      Return vtDir
-
-   End Function
-
-   ' funzione chiamata da OnMyMouseMoveScene: gestisce la modifica lungo una dimensione del rettangolo selezionato
-   Private Sub OnMyMouseMoveSawRettangle(sender As Object, e As System.Windows.Forms.MouseEventArgs)
-      ' Verifico di essere il gestore attivo
-      If Not m_bActive Then Return
-      ' Se drag non abilitato o già in esecuzione, esco
-      If Not m_bDrag Or m_bDragging Then Return
-      ' Se primo movimento di drag, verifico di aver superato la soglia di movimento in pixel
-      If m_bDragToStart Then
-         If Math.Abs(e.Location.X - m_locPrev.X) < m_nRestRadius And
-            Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
-            Return
-         End If
-         m_bDragToStart = False
-      End If
-
-      ' riferiemento che deve rimanere fisso del rettangolo 
-      Dim frFixed As Frame3d = Nothing
-      ' lunghezza del lato da modificare
-      Dim MaxLen As Double = 0
-      Dim MinLen As Double = 0
-      ' recupero info sul rettangolo selezionato
-      Dim vtDir As Vector3d = GetRettangleInfoScale(frFixed, MaxLen, MinLen)
-      If vtDir.Equals(Vector3d.NULL) Then
-         Return
-      End If
-
-      ' Inizio esecuzione di drag
-      m_bDragging = True
-
-      ' Ricavo il punto corrente in coordinate mondo
-      Dim ptCurr As Point3d
-      EgtUnProjectPoint(e.Location, ptCurr)
-      ' Ricavo il vettore di movimento
-      Dim vtMove As Vector3d = ptCurr - m_ptPrev
-      ' ricavo il valore efficace di allungamento (la proiezione)
-      Dim dProjection As Double = vtMove * vtDir
-      vtMove = vtDir * dProjection
-      ' recupero il valore di scalatura
-      Dim dScalefactor = dProjection / MaxLen + 1
-
-      ' Modifico dimensione figura
-      If Math.Abs(dScalefactor) > EPS_SMALL * EPS_SMALL Then
-         EgtScale(m_nIdSelectedOutLoopRettangle, frFixed, dScalefactor, 1, 1, GDB_ID.ROOT)
-         EgtScale(m_nIdSelectedFlatSurfRettangle, frFixed, dScalefactor, 1, 1, GDB_ID.ROOT)
-         Dim ptCen As Point3d
-         EgtCenterPoint(m_nIdSelectedTextRettangle, ptCen)
-         EgtModifyText(m_nIdSelectedTextRettangle, m_sTextContent & LenToString(MaxLen + dProjection, 2) & " x " & LenToString(MinLen, 2))
-         EgtMove(m_nIdSelectedTextRettangle, vtMove * 0.5)
-         If m_nIdSelectedTextTopRettangle <> GDB_ID.NULL Then
-            EgtMove(m_nIdSelectedTextTopRettangle, vtMove * 0.5)
-         End If
-      End If
-
-      Dim nWarn As Integer = 0
-      ResetAllMachinings(nWarn)
-      EnableReferenceRegion(False)
-      ' se la modifica genera un errore allora ripristino la figura prima della defomrazione
-      If Not EgtVerifyPart(EgtGetParent(m_nIdSelectedOutLoopRettangle), True) Then
-         EgtScale(m_nIdSelectedOutLoopRettangle, frFixed, 1 / dScalefactor, 1, 1, GDB_ID.ROOT)
-         EgtScale(m_nIdSelectedFlatSurfRettangle, frFixed, 1 / dScalefactor, 1, 1, GDB_ID.ROOT)
-         Dim ptCen As Point3d
-         EgtCenterPoint(m_nIdSelectedTextRettangle, ptCen)
-         EgtModifyText(m_nIdSelectedTextRettangle, m_sTextContent & LenToString(MaxLen, 2) & " x " & LenToString(MinLen, 2))
-         EgtMove(m_nIdSelectedTextRettangle, -vtMove * 0.5)
-         If m_nIdSelectedTextTopRettangle <> GDB_ID.NULL Then
-            EgtMove(m_nIdSelectedTextTopRettangle, -vtMove * 0.5)
-         End If
-      End If
-
-      EgtDraw()
-      ' Aggiorno il punto precedente
-      m_ptPrev = ptCurr
-      ' Terminata esecuzione di drag
-      m_bDragging = False
-   End Sub
-
-   ' funzione chiamata da OnMyMouseUp: gestisce il reset di tutti gli indici in uso 
-   Public Sub ResetDragRettangleParam()
-      ' deseleziono l'elemento corrente
-      EgtDeselectObj(m_nIdSelectedSawRettangle)
-      EgtDeselectObj(m_nIdSelectedCurvRettangle)
-      EgtResetMark(m_nIdSelectedSawRettangle)
-      ' resetto gli indici
-      m_nIdSelectedOutLoopRettangle = GDB_ID.NULL
-      m_nIdSelectedRegionRettangle = GDB_ID.NULL
-      m_nIdSelectedSawRettangle = GDB_ID.NULL
-      m_nIdSelectedCurvRettangle = GDB_ID.NULL
-      m_nIdSelectedTextRettangle = GDB_ID.NULL
-      m_nIdSelectedTextTopRettangle = GDB_ID.NULL
-      m_nIdSelectedFlatSurfRettangle = GDB_ID.NULL
-      m_SideListRettangle = {GDB_ID.NULL, GDB_ID.NULL, GDB_ID.NULL, GDB_ID.NULL}
-      m_sTextContent = String.Empty
-      ' disattivo il drag
-      m_bDrag = False
-      ' aggiorno le lavorazioni
-      Dim nWarn As Integer = 0
-      ResetAllMachinings(nWarn)
-      EgtDraw()
-   End Sub
-
-#End Region    ' Drag Rettangolo
-
    Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
       ' Verifico di essere il gestore attivo e non in modalità registrazione
       If Not m_bActive Or m_bRegister Then Return
@@ -498,25 +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
 
-      ' se in modalità DragRettangle (deformazione delle componenti rettangolari)
-      If m_bIsCheckedDragRettangle Then
-         OnMyMouseDownSceneSelSideRettangle(sender, e)
-         ' Dati per drag (abilito il Drag)
-         m_locPrev = e.Location
-         m_bDrag = EgtUnProjectPoint(e.Location, m_ptPrev) And m_nIdSelectedCurvRettangle <> GDB_ID.NULL
-         m_bDragToStart = m_bDrag
-         m_bVerify = m_bDrag AndAlso (Keyboard.Modifiers And ModifierKeys.Shift) > 0
-         m_vtTotMove = Vector3d.NULL()
-         Return
-      End If
-
       ' Per default no drag
       m_bDrag = False
       ' Verifico se selezionato indicativo di pezzo
@@ -551,15 +229,15 @@ Public Class NestPageUC
                ' se non è stata eseguita nessuna scelta esco dal ciclo 
                If nRes = 0 Then Exit While
                ' imposto l'altra tavola
-               Dim sOtherTab = If(sNamePartId = MAIN_TAB, SECOND_TAB, MAIN_TAB)
-               EgtChangeTable(sOtherTab, True)
-               m_CurrProjPage.AdjustAdditionalTable(True)
+               Dim sOtherTab = If( sNamePartId = MAIN_TAB, SECOND_TAB, MAIN_TAB)
+               EgtChangeTable( sOtherTab, True)
+               m_CurrProjPage.AdjustAdditionalTable( True)
                EgtSetMachineLook(MCH_LOOK.TAB)
                ' aggiorno le lavorazioni
                UpdateAllMachiningsToolpaths()
                ' aggiorno i movimenti pezzi tra disposizioni
-               For nI As Integer = 1 To EgtGetPhaseCount()
-                  EgtSetCurrPhase(nI)
+               For nI As Integer = 1  To EgtGetPhaseCount()
+                  EgtSetCurrPhase( nI)
                   Dim nDispId As Integer = EgtGetPhaseDisposition(nI)
                   SpecialApplyDisposition(nDispId, True)
                Next
@@ -572,31 +250,31 @@ Public Class NestPageUC
                Dim nPPId As Integer = EgtGetFirstPart()
                While nPPId <> GDB_ID.NULL
                   PackPartInStore(nPPId)
-                  nPPId = EgtGetNextPart(nPPId)
+                  nPPId = EgtGetNextPart( nPPId)
                End While
                ' se prevista rotazione
                If GetPrivateProfileInt(S_TABLE, K_CHANGETABWD, 0, m_MainWindow.GetMachIniFile()) = 2 Then
                   ' Dati tavola
                   Dim b3Tab As New BBox3d
-                  EgtGetTableArea(1, b3Tab)
+                  EgtGetTableArea( 1, b3Tab)
                   ' Box lastra
                   Dim b3OrigRaw As New BBox3d
-                  GetRawBox(b3OrigRaw)
+                  GetRawBox( b3OrigRaw)
                   ' Allargo i limiti della tavola in tutte le fasi
                   Const TAB_OFFS As Double = 3000
                   For nI As Integer = 1 To EgtGetPhaseCount()
                      EgtSetCurrPhase(nI)
-                     EgtSetTableAreaOffset(TAB_OFFS, TAB_OFFS, TAB_OFFS, TAB_OFFS)
+                     EgtSetTableAreaOffset( TAB_OFFS, TAB_OFFS, TAB_OFFS, TAB_OFFS) 
                   Next
                   EgtSetCurrPhase(1)
                   ' Rotazione
                   Dim dAngRot As Double = If(sOtherTab = SECOND_TAB, 180, -180)
-                  If Not RotateAllRawParts(dAngRot, False) Then
+                  if Not RotateAllRawParts(dAngRot, False) Then
                      m_CurrProjPage.SetWarningMessage(EgtMsg(90339))        'Rotazione impossibile
                   End If
                   ' Traslazione per riportare la lastra nella stessa posizione rispetto all'angolo BL che diveta TR e viceversa
                   Dim b3Raw As New BBox3d
-                  GetRawBox(b3Raw)
+                  GetRawBox( b3Raw)
                   Dim vtMove As Vector3d
                   If sOtherTab = SECOND_TAB Then
                      Dim vtDiffIni As Vector3d = b3OrigRaw.Min() - b3Tab.Min()
@@ -605,14 +283,14 @@ Public Class NestPageUC
                   Else
                      Dim vtDiffIni As Vector3d = b3Tab.Max() - b3OrigRaw.Max()
                      Dim vtDiffFin As Vector3d = b3Raw.Min() - b3Tab.Min()
-                     vtMove = -(vtDiffFin - vtDiffIni)
+                     vtMove = -( vtDiffFin - vtDiffIni)
                   End If
                   vtMove.z = 0
                   MoveAllRawParts(vtMove)
                   ' Ripristino i limiti della tavola in tutte le fasi
                   For nI As Integer = 1 To EgtGetPhaseCount()
                      EgtSetCurrPhase(nI)
-                     EgtSetTableAreaOffset(0, 0, 0, 0)
+                     EgtSetTableAreaOffset( 0, 0, 0, 0) 
                   Next
                   EgtSetCurrPhase(1)
                   HideAllMachinings()
@@ -645,13 +323,6 @@ Public Class NestPageUC
          End If
          m_bDragToStart = False
       End If
-
-      ' se devo muovere un lato del rettangolo
-      If m_bIsCheckedDragRettangle Then
-         OnMyMouseMoveSawRettangle(sender, e)
-         Return
-      End If
-
       ' Determino cosa muovere
       Dim nMoveId = If(m_nIdToSel <> GDB_ID.NULL, m_nIdToSel, GDB_ID.SEL)
       ' Verifico se in tavola o in parcheggio
@@ -744,13 +415,6 @@ Public Class NestPageUC
       If Not m_bActive Then Return
       ' verifico che non sia attivo il comando Test
       If m_bSelectCurv Then Return
-      ' verifico che non sia attivo il comando di Drag dei rettangoli
-      If m_bIsCheckedDragRettangle Then
-         ' deseleziono gli oggeti, resetto le variabili usate, aggiorno il disegno
-         ResetDragRettangleParam()
-         Return
-      End If
-
       ' Se eseguito drag
       If Not m_bDragToStart Then
          ' Se movimento con sola verifica finale
@@ -761,16 +425,16 @@ Public Class NestPageUC
             UpdateNestRegions()
             EnableReferenceRegion(False)
             ' Eseguo verifica
-            If VerifyTrfData(nMoveId) And EgtVerifyPart(nMoveId, m_bReducedCut) Then
+            If VerifyTrfData( nMoveId) And EgtVerifyPart( nMoveId, m_bReducedCut) Then
                m_CurrProjPage.ResetOrderMachiningFlag()
-               ' Non superata riporto alla posizione iniziale
+            ' Non superata riporto alla posizione iniziale
             Else
                If m_bFromParking Then
                   m_CurrProjPage.ClearMessage()
-                  PreRemoveOnePart(nMoveId)
-                  VeinMatching.OnRemovePartFromRaw(nMoveId)
+                  PreRemoveOnePart( nMoveId)
+                  VeinMatching.OnRemovePartFromRaw( nMoveId)
                Else
-                  EgtMove(nMoveId, -m_vtTotMove)
+                  EgtMove( nMoveId, -m_vtTotMove)
                   ' Eventuale notifica al VeinMatching
                   If nMoveId = GDB_ID.SEL Then
                      Dim nId As Integer = EgtGetFirstSelectedObj()
@@ -784,11 +448,11 @@ Public Class NestPageUC
                End If
             End If
             m_bFromParking = False
-            ' altrimenti caso con verifica durante il movimento
+         ' altrimenti caso con verifica durante il movimento
          Else
             ' Basta reset alla fine
          End If
-         ' Se selezione da eseguire
+      ' Se selezione da eseguire
       ElseIf m_nIdToSel <> GDB_ID.NULL Then
          ' Determino se pezzo in tavola o in parcheggio
          Dim bPartInTable As Boolean = (EgtGetParent(m_nIdToSel) = m_nRawId)
@@ -805,7 +469,7 @@ Public Class NestPageUC
          VeinMatching.OnSelectPart(m_nIdToSel)
          ' Set flag posizione selezionati
          m_nPartPos = If(bPartInTable, PART_POS.IN_TABLE, PART_POS.OUT_TABLE)
-         ' Se deselezione da eseguire
+      ' Se deselezione da eseguire
       ElseIf m_nIdToDesel <> GDB_ID.NULL Then
          EgtDeselectObj(m_nIdToDesel)
          ' Eventuale aggiornamento VeinMatching
@@ -1581,18 +1245,6 @@ Public Class NestPageUC
       Return True
    End Function
 
-   Private Sub DragRettangle_Click() Handles DragRettanleBtn.Click
-      If DragRettanleBtn.IsChecked Then
-         m_bIsCheckedDragRettangle = True
-      Else
-         m_bIsCheckedDragRettangle = False
-         ResetDragRettangleParam()
-         m_CurrProjPage.ClearMessage()
-         ShowParkedParts()
-      End If
-      EgtDraw()
-   End Sub
-
    Private Sub StorePartBtn_Click(sender As Object, e As RoutedEventArgs) Handles StorePartBtn.Click
       EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
       ' Ciclo di parcheggio dei pezzi selezionati

CadCuts/VacuumCups.vb

@@ -8,8 +8,6 @@ Module VacuumCups
    Private m_nVacId As Integer = GDB_ID.NULL
    Private m_nRefId As Integer = GDB_ID.NULL
    Private m_dPreferredRot As Double = 0
-   Private m_dPrefVertRotXMinus As Double = 0
-   Private m_dPrefVertRotXPlus As Double = 0
    Private m_dDripRefAng As Double = 0
 
    ' Nome del gruppo temporaneo per le ventose
@@ -76,9 +74,6 @@ Module VacuumCups
       If m_nVacId = GDB_ID.NULL Then Return False
       ' Angolo di rotazione preferito
       EgtGetInfo( m_nVacId, KEY_VACLAY_PREFROT, m_dPreferredRot)
-      ' Angoli di rotazione preferiti per ventosa in verticale (lungo Y) a sinistra e a destra del centro tavola
-      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFVROTXMINUS, m_dPrefVertRotXMinus)
-      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFVROTXPLUS, m_dPrefVertRotXPlus)
       ' Direzione di riferimento per tagli Drip
       EgtGetInfo( m_nVacId, KEY_VACLAY_DRIPREFDIR, m_dDripRefAng)
       ' Nascondo il gruppo ma rendo visibili le curve di contorno delle ventose
@@ -368,9 +363,6 @@ Module VacuumCups
       If b3Vac.IsEmpty() Then Return INFINITO
       ' Se box maggiore di quello del pezzo, scarto soluzione
       If b3Vac.Radius() > b3Raw.Radius() Then Return INFINITO
-      ' Recupero l'area della tavola
-      Dim b3Tab As New BBox3d
-      EgtGetTableArea(1, b3Tab)
       ' Determino il movimento
       vtMove = ptRawCen - b3Vac.Center()
       b3Vac.Move(vtMove)
@@ -382,19 +374,11 @@ Module VacuumCups
          frMinRect.VersX().ToSpherical(dLen, dAngVertDeg, dAngOrizzDeg)
          dRotAngDeg = dAngOrizzDeg
          If b3Vac.DimY() > b3Vac.DimX() + EPS_SMALL Then dRotAngDeg -= 90
-         Dim dPreferredRot As Double = m_dPreferredRot
-         If Math.Abs( dRotAngDeg - 90) < 45  Or  Math.Abs( dRotAngDeg - 270) < 45 Then
-            If frMinRect.Orig().x < b3Tab.Center().x Then
-               dPreferredRot = m_dPrefVertRotXMinus
-            else
-               dPreferredRot = m_dPrefVertRotXPlus
-            End If
-         End If 
          Dim dAngDelta As Double = If( Math.Abs( b3Vac.DimY() - b3Vac.DimX()) < 10 * EPS_SMALL, 90, 180)
-         While dRotAngDeg - dPreferredRot >= dAngDelta / 2 
+         While dRotAngDeg - m_dPreferredRot >= dAngDelta / 2 
             dRotAngDeg -= dAngDelta
          End While
-         While dRotAngDeg - dPreferredRot <= -dAngDelta / 2
+         While dRotAngDeg - m_dPreferredRot <= -dAngDelta / 2
             dRotAngDeg += dAngDelta
          End While
       Else
@@ -447,6 +431,8 @@ Module VacuumCups
       ptRef.Move(vtMove)
       ptRef.Rotate(ptRotCen, Vector3d.Z_AX(), dRotAngDeg)
       ' Ne calcolo la distanza dal centro della tavola
+      Dim b3Tab As New BBox3d
+      EgtGetTableArea(1, b3Tab)
       Dim dDist As Double = Point3d.DistXY(ptRef, b3Tab.Center())
       Return dDist
    End Function

Constants/ConstGen.vb

@@ -92,8 +92,6 @@ Module ConstGen
    Public Const KEY_VACLAY_SEL As String = "Sel"
    ' Info in gruppo layout per angolo di rotazione preferito
    Public Const KEY_VACLAY_PREFROT As String = "PreferredRot"
-   Public Const KEY_VACLAY_PREFVROTXMINUS As String = "PrefVertRotXMinus"
-   Public Const KEY_VACLAY_PREFVROTXPLUS As String = "PrefVertRotXPlus"
    ' Info in gruppo layout per direzione di riferimento ventose per tagli da sotto
    Public Const KEY_VACLAY_DRIPREFDIR As String = "DripRefDir"
    ' Info in asse rotante ventosa per step discreti

Constants/ConstIni.vb

@@ -148,7 +148,6 @@ Module ConstIni
    Public Const K_TEXTCOLOR As String = "TextColor"
    Public Const K_AUTOMATICOPTIMIZE As String = "AutomaticOptimize"
    Public Const K_AUTOMATICMAXTIME As String = "AutomaticMaxTime"
-   Public Const K_DRAG_RETTANGLE As String = "DragRettangle"
 
    Public Const S_SPLIT As String = "Split"
    Public Const K_MOVE_LEV As String = "MoveLevel"

Constants/ConstKitData.vb

@@ -26,5 +26,6 @@
    Public Const K_LILEN As String = "LiLen"
    Public Const K_LIHEIGHT As String = "LiHeight"
    Public Const K_LILOAD As String = "LiLoad"
+   
 
 End Module

Constants/ConstMachIni.vb

@@ -44,7 +44,6 @@
    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"
@@ -77,9 +76,6 @@
    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_ENABLEZONE As String = "EnableZone"
-   Public Const K_ENABLEPC As String = "EnablePC"
    Public Const K_HSM As String = "Hsm"
    Public Const K_VACUUMUP As String = "VacuumUp"
    Public Const K_VACUUMDOWN As String = "VacuumDown"
@@ -107,8 +103,6 @@
    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"
@@ -251,7 +245,6 @@
 
    Public Const S_MACH_INPROGRESS As String = "InProgress"
    Public Const K_PHASEVAR As String = "PhaseVar"
-   Public Const K_WP_STEPTIME As String = "WPStepTime"
 
    Public Const S_MACH_PROBING As String = "Probing"
    Public Const K_PROBINGSTATEVAR As String = "ProbingStateVar"

DirectCuts/ControlsMachineButtonUC.xaml.vb

@@ -330,49 +330,6 @@ 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
-
-   Friend Sub ZoneStateChanged(ZoneState As Integer)
-      'Dim sFlag As String = String.Empty
-      'If ZoneState = 1 Then
-      '   sFlag = BTN_ENABLE_ZONE_1
-      'ElseIf ZoneState = 2 Then
-      '   sFlag = BTN_ENABLE_ZONE_2
-      'End If
-      'Dim EnableZoneButton As TwoStateButton = Nothing
-      'For Each MachineButton As MachineButton In m_ButtonList
-      '   If MachineButton.StateFlag = K_ENABLEZONE Then
-      '      EnableZoneButton = MachineButton
-      '   End If
-      'Next
-      'If Not IsNothing(EnableZoneButton) Then
-      '   EnableZoneButton.SetIsChecked(EnableZone)
-      'End If
-   End Sub
-
-   Friend Sub PcStateChanged(EnablePC As Boolean)
-      'Dim EnablePCButton As TwoStateButton = Nothing
-      'For Each MachineButton As MachineButton In m_ButtonList
-      '   If MachineButton.StateFlag = K_ENABLEPC Then
-      '      EnablePCButton = MachineButton
-      '   End If
-      'Next
-      'If Not IsNothing(EnablePCButton) Then
-      '   EnablePCButton.SetIsChecked(EnablePC)
-      'End If
-   End Sub
-
-
    Public Function GetPrivateProfileMachineButtons(
                          ByVal lpAppName As String,
                          ByVal lpKeyName As String,
@@ -445,8 +402,6 @@ Public MustInherit Class MachineButton
    Friend Const BTN_STATE_THREEAXIS As String = "ThreeAxis"
    Friend Const BTN_STATE_FIVEAXIS As String = "FiveAxis"
    Friend Const BTN_STATE_NOTHING As String = "Nothing"
-   Friend Const BTN_ENABLE_ZONE_1 As String = "EnableZone1"
-   Friend Const BTN_ENABLE_ZONE_2 As String = "EnableZone2"
 
    ' Dichiarazione delle Page UserControl
    Friend Shared m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
@@ -692,7 +647,6 @@ 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

@@ -201,8 +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>
 
@@ -239,11 +239,9 @@
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
             <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
          </ToggleButton>
-
-         <!--Comando Manula/MDI-->
-         <Button Name="ManualModeBtn" Grid.Column="7"
-                Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-             <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+         <Button Name="ManualModeBtn" Grid.Column="8"
+               Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+            <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </Button>
 
       </Grid>

DirectCuts/MachineButtonsUC.xaml

@@ -19,8 +19,7 @@
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-        </Grid.ColumnDefinitions>
+      </Grid.ColumnDefinitions>
 
       <ToggleButton Name="MachineButton1" Grid.Column="0" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
          <Image Name="ImageButton1" Style="{StaticResource OmagCut_ButtonIcon}"/>
@@ -62,10 +61,6 @@
          <Image Name="ImageButton10" Style="{StaticResource OmagCut_ButtonIcon}"/>
       </ToggleButton>
 
-        <ToggleButton Name="MachineButton11" Grid.Column="10" Style="{DynamicResource OmagCut_ModifiedGradientYellowIconToggleButton}">
-            <Image Name="ImageButton11" Style="{StaticResource OmagCut_ButtonIcon}"/>
-        </ToggleButton>
-
-    </Grid>
+   </Grid>
 
 </UserControl>

DirectCuts/MachineButtonsUC.xaml.vb

@@ -10,8 +10,7 @@ Public Class MachineButtonsUC
    Private m_bOnlyLaser As Boolean = False
    Private m_bFirst As Boolean = True
 
-   ' 9/2 aggiunto spazio per un nuovo bottone
-   Private Const MAX_BUTTONS As Integer = 11
+   Private Const MAX_BUTTONS As Integer = 10
    Private m_nCount As Integer = 0
    Private ImageArrayY(MAX_BUTTONS - 1) As String
    Private ImageArrayN(MAX_BUTTONS - 1) As String
@@ -32,10 +31,6 @@ 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"
-   Private Const BTN_ENABLE_ZONE_1 As String = "EnableZone1"
-   Private Const BTN_ENABLE_ZONE_2 As String = "EnableZone2"
-   Private Const BTN_ENABLE_PC As String = "EnablePC"
 
    Public Sub New(Optional bOnlyLaser As Boolean = False)
       ' This call is required by the designer.
@@ -80,10 +75,7 @@ Public Class MachineButtonsUC
       For nIndex As Integer = 0 To m_nCount - 1
          If StateFlagArray(nIndex) = BTN_STATE_NOTHING OrElse
             StateFlagArray(nIndex) = BTN_STATE_DOOR_OPENED OrElse
-            StateFlagArray(nIndex) = BTN_STATE_DOOR_CLOSED OrElse
-            StateFlagArray(nIndex) = BTN_ENABLE_PC OrElse
-            StateFlagArray(nIndex) = BTN_ENABLE_ZONE_1 OrElse
-            StateFlagArray(nIndex) = BTN_ENABLE_ZONE_2 Then
+            StateFlagArray(nIndex) = BTN_STATE_DOOR_CLOSED Then
             ' mostra immagine fissa
             Try
                Dim s As String
@@ -142,8 +134,7 @@ Public Class MachineButtonsUC
    End Sub
 
    Private Sub MachineButton_Click(sender As Object, e As RoutedEventArgs) Handles MachineButton1.Click, MachineButton2.Click, MachineButton3.Click, MachineButton4.Click, MachineButton5.Click,
-                                                                                   MachineButton6.Click, MachineButton7.Click, MachineButton8.Click, MachineButton9.Click, MachineButton10.Click,
-                                                                                   MachineButton11.Click
+                                                                                   MachineButton6.Click, MachineButton7.Click, MachineButton8.Click, MachineButton9.Click, MachineButton10.Click
       Dim CurrentBtn As Primitives.ToggleButton = e.Source
       ' recupero l'inidce del bottone selezionato
       Dim nIndex As Integer = GetToggleButtonIndex(CurrentBtn) - 1
@@ -162,18 +153,6 @@ Public Class MachineButtonsUC
          Return
       End If
 
-      ' Se il bottone chiamantè quello per la selezione del pannello di controllo
-      If nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_PC) Then
-         Dim sTLuaFile As String = sBaseDir & CommandArrayY(nIndex)
-         Dim sFLuaFile As String = sBaseDir & CommandArrayN(nIndex)
-         If m_CN.nEnablePc = 1 Then
-            ExecuteMDICommand(CurrentBtn, sTLuaFile)
-         ElseIf m_CN.nEnablePc = 2 Then
-            ExecuteMDICommand(CurrentBtn, sFLuaFile)
-         End If
-         Return
-      End If
-
       If CurrentBtn.IsChecked() Then
          'EgtLuaExecFile(sBaseDir & CommandArrayY(nIndex))
          sLuaFileName = sBaseDir & CommandArrayY(nIndex)
@@ -365,7 +344,6 @@ 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)
@@ -606,203 +584,6 @@ 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
-
-   Friend Sub EnableZoneStateChanged(ZoneState As Integer)
-      Dim sFlag As String = String.Empty
-      If ZoneState = 1 Then
-         sFlag = BTN_ENABLE_ZONE_1
-      ElseIf ZoneState = 2 Then
-         sFlag = BTN_ENABLE_ZONE_2
-      End If
-      ' recupero il bottone che deve essere acceso (quindi spengo l'altro)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, sFlag)
-
-      ' se non trovo nessun riferimento allora spengo entrambi i comandi
-      If nIndex = -1 Then
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_1)
-         GetToggleButton(nIndex + 1).IsChecked = False
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_2)
-         GetToggleButton(nIndex + 1).IsChecked = False
-         Return
-      End If
-
-      If ZoneState = 1 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
-         ' spengo l'altro bottone (lo stato dei due bottoni sono gestiti da una sola variabile)
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_2)
-         GetToggleButton(nIndex + 1).IsChecked = False
-
-      ElseIf ZoneState = 2 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 " & ImageArrayN(nIndex + 1))
-         End Try
-         ' spengo l'altro bottone (lo stato dei due bottoni sono gestiti da una sola variabile)
-         nIndex = Array.IndexOf(StateFlagArray, BTN_ENABLE_ZONE_1)
-         GetToggleButton(nIndex + 1).IsChecked = False
-      End If
-   End Sub
-
-   Friend Sub EnablePcStateChanged(PcState As Integer)
-      ' il comando ButtonY accendo il Pannello_1, il comando ButtonN accendo il Pannello_2 (uno è la negazione dell'altro)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_ENABLE_PC)
-      If nIndex = -1 Then Return
-      If PcState = 1 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
-      ElseIf PcState = 2 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\" & ImageArrayN(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayN(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
-      Else
-         ' nessuno dei due pannelli attivo
-         GetToggleButton(nIndex + 1).IsChecked = False
-      End If
-   End Sub
-
-   Friend Sub TableUpChanged(TableUpState As Boolean)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, K_TABLEUP)
-      If nIndex = -1 Then Return
-      If TableUpState 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\" & ImageArrayN(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayN(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
-
-   Friend Sub TableDownChanged(TableDownState As Boolean)
-      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, K_TABLEDOWN)
-      If nIndex = -1 Then Return
-      If TableDownState 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\" & ImageArrayN(nIndex)
-            Else
-               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayN(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
@@ -838,86 +619,78 @@ Public Class MachineButtonsUC
 
    '-----------------------------------------------------------------------------------------------------------------
 
-#End Region    ' State changed
-
    Private Function GetToggleButton(ByVal nIndex As Integer) As Primitives.ToggleButton
       Select Case nIndex
-         Case 1
-            Return MachineButton1
-         Case 2
-            Return MachineButton2
-         Case 3
-            Return MachineButton3
-         Case 4
-            Return MachineButton4
-         Case 5
-            Return MachineButton5
-         Case 6
-            Return MachineButton6
-         Case 7
-            Return MachineButton7
-         Case 8
-            Return MachineButton8
-         Case 9
-            Return MachineButton9
-         Case 10
-            Return MachineButton10
-         Case Else
-            Return MachineButton11
+      Case 1
+         Return MachineButton1
+      Case 2
+         Return MachineButton2
+      Case 3
+         Return MachineButton3
+      Case 4
+         Return MachineButton4
+      Case 5
+         Return MachineButton5
+      Case 6
+         Return MachineButton6
+      Case 7
+         Return MachineButton7
+      Case 8
+         Return MachineButton8
+      Case 9
+         Return MachineButton9
+      Case Else
+         Return MachineButton10
       End Select
    End Function
 
    Private Function GetToggleButtonIndex(ByVal nBtnName As Primitives.ToggleButton) As Integer
       Select Case nBtnName.Name
-         Case MachineButton1.Name
-            Return 1
-         Case MachineButton2.Name
-            Return 2
-         Case MachineButton3.Name
-            Return 3
-         Case MachineButton4.Name
-            Return 4
-         Case MachineButton5.Name
-            Return 5
-         Case MachineButton6.Name
-            Return 6
-         Case MachineButton7.Name
-            Return 7
-         Case MachineButton8.Name
-            Return 8
-         Case MachineButton9.Name
-            Return 9
-         Case MachineButton10.Name
-            Return 10
-         Case Else
-            Return 11
+      Case MachineButton1.Name
+         Return 1
+      Case MachineButton2.Name
+         Return 2
+      Case MachineButton3.Name
+         Return 3
+      Case MachineButton4.Name
+         Return 4
+      Case MachineButton5.Name
+         Return 5
+      Case MachineButton6.Name
+         Return 6
+      Case MachineButton7.Name
+         Return 7
+      Case MachineButton8.Name
+         Return 8
+      Case MachineButton9.Name
+         Return 9
+      Case Else
+         Return 10
       End Select
    End Function
 
    Private Function GetImage(ByVal nInd As Integer) As Image
       Select Case nInd
-         Case 1
-            Return ImageButton1
-         Case 2
-            Return ImageButton2
-         Case 3
-            Return ImageButton3
-         Case 4
-            Return ImageButton4
-         Case 5
-            Return ImageButton5
-         Case 6
-            Return ImageButton6
-         Case 7
-            Return ImageButton7
-         Case 8
-            Return ImageButton8
-         Case 9
-            Return ImageButton9
-         Case 10
-            Return ImageButton10
-         Case Else
-            Return ImageButton11
+      Case 1
+         Return ImageButton1
+      Case 2
+         Return ImageButton2
+      Case 3
+         Return ImageButton3
+      Case 4
+         Return ImageButton4
+      Case 5
+         Return ImageButton5
+      Case 6
+         Return ImageButton6
+      Case 7
+         Return ImageButton7
+      Case 8
+         Return ImageButton8
+      Case 9
+         Return ImageButton9
+      Case Else
+         Return ImageButton10
       End Select
    End Function
 

Machine/MachiningDbPageUC.xaml.vb

@@ -339,7 +339,7 @@ Public Class MachiningDbPageUC
          Next
          MachiningToExportList.Add(ImpExpMachiningFamily)
       Next
-      Dim ExportWndVM As New ImportExportMachiningWindowVM(MachiningToExportList, true)
+      Dim ExportWndVM As New ImportExportMachiningWindowVM(MachiningToExportList)
       Dim ExportWnd As New ImportExportMachiningWindowWD(Application.Current.MainWindow, ExportWndVM)
 
       ExportWnd.ShowDialog()
@@ -396,7 +396,7 @@ Public Class MachiningDbPageUC
             MachinigToImportList.Add(NewFamily)
          End If
       Next
-      Dim ImportWndVM As New ImportExportMachiningWindowVM(MachinigToImportList, False, ImportFilePath, ImportFileMachiningNameList)
+      Dim ImportWndVM As New ImportExportMachiningWindowVM(MachinigToImportList, ImportFilePath, ImportFileMachiningNameList)
       Dim ImportWnd As New ImportExportMachiningWindowWD(Application.Current.MainWindow, ImportWndVM)
 
       ImportWnd.ShowDialog()

Machine/PolishingsPageUC.xaml

@@ -203,15 +203,15 @@
                     <EgtWPFLib:EgtTextBox Name="ZigZagXTxBx" Grid.Row="2" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                     <EgtWPFLib:EgtTextBox Name="StepXTxBx" Grid.Row="2" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                     <EgtWPFLib:EgtTextBox Name="OffZigZagXTxBx" Grid.Row="2" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="RadiusXTxBx" Grid.Row="2" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
-                    <EgtWPFLib:EgtTextBox Name="DistanceXTxBx" Grid.Row="2" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
+                    <EgtWPFLib:EgtTextBox Name="RadiusXTxBx" Grid.Row="2" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="DistanceXTxBx" Grid.Row="2" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                             
                     <!--Cammino verticale Y-->
                     <EgtWPFLib:EgtTextBox Name="ZigZagYTxBx" Grid.Row="3" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                     <EgtWPFLib:EgtTextBox Name="StepYTxBx" Grid.Row="3" Grid.Column="3" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                     <EgtWPFLib:EgtTextBox Name="OffZigZagYTxBx" Grid.Row="3" Grid.Column="4" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
-                    <EgtWPFLib:EgtTextBox Name="RadiusYTxBx" Grid.Row="3" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
-                    <EgtWPFLib:EgtTextBox Name="DistanceYTxBx" Grid.Row="3" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0" Visibility="Collapsed"/>
+                    <EgtWPFLib:EgtTextBox Name="RadiusYTxBx" Grid.Row="3" Grid.Column="5" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
+                    <EgtWPFLib:EgtTextBox Name="DistanceYTxBx" Grid.Row="3" Grid.Column="6" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>
                             
                     <!--Cammino a spirale-->
                     <EgtWPFLib:EgtTextBox Name="SpiralTxBx" Grid.Row="4" Grid.Column="2" Style="{DynamicResource OmagCut_CalculatorTextBox}" Margin="10,0"/>

Machine/ToolsDbPageUC.xaml.vb

@@ -506,7 +506,7 @@ Public Class ToolsDbPageUC
          ToolToExportList.Add(ImpExpToolFamily)
       Next
 
-      Dim ExportWndVM As New ImportExportToolWindowVM(ToolToExportList, True)
+      Dim ExportWndVM As New ImportExportToolWindowVM(ToolToExportList)
       Dim ExportWnd As New ImportExportToolWD(Application.Current.MainWindow, ExportWndVM)
 
       ExportWnd.ShowDialog()
@@ -558,7 +558,7 @@ Public Class ToolsDbPageUC
             ToolToImportList.Add(NewFamily)
          End If
       Next
-      Dim ImportWndVM As New ImportExportToolWindowVM(ToolToImportList, False, ImportFilePath, ImportFileToolNameList)
+      Dim ImportWndVM As New ImportExportToolWindowVM(ToolToImportList, ImportFilePath, ImportFileToolNameList)
       Dim ImportWnd As New ImportExportToolWD(Application.Current.MainWindow, ImportWndVM)
 
       ImportWnd.ShowDialog()

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, 2402, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2402, 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
@@ -567,10 +567,9 @@ Class MainWindow
 
    Private Sub WorkInProgressBtn_Click(sender As Object, e As RoutedEventArgs) Handles WorkInProgressBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
+
       ' disbilito Test
       TestOff()
-      ' disabilito DragRettangle
-      DragRettangleOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = True
@@ -627,7 +626,6 @@ Class MainWindow
       EgtMdbGetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
-      DragRettangleOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -681,7 +679,6 @@ Class MainWindow
    Private Sub CadCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles CadCutBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
-      DragRettangleOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -734,7 +731,6 @@ Class MainWindow
    Private Sub FrameCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles FrameCutBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
-      DragRettangleOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -788,7 +784,6 @@ Class MainWindow
    Private Sub MachineBtn_Click(sender As Object, e As RoutedEventArgs) Handles MachineBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
-      DragRettangleOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -837,7 +832,6 @@ Class MainWindow
    Private Sub OptionsBtn_Click(sender As Object, e As RoutedEventArgs) Handles OptionsBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
-      DragRettangleOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -1897,12 +1891,4 @@ Class MainWindow
       Me.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
    End Sub
 
-   ' spegne il comando per la mofica dei rettangoli
-   Public Sub DragRettangleOff()
-      m_CadCutPageUC.m_NestPage.DragRettanleBtn.IsChecked = False
-      Me.m_CadCutPageUC.m_NestPage.m_bIsCheckedDragRettangle = False
-      ShowParkedParts()
-
-   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.2.3")>
-<Assembly: AssemblyFileVersion("2.4.2.3")>
+<Assembly: AssemblyVersion("2.4.2.1")>
+<Assembly: AssemblyFileVersion("2.4.2.1")>

NcComm/CNCommunication.vb

@@ -281,14 +281,6 @@ 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_ENABLEZONE, "", sVal, m_MainWindow.GetMachIniFile())
-         m_CN.SetCnDataVar(CN_generico.CnData.EnableZone, sVal)
-         GetPrivateProfileString(S_NCDATA, K_ENABLEPC, "", sVal, m_MainWindow.GetMachIniFile())
-         m_CN.SetCnDataVar(CN_generico.CnData.EnablePC, 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())
@@ -547,9 +539,6 @@ 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_ControlsMachineButton.ZoneStateChanged(m_CN.nEnableZone)
-            'm_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.PcStateChanged(m_CN.nEnablePc)
             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)
@@ -594,12 +583,7 @@ Public Class CNCommunication
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ThreeAxisStateChanged(True)
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.FiveAxisStateChanged(False)
             End If
-            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
-            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ParkingStateChanged(m_CN.bParkingState)
-            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnableZoneStateChanged(m_CN.nEnableZone)
-            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnablePcStateChanged(m_CN.nEnablePc)
-            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.TableUpChanged(m_CN.bTableUpState)
-            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.TableDownChanged(m_CN.bTableDownState)
+            m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
 
             ' Nuovi bottoni (uso joystick) per Area4
             If m_IsNewConsole Then
@@ -635,11 +619,6 @@ 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)
-         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.EnableZoneStateChanged(m_CN.nEnableZone)
-         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.EnablePcStateChanged(m_CN.nEnablePc)
-         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.TableUpChanged(m_CN.bTableUpState)
-         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.TableDownChanged(m_CN.bTableDownState)
       End If
 
    End Sub

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 = 55                     ' Numero di dati del CN (Speed,Feed,...)
+   Public Const NUM_DATA = 52                     ' Numero di dati del CN (Speed,Feed,...)
 
    Public m_NewVariable As Boolean = False        ' per scrittura delle vairbaili Apllication del PLC
 
@@ -66,10 +66,6 @@ Public MustInherit Class CN_generico
       ZBJog = 49
       PowerON = 50
       Remote = 51
-
-      Parking = 52
-      EnableZone = 53
-      EnablePC = 54
    End Enum
 
 #End Region
@@ -177,9 +173,6 @@ Public MustInherit Class CN_generico
    Public nDoorClosedState As Integer
    Public bLimitZState As Boolean
    Public bPowerOvr As Double
-   Public bParkingState As Boolean
-   Public nEnableZone As Integer
-   Public nEnablePc As Integer
    Public bHsm As Double
    Public bVacuumUp As Boolean
    Public bVacuumDown As Boolean

NcComm/M_Num.vb

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

OmagCUT.vbproj

@@ -1240,7 +1240,6 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Spiral.png" />
-    <Resource Include="Resources\NewIcons\Drag_Rettangle.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>

OmagCUTDarkDictionary.xaml

@@ -105,7 +105,6 @@
     <BitmapImage x:Key="Elimina-pezzoImg" UriSource="Resources/NewIcons/Elimina-pezzo.png"></BitmapImage>
     <BitmapImage x:Key="Seleziona-tuttoImg" UriSource="Resources/NewIcons/Seleziona-tutto.png"></BitmapImage>
     <BitmapImage x:Key="Deseleziona-tuttoImg" UriSource="Resources/NewIcons/Deseleziona-tutto.png"></BitmapImage>
-    <BitmapImage x:Key="Drag_RettangleImg" UriSource="Resources/NewIcons/Drag_Rettangle.png"></BitmapImage>
     
     <!--Machine-->
     <BitmapImage x:Key="DatiMacchinaImg" UriSource="Resources/NewIcons/DatiMacchina.png"></BitmapImage>

OmagCUTDictionary.xaml

@@ -173,7 +173,6 @@
     <BitmapImage x:Key="Elimina-pezzoImg" UriSource="Resources/NewIcons/Elimina-pezzo.png"></BitmapImage>
     <BitmapImage x:Key="Seleziona-tuttoImg" UriSource="Resources/NewIcons/Seleziona-tutto.png"></BitmapImage>
     <BitmapImage x:Key="Deseleziona-tuttoImg" UriSource="Resources/NewIcons/Deseleziona-tutto.png"></BitmapImage>
-    <BitmapImage x:Key="Drag_RettangleImg" UriSource="Resources/NewIcons/Drag_Rettangle.png"></BitmapImage>
 
     <!--Machine-->
     <BitmapImage x:Key="DatiMacchinaImg" UriSource="Resources/NewIcons/DatiMacchina.png"></BitmapImage>

Project/CurrentProjectPageUC.xaml.vb

@@ -49,7 +49,7 @@ Public Class CurrentProjectPageUC
       m_MainWindow.m_FrameCutPageUC.SetValue(Grid.ColumnSpanProperty, 2)
 
       'Assegno SceneButtons alla pagina
-      UpperButtonGrid.Children.Add(m_SceneButtons)
+      Me.UpperButtonGrid.Children.Add(m_SceneButtons)
 
       'Assegnazione scena all'host e posizionamento nella PlacePageGrid
       CurrentProjectSceneHost.Child = CurrentProjectScene
@@ -66,6 +66,7 @@ Public Class CurrentProjectPageUC
    End Sub
 
    Private Sub CurrentProjectPage_Loaded(sender As Object, e As RoutedEventArgs)
+
       ' Impostazioni MruLists: carico la lista degli ultimi file caricati/aperti
       m_MruFiles.Init(S_MRUFILES, 8)
       If m_bFirst Then

Project/ProjectMgrUC.xaml.vb

@@ -33,6 +33,7 @@ Public Class ProjectMgrUC
    End Sub
 
    Private Sub ProjectMgrUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+
       ' Impostazioni
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
       m_CurrMachine = m_MainWindow.m_CurrentMachine
@@ -269,6 +270,7 @@ Public Class ProjectMgrUC
       End If
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
       m_MainWindow.m_ActivePage = MainWindow.Pages.Simulation
+
    End Sub
 
    Private Sub WorkBtn_Click(sender As Object, e As RoutedEventArgs) Handles WorkBtn.Click

Project/SceneButtonsUC.xaml

@@ -4,7 +4,7 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
    mc:Ignorable="d" 
-   d:DesignHeight="85.3" d:DesignWidth="597.1">
+   d:DesignHeight="85.3">
 
    <!-- Definizione del controllo SceneButton -->
    <Grid Name="SceneButtonsGrid">
@@ -16,7 +16,9 @@
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
 
         <ToggleButton Name="MeasureBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
          <Image Source="{DynamicResource MeasureImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
@@ -39,7 +41,15 @@
       <Button Name="TopViewBtn" Grid.Column="6" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
          <Image Source="{DynamicResource LookFromTOPImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
       </Button>
-      
-   </Grid>
+
+        <Button Name="FrontViewBtn" Grid.Column="7" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource LookFromTOPImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+        </Button>
+        <Button Name="LeftViewBtn" Grid.Column="8" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource LookFromTOPImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+        </Button>
+
+
+    </Grid>
 
 </UserControl>

Project/SceneButtonsUC.xaml.vb

@@ -72,25 +72,56 @@ Public Class SceneButtonsUC
       EgtSetView(VT.TOP)
    End Sub
 
+   Private Sub LeftViewBtn_Click(sender As Object, e As RoutedEventArgs) Handles LeftViewBtn.Click
+      EgtSetView(VT.LEFT)
+   End Sub
+
+   Private Sub FrontViewBtn_Click(sender As Object, e As RoutedEventArgs) Handles FrontViewBtn.Click
+      EgtSetView(VT.FRONT)
+   End Sub
+
    Private Function GetCurrScene() As EgtUILib.Scene
-   Select Case m_MainWindow.m_ActivePage
-      Case MainWindow.Pages.WorkInProgress
-         Return m_MainWindow.m_WorkInProgressPageUC.WorkInProgressScene
-      Case MainWindow.Pages.DirectCut
-         Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
-      Case MainWindow.Pages.CadCut
-         Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
-      Case MainWindow.Pages.Open
-         Return m_MainWindow.m_OpenPage.OpenScene
-      Case MainWindow.Pages.FrameCut
-         Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
-      Case MainWindow.Pages.Draw
-         Return m_MainWindow.m_DrawPageUC.DrawScene
-      Case MainWindow.Pages.Import
-         Return m_MainWindow.m_ImportPageUC.ImportScene
-      Case Else
-         Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
-   End Select
+      Select Case m_MainWindow.m_ActivePage
+         Case MainWindow.Pages.WorkInProgress
+            Return m_MainWindow.m_WorkInProgressPageUC.WorkInProgressScene
+         Case MainWindow.Pages.DirectCut
+            Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
+         Case MainWindow.Pages.CadCut
+            Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
+         Case MainWindow.Pages.Open
+            Return m_MainWindow.m_OpenPage.OpenScene
+         Case MainWindow.Pages.FrameCut
+            Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
+         Case MainWindow.Pages.Draw
+            Return m_MainWindow.m_DrawPageUC.DrawScene
+         Case MainWindow.Pages.Import
+            Return m_MainWindow.m_ImportPageUC.ImportScene
+         Case Else
+            Return m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene
+      End Select
    End Function
 
+   Sub New(Optional ByVal bActiveViewBtn As Boolean = False)
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+      If bActiveViewBtn Then
+         If Not SceneButtonsGrid.Children.Contains(LeftViewBtn) Then
+            Dim Row As New RowDefinition
+            SceneButtonsGrid.RowDefinitions.Add(Row)
+            SceneButtonsGrid.Children.Add(FrontViewBtn)
+            SceneButtonsGrid.Children.Add(LeftViewBtn)
+         End If
+      Else
+         If SceneButtonsGrid.Children.Contains(LeftViewBtn) Then
+            SceneButtonsGrid.Children.RemoveAt(7)
+            SceneButtonsGrid.Children.RemoveAt(7)
+            SceneButtonsGrid.Width = 721.2
+         End If
+      End If
+
+   End Sub
+
+
 End Class

RawPhoto/Camera.vb

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

Simulation/SimulationPageUC.xaml

@@ -22,9 +22,9 @@
       <!-- Definizione della Grid superiore -->
       <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="4*"/>
+            <ColumnDefinition Width="2*"/>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="7*"/>
+            <ColumnDefinition Width="9*"/>
          </Grid.ColumnDefinitions>
 
          <Button Name="MachViewModeBtn" Grid.Column="1"

Simulation/SimulationPageUC.xaml.vb

@@ -5,7 +5,8 @@ Public Class SimulationPageUC
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private m_CurrProjPage As CurrentProjectPageUC
-
+   ' Dichiarazione delle Page UserControl
+   Friend m_SceneButtons As SceneButtonsUC
    ' Funzioni di callback per output in interfaccia da LUA
    Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
    Private m_OutTextCallback As New OutTextCallback(AddressOf ProcessOutText)
@@ -48,6 +49,12 @@ Public Class SimulationPageUC
    End Sub
 
    Private Sub SimulationPage_Initialized(sender As Object, e As EventArgs)
+      'Creazione delle Page UserControl
+      m_SceneButtons = New SceneButtonsUC(True)
+
+      'Posizionemento nella griglia delle Page UserControl
+      m_SceneButtons.SetValue(Grid.ColumnProperty, 5)
+
       ' Impostazioni box stime
       m_bEstim = (GetPrivateProfileInt(S_MACH_ESTIMATIONS, K_ENABLEEST, 0, m_MainWindow.GetMachIniFile()) <> 0)
       If Not m_bEstim Then EstimGrid.Visibility = Windows.Visibility.Hidden
@@ -74,12 +81,16 @@ Public Class SimulationPageUC
          StopBtn.SetValue(Grid.RowProperty, 4)
          SpeedSlider.SetValue(Grid.RowProperty, 5)
       End If
+
+      Me.UpperButtonGrid.Children.Add(m_SceneButtons)
+
       ' Pulsante Play
       PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Play.png", UriKind.Relative))
    End Sub
 
    Private Sub SimulationPage_Loaded(sender As Object, e As RoutedEventArgs)
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+
       Dim bOk As Boolean = True
       ' Elimino eventuale attrezzaggio da OmagOFFICE
       EgtEraseCurrSetup()

WorkInProgress/WorkInProgressPageUC.xaml

@@ -17,9 +17,9 @@
    
       <Grid Name="UpperButtonsGrid">
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="7*"/>
+            <ColumnDefinition Width="5*"/>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="7*"/>
+            <ColumnDefinition Width="9*"/>
          </Grid.ColumnDefinitions>
 
          <Button Name="MachViewModeBtn" Grid.Column="1"

WorkInProgress/WorkInProgressPageUC.xaml.vb

@@ -31,7 +31,7 @@ Public Class WorkInProgressPageUC
    Private Sub WorkInProgressPage_Initialized(sender As Object, e As EventArgs)
 
       ' Creazione delle Page UserControl
-      m_SceneButtons = New SceneButtonsUC
+      m_SceneButtons = New SceneButtonsUC(True)
       m_MachineButtons = New MachineButtonsUC
 
       ' Posizionemento nella griglia dei bottoni di vista
@@ -201,9 +201,6 @@ Public Class WorkInProgressPageUC
       End If
       EgtSetCurrPhase(nCurrPhase, True)
       EgtDraw()
-      ' Tempo di ritardo nel ciclo
-      Dim nTimeStep As Integer = 50
-      nTimeStep = GetPrivateProfileInt(S_MACH_INPROGRESS, K_WP_STEPTIME, nTimeStep, m_MainWindow.GetMachIniFile())
       ' Ciclo
       While m_bContinue
          ' Rileggo la variabile di fase
@@ -236,7 +233,7 @@ Public Class WorkInProgressPageUC
             EgtDraw()
          End If
          ' Per evitare di ciclare rapidissimamente e consumare inutilmente CPU
-         System.Threading.Thread.Sleep(nTimeStep)
+         System.Threading.Thread.Sleep(10)
          ' Leggo la fase
          If m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 3 Then
             m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 0