Miglioramento gestione scarico frontale

CAM/CamAuto.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.Windows.Forms.Integration
+Imports EgtUILib
 
 Friend Module CamAuto
 
@@ -29,7 +30,7 @@ Friend Module CamAuto
       Return bOk
    End Function
 
-   Friend Function AddWaterJetMachining( nOperId As Integer, ByRef nWarn As Integer) As Boolean
+   Friend Function AddWaterJetMachining(nOperId As Integer, ByRef nWarn As Integer) As Boolean
       EgtLuaCreateGlobTable("CAM")
       SetLuaStandardCamParams()
       EgtLuaSetGlobIntVar("CAM.OPERID", nOperId)
@@ -163,6 +164,22 @@ Friend Module CamAuto
       Return bOk
    End Function
 
+   Friend Function ResetAllRawPart() As Boolean
+      Dim nPhase As Integer = 1
+      Dim nOtherRaw As Integer = EgtGetFirstRawPart()
+      While nOtherRaw <> GDB_ID.NULL
+         ' se il pezzo non appartiene alla prima fase allora viene eliminato
+         If Not EgtVerifyRawPartPhase(nOtherRaw, nPhase) Then
+            Dim NextRaw As Integer = EgtGetNextRawPart(nOtherRaw)
+            EgtRemoveRawPart(nOtherRaw)
+            nOtherRaw = NextRaw
+         Else
+            nOtherRaw = EgtGetNextRawPart(nOtherRaw)
+         End If
+      End While
+      Return True
+   End Function
+
    ' verifico che il contorno passato non sia stato separato
    Friend Function VerifyOutLoopIsClosed(nIdLayerOutLoop As Integer)
       Dim nIdMy As Integer = EgtGetFirstInGroup(nIdLayerOutLoop)

CadCuts/MoveRawPartPage.xaml

@@ -7,164 +7,167 @@
    mc:Ignorable="d" 
    d:DesignHeight="853.3" d:DesignWidth="1280">
 
-   <!-- Definizione della SplitPage -->
-   <Grid Name="SplitPageGrid" >
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="3*"/>
-         <ColumnDefinition Width="12*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="8*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
+    <!-- Definizione della SplitPage -->
+    <Grid Name="SplitPageGrid" >
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="12*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="8*"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
 
-      <!--Upper button grid-->
-      <Grid Grid.Column="1">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="4*"/>
-            <ColumnDefinition Width="8*"/>
-         </Grid.ColumnDefinitions>
-
-         <!--Griglia per oscurare i bottoni della pagina sottostante-->
-         <Grid Background="{DynamicResource OmagCut_Gray}">
+        <!--Upper button grid-->
+        <Grid Grid.Column="1">
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="4*"/>
+                <ColumnDefinition Width="8*"/>
             </Grid.ColumnDefinitions>
 
-            <Button Name="PrevBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            <!--Griglia per oscurare i bottoni della pagina sottostante-->
+            <Grid Background="{DynamicResource OmagCut_Gray}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+                <Button Name="PrevBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+                <Button Name="NextBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
+                        <Image.RenderTransform>
+                            <TransformGroup>
+                                <RotateTransform Angle="180"/>
+                            </TransformGroup>
+                        </Image.RenderTransform>
+                    </Image>
+                </Button>
+                <Button Name="ModifyBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+
+            </Grid>
+        </Grid>
+
+        <!--Left Button Grid-->
+        <Grid Grid.RowSpan="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
+
+            <Button Name="TopLBtn" Grid.Column="0" Grid.Row="1"
+         Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
+                <Image Source="{DynamicResource TopLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
             </Button>
-            <Button Name="NextBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource NumericKeyboardArrowImg}" Style="{StaticResource OmagCut_ButtonIcon}" RenderTransformOrigin="0.5,0.5">
-                  <Image.RenderTransform>
-                     <TransformGroup>
-                        <RotateTransform Angle="180"/>
-                     </TransformGroup>
-                  </Image.RenderTransform>
-               </Image>
+            <Button Name="UpBtn" Grid.Column="1" Grid.Row="1"
+         Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
+                <Image Source="{DynamicResource UpArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
             </Button>
-            <Button Name="ModifyBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}"/>
-
-         </Grid>
-      </Grid>
-
-      <!--Left Button Grid-->
-      <Grid Grid.RowSpan="3">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="2*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
-
-         <Button Name="TopLBtn" Grid.Column="0" Grid.Row="1"
+            <Button Name="TopRBtn" Grid.Column="2" Grid.Row="1"
          Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
-            <Image Source="{DynamicResource TopLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="UpBtn" Grid.Column="1" Grid.Row="1"
-         Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
-            <Image Source="{DynamicResource UpArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="TopRBtn" Grid.Column="2" Grid.Row="1"
-         Style="{DynamicResource OmagCut_TopGrayGradientYellowButton}">
-            <Image Source="{DynamicResource TopRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="LeftBtn" Grid.Column="0" Grid.Row="2"
+                <Image Source="{DynamicResource TopRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="LeftBtn" Grid.Column="0" Grid.Row="2"
          Style="{DynamicResource OmagCut_LeftGrayGradientYellowButton}">
-            <Image Source="{DynamicResource LeftArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <EgtWPFLib:EgtTextBox Name="StepMoveTxBx" Grid.Column="1" Grid.Row="2" Width="50"
+                <Image Source="{DynamicResource LeftArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <EgtWPFLib:EgtTextBox Name="StepMoveTxBx" Grid.Column="1" Grid.Row="2" Width="50"
             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-         <Button Name="ResetBtn" Grid.Column="1" Grid.Row="2"
+            <Button Name="ResetBtn" Grid.Column="1" Grid.Row="2"
             Style="{DynamicResource OmagCut_YellowTextButton}">
-         </Button>
-         <Button Name="RightBtn" Grid.Column="2" Grid.Row="2"
+            </Button>
+            <Button Name="RightBtn" Grid.Column="2" Grid.Row="2"
          Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource RightArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="BottomLBtn" Grid.Column="0" Grid.Row="3"
+                <Image Source="{DynamicResource RightArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="BottomLBtn" Grid.Column="0" Grid.Row="3"
          Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
-            <Image Source="{DynamicResource BottomLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="DownBtn" Grid.Column="1" Grid.Row="3"
+                <Image Source="{DynamicResource BottomLeftImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="DownBtn" Grid.Column="1" Grid.Row="3"
          Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
-            <Image Source="{DynamicResource DownArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
-         <Button Name="BottomRBtn" Grid.Column="2" Grid.Row="3"
+                <Image Source="{DynamicResource DownArrowImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="BottomRBtn" Grid.Column="2" Grid.Row="3"
          Style="{DynamicResource OmagCut_BottomGrayGradientYellowButton}">
-            <Image Source="{DynamicResource BottomRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-         </Button>
+                <Image Source="{DynamicResource BottomRightImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
 
-         <Button Name="RotateCounterClockwiseBtn" Grid.Column="0" Grid.Row="4"
+            <Button Name="RotateCounterClockwiseBtn" Grid.Column="0" Grid.Row="4"
             Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                 <Image Source="{DynamicResource CounterClockwiseRotateImg}" Width="64" Height="65" HorizontalAlignment="Center"
                VerticalAlignment="Center" />
-         </Button>
+            </Button>
 
-         <Grid Name="RotationAngle" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50" IsLength="False"
+            <Grid Name="RotationAngle" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <EgtWPFLib:EgtTextBox Name="RotationAngleTxBx"  Width="50" IsLength="False"
             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
+                <TextBlock Grid.Column="1" FontSize="30" Margin="2,-5,0,0"
             Text="°"/>
-         </Grid>
+            </Grid>
 
-         <Button Name="RotateClockwiseBtn" Grid.Column="2" Grid.Row="4"
+            <Button Name="RotateClockwiseBtn" Grid.Column="2" Grid.Row="4"
             Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
+                <Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
                VerticalAlignment="Center" />
-         </Button>
+            </Button>
 
-
-         <Button Name="RemovePartBtn" Grid.ColumnSpan="2" Grid.Row="6"
+            <!--Gestione sfridi-->
+            <Button Name="RemovePartBtn" Grid.ColumnSpan="2" Grid.Row="6"
                  Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-         <Button Name="ScrapsBtn" Grid.Column="3" Grid.Row="6"
+            <Button Name="ScrapsBtn" Grid.Column="3" Grid.Row="6"
                  Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
+            <!--Gestione scarico pezzi-->
+            <Button Name="UnloadPartsBtn" Grid.ColumnSpan="2" Grid.Row="7"
+                 Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
             <Grid Grid.Row="7" Grid.ColumnSpan="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="0.5*"/>
+                </Grid.ColumnDefinitions>
+
+            </Grid>
+
+        </Grid>
+
+        <!--Lower button grid, sfondo grigio per coprire i bottoni della pagina sottostante-->
+        <Grid Grid.Column="1" Grid.Row="2" Background="{DynamicResource OmagCut_Gray}">
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="0.5*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="0.5*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="10*"/>
             </Grid.ColumnDefinitions>
-
-         </Grid>
-
-      </Grid>
-
-      <!--Lower button grid, sfondo grigio per coprire i bottoni della pagina sottostante-->
-      <Grid Grid.Column="1" Grid.Row="2" Background="{DynamicResource OmagCut_Gray}">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="10*"/>
-         </Grid.ColumnDefinitions>
             <!-- Inserimento della pausa durante il movimento sulla tavola di scarico-->
             <Button Name="PauseBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
                 <Image Source="{DynamicResource Pausa-ON_OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
             </Button>
         </Grid>
 
-   </Grid>
+    </Grid>
 
 </UserControl>

CadCuts/MoveRawPartPage.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.Windows.Forms.Integration
+Imports EgtUILib
 
 Public Class MoveRawPartPage
    ' Riferimento alla MainWindow
@@ -35,12 +36,16 @@ Public Class MoveRawPartPage
    Private m_ScrapsVisibility As Visibility = Visibility.Visible
    Private m_CurrRawOnVacuum As Integer = GDB_ID.NULL
 
+   ' definisce se è stata inserito uno scarico 
+   Private m_IsCurrPhaseUnloaded As Boolean = False
+
    Private Sub MoveRawPartPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Assegno testi
       RemovePartBtn.Content = EgtMsg(MSG_MOVERAWPAGEUC + 1)  'Rimuovi
       ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17)       'Modifica
       ResetBtn.Content = EgtMsg(MSG_NESTPAGEUC + 6)          'Reset
       ScrapsBtn.Content = "Add Scraps"
+      UnloadPartsBtn.Content = "Move part"
    End Sub
 
    Private Sub MoveRawPartPage_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded
@@ -60,7 +65,12 @@ Public Class MoveRawPartPage
       End If
       ' Deseleziono tutto
       EgtDeselectAll()
-      ' Recupero i tagli allungati prima definiti
+      ' resetto variabili di navigazione nelle fasi
+      m_bPrev = False
+      m_bToNext = False
+
+      '---------------------------- CREATE NEW PHASE ----------------------------
+      ' Recupero i tagli ABILITATI prima definiti
       Dim Cuts(0) As Integer
       m_SplitPage.GetEnabledCuts(Cuts)
       ' Fase precedente
@@ -69,11 +79,19 @@ Public Class MoveRawPartPage
       Dim vNewRaws As New List(Of Integer)
       If Not m_SplitPage.m_bShow Then
          SplitRawParts(nPrevPhase, Cuts, vNewRaws)
+         m_IsCurrPhaseUnloaded = False
       Else
-         EgtSetCurrPhase(nPrevPhase + 1)
+         nPrevPhase = nPrevPhase + 1
+         EgtSetCurrPhase(nPrevPhase)
          HideAllMachinings()
+         ' verifico se la fase corrente è di tipo scarico frontale
+         m_nCurrDisposition = EgtGetPhaseDisposition(nPrevPhase)
+         If IsDispUnloadOnAuxTab(m_nCurrDisposition) Then
+            m_SplitPage.m_bOnAuxTab = True
+         End If
       End If
       m_nCurrPhase = EgtGetCurrPhase()
+      '---------------------------- CREATE NEW PHASE ----------------------------
 
       '---------------------------- SCRAPS ----------------------------
       ' gestione visualizzazione del comando "Scraps"
@@ -101,14 +119,19 @@ Public Class MoveRawPartPage
       End If
       '---------------------------- SCRAPS ----------------------------
 
+      '---------------------------- AUX TABLE ---------------------------- 
       ' Se movimento pezzi finale, sistemazioni per tavolo ausiliario
-      If m_SplitPage.m_bOnAuxTab Then
-         ' assegnazione delle info tavola ausiliaria alla dispozione corrente
+      If m_SplitPage.m_bOnAuxTab And m_SplitPage.m_bEnableOnAuxTab Then
+         ' assegnazione delle info tavola ausiliaria alla dispozione corrente (Spostato nella funzione Refresh)
          SetAuxTabInCurrDisposition()
+         UnloadPartsBtn.Content = "Go to MOVE part"
          ' altrimenti, aggiorno visualizzazione
-      Else
+      ElseIf Not m_SplitPage.m_bOnAuxTab And m_SplitPage.m_bEnableOnAuxTab Then
          EgtDraw()
+         UnloadPartsBtn.Content = "Go to UNLOAD part"
       End If
+      '---------------------------- AUX TABLE ---------------------------- 
+
       ' Carico i parametri di movimento
       m_dStep = GetPrivateProfileDouble(S_RAWMOVE, K_RAWSTEP, 50, m_MainWindow.GetIniFile())
       ' Ricavo la lunghezza del baffo di taglio 
@@ -167,6 +190,30 @@ Public Class MoveRawPartPage
 
       ' aggiorno il messaggio del comando per gestire gli sfridi
       VerifyIsNewScrap(m_CurrRawOnVacuum)
+      ' aggiorno la visibilità dei comandi
+      RefreshVisibility()
+      ' salvo l'idice della fase corrente
+      m_nCurrDisposition = EgtGetPhaseDisposition(m_nCurrPhase)
+      ' Abilitazione bottone modifica
+      ModifyBtn.IsEnabled = m_SplitPage.m_bShow
+      ' gestione abilitazione altri bottoni
+      EnableButtons()
+   End Sub
+
+   ' Gestione di visualizzazione dei comandi per il movimento dei pezzi
+   Private Sub RefreshVisibility()
+      ' Aggiorno visulizzazione comando per passare alla pagina di scarico
+      If Not m_SplitPage.m_bEnableOnAuxTab Then
+         UnloadPartsBtn.Visibility = Visibility.Hidden
+      Else
+         UnloadPartsBtn.Visibility = Visibility.Visible
+         If m_SplitPage.m_bOnAuxTab Then
+            UnloadPartsBtn.Content = "Go to MOVE part"
+            ' altrimenti, aggiorno visualizzazione
+         Else
+            UnloadPartsBtn.Content = "Go to UNLOAD part"
+         End If
+      End If
       ' Aggiorno interfaccia per taglio perpendicolare
       If m_bByHand Then
          UpBtn.Visibility = Windows.Visibility.Visible
@@ -222,12 +269,6 @@ Public Class MoveRawPartPage
          ResetBtn.Visibility = Windows.Visibility.Visible
          ScrapsBtn.Visibility = Windows.Visibility.Hidden
       End If
-      ' salvo l'idice della fase corrente
-      m_nCurrDisposition = EgtGetPhaseDisposition(m_nCurrPhase)
-      ' Abilitazione bottone modifica
-      ModifyBtn.IsEnabled = m_SplitPage.m_bShow
-      ' gestione abilitazione altri bottoni
-      EnableButtons()
    End Sub
 
    Private Sub SetAuxTabInCurrDisposition()
@@ -292,12 +333,12 @@ Public Class MoveRawPartPage
                EgtSetStatus(nId, GDB_ST.ON_)
                ' prima di rilasciare il pezzo verifico che non vada in collisione con altri pezzi sulla tavola (evito il controllo se ultima fase)
                If VerifyCollisionWithOtherRawPart(nId) Then
-                     ' mantengo la selezione del pezzo
-                     EgtSetStatus(nId, GDB_ST.SEL)
-                     m_CurrProjPage.SetErrorMessage("Collisione pezzi")
-                  Else
-                     ' Se con ventose, le nascondo
-                     If Not m_bByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
+                  ' mantengo la selezione del pezzo
+                  EgtSetStatus(nId, GDB_ST.SEL)
+                  m_CurrProjPage.SetErrorMessage("Collisione pezzi")
+               Else
+                  ' Se con ventose, le nascondo
+                  If Not m_bByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
                End If
             Else
 
@@ -445,7 +486,7 @@ Public Class MoveRawPartPage
             If EgtMoveRawPart(nRawId, dMove * m_vtDir) Then
                m_dCurrDist += Math.Abs(dMove)
             End If
-         ' Altrimenti movimento Y +
+            ' Altrimenti movimento Y +
          Else
             If m_bRawWithCups Then
                Dim vtMove As New Vector3d(0, m_dStep, 0)
@@ -488,7 +529,7 @@ Public Class MoveRawPartPage
             If EgtMoveRawPart(nRawId, dMove * m_vtDir) Then
                m_dCurrDist -= Math.Abs(dMove)
             End If
-         ' Altrimenti movimento Y -
+            ' Altrimenti movimento Y -
          Else
             If m_bRawWithCups Then
                Dim vtMove As New Vector3d(0, -m_dStep, 0)
@@ -780,6 +821,33 @@ Public Class MoveRawPartPage
       End While
    End Sub
 
+   ' Passo dalla pagina di movimento dei pezzi alla pagina di scarico
+   Private Sub UnloadPartBtn_Click() Handles UnloadPartsBtn.Click
+      ' forzo lo stato di scarico frontale oppure di movimento
+      m_SplitPage.m_bOnAuxTab = Not m_SplitPage.m_bOnAuxTab
+
+      ' se rientro nella fase di spostamenti allora nascondo la tavola di scarico
+      If Not m_SplitPage.m_bOnAuxTab Then
+         ' se ci sono pezzi sulla tavola di scarico non posso nasconderla
+         Dim LclLstOfUnldPart As New List(Of Integer)
+         If Not PartOnAuxTab(LclLstOfUnldPart, m_nCurrPhase) Then
+            EgtDisableModified()
+            ' nascondo la tavola di scarico
+            EgtSetStatus(m_nAuxTabId, GDB_ST.OFF)
+            ' Nascondo eventuali pezzi in parcheggio
+            HideParkedParts()
+            EgtEnableModified()
+         End If
+      Else
+         ' Assegnazione delle info tavola ausiliaria alla dispozione corrente
+         SetAuxTabInCurrDisposition()
+      End If
+
+      ' 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
       Dim dStep As Double
       If StringToLen(StepMoveTxBx.Text, dStep) Then
@@ -821,16 +889,16 @@ Public Class MoveRawPartPage
       Dim ptRef As Point3d
       If Not EgtGetInfo(nRefId, "Pos", ptRef) Then Return
       Dim sCorn As String = ""
-      EgtGetInfo( nRefId, "COR", sCorn)
-      Select sCorn
-      Case "TL"
-         nCorn = MCH_CR.TL
-      Case "TR"
-         nCorn = MCH_CR.TR
-      Case "BL"
-         nCorn = MCH_CR.BL
-      Case "BR"
-         nCorn = MCH_CR.BR
+      EgtGetInfo(nRefId, "COR", sCorn)
+      Select Case sCorn
+         Case "TL"
+            nCorn = MCH_CR.TL
+         Case "TR"
+            nCorn = MCH_CR.TR
+         Case "BL"
+            nCorn = MCH_CR.BL
+         Case "BR"
+            nCorn = MCH_CR.BR
       End Select
       ' Recupero il centro del grezzo
       Dim ptRawCen As Point3d
@@ -1007,8 +1075,44 @@ Public Class MoveRawPartPage
    End Function
 
    Private Sub PauseBtn_Click(sender As Object, e As RoutedEventArgs) Handles PauseBtn.Click
+      ' verifico la presenza di eventuali pezzi sulla tavola di scarico
+      Dim LclLstOfUnldPart As New List(Of Integer)
+      PartOnAuxTab(LclLstOfUnldPart, m_nCurrPhase)
+      If Not InsertPauseInCurrPhase() Then Return
+      AddNewPhase()
+   End Sub
+
+   ' restituisce la lista dei pezzi che sono sulla tavola di scarico nella fase indicata
+   Private Function PartOnAuxTab(ByRef ListOfUnloadedPatr As List(Of Integer), nPhase As Integer) As Boolean
+      m_IsCurrPhaseUnloaded = False
+      ' Area tavolo ausiliario
+      Dim b3AuxTab As New BBox3d
+      EgtGetBBoxGlob(EgtGetFirstNameInGroup(m_nAuxTabId, "A1"), GDB_BB.STANDARD, b3AuxTab)
+      ' Area pezzi 
+      Dim nOtherRaw As Integer = EgtGetFirstRawPart()
+      While nOtherRaw <> GDB_ID.NULL
+         If EgtVerifyRawPartPhase(nOtherRaw, nPhase) Then
+            Dim b3OtherRaw As New BBox3d
+            ' EgtGetRawPartBBox(nOtherRaw, b3OtherRaw)
+            EgtGetBBoxGlob(nOtherRaw, GDB_BB.STANDARD, b3OtherRaw)
+            ' se il centro del pezzo è sulla tavola di scarico
+            If b3OtherRaw.Center.y < b3AuxTab.Max().y Then
+               m_IsCurrPhaseUnloaded = True
+               ListOfUnloadedPatr.Add(nOtherRaw)
+               ' salvo l'info che indica che il pezzo deve essere scaricato
+               EgtSetInfo(nOtherRaw, "Unloaded", 1)
+               'Exit While
+            End If
+         End If
+         nOtherRaw = EgtGetNextRawPart(nOtherRaw)
+      End While
+      Return m_IsCurrPhaseUnloaded
+   End Function
+
+   ' inserisce una pausa nella fase corrente
+   Private Function InsertPauseInCurrPhase() As Boolean
       ' verifico che ci sia almeno un elemto selezionato (dati di aggancio pezzo)
-      If m_RawMoveDataList.Count = 0 Then Return
+      If m_RawMoveDataList.Count = 0 Then Return False
       ' verifico che sia stato inseito almeno uno spostamento, altrimenti lo rimuovo
       Dim Index As Integer = 0
       For Index = m_RawMoveDataList.Count - 1 To 0 Step -1
@@ -1017,8 +1121,9 @@ Public Class MoveRawPartPage
          End If
       Next
       ' verifico che la lista non sia vuota
-      If m_RawMoveDataList.Count = 0 Then Return
-
+      If m_RawMoveDataList.Count = 0 Then
+         Return False
+      End If
       ' recupero disposizione fase corrente
       Dim nDispId As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
       ' imposto la pausa nella disposizione corrente
@@ -1026,30 +1131,22 @@ Public Class MoveRawPartPage
       ' aggiungo al gruppo disposizione dei sottogruppi con i dati di movimento dei grezzi spostati
       SaveMoveInfoInDisposition(nDispId, m_RawMoveDataList)
       ' imposto eventuale movimento pezzi su tavola ausiliaria
-      SaveMovePartsOnAuxTable(nDispId, m_SplitPage.m_bOnAuxTab)
+      SaveMovePartsOnAuxTable(nDispId, m_IsCurrPhaseUnloaded)
+      ' SaveMovePartsOnAuxTable(nDispId, m_SplitPage.m_bOnAuxTab)
       '' Eseguo calcolo speciale dei movimenti: per tavola multicut
       'SpecialApplyDisposition(nDispId, True, Not m_SplitPage.m_bOnAuxTab)
+      SaveRemoveByHandInDisposition(nDispId, False)
+      Return True
+   End Function
 
+   ' crea una nuvoa fase/disposizione, la rende corrente, ricalcolo i grezzi e le lavorazioni della nuova fase
+   Private Function AddNewPhase() As Boolean
       ' Creo nuova fase
       Dim nNewPhase As Integer = EgtAddPhase()
-
-      ' Eseguo eventuali spezzature dei grezzi e vi sposto i pezzi (i grezzi devono essere sempre copiati per Registrazione con rotazione)
-      Dim nRawId As Integer = EgtGetFirstRawPart()
-      While nRawId <> GDB_ID.NULL
-         ' se il grezzo è presente nella fase precedente e non è quello selezionato allora procedo a creare una copia nella nuova fase
-         If EgtVerifyRawPartPhase(nRawId, nNewPhase - 1) Then
-            Dim bKeepRawPart As Boolean = True
-            For Each RawOnAuxTabData As RawMoveData In m_RawMoveDataList
-               If nRawId = RawOnAuxTabData.m_nId Then
-                  bKeepRawPart = False
-                  Exit For
-               End If
-            Next
-            If bKeepRawPart Then EgtKeepRawPart(nRawId, nNewPhase - 1)
-         End If
-         ' passo al successivo grezzo
-         nRawId = EgtGetNextRawPart(nRawId)
-      End While
+      ' Carico i grezzi rimasti sulla tavola nella nuova fase
+      ChangePhaseRawPart(nNewPhase)
+      ' Sposto le lavorazioni rimaste nella nuova fase
+      ChangeOperationPhase(nNewPhase)
 
       Dim nCurrDisposition As Integer = EgtGetPhaseDisposition(nNewPhase)
       'SetPause(nCurrDisposition)
@@ -1060,8 +1157,43 @@ Public Class MoveRawPartPage
       SetAuxTabInCurrDisposition()
       ' ripulisco la lista degli spostamenti
       m_RawMoveDataList.Clear()
+      m_IsCurrPhaseUnloaded = False
       ' aggiorno la fase corrente
       m_nCurrPhase = EgtGetCurrPhase()
+      Return True
+   End Function
+
+   ' Copio i grezzi rimasti sulla tavola nella fase successiva
+   Private Sub ChangePhaseRawPart(ByVal nNewPhase As Integer)
+      ' recupero l'elenco dei pezzi che sono stati scaricati sulla tavola
+      Dim LocalLstOfUnldPart As New List(Of Integer)
+      PartOnAuxTab(LocalLstOfUnldPart, nNewPhase - 1)
+      ' Eseguo eventuali spezzature dei grezzi e vi sposto i pezzi (i grezzi devono essere sempre copiati per Registrazione con rotazione)
+      Dim nRawId As Integer = EgtGetFirstRawPart()
+      While nRawId <> GDB_ID.NULL
+         ' se il grezzo è presente nella fase precedente e non è quello selezionato allora procedo a creare una copia nella nuova fase
+         If EgtVerifyRawPartPhase(nRawId, nNewPhase - 1) Then
+            Dim bKeepRawPart As Boolean = True
+            For Each RawOnAuxTabData As RawMoveData In m_RawMoveDataList
+               If nRawId = RawOnAuxTabData.m_nId Then
+                  ' se il pezzo è stato scaricato allora non deve essere riportato nella fase successiva
+                  For Each UnloadPart As Integer In LocalLstOfUnldPart
+                     If nRawId = UnloadPart Then
+                        ' salvo l'info che indica che il pezzo deve essere scaricato
+                        EgtSetInfo(nRawId, "Unloaded", 1)
+                        bKeepRawPart = False
+                        Exit For
+                     End If
+                  Next
+                  'bKeepRawPart = False
+                  Exit For
+               End If
+            Next
+            If bKeepRawPart Then EgtKeepRawPart(nRawId, nNewPhase - 1)
+         End If
+         ' passo al successivo grezzo
+         nRawId = EgtGetNextRawPart(nRawId)
+      End While
    End Sub
 
    Private Sub ResetBtn_Click(sender As Object, e As RoutedEventArgs) Handles ResetBtn.Click
@@ -1077,6 +1209,8 @@ Public Class MoveRawPartPage
       EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dAngRaw)
       AddRawMoveData(nRawId, vtMove, m_RawMoveDataList)
       RemoveRawMoveData(nRawId, m_RawMoveDataList)
+      ' elimino l'info che indica che il pezzo è scaricato sulla tavola
+      EgtRemoveInfo(nRawId, "Unloaded")
       ' Disabilito pezzo e nascondo le ventose
       EgtSetStatus(nRawId, GDB_ST.ON_)
       EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
@@ -1109,6 +1243,14 @@ Public Class MoveRawPartPage
          m_nCurrPhase -= 1
          m_bPrev = False
          m_SplitPage.m_bShow = True
+         m_SplitPage.m_bOnAuxTab = True
+         ' imposto la visibilità della tavola ausiliaria
+         SetAuxTabInCurrDisposition()
+         ' carico le info di disposizione dei pezzi
+         m_RawMoveDataList.Clear()
+         m_bRemovedRaw = GetRemoveByHandInDisposition(m_nCurrDisposition)
+         GetMoveInfoInDisposition(m_nCurrDisposition, m_RawMoveDataList)
+         RefreshVisibility()
          EgtDraw()
          Return
       End If
@@ -1139,18 +1281,52 @@ Public Class MoveRawPartPage
          Return
       End If
 
-      ' se la disposizione corrente è sulla tavola ausiliaria allora lo sarà anche quella successiva
-      If IsDispUnloadOnAuxTab(m_nCurrDisposition) <> 0 Then
-         EgtSetCurrPhase(m_nCurrPhase + 1)
-         m_nCurrDisposition = EgtGetNextOperation(m_nCurrDisposition)
-         m_nCurrPhase += 1
-         m_bToNext = False
-         m_SplitPage.m_bShow = True
-         EgtDraw()
-         EnableButtons()
-         Return
+      ' ------- VISUALIZZAZIONE -------
+      If m_SplitPage.m_bShow Then
+         ' verifico se la fase successiva è uno scarico frontale
+         If NextOperationIsUnloading(m_nCurrDisposition) Then
+            ' imposto la nuova fase (che è stata modificata all'interno della funzione di controllo)
+            EgtSetCurrPhase(m_nCurrPhase)
+            ' carico i dati di movimento dei pezzi nella fase corrente
+            m_RawMoveDataList.Clear()
+            m_bRemovedRaw = GetRemoveByHandInDisposition(m_nCurrDisposition)
+            GetMoveInfoInDisposition(m_nCurrDisposition, m_RawMoveDataList)
+            EgtDraw()
+            Return
+         ElseIf IsDispUnloadOnAuxTab(m_nCurrDisposition) <> 0 AndAlso Not NextOperationIsUnloading(m_nCurrDisposition) Then
+            ' imposto la nuova fase, al termine della Sub verrà caricata la pagina Split nella fase indicata ora
+            m_bToNext = True
+            m_nCurrPhase += 1
+            EgtSetCurrPhase(m_nCurrPhase)
+            EgtDraw()
+         End If
       End If
 
+      ' -------     MODIFICA    -------
+      If Not m_SplitPage.m_bShow Then
+         ' se la tavola di scarico presente oppure ci sono pezzi sulla tavola di scarico
+         Dim LclLstOfUnldPart As New List(Of Integer)
+         If m_SplitPage.m_bOnAuxTab Or PartOnAuxTab(LclLstOfUnldPart, m_nCurrPhase) Then
+            ' se ci sono pezzi sulla tavola di scarico prima di procedere inserisco una pausa e creo una nuoava fase
+            If m_IsCurrPhaseUnloaded AndAlso InsertPauseInCurrPhase() Then AddNewPhase()
+            ' nascondo la tavola di scarico
+            EgtDisableModified()
+            EgtSetStatus(m_nAuxTabId, GDB_ST.OFF)
+            EgtEnableModified()
+         End If
+         m_bToNext = True
+         '' se la disposizione corrente è sulla tavola ausiliaria allora lo sarà anche quella successiva
+         'If IsDispUnloadOnAuxTab(m_nCurrDisposition) <> 0 Then
+         '   EgtSetCurrPhase(m_nCurrPhase + 1)
+         '   m_nCurrDisposition = EgtGetNextOperation(m_nCurrDisposition)
+         '   m_nCurrPhase += 1
+         '   m_bToNext = False
+         '   m_SplitPage.m_bShow = True
+         '   EgtDraw()
+         '   EnableButtons()
+         '   Return
+         'End If
+      End If
       ' resetto l'inidice del pezzo da mnovimentare
       m_CurrRawOnVacuum = GDB_ID.NULL
       ' Deseleziono tutto
@@ -1193,7 +1369,7 @@ Public Class MoveRawPartPage
       ' disabilito bottone
       ModifyBtn.IsEnabled = False
       ' gestione abilitazione altri bottoni
-      EnableButtons()
+      EnableButtons(MachiningList.Count > 0)
    End Sub
 
    ' verifica se la disposizione indicata è uno scarico sulla tavola ausiliaria
@@ -1204,6 +1380,20 @@ Public Class MoveRawPartPage
       Return bVal
    End Function
 
+   ' restituisce e attiva la successiva disposizione se è uno scarico frontale
+   Public Function NextOperationIsUnloading(nCurrDispId As Integer) As Boolean
+      ' recupero la primo operazione successiva
+      Dim nNextIdOperation As Integer = EgtGetNextOperation(nCurrDispId)
+      ' a partire da questa cerco la prima disposizione disponibile
+      Dim nNextIdDips As Integer = GetNextDisposition(nNextIdOperation)
+      If nNextIdDips = nNextIdOperation And IsDispUnloadOnAuxTab(nNextIdOperation) Then
+         m_nCurrPhase += 1
+         m_nCurrDisposition = nNextIdOperation
+         Return True
+      End If
+      Return False
+   End Function
+
    ' recupero la prima disposizione disponibile tra l'elenco delle operazioni presenti
    Public Function GetNextDisposition(nCurrDisposId As Integer) As Integer
       Dim nDispId As Integer = nCurrDisposId
@@ -1216,7 +1406,7 @@ Public Class MoveRawPartPage
       Return GDB_ID.NULL
    End Function
 
-   Private Sub EnableButtons()
+   Private Sub EnableButtons(Optional bExistsMachining As Boolean = False)
       UpBtn.IsEnabled = Not m_SplitPage.m_bShow
       LeftBtn.IsEnabled = Not m_SplitPage.m_bShow
       RightBtn.IsEnabled = Not m_SplitPage.m_bShow
@@ -1232,19 +1422,35 @@ Public Class MoveRawPartPage
       BottomRBtn.IsEnabled = Not m_SplitPage.m_bShow
       PauseBtn.IsEnabled = Not m_SplitPage.m_bShow
       ResetBtn.IsEnabled = Not m_SplitPage.m_bShow
+      UnloadPartsBtn.IsEnabled = Not m_SplitPage.m_bShow
       If m_SplitPage.m_bShow Then
          NextBtn.IsEnabled = (m_nCurrPhase < EgtGetPhaseCount())
       Else
-         NextBtn.IsEnabled = Not m_SplitPage.m_bOnAuxTab
+         ' Se esistono delle lavorazioni allora abilito il pulsante per procedere
+         If Not bExistsMachining Then
+            NextBtn.IsEnabled = Not m_SplitPage.m_bOnAuxTab
+         Else
+            NextBtn.IsEnabled = True
+         End If
+
       End If
    End Sub
 
+   ' esco dalla pagina di scarico
    Private Sub MoveRawPartPage_Unloaded(sender As Object, e As EventArgs) Handles Me.Unloaded
       ' verifico che la fase corrente non sia vuota
       Dim nLastDispId As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
-      If EgtIsOperationEmpty(nLastDispId) And m_SplitPage.m_bOnAuxTab And m_RawMoveDataList.Count = 0 Then
-         EgtErase(nLastDispId)
-      End If
+
+      '' se sono in visualizzazione allora non elimino essuna operazione
+      'If Not m_SplitPage.m_bShow Then
+      '   If EgtIsOperationEmpty(nLastDispId) And Not m_SplitPage.m_bOnAuxTab And m_RawMoveDataList.Count = 0 Then
+      '      EgtErase(nLastDispId)
+      '   ElseIf EgtIsOperationEmpty(nLastDispId) And m_SplitPage.m_bOnAuxTab And m_RawMoveDataList.Count = 0 Then
+      '      ' Dichiaro pagina non attiva
+      '      m_bActive = False
+      '      Return
+      '   End If
+      'End If
 
       ' Se movimento con ventose
       If Not m_bByHand Then
@@ -1260,8 +1466,9 @@ Public Class MoveRawPartPage
             SaveMoveInfoInDisposition(nDispId, m_RawMoveDataList)
             ' imposto eventuale presenza rimozioni manuali
             SaveRemoveByHandInDisposition(nDispId, m_bRemovedRaw)
-            ' imposto eventuale movimento pezzi su tavola ausiliaria
-            SaveMovePartsOnAuxTable(nDispId, m_SplitPage.m_bOnAuxTab)
+            ' imposto eventuale movimento pezzi su tavola ausiliaria (se è realmente avvenuto)
+            'SaveMovePartsOnAuxTable(nDispId, m_SplitPage.m_bOnAuxTab)            
+            SaveMovePartsOnAuxTable(nDispId, m_IsCurrPhaseUnloaded)
             ' Eseguo calcolo speciale dei movimenti
             SpecialApplyDisposition(nDispId, True, Not m_SplitPage.m_bOnAuxTab)
          End If
@@ -1277,13 +1484,18 @@ Public Class MoveRawPartPage
             SpecialApplyDisposition(nDispId, True)
          End If
       End If
+
       ' Nascondo eventuale tavola ausiliaria
       If m_SplitPage.m_bOnAuxTab Then
          EgtDisableModified()
          EgtSetStatus(m_nAuxTabId, GDB_ST.OFF)
          EgtEnableModified()
-         EgtZoom(ZM.ALL, False)
-         If Not m_bPrev Then
+         ' se sto uscendo dalla pagina delle spezzature
+         If Not m_bPrev And Not m_bToNext Then
+            Dim nDispId As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
+            ' se sto uscendo dalla pagina split (senza passare dal comando next) 
+            Dim lclLstUnlPart As New List(Of Integer)
+            SaveMovePartsOnAuxTable(nDispId, PartOnAuxTab(lclLstUnlPart, m_nCurrPhase))
             ' Cancello eventuale manipolatore pezzi
             EgtDisableModified()
             RemoveVacuumCups()
@@ -1300,10 +1512,30 @@ Public Class MoveRawPartPage
          m_bPrev = False
          m_SplitPage.m_bShow = True
       End If
+
+      Dim Ph As Integer = EgtGetCurrPhase()
+      ' aggiorno il disegno
+      EgtZoom(ZM.ALL, False)
       ' Dichiaro pagina non attiva
       m_bActive = False
    End Sub
 
+   ' ----------------- TEST funzione per debug operazioni  -----------------
+   Private Sub SaveMyFileTest(sFilename As String)
+      LoadCurrPhaseMachining()
+      ' salvo il file corrente per poterlo studiare e capire cosa è successo nella rappresentazione dei grezzi
+      EgtSaveFile("C:\EgtData\OmagCUT\MyProjects\" & sFilename & ".nge", NGE.BIN)
+   End Sub
+
+   Private Sub LoadCurrPhaseMachining()
+      Dim m_MachiningList As New List(Of SplitMach)
+      'm_SplitPage.ShowMachiningList()
+      'm_SplitPage.SaveOrderMachinig(m_nCurrPhase)
+      ' Preparo la lista delle lavorazioni
+      CalculateSplitMachList(m_nCurrPhase, m_MachiningList)
+      Dim b As Boolean = False
+   End Sub
+
 End Class
 
 

CadCuts/SplitAuto.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.Windows.Forms.Integration
+Imports EgtUILib
 
 Public Module SplitAuto
 
@@ -132,7 +133,7 @@ Public Module SplitAuto
                      Mach.m_bStartAll = False
                      Mach.m_bEndAll = False
                   End If
-               ' Waterjet
+                  ' Waterjet
                ElseIf Mach.m_nType = MCH_OY.WATERJETTING Then
                   Mach.m_nInterf = FMI_TYPE.NONE
                   ' recupero l'angolo di fianco
@@ -141,7 +142,7 @@ Public Module SplitAuto
                   Mach.m_bCanEndAll = False
                   Mach.m_bStartAll = False
                   Mach.m_bEndAll = False
-               ' Forature e fresature
+                  ' Forature e fresature
                Else
                   Mach.m_nInterf = FMI_TYPE.NONE
                   Mach.m_dSideAng = 0
@@ -156,7 +157,7 @@ Public Module SplitAuto
                Mach.m_bPause = GetPause(nOperId)
                ' inserisco in lista
                MachSplitList.Add(Mach)
-            ' altrimenti la disattivo
+               ' altrimenti la disattivo
             Else
                EgtSetOperationMode(nOperId, False)
             End If
@@ -194,7 +195,7 @@ Public Module SplitAuto
 
    Private Sub ColorSingleMachining(nOperId As Integer, sLay As String, dSideAng As Double, bEnabled As Boolean, nInterf As Integer)
       ' Verifico se è un taglio da sopra o da sotto
-      Dim bOnMach As Boolean = (sLay = NAME_ONPATH Or ( sLay = NAME_INLOOP AndAlso EgtExistsInfo( nOperId, INFO_FILOTOP)))
+      Dim bOnMach As Boolean = (sLay = NAME_ONPATH Or (sLay = NAME_INLOOP AndAlso EgtExistsInfo(nOperId, INFO_FILOTOP)))
       Dim bDrip As Boolean = (sLay = NAME_DRIPCUT Or sLay = NAME_UNDERDRILL)
       ' Recupero il preview della lavorazione
       Dim nPvId As Integer = GDB_ID.NULL
@@ -219,11 +220,11 @@ Public Module SplitAuto
             Next
             EgtSetColor(nDwnCutId, COL_MCH_DISABLED)
             Dim bFreeStart As Boolean = (nInterf And FMI_TYPE.LI) <> FMI_TYPE.LI
-            EgtSetColor(nPrcId, If(bFreeStart, COL_MCH_DISABLED, COL_MCH_DIS_INTERF))
-            EgtSetColor(nDwnPrcId, If(bFreeStart, COL_MCH_DISABLED, COL_MCH_DIS_INTERF))
+            EgtSetColor(nPrcId, If(bFreeStart, COL_MCH_DISABLED(), COL_MCH_DIS_INTERF()))
+            EgtSetColor(nDwnPrcId, If(bFreeStart, COL_MCH_DISABLED(), COL_MCH_DIS_INTERF()))
             Dim bFreeEnd As Boolean = (nInterf And FMI_TYPE.LO) <> FMI_TYPE.LO
-            EgtSetColor(nPocId, If(bFreeEnd, COL_MCH_DISABLED, COL_MCH_DIS_INTERF))
-            EgtSetColor(nDwnPocId, If(bFreeEnd, COL_MCH_DISABLED, COL_MCH_DIS_INTERF))
+            EgtSetColor(nPocId, If(bFreeEnd, COL_MCH_DISABLED(), COL_MCH_DIS_INTERF()))
+            EgtSetColor(nDwnPocId, If(bFreeEnd, COL_MCH_DISABLED(), COL_MCH_DIS_INTERF()))
          Else
             Dim colCut As Color3d
             If bOnMach Then
@@ -342,6 +343,7 @@ Public Module SplitAuto
       Dim ptOri As Point3d
       EgtGetTableRef(1, ptOri)
       Dim vtOri As New Vector3d(ptOri.x, ptOri.y, ptOri.z)
+      ' ---------------------------------- GREZZI ----------------------------------
       ' Eseguo eventuali spezzature dei grezzi e vi sposto i pezzi (i grezzi devono essere sempre copiati per Registrazione con rotazione)
       Dim nRawId As Integer = EgtGetFirstRawPart()
       While nRawId <> GDB_ID.NULL
@@ -393,10 +395,19 @@ Public Module SplitAuto
          ' passo al successivo grezzo
          nRawId = EgtGetNextRawPart(nRawId)
       End While
+      ' ---------------------------------- GREZZI ----------------------------------
       ' Cancello preview dei tagli allungati dalla lavorazione
       For Each nCut As Integer In vCuts
          RemoveMachiningPreview(nCut)
       Next
+      ' ---------------------------------- LAVORAZIONI ----------------------------------
+      ChangeOperationPhase(nNewPhase)
+      ' ---------------------------------- LAVORAZIONI ----------------------------------
+      Return True
+   End Function
+
+   ' Sposta le lavorzioni della fase precedente a quella indicata
+   Friend Sub ChangeOperationPhase_ERR(nNewPhase As Integer)
       ' Sposto tutte le lavorazioni disabilitate e le eventuali inglobate nella nuova fase
       Dim nId = EgtGetFirstOperation()
       While nId <> GDB_ID.NULL
@@ -417,9 +428,50 @@ Public Module SplitAuto
          End If
          nId = nNextId
       End While
-      Return True
-   End Function
+   End Sub
 
+   ' Miglioramento della gestione delle lavorazioni
+   Friend Sub ChangeOperationPhase(nNewPhase As Integer)
+      ' creo l'elenco delle lavorazioni che devono essere sposate
+      Dim MchList As New List(Of Integer)
+      ' Recupero le lavorazioni disabilitate e le eventuali inglobate nella nuova fase
+      Dim nId = EgtGetFirstOperation()
+      While nId <> GDB_ID.NULL
+         Dim nNextId = EgtGetNextOperation(nId)
+         If IsValidMachining(nId) And EgtGetOperationPhase(nId) = nNewPhase - 1 And EgtExistsInfo(nId, INFO_MCH_USER_OFF) Then
+            ' Provo ad inserire la lavorazione nell'elenco
+            AddMach(MchList, nId)
+            ' sposto le inglobate
+            Dim sInfo As String = String.Empty
+            If EgtGetInfo(nId, INFO_MCH_OTHMID, sInfo) Then
+               Dim sItems() As String = sInfo.Split(",".ToCharArray)
+               For Each sId2 As String In sItems
+                  Dim nId2 As Integer = 0
+                  StringToInt(sId2, nId2)
+                  If nId2 > 0 Then
+                     ' Provo ad inserire la lavorazione nell'elenco
+                     AddMach(MchList, nId2)
+                  End If
+               Next
+            End If
+         End If
+         nId = nNextId
+      End While
+      ' Procedo ora a spostare le lavorazioni nella nuova disposizione
+      For Each ItemMchId As Integer In MchList
+         EgtChangeOperationPhase(ItemMchId, nNewPhase)
+      Next
+   End Sub
+
+   ' Inserisce gli inidici delle lavorazioni evitando di inserire dei doppioni
+   Private Sub AddMach(MchList As List(Of Integer), IdMch As Integer)
+      For Each Item As Integer In MchList
+         If IdMch = Item Then
+            Return
+         End If
+      Next
+      MchList.Add(IdMch)
+   End Sub
    '-----------------------------------------------------------------------------------------------
    Friend Function CalculateSplitAuto() As Boolean
       ' Fase iniziale

CadCuts/SplitPageUC.xaml.vb

@@ -13,7 +13,7 @@ Public Class SplitPageUC
    ' Tipo movimento dei grezzi (manuale o con testa ventosa)
    Private m_bByHand As Boolean = True
    ' Abilitazione movimento finale pezzi su tavola ausiliaria
-   Private m_bEnableOnAuxTab As Boolean = False
+   Friend m_bEnableOnAuxTab As Boolean = False
    ' Stato
    Private m_nCurrPhase As Integer = 0
    Private m_MachiningList As New List(Of SplitMach)
@@ -49,6 +49,7 @@ Public Class SplitPageUC
    Private m_bModified As Boolean = False
    Private m_nNbrGrpId As Integer = GDB_ID.NULL
    Private m_bToNext As Boolean = False
+   Private m_bToPrev As Boolean = False
    Friend m_bOnAuxTab As Boolean = False
    ' Drag
    Private m_nDragInd As Integer = -1
@@ -167,6 +168,7 @@ Public Class SplitPageUC
       m_bModified = False
       ' Reset flag tipo uscita
       m_bToNext = False
+      m_bToPrev = False
       ' Abilitazione bottoni
       EnableButtons()
       ' Se sola visualizzazione, segnalazione di eventuale fase di restart
@@ -180,7 +182,8 @@ Public Class SplitPageUC
       End If
    End Sub
 
-   Private Sub ShowMachiningList()
+   ' preparo la lista delle lavorazioni da mostrare in interfaccia
+   Public Sub ShowMachiningList()
       m_ItemList.Clear()
       For i As Integer = 1 To m_MachiningList.Count()
          Dim Mach As SplitMach = m_MachiningList(i - 1)
@@ -710,30 +713,8 @@ Public Class SplitPageUC
          MoveUpBtn.IsEnabled = False
          MoveDownBtn.IsEnabled = False
       End If
-
+      ' Recupero la selezione dei tagli correnti
       GetCurrSelection()
-
-      '' verifico che siano contigui
-      'Dim bContigus As Boolean = False
-      'Dim OrdIndex = 0
-      'OrdIndex = MachiningLsBx.SelectedItems(MachiningLsBx.SelectedItems.Count - 1).Ind
-      '' recupero l'indice dell'ultimo elemento selezionato
-      'Dim LastSel As NameIdLsBxItem = MachiningLsBx.SelectedItems(MachiningLsBx.SelectedItems.Count - 1)
-      'If MachiningLsBx.SelectedItems.Count = 1 Then
-      '   bContigus = True
-      'Else
-      '   For Each Item As NameIdLsBxItem In ItemList
-      '      If Item.Ind = LastSel.Ind + 1 Or Item.Ind = LastSel.Ind - 1 Then
-      '         bContigus = True
-      '      End If
-      '   Next
-      'End If
-      '' se non contiguo, elimino dai selezionati il primo(che è l'ultimo ad essere stato selezionato)
-      'If Not bContigus Then
-      '   ItemList.Remove(LastSel)
-      '   MachiningLsBx.SelectedItems.RemoveAt(MachiningLsBx.SelectedItems.Count - 1)
-      'End If
-
       ' resetto marcatura lavorazioni
       If m_CurrFirstInd > -1 Then
          For Index As Integer = m_CurrFirstInd To m_CurrLastInd
@@ -827,6 +808,8 @@ Public Class SplitPageUC
       Next
 
       VerifyHomogenousMachining(ItemList)
+      ' Abilitazione bottone Next
+      EnableButtons()
    End Sub
 
    Private Sub AllOnBtn_Click(sender As Object, e As RoutedEventArgs) Handles AllOnBtn.Click
@@ -1780,15 +1763,26 @@ Public Class SplitPageUC
    Private Sub PrevBtn_Click(sender As Object, e As RoutedEventArgs) Handles PrevBtn.Click
       ' Dichiaro solo visualizzazione
       m_bShow = True
-      ' Esco 
-      ExitSplit(False)
+      '' Esco 
+      'ExitSplit(False)
       ' Torno alla fase precedente
-      EgtSetCurrPhase(EgtGetCurrPhase() - 1)
+      Dim nCurrPhase As Integer = EgtGetCurrPhase()
+      ' se questa è la prima fase, non possono tornare più indietro di così
+      If nCurrPhase = 1 Then
+         Return
+      End If
+      EgtSetCurrPhase(nCurrPhase - 1)
+      m_bToPrev = True
       ' Reimposto la precedente
-      SplitPageUC_Loaded(Nothing, Nothing)
+      'SplitPageUC_Loaded(Nothing, Nothing)
+      ' torno alla disposizione della fase corrente
+      m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Remove(m_MainWindow.m_CadCutPageUC.m_SplitPage)
+      m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Add(m_MainWindow.m_CadCutPageUC.m_MoveRawPartPage)
+      m_MainWindow.m_CadCutPageUC.m_CadCutMode = CadCutPageUC.CadCutModes.MoveRawPart
    End Sub
 
    Private Sub NextBtn_Click(sender As Object, e As RoutedEventArgs) Handles NextBtn.Click
+      ' ------- VISUALIZZAZIONE -------
       If m_bShow Then
          Dim CurrDisposition As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
          ' recupero l'operazione successiva
@@ -1910,7 +1904,7 @@ Public Class SplitPageUC
    Private Sub SplitPageUC_Unloaded(sender As Object, e As EventArgs) Handles Me.Unloaded
       m_bActive = False
       m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
-      ExitSplit(Not m_bToNext)
+      ExitSplit(Not m_bToNext And Not m_bToPrev)
       EgtDraw()
    End Sub
 
@@ -1929,22 +1923,7 @@ Public Class SplitPageUC
       EgtEnableModified()
       ' se modificato salvo ordine e stato delle lavorazioni
       If m_bModified Then
-         ' Al primo posto deve rimanere la disposizione della fase
-         Dim nFirstOperId As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
-         For i As Integer = m_ItemList.Count() - 1 To 0 Step -1
-            Dim nI As Integer = m_ItemList(i).Ind
-            Dim nMchId As Integer = m_MachiningList(nI).m_nId
-            EgtRelocate(nMchId, nFirstOperId, GDB_POS.AFTER)
-            If m_MachiningList(nI).m_bEnabled Then
-               EgtSetOperationMode(m_MachiningList(nI).m_nId, True)
-               EgtRemoveInfo(m_MachiningList(nI).m_nId, INFO_MCH_USER_OFF)
-            Else
-               EgtSetOperationMode(m_MachiningList(nI).m_nId, False)
-               EgtSetInfo(m_MachiningList(nI).m_nId, INFO_MCH_USER_OFF, True)
-            End If
-         Next
-         ' dichiaro ordine salvato
-         m_MainWindow.m_CurrentProjectPageUC.SetOrderMachiningFlag()
+         SaveOrderMachinig(m_nCurrPhase)
       End If
       ' Affondamento ridotto
       Dim dReducedDepth As Double = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_REDUCEDDEPTH, 1, m_MainWindow.GetMachIniFile())
@@ -1968,6 +1947,25 @@ Public Class SplitPageUC
       End If
    End Sub
 
+   Friend Sub SaveOrderMachinig(CurrPhase As Integer)
+      ' Al primo posto deve rimanere la disposizione della fase
+      Dim nFirstOperId As Integer = EgtGetPhaseDisposition(CurrPhase)
+      For i As Integer = m_ItemList.Count() - 1 To 0 Step -1
+         Dim nI As Integer = m_ItemList(i).Ind
+         Dim nMchId As Integer = m_MachiningList(nI).m_nId
+         EgtRelocate(nMchId, nFirstOperId, GDB_POS.AFTER)
+         If m_MachiningList(nI).m_bEnabled Then
+            EgtSetOperationMode(m_MachiningList(nI).m_nId, True)
+            EgtRemoveInfo(m_MachiningList(nI).m_nId, INFO_MCH_USER_OFF)
+         Else
+            EgtSetOperationMode(m_MachiningList(nI).m_nId, False)
+            EgtSetInfo(m_MachiningList(nI).m_nId, INFO_MCH_USER_OFF, True)
+         End If
+      Next
+      ' dichiaro ordine salvato
+      m_MainWindow.m_CurrentProjectPageUC.SetOrderMachiningFlag()
+   End Sub
+
    Friend Function GetDisabledCutsCount() As Integer
       ' Determino il numero di tagli disabilitati
       Dim nCount As Integer = 0
@@ -2032,7 +2030,7 @@ Public Class SplitPageUC
                NextBtn.IsEnabled = (GetDisabledCutsCount() > 0 And GetSplitCutsCount() = 1)
                ' Altrimenti
             Else
-               ' movimento standard sulla tavola (almeno un taglio disabilitato)
+               ' movimento standard sulla tavola (almeno un taglio disabilitato allora False)
                Dim bStdTab As Boolean = (GetDisabledCutsCount() > 0)
                ' movimento su tavola di scarico
                m_bOnAuxTab = Not bStdTab AndAlso (m_nCurrPhase = EgtGetPhaseCount() And m_bEnableOnAuxTab)

Constants/ConstIni.vb

@@ -116,8 +116,6 @@ Module ConstIni
    Public Const K_LASTCOLOR As String = "LastColor"
    Public Const K_COLOR As String = "Color"
 
-   Public Const S_FRAMECOMPO As String = "FrameCompo"
-
    Public Const S_EXTCOMPO As String = "Compo"
 
    Public Const S_INTCOMPO As String = "InternalCompo"
@@ -225,12 +223,6 @@ Module ConstIni
    Public Const K_RAWOFFSX As String = "OffsX"
    Public Const K_RAWOFFSY As String = "OffsY"
    Public Const K_RAWKERF As String = "Kerf"
-   Public Const K_ENABLEOTHERREFTAB As String = "EnableOtherRefTab"
-   Public Const K_OTHERREFTAB As String = "OtherRefTab"
-   Public Const K_OTHERREFTABX As String = "OtherRefTabX"
-   Public Const K_OTHERREFTABY As String = "OtherRefTabY"
-   Public Const K_OTHERREFTABPOS As String = "OtherRefTabPos"
-
 
    Public Const S_RAWMOVE As String = "RawMove"
    Public Const K_RAWSTEP As String = "Step"

DirectCuts/ControlsMachineButtonUC.xaml.vb

@@ -683,17 +683,6 @@ Public MustInherit Class MachineButton
       End If
       EgtLuaSetGlobNumVar("CMD.S", dSpeed)
 
-      ' versione 2.5e1
-      EgtTdbSetCurrTool(m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text)
-      Dim sToolPos As String = String.Empty
-      If EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sToolPos) Then
-         EgtLuaGetGlobStringVar("CMD.TCPOS", sToolPos)
-      End If
-      Dim dToolDiam As Double = 0
-      If EgtTdbGetCurrToolParam(MCH_TP.DIAM, dToolDiam) Then
-         EgtLuaSetGlobNumVar("CMD.DIAM", dToolDiam * 1000)
-      End If
-
       Dim dL1, dL2, dL3, dR1, dR2 As Double
       m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2)
       EgtLuaSetGlobNumVar("CMD.L1", dL1)

DirectCuts/FlatteningCut.xaml.vb

@@ -186,10 +186,7 @@ Public Class FlatteningCut
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_MACHTYPE, m_nMachType.ToString(), m_MainWindow.GetIniFile())
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_ROTLOCK, If( m_bRotLock, "1", "0"), m_MainWindow.GetIniFile())
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_POSX, DoubleToString( m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_POSY, DoubleToString(m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
-      ' imposto la Z di sicurezza corretta
-      EgtMdbSetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
-      EgtMdbSave()
+      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_POSY, DoubleToString( m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare

DirectCuts/MachineButtonsUC.xaml.vb

@@ -380,17 +380,6 @@ Public Class MachineButtonsUC
          EgtTdbGetCurrToolParam(MCH_TP.SPEED, dSpeed)
       End If
       EgtLuaSetGlobNumVar("CMD.S", dSpeed)
-      ' versione 2.5e1
-      EgtTdbSetCurrTool(m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text)
-      Dim sToolPos As String = String.Empty
-      If EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sToolPos) Then
-         EgtLuaGetGlobStringVar("CMD.TCPOS", sToolPos)
-      End If
-      Dim dToolDiam As Double = 0
-      If EgtTdbGetCurrToolParam(MCH_TP.DIAM, dToolDiam) Then
-         EgtLuaSetGlobNumVar("CMD.DIAM", dToolDiam * 1000)
-      End If
-
       Dim dL1, dL2, dL3, dR1, dR2 As Double
       m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2)
       EgtLuaSetGlobNumVar("CMD.L1", dL1)

DrawImport/CompoDimensionUC.xaml.vb

@@ -37,7 +37,7 @@ Public Class CompoDimensionUC
       InternComponentBtn.Content = EgtMsg(MSG_COMPONENTPAGEUC + 47)     ' Componenti interni
       If Not String.IsNullOrEmpty(sCompoDir) Then
          bEnableAlzFront = True
-         AlzFrontBtn.Content = EgtMsg(91137)
+         AlzFrontBtn.Content = "Alzatine & Frontalini"
       Else
          AlzFrontBtn.Visibility = Visibility.Collapsed
       End If
@@ -107,10 +107,8 @@ Public Class CompoDimensionUC
    Friend Sub ShowAlzFrontBtn(ByVal value As Boolean)
       If value Then
          AlzFrontBtn.Visibility = Visibility.Visible
-         m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Visibility.Hidden
       Else
          AlzFrontBtn.Visibility = Visibility.Hidden
-         m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Visibility.Visible
       End If
    End Sub
 

DrawImport/DrawPageUC.xaml.vb

@@ -283,19 +283,6 @@ Public Class DrawPageUC
       m_sCsvOrder = ""
       m_sCsvList = ""
       m_sCsvName = ""
-
-      ' Visuliazzazione dei bottoni per modifica dei componenti
-      If m_MainWindow.FrameCutBtn.IsChecked Then
-         SideAngleBtn.Visibility = Visibility.Hidden
-         FiloTopBtn.Visibility = Visibility.Hidden
-         EngraveBtn.Visibility = Visibility.Hidden
-         DripCutBtn.Visibility = Visibility.Hidden
-      Else
-         SideAngleBtn.Visibility = Visibility.Visible
-         FiloTopBtn.Visibility = Visibility.Visible
-         EngraveBtn.Visibility = Visibility.Visible
-         DripCutBtn.Visibility = Visibility.Visible
-      End If
    End Sub
 
    ' recupero il click sulla scena ed assegno il metodo a secondo della pagina aperta
@@ -566,7 +553,6 @@ Public Class DrawPageUC
       OkBtn.IsEnabled = True
    End Sub
 
-   ' Navigazione nelle due pagine per la selezione dei componenti da disegnare
    Friend Sub BackBtn_Click(sender As Object, e As RoutedEventArgs) Handles BackBtn.Click
       m_SceneButtons.MeasureBtn.IsChecked = False
       DrawPage_Unloaded(sender, e)
@@ -618,10 +604,6 @@ Public Class DrawPageUC
       MakePreview(sMsg)
       MessageTxBl.Text = sMsg
       MessageGrid.Background = If(m_bDrawOk, Brushes.Transparent, Application.Current.FindResource("OmagCut_Red"))
-
-      ' EseguoUpdate del solido
-      Utility.CreateSolid3D(m_MainWindow.GetIniFile())
-
       ' aggiorno visualizzazione
       EgtSetView(VT.TOP, False)
       EgtZoom(ZM.ALL)
@@ -631,8 +613,7 @@ Public Class DrawPageUC
       ' Costruisco path completa del componente
       Dim sPath = m_sCompoDir & "\" & m_sCompoName
       ' Carico il file
-      Dim bOk As Boolean = EgtLuaExecFile(sPath)
-      Return bOk
+      Return EgtLuaExecFile(sPath)
    End Function
 
    Private Function ReadAndShowVariables() As Boolean
@@ -1143,30 +1124,6 @@ Public Class DrawPageUC
       Return True
    End Function
 
-   Private Function MakeSectionFrameInsert() As Boolean
-      ' m_MainWindow.m_ImportPageUC.LoadFrame()
-      ' recupero il primo layer del primo pezzo
-      Dim nLayerId As Integer = EgtGetFirstLayer(EgtGetFirstPart())
-      If nLayerId = GDB_ID.NULL Then Return False
-      ' percorso in cui salvare tempora
-      Dim sTmpFile As String = m_MainWindow.GetTempDir() & "\Frame.Nge"
-      If Not EgtSaveObjToFile(nLayerId, sTmpFile, NGE.BIN) Then Return False
-      ' Passo al contesto principale
-      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-      ' Inserisco il pezzo
-      If Not My.Computer.FileSystem.FileExists(sTmpFile) Then Return False
-      EgtInsertFile(sTmpFile)
-      ' Ne recupero l'Id
-      Dim nPartId As Integer = EgtGetLastPart()
-      ' Creo la cornice
-      m_MainWindow.m_FrameCutPageUC.CreateFrame(nPartId)
-      ' Ricalcolo lavorazioni
-      AddFrameMachinings(m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dStartTrim, m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dEndTrim)
-      ' Cancello il file
-      My.Computer.FileSystem.DeleteFile(sTmpFile)
-      Return True
-   End Function
-
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
       m_bBackFromInternalCompo = False
       m_bInternalCompo = False
@@ -1182,12 +1139,7 @@ Public Class DrawPageUC
       Dim InsNbr As Integer = Int32.Parse(PartNumTxBx.Text)
       ' Passo al contesto principale
       'MakeInsert(InsNbr, sPartName)
-      If m_MainWindow.FrameCutBtn.IsChecked Then
-         MakeSectionFrameInsert()
-      Else
-         MakeMultipleInsert(InsNbr, sPartName)
-      End If
-
+      MakeMultipleInsert(InsNbr, sPartName)
       ' Aggiorno ambiente principale
       EgtZoom(ZM.ALL)
       ' Elimino nome del componente precedente
@@ -1201,7 +1153,7 @@ Public Class DrawPageUC
       ' Istruzioni per chiudere ImportPageUC e aprire CadCutPageUC
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_DrawPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
-      m_MainWindow.m_ActivePage = If(m_MainWindow.FrameCutBtn.IsChecked, MainWindow.Pages.FrameCut, MainWindow.Pages.CadCut)
+      m_MainWindow.m_ActivePage = MainWindow.Pages.CadCut
 
    End Sub
 
@@ -1222,7 +1174,7 @@ Public Class DrawPageUC
       ' Istruzioni per chiudere ImportPageUC e aprire CadCutPageUC
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_DrawPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
-      m_MainWindow.m_ActivePage = If(m_MainWindow.FrameCutBtn.IsChecked, MainWindow.Pages.FrameCut, MainWindow.Pages.CadCut)
+      m_MainWindow.m_ActivePage = MainWindow.Pages.CadCut
    End Sub
 
    Private Sub TrfDataBtn_Click(sender As Object, e As RoutedEventArgs) Handles TrfDataBtn.Click

DrawImport/FiloTopUC.xaml.vb

@@ -1,5 +1,4 @@
 Imports EgtUILib
-Imports EgtWPFLib5
 
 Public Class FiloTopUC
 
@@ -39,18 +38,17 @@ Public Class FiloTopUC
       m_CallingPage = m_MainWindow.m_ActivePage
 
       ' Imposto messaggi
-      ParameterTxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 10)       ' Offset
-      Parameter2TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11)      ' Affondamento
-      Parameter3TxBl.Text = EgtMsg(91138)
+      ParameterTxBl.Text = EgtMsg( MSG_IMPORTPAGEUC + 10)       ' Offset
+      Parameter2TxBl.Text = EgtMsg( MSG_IMPORTPAGEUC + 11)      ' Affondamento
 
       If m_CallingPage = MainWindow.Pages.Draw Then
          ' Imposto questa come pagina correntemente visualizzata nella drawpage
          m_MainWindow.m_DrawPageUC.m_ActiveComponentPage = DrawPageUC.Pages.FiloTop
          ' Imposto contesto corrente
-         EgtSetCurrentContext(m_MainWindow.m_DrawPageUC.DrawScene.GetCtx())
+         EgtSetCurrentContext( m_MainWindow.m_DrawPageUC.DrawScene.GetCtx())
       ElseIf m_CallingPage = MainWindow.Pages.Import Then
          ' Imposto contesto corrente
-         EgtSetCurrentContext(m_MainWindow.m_ImportPageUC.ImportScene.GetCtx())
+         EgtSetCurrentContext( m_MainWindow.m_ImportPageUC.ImportScene.GetCtx())
       End If
 
       ' Gestisco visualizzazione dei parametri
@@ -59,9 +57,9 @@ Public Class FiloTopUC
       Parameter3TxBl.Visibility = Windows.Visibility.Visible
 
       ' Aggiorno valori
-      m_dFiloTopOffset = GetPrivateProfileDouble(S_SIDES, K_FILOTOPOFFSET, 5, m_MainWindow.GetIniFile())
-      ParameterTxBx.Text = LenToString(m_dFiloTopOffset, 3)
-      m_dFiloTopDepth = GetPrivateProfileDouble(S_SIDES, K_FILOTOPDEPTH, 5, m_MainWindow.GetIniFile())
+      m_dFiloTopOffset = GetPrivateProfileDouble( S_SIDES, K_FILOTOPOFFSET, 5, m_MainWindow.GetIniFile())
+      ParameterTxBx.Text = LenToString( m_dFiloTopOffset, 3)
+      m_dFiloTopDepth = GetPrivateProfileDouble( S_SIDES, K_FILOTOPDEPTH, 5, m_MainWindow.GetIniFile())
       Parameter2TxBx.Text = LenToString(m_dFiloTopDepth, 3)
       m_bCornerradius = GetPrivateProfileInt(S_SIDES, K_ROUNDOFF, 0, m_MainWindow.GetIniFile()) <> 0
       Parameter3ChBx.IsChecked = m_bCornerradius
@@ -82,8 +80,8 @@ Public Class FiloTopUC
          Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
          While nLayId <> GDB_ID.NULL
             Dim sLayName As String = ""
-            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) Then
-               EgtSetInfo(nLayId, INFO_OFFSET, m_dFiloTopOffset)
+            If EgtGetName( nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo( nLayId, INFO_FILOTOP) Then
+               EgtSetInfo( nLayId, INFO_OFFSET, m_dFiloTopOffset)
             End If
             nLayId = EgtGetNextLayer(nLayId)
          End While
@@ -103,16 +101,13 @@ Public Class FiloTopUC
          Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
          While nLayId <> GDB_ID.NULL
             Dim sLayName As String = ""
-            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) Then
-               EgtSetInfo(nLayId, INFO_DEPTH, m_dFiloTopDepth)
+            If EgtGetName( nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo( nLayId, INFO_FILOTOP) Then
+               EgtSetInfo( nLayId, INFO_DEPTH, m_dFiloTopDepth)
             End If
             nLayId = EgtGetNextLayer(nLayId)
          End While
          nPartId = EgtGetNextPart(nPartId)
       End While
-
-      Utility.CreateSolid3D(m_MainWindow.GetIniFile())
-      EgtDraw()
    End Sub
 
    Private Sub Parameter3ChBx_Checked() Handles Parameter3ChBx.Click
@@ -220,16 +215,12 @@ Public Class FiloTopUC
                   EgtRemoveInfo(nLayId, "FiloTopRef")
                   EgtOutLog("Error in generation OffsetPreView in TopEgde ")
                End If
-
-               If bOk Then Utility.CreateSolid3D(m_MainWindow.GetIniFile())
-
                ' ---------------------- Fine GESTIONE PREVIEW percorso -------------------------------
             End If
-            nLayId = EgtGetNextLayer(nLayId)
+               nLayId = EgtGetNextLayer(nLayId)
          End While
          nPartId = EgtGetNextPart(nPartId)
       End While
-
       EgtDraw()
    End Sub
 

DrawImport/MainComponentPageUC.xaml.vb

@@ -41,7 +41,6 @@ Public Class MainComponentPageUC
       m_MainWindow.m_DrawPageUC.FiloTopBtn.IsEnabled = False
       m_MainWindow.m_DrawPageUC.EngraveBtn.IsEnabled = False
       m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = False
-      m_MainWindow.m_DrawPageUC.m_bBackFromInternalCompo = False
    End Sub
 
    Private Function GetButton(ByVal nInd As Integer) As Button
@@ -168,7 +167,7 @@ Public Class MainComponentPageUC
 
    Private Sub Compo_Click(sender As Object, e As RoutedEventArgs) Handles Compo1.Click, Compo2.Click, Compo3.Click, Compo4.Click, Compo5.Click, Compo6.Click, Compo7.Click, Compo8.Click
       CurrentBtn = DirectCast(e.Source, Button)
-      Dim CompoName As String = If(m_MainWindow.FrameCutBtn.IsChecked, S_FRAMECOMPO, S_COMPO) & GetIndexFromButton(CurrentBtn).ToString
+      Dim CompoName As String = S_COMPO & GetIndexFromButton(CurrentBtn).ToString
       m_sCurrCompoFam = CompoName
       m_SecondaryComponentPage.m_sCurrCompo = String.Empty
       Dim nCount As Integer = GetPrivateProfileInt(CompoName, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
@@ -252,18 +251,13 @@ Public Class MainComponentPageUC
    End Sub
 
    Private Sub LoadPage()
-      If m_MainWindow.FrameCutBtn.IsChecked Then
-         LoadFramePage()
-         Return
-      End If
-
       Dim nDeltaSecondPage As Integer = 8
       ' Leggo numero di componenti presenti
       Dim nCompoNumber As Integer = GetPrivateProfileInt(S_COMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
       ' Calcolo indici a seconda della pagina in cui sono
       If m_bIsFirstPage Then
          ClearButton(nCompoNumber)
-         nDeltaSecondPage = 0
+      nDeltaSecondPage = 0
       Else
          ClearButton(nCompoNumber)
          nDeltaSecondPage = 8
@@ -331,86 +325,16 @@ Public Class MainComponentPageUC
 
    End Sub
 
-   Private Sub LoadFramePage()
-      Dim nDeltaSecondPage As Integer = 8
-      ' Leggo numero di componenti presenti
-      Dim nCompoNumber As Integer = GetPrivateProfileInt(S_FRAMECOMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
-      ' Calcolo indici a seconda della pagina in cui sono
-      If m_bIsFirstPage Then
-         ClearButton(nCompoNumber)
-         nDeltaSecondPage = 0
-      Else
-         ClearButton(nCompoNumber)
-         nDeltaSecondPage = 8
-      End If
-
-      ' Creazione converter da String a ImageSource
-      Dim ImageConverter As New ImageSourceConverter
-      Dim ThicknessConverter As New ThicknessConverter
-
-      'Assegnazione immagine e testo ai Button
-      For index As Integer = 1 To 8
-         Dim CustomThickness As New Thickness(0)
-         Dim nCompoName As Integer = GetPrivateProfileInt(S_FRAMECOMPO & index + nDeltaSecondPage, "Name", 0, m_MainWindow.GetIniFile())
-         Dim sCompoImage As String = ""
-         Dim sCompoImageSource As ImageSource
-
-         'verifico presenza immagine e la aggiungo
-         If GetPrivateProfileString(S_FRAMECOMPO & index + nDeltaSecondPage, "Image", "", sCompoImage, m_MainWindow.GetIniFile()) <> 0 Then
-            Try
-               sCompoImageSource = ImageConverter.ConvertFromString(m_MainWindow.GetResourcesDir() & "\" & sCompoImage)
-               GetImage(index).Height = 65
-               GetImage(index).Width = 65
-               GetImage(index).Source = sCompoImageSource
-            Catch ex As Exception
-               EgtOutLog("Error loading image " & sCompoImage)
-               sCompoImage = String.Empty
-               GetImage(index).Height = 0
-               GetImage(index).Width = 0
-               CustomThickness.Right = 0
-               GetImage(index).Margin = CustomThickness
-            End Try
-         Else
-            'Se non c'è l'immagine azzero la distanza tra testo e immagine
-            CustomThickness.Right = 0
-            GetImage(index).Margin = CustomThickness
-         End If
-
-         'verifico presenza testo
-         If nCompoName > 0 Then
-            Dim sCompoName As String = EgtMsg(MSG_COMPONENTPAGEUC + nCompoName)
-            'verifico presenza immagine
-            If sCompoImage.Length > 0 Then
-               'se la lunghezza del testo è maggiore di 15 lo taglio
-               If sCompoName.Length > 15 Then
-                  sCompoName = sCompoName.Substring(0, 15)
-               End If
-               GetLabel(index).Text = sCompoName
-               'Se ci sono sia testo che immagine imposto un margine di 10
-               CustomThickness.Right = 10
-               GetImage(index).Margin = CustomThickness
-            Else
-               'se l'immagine non c'è e il testo è maggiore di 20 lo taglio
-               If sCompoName.Length > 20 Then
-                  sCompoName = sCompoName.Substring(0, 20)
-               End If
-               GetLabel(index).Text = sCompoName
-            End If
-         Else
-            'Se non c'è testo azzero la distanza tra testo e immagine
-            CustomThickness.Right = 0
-            GetImage(index).Margin = CustomThickness
-         End If
-
-      Next
-
-   End Sub
-
    ' Gestione bottone altri componenti
    Private Sub Compo9_Click(sender As Object, e As RoutedEventArgs) Handles Compo9.Click
       If m_bIsFirstPage Then
          m_bIsFirstPage = False
          LoadPage()
+         'Compo9.SetValue(Grid.ColumnProperty, 1)
+         'Compo9.SetValue(Grid.ColumnSpanProperty, 1)
+         'ImageCompo9.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NumericKeyboardArrow.png", UriKind.Relative))
+         'ImageCompo9.Visibility = Windows.Visibility.Visible
+         'LabelCompo9.Visibility = Windows.Visibility.Hidden
          Compo9.SetValue(Grid.ColumnProperty, 0)
          Compo9.SetValue(Grid.ColumnSpanProperty, 2)
          ImageCompo9.Visibility = Windows.Visibility.Hidden

DrawImport/SideAngleUc.xaml.vb

@@ -171,25 +171,25 @@ Public Class SideAngleUC
 
       ' Aggiorno valori
       If m_Mode = ModeOpt.DRIP Then
-         m_dDripOffset = GetPrivateProfileDouble(S_SIDES, K_DRIPOFFSET, 20, m_MainWindow.GetIniFile())
-         m_dDripOffset2 = GetPrivateProfileDouble(S_SIDES, K_DRIPOFFSET2, 0, m_MainWindow.GetIniFile())
-         m_dDripDepth = GetPrivateProfileDouble(S_SIDES, K_DRIPDEPTH, 10, m_MainWindow.GetIniFile())
-         m_dDripShort = GetPrivateProfileDouble(S_SIDES, K_DRIPSHORT, 0, m_MainWindow.GetIniFile())
-         Parameter1TxBx.Text = LenToString(m_dDripOffset, 3)
-         Parameter2TxBx.Text = LenToString(m_dDripOffset2, 3)
-         Parameter3TxBx.Text = LenToString(m_dDripDepth, 3)
-         Parameter4TxBx.Text = LenToString(m_dDripShort, 3)
+         m_dDripOffset = GetPrivateProfileDouble( S_SIDES, K_DRIPOFFSET, 20, m_MainWindow.GetIniFile())
+         m_dDripOffset2 = GetPrivateProfileDouble( S_SIDES, K_DRIPOFFSET2, 0, m_MainWindow.GetIniFile())
+         m_dDripDepth = GetPrivateProfileDouble( S_SIDES, K_DRIPDEPTH, 10, m_MainWindow.GetIniFile())
+         m_dDripShort = GetPrivateProfileDouble( S_SIDES, K_DRIPSHORT, 0, m_MainWindow.GetIniFile())
+         Parameter1TxBx.Text = LenToString( m_dDripOffset, 3)
+         Parameter2TxBx.Text = LenToString( m_dDripOffset2, 3)
+         Parameter3TxBx.Text = LenToString( m_dDripDepth, 3)
+         Parameter4TxBx.Text = LenToString( m_dDripShort, 3)
       ElseIf m_Mode = ModeOpt.ENGRAVE Then
-         m_dDripOffset = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEOFFSET, 20, m_MainWindow.GetIniFile())
-         m_nEngrNbr2 = GetPrivateProfileInt(S_SIDES, K_ENGRAVENUMBER2, 1, m_MainWindow.GetIniFile())
-         m_dDripOffset2 = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEOFFSET2, 0, m_MainWindow.GetIniFile())
-         m_dDripDepth = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEDEPTH, 10, m_MainWindow.GetIniFile())
+         m_dDripOffset = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEOFFSET, 20, m_MainWindow.GetIniFile())
+         m_nEngrNbr2 = GetPrivateProfileInt( S_SIDES, K_ENGRAVENUMBER2, 1, m_MainWindow.GetIniFile())
+         m_dDripOffset2 = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEOFFSET2, 0, m_MainWindow.GetIniFile())
+         m_dDripDepth = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEDEPTH, 10, m_MainWindow.GetIniFile())
          m_dEngraveDepth2 = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEDEPTH2, 0, m_MainWindow.GetIniFile())
          m_dEngraveAngle = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEANGLE, 0, m_MainWindow.GetIniFile())
          Parameter1TxBx.Text = LenToString(m_dDripOffset, 3)
          Parameter2aTxBx.Text = m_nEngrNbr2.ToString()
-         Parameter2bTxBx.Text = LenToString(m_dDripOffset2, 3)
-         Parameter3TxBx.Text = LenToString(m_dDripDepth, 3)
+         Parameter2bTxBx.Text = LenToString( m_dDripOffset2, 3)
+         Parameter3TxBx.Text = LenToString( m_dDripDepth, 3)
          Parameter4TxBx.Text = LenToString(m_dEngraveDepth2, 3)
          Parameter5TxBx.Text = DoubleToString(m_dEngraveAngle, 3)
       End If
@@ -311,8 +311,8 @@ Public Class SideAngleUC
       ' Attualmente il vaore m_nCount è inizializzato ad "1"..
       ' Bottoni Prev Next
       If m_nCount <= MAX_LINES Then
-         PrevBtn.Visibility = Windows.Visibility.Hidden
-         NextBtn.Visibility = Windows.Visibility.Hidden
+         PrevBtn.Visibility= Windows.Visibility.Hidden
+         NextBtn.Visibility= Windows.Visibility.Hidden
       Else
          Grid.SetRow(PrevBtn, MAX_LINES - m_nShow)
          PrevBtn.Visibility = Windows.Visibility.Visible
@@ -371,7 +371,7 @@ Public Class SideAngleUC
                GetHeelTxBxFromIndex(Index).Text = GetPrivateProfileDouble(S_SIDES, K_DRIPSHORT & "A" & nI.ToString & "_End", 0, m_MainWindow.GetIniFile())
             End If
          End If
-         Dim TxBlIndex As Integer = (m_nCurrPage - 1) * MAX_LINES + nI - 1
+            Dim TxBlIndex As Integer = (m_nCurrPage - 1) * MAX_LINES + nI - 1
          GetTxBlFromIndex(Index).Text = If(m_Mode = ModeOpt.SIDEANGLE,
                                            m_SideAngleEntityList(TxBlIndex).sEntityName,
                                            m_DripEntityList(TxBlIndex).sEntityName)
@@ -495,15 +495,15 @@ Public Class SideAngleUC
    '-------------> Restituisce gli oggetto della grafica assegnato l'indice
 
    ' quando esco salvo nel file l'ultima configurazione per le incisioni
-   Private Sub SideAngleUC_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
+   Private Sub SideAngleUC_Unloaded( sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
       If m_CallingPage = MainWindow.Pages.Draw Then
          ' Ricavo nome pezzo
-         Dim PartId As Integer = EgtGetFirstInGroup(GDB_ID.ROOT)
+         Dim PartId As Integer = EgtGetFirstInGroup( GDB_ID.ROOT)
          ' Svuoto layer in cui sono presenti i testi con le inclinazioni dei lati
          If m_Mode = ModeOpt.SIDEANGLE Then
-            EgtEmptyGroup(EgtGetFirstNameInGroup(PartId, SIDE_ANGLE_LAYER))
+            EgtEmptyGroup( EgtGetFirstNameInGroup( PartId, SIDE_ANGLE_LAYER))
          Else
-            EgtEmptyGroup(EgtGetFirstNameInGroup(PartId, SIDE_ANGLE_LAYER))
+            EgtEmptyGroup( EgtGetFirstNameInGroup( PartId, SIDE_ANGLE_LAYER))
          End If
       ElseIf m_CallingPage = MainWindow.Pages.Import Then
          ' Nessuna azione necessaria
@@ -516,7 +516,7 @@ Public Class SideAngleUC
          'WritePrivateProfileString( S_SIDES, K_DRIPSHORT, DoubleToString( m_dDripShort, 3), m_MainWindow.GetIniFile())
       ElseIf m_Mode = ModeOpt.ENGRAVE Then
          WritePrivateProfileString(S_SIDES, K_ENGRAVEOFFSET, LenToString(m_dDripOffset, 3), m_MainWindow.GetIniFile())
-         WritePrivateProfileString(S_SIDES, K_ENGRAVENUMBER2, m_nEngrNbr2.ToString(), m_MainWindow.GetIniFile())
+         WritePrivateProfileString( S_SIDES, K_ENGRAVENUMBER2, m_nEngrNbr2.ToString(), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEOFFSET2, LenToString(m_dDripOffset2, 3), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH, LenToString(m_dDripDepth, 3), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH2, LenToString(m_dEngraveDepth2, 3), m_MainWindow.GetIniFile())
@@ -538,7 +538,7 @@ Public Class SideAngleUC
          PartId = If(m_MainWindow.m_DrawPageUC.SelectedLayer <> GDB_ID.NULL, EgtGetFirstPart(), GDB_ID.NULL)
          ' Recupero nome layer con geometria di contorno (esterno o interno) del pezzo
          LoopId = m_MainWindow.m_DrawPageUC.SelectedLayer
-      ElseIf m_CallingPage = MainWindow.Pages.Import Then
+         ElseIf m_CallingPage = MainWindow.Pages.Import Then
          ' Imposto contesto corrente
          EgtSetCurrentContext(m_MainWindow.m_ImportPageUC.ImportScene.GetCtx())
          ' Recupero nome pezzo
@@ -579,10 +579,6 @@ Public Class SideAngleUC
          ' Creo le geometrie dei gocciolatoi
          CreateDripGeom(PartId)
       End If
-
-      ' se abilitato e dimensione solido da sotto: creo il solido
-      Utility.CreateSolid3D(m_MainWindow.GetIniFile())
-
       ' Aggiorno visualizzazione
       EgtDraw()
    End Sub
@@ -604,7 +600,7 @@ Public Class SideAngleUC
          For nIndex As Integer = 1 To m_nCount
             Dim Entity As DripEntity = m_DripEntityList(nIndex - 1)
             ' Imposto check box (se sono stati definiti il numero corretto di CheckBox
-            If nIndex < (m_nCurrPage - 1) * MAX_LINES Or nIndex > m_nCurrPage * MAX_LINES Then Continue For
+            If nIndex < ( m_nCurrPage - 1) * MAX_LINES Or nIndex > m_nCurrPage * MAX_LINES Then Continue For
             Dim nChIndex As Integer = nIndex - (m_nCurrPage - 1) * MAX_LINES + MAX_LINES - m_nShow
             ' verifico se l'entità ha un gocciolatoio
             GetChBxFromIndex(nChIndex).IsChecked = Entity.bHaveDrip
@@ -977,15 +973,15 @@ Public Class SideAngleUC
    Private Sub PrevBtn_Click(sender As Object, e As RoutedEventArgs) Handles PrevBtn.Click
       If m_nCurrPage = 1 Then Return
       m_nCurrPage -= 1
-      m_nShow = Math.Min(m_nCount - (m_nCurrPage - 1) * MAX_LINES, MAX_LINES)
+      m_nShow = Math.Min( m_nCount - ( m_nCurrPage - 1) * MAX_LINES, MAX_LINES)
       TxBlChBxView()
       RefreshCheckAndValue()
    End Sub
 
    Private Sub NextBtn_Click(sender As Object, e As RoutedEventArgs) Handles NextBtn.Click
-      If m_nCount <= (m_nCurrPage - 1) * MAX_LINES Then Return
+      If m_nCount <= ( m_nCurrPage - 1) * MAX_LINES Then Return
       m_nCurrPage += 1
-      m_nShow = Math.Min(m_nCount - (m_nCurrPage - 1) * MAX_LINES, MAX_LINES)
+      m_nShow = Math.Min( m_nCount - ( m_nCurrPage - 1) * MAX_LINES, MAX_LINES)
       TxBlChBxView()
       RefreshCheckAndValue()
    End Sub
@@ -997,7 +993,7 @@ Public Class SideAngleUC
          Dim bVal As Boolean = CurrCheckBox.IsChecked()
          Dim SideIndex As Integer = CInt(CurrCheckBox.Name.Substring(1))
          ' Converto nome checkbox in nome elemento tenendo conto della pagina e dello slittamento verso il basso
-         Dim nCurrSide As Integer = (m_nCurrPage - 1) * MAX_LINES + SideIndex - (MAX_LINES - m_nShow)
+         Dim nCurrSide As Integer = ( m_nCurrPage - 1) * MAX_LINES + SideIndex - ( MAX_LINES - m_nShow)
          Dim sCurrSide As String = m_DripEntityList(nCurrSide - 1).sEntityName
          ' aggiorno l'entità con i valori scritti nel campo di testo
          Dim CurrEntity As DripEntity = DripEntity.FindEntity(sCurrSide)
@@ -1196,7 +1192,7 @@ Public Class SideAngleUC
          AngleTxBx.Text = DoubleToString(dSideAngle, 2)
       End If
       ' Converto nome checkbox in nome elemento tenendo conto della pagina e dello slittamento verso il basso
-      Dim nCurrSide As Integer = (m_nCurrPage - 1) * MAX_LINES + SideIndex - (MAX_LINES - m_nShow)
+      Dim nCurrSide As Integer = ( m_nCurrPage - 1) * MAX_LINES + SideIndex - ( MAX_LINES - m_nShow)
       Dim sCurrSide As String = m_SideAngleEntityList(nCurrSide - 1).sEntityName
       ' Lo modifico nella geometria e nella lista inclinazioni
       ModifySideAngle(sCurrSide, dSideAngle)
@@ -1266,7 +1262,7 @@ Public Class SideAngleUC
          HeelTxBx.Text = "0"
       End If
       ' Converto nome checkbox in nome elemento tenendo conto della pagina e dello slittamento verso il basso
-      Dim nCurrSide As Integer = (m_nCurrPage - 1) * MAX_LINES + SideIndex - (MAX_LINES - m_nShow)
+      Dim nCurrSide As Integer = ( m_nCurrPage - 1) * MAX_LINES + SideIndex - ( MAX_LINES - m_nShow)
       Dim sCurrSide As String = m_SideAngleEntityList(nCurrSide - 1).sEntityName
       ' Lo modifico nella geometria e nella lista inclinazioni
       ModifySideHeel(sCurrSide, dSideHeel)
@@ -1307,7 +1303,7 @@ Public Class SideAngleUC
       If dSideAngle <> 0 Then
          EgtSetInfo(CurrEntity.nGeomId, INFO_SIDE_ANGLE, dSideAngle)
          EgtSetInfo(CurrEntity.nGeomId, INFO_ORIG_SIDE_ANGLE, dSideAngle)
-         ' Cancello inclinazione nell'apposito campo info
+      ' Cancello inclinazione nell'apposito campo info
       Else
          EgtRemoveInfo(CurrEntity.nGeomId, INFO_SIDE_ANGLE)
          EgtRemoveInfo(CurrEntity.nGeomId, INFO_ORIG_SIDE_ANGLE)
@@ -1328,7 +1324,7 @@ Public Class SideAngleUC
       ' Scrivo nuovo tallone nelle info
       If dSideHeel > 10 * EPS_SMALL Then
          EgtSetInfo(CurrEntity.nGeomId, INFO_HEEL, dSideHeel)
-         ' Cancello inclinazione nell'apposito campo info
+      ' Cancello inclinazione nell'apposito campo info
       Else
          EgtRemoveInfo(CurrEntity.nGeomId, INFO_HEEL)
       End If

Frames/FrameCutPageUC.xaml

@@ -7,132 +7,124 @@
    mc:Ignorable="d" 
    d:DesignHeight="853.3" d:DesignWidth="1280">
 
-    <!-- Definizione della FrameCutPage -->
-    <Grid Name="FrameCutPageGrid" >
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*"/>
-            <ColumnDefinition Width="12*"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
+   <!-- Definizione della FrameCutPage -->
+   <Grid Name="FrameCutPageGrid" >
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="3*"/>
+         <ColumnDefinition Width="12*"/>
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="8*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+      
+      <!-- Definizione della Grid superiore -->
+      <Grid Grid.Column="1" Grid.Row="0" >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="4*"/>
+         </Grid.ColumnDefinitions>
+         
+         <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         </Button>
+         <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+            <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         </Button>
+         <ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
+            <Image Source="{DynamicResource FrameMachiningImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         </ToggleButton>
+
+      </Grid>
+
+      <Grid Name="LeftGrid" Grid.Row="1">
+         <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
-            <RowDefinition Height="8*"/>
-            <RowDefinition Height="1*"/>
-        </Grid.RowDefinitions>
+            <RowDefinition Height="7*"/>
+         </Grid.RowDefinitions>
+      
+      <Grid Grid.Row="1">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="0.6*"/>
+            <RowDefinition Height="0.8*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.8*"/>
+            <RowDefinition Height="2.5*"/>
+         </Grid.RowDefinitions>
 
-        <!-- Definizione della Grid superiore -->
-        <Grid Grid.Column="1" Grid.Row="0" >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="4*"/>
-            </Grid.ColumnDefinitions>
-
-            <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-            <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-            <ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
-                <Image Source="{DynamicResource FrameMachiningImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </ToggleButton>
-
-        </Grid>
-
-        <Grid Name="LeftGrid" Grid.Row="1">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="7*"/>
-            </Grid.RowDefinitions>
-
-            <Grid Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="0.6*"/>
-                    <RowDefinition Height="0.8*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.8*"/>
-                    <RowDefinition Height="0.8*"/>
-                    <RowDefinition Height="1.7*"/>
-                </Grid.RowDefinitions>
-
-                <ComboBox Name="AlongAxCmBx" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}" 
+         <ComboBox Name="AlongAxCmBx" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}" 
                Width="200" MaxDropDownHeight="300">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
+            <ComboBox.ItemTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+               </DataTemplate>
+            </ComboBox.ItemTemplate>
+         </ComboBox>
 
-                <UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
-                    <Button Name="SelSectionBtn" 
+         <UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
+            <Button Name="SelSectionBtn" 
                     Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-                        <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                    </Button>
-
-                    <Grid>
-                        <Button Name="SelGuideBtn" 
+                <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+             
+            <Grid>
+               <Button Name="SelGuideBtn" 
                        Style="{DynamicResource OmagCut_YellowTextButton}"/>
-                        <UniformGrid Name="ArcGrid" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
-                            <TextBlock Name="ArcRadTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
+               <UniformGrid Name="ArcGrid" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
+                  <TextBlock Name="ArcRadTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
                              Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                            <EgtWPFLib:EgtTextBox Name="ArcRadTxBx" Grid.Column="2" Grid.Row="2" Width="50"
+                  <EgtWPFLib:EgtTextBox Name="ArcRadTxBx" Grid.Column="2" Grid.Row="2" Width="50"
                              Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                            <TextBlock Name="ArcAngTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
+                  <TextBlock Name="ArcAngTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
                              Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                            <EgtWPFLib:EgtTextBox Name="ArcAngTxBx" Grid.Column="2" Grid.Row="3" Width="50"
+                  <EgtWPFLib:EgtTextBox Name="ArcAngTxBx" Grid.Column="2" Grid.Row="3" Width="50"
                              Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                        </UniformGrid>
-                    </Grid>
-                </UniformGrid>
+               </UniformGrid>
+            </Grid>  
+         </UniformGrid>
 
-                <TextBlock Name="OffsZTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
+         <TextBlock Name="OffsZTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="OffsZTxBx" Grid.Column="2" Grid.Row="2" Width="50"
+         <EgtWPFLib:EgtTextBox Name="OffsZTxBx" Grid.Column="2" Grid.Row="2" Width="50"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <TextBlock Name="OffsXyTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
+         <TextBlock Name="OffsXyTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="OffsXyTxBx" Grid.Column="2" Grid.Row="3" Width="50"
+         <EgtWPFLib:EgtTextBox Name="OffsXyTxBx" Grid.Column="2" Grid.Row="3" Width="50"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <TextBlock Name="OffsYyTxBl"  Grid.Row="4" Grid.ColumnSpan="2"
+         <TextBlock Name="OffsYyTxBl"  Grid.Row="4" Grid.ColumnSpan="2"
             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="OffsYyTxBx" Grid.Column="2" Grid.Row="4" Width="50"
+         <EgtWPFLib:EgtTextBox Name="OffsYyTxBx" Grid.Column="2" Grid.Row="4" Width="50"
             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-                <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
-                    <Button Name="MirrorPartBtn" 
+         <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
+            <Button Name="MirrorPartBtn" 
                     Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                         <Image Source="{DynamicResource SpecchiaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                    </Button>
-                    <Button Name="RemovePartBtn" 
+            </Button>
+            <Button Name="RemovePartBtn" 
                     Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                         <Image Source="{DynamicResource Rimuovi_eliminaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                    </Button>
-                </UniformGrid>
+            </Button>
+         </UniformGrid>
 
-                <UniformGrid Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="2" >
-                    <Button Name="CompoBtn" 
-                    Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                        <Image Source="{DynamicResource DrawImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-                    </Button>
-                </UniformGrid>
-
-                <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
+         <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
             Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
 
          <ComboBox Name="SawRoughingCmBx" Grid.Row="5" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
@@ -190,10 +182,10 @@
             </ComboBox.ItemTemplate>
          </ComboBox>-->
 
-            </Grid>
+      </Grid>
+         
+      </Grid>
 
-        </Grid>
-
-    </Grid>
+   </Grid>
 
 </UserControl>

Frames/FrameCutPageUC.xaml.vb

@@ -81,8 +81,6 @@ Public Class FrameCutPageUC
       m_ProjectMgr.CSVBtn.Visibility = Windows.Visibility.Hidden
       m_ProjectMgr.VeinMatchingBtn.Visibility = Windows.Visibility.Hidden
       m_ProjectMgr.RegisterBtn.Visibility = Windows.Visibility.Hidden
-      ' Visualizzo il bottone per l'importazione dei compo frame
-      CompoBtn.Visibility = If(GetPrivateProfileInt(S_FRAMECOMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile()) > 0, Visibility.Visible, Visibility.Hidden)
       ' Recupero dimensioni e kerf del grezzo
       m_nRawId = EgtGetFirstRawPart()
       GetRawBox(m_RawBox)
@@ -438,16 +436,6 @@ Public Class FrameCutPageUC
       End If
    End Sub
 
-   Private Sub CompoBtn_Click(sender As Object, e As RoutedEventArgs) Handles CompoBtn.Click
-      m_MainWindow.TestOff()
-      m_MainWindow.DragRettangleOff()
-      m_MainWindow.SplitCurvWJOff()
-      m_MainWindow.StartCurvWJOff()
-      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
-   End Sub
-
    Friend Function CreateFrame(nPartId As Integer) As Boolean
       If Not MyCreateFrame( nPartId) Then
          EgtErase( nPartId)

Machine/AlarmsPageUC.xaml.vb

@@ -1189,12 +1189,6 @@ Public Class AlarmsPageUC
       EgtLuaSetGlobNumVar("CMD.THICK", dToolThick * 1000)
       EgtTdbGetCurrToolParam(MCH_TP.LEN, dToolLen)
       EgtLuaSetGlobNumVar("CMD.LENGTH", dToolLen * 1000)
-      ' Nuova varibile per gestione tastatura utensili Frankfurt (Polishing)
-      Dim nType As Integer
-      EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
-      If m_CurrentMachine.bPolishingWheel AndAlso nType = MCH_TY.MILL_POLISHING Then
-         EgtLuaSetGlobStringVar("CMD.POLISHING", "1")
-      End If
       EgtLuaSetGlobBoolVar("CMD.INCHES", m_MainWindow.m_CNCommunication.GetMachineInInches())
       EgtLuaCallFunction("CMD.CmdString")
       ' Leggo variabili

Machine/PolishingsPageUC.xaml.vb

@@ -61,8 +61,8 @@ Public Class PolishingsPageUC
       RepeatTxBl.Text = EgtMsg(91093)             ' Ripetizioni
       StepTxBl.Text = EgtMsg(90787)               ' Passo
       OffSetTxBl.Text = EgtMsg(91089)             ' Offset
-      RadiusTxBl.Text = EgtMsg(91139)             ' Raggio
-      DistanceTxBl.Text = EgtMsg(91140)           ' Distanza
+      RadiusTxBl.Text = "Raggio"
+      DistanceTxBl.Text = "Distanza"
       LiLoGpBx.Header = EgtMsg(91094)             ' Attacco/Uscita
       LiLenTxBl.Text = EgtMsg(91097)              ' Lunghezza
       LiHeightTxBl.Text = EgtMsg(91095)           ' Altezza

MainWindow.xaml.vb

@@ -328,8 +328,8 @@ Class MainWindow
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2505, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2505, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2504, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2504, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Inizializzazione generale di EgtInterface

My Project/AssemblyInfo.vb

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

OmagCUT.vbproj

@@ -245,9 +245,6 @@
     <Compile Include="Project\CicloStartWD.xaml.vb">
       <DependentUpon>CicloStartWD.xaml</DependentUpon>
     </Compile>
-    <Compile Include="RawPhoto\OtherRefTabWD.xaml.vb">
-      <DependentUpon>OtherRefTabWD.xaml</DependentUpon>
-    </Compile>
     <Compile Include="RawPhoto\SlabIdWD.xaml.vb">
       <DependentUpon>SlabIdWD.xaml</DependentUpon>
     </Compile>
@@ -522,10 +519,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="RawPhoto\OtherRefTabWD.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="RawPhoto\SlabIdWD.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1337,9 +1330,6 @@
   <ItemGroup>
     <Resource Include="Resources\ToolChangerPos.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewIcons\RefTab.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe

OmagCUTDarkDictionary.xaml

@@ -32,7 +32,6 @@
     <BitmapImage x:Key="AlignPiecesImg" UriSource="Resources/NewIcons/ruota-oggetto-inclinato.png"></BitmapImage>
     <BitmapImage x:Key="BarCodeImg" UriSource="Resources/NewIcons/BarCode.png"></BitmapImage>
     <BitmapImage x:Key="SlabIdImg" UriSource="Resources/NewIcons/SlabId.png"></BitmapImage>
-    <BitmapImage x:Key="RefTabImg" UriSource="Resources/NewIcons/RefTab.png"></BitmapImage>
     <BitmapImage x:Key="BottomLeftImg" UriSource="Resources/NewIcons/1-BottomLeft.png"></BitmapImage>
     <BitmapImage x:Key="BottomRightImg" UriSource="Resources/NewIcons/2-BottomRight.png"></BitmapImage>
     <BitmapImage x:Key="PartRotOnImg" UriSource="Resources/NewIcons/PartRotOn.png"></BitmapImage>

OmagCUTDictionary.xaml

@@ -102,7 +102,6 @@
     <BitmapImage x:Key="AlignPiecesImg" UriSource="Resources/AlignPieces.png"></BitmapImage>
     <BitmapImage x:Key="BarCodeImg" UriSource="Resources/BarCode.png"></BitmapImage>
     <BitmapImage x:Key="SlabIdImg" UriSource="Resources/SlabId.png"></BitmapImage>
-    <BitmapImage x:Key="RefTabImg" UriSource="Resources/NewIcons/RefTab.png"></BitmapImage>
     <BitmapImage x:Key="BottomLeftImg" UriSource="Resources/BottomLeft.png"></BitmapImage>
     <BitmapImage x:Key="BottomRightImg" UriSource="Resources/BottomRight.png"></BitmapImage>
     <BitmapImage x:Key="PartRotOnImg" UriSource="Resources/PartRotOn.png"></BitmapImage>

Project/ProjectMgrUC.xaml.vb

@@ -263,6 +263,8 @@ Public Class ProjectMgrUC
       Dim nWarn As Integer = 0
       ResetAllMachinings(nWarn)
       If nWarn = 1 Then m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SPLITPAGEUC + 11)) ' Lama troppo grande per utilizzo ventosa
+      ' Se eistono elimino i grezzi delle fasi che non contengono lavorazioni
+      ResetAllRawPart()
       ' Aggiorno Info C Home
       Dim dCHome As Double
       EgtGetAxisHomePos("C", dCHome)

RawPhoto/OtherRefTabWD.xaml

@@ -1,82 +0,0 @@
-<Window x:Class="OtherRefTabWD"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
-   FontFamily="{DynamicResource OmagCut_Font}"
-   ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
-   Title="ModifStartEndWD" Height="250" Width="320" ShowInTaskbar="False">
-
-    <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
-    <Border Style="{DynamicResource OmagCut_Border}">
-        <Grid x:Name="SaveNameGrid">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="0.2*"/>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="0.2*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <!--<RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="0.5*"/>-->
-                <RowDefinition Height="0.2*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="0.2*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="0.2*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="0.2*"/>
-                <RowDefinition Height="1.5*"/>
-                <RowDefinition Height="0.2*"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Name="RefRawTxbl" Grid.Column="1" Grid.Row="1"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            
-            <ComboBox Name="RefTabModeCmBx" Grid.Column="2" Grid.Row="1" Style="{StaticResource OmagCut_ComboBox}" 
-               MaxDropDownHeight="300" Margin="0,0,0,0">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-
-            <TextBlock Name="RefTabXTxbl" Grid.Column="1" Grid.Row="3"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="RefTabXTxBx" Grid.Column="2" Grid.Row="3"
-            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-
-            <TextBlock Name="RefTabYTxbl" Grid.Column="1" Grid.Row="5"
-            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="RefTabYTxBx" Grid.Column="2" Grid.Row="5"
-            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-
-            <Grid Name="ButtonsGrid" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="7" Grid.RowSpan="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.5*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="0.5*"/>
-                </Grid.ColumnDefinitions>
-
-                <Button Name="OkBtn" Grid.Column="1"
-                    Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-                <Button Name="ExitBtn" Grid.Column="3"
-                    IsCancel="True"
-                    Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-                </Button>
-
-            </Grid>
-
-        </Grid>
-
-    </Border>
-
-</Window>

RawPhoto/OtherRefTabWD.xaml.vb

@@ -1,108 +0,0 @@
-Imports System.IO
-Imports EgtUILib
-Imports EgtWPFLib
-
-Public Class OtherRefTabWD
-   Dim m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-   Dim m_RawPartPage As RawPartPageUC
-
-   Private m_sPosX As String = "0"
-   Private m_sPosY As String = "0"
-
-   Private m_dPrevOffsetX As Double = 0
-   Private m_dPrevOffsetY As Double = 0
-
-   Private m_SelIndex As Integer = 0
-
-   Sub New(Owner As Window, PosX As String, PosY As String, OffsetX As Double, OffsetY As Double, OtherRefMode As Integer)
-      Me.Owner = Owner
-      ' La chiamata è richiesta dalla finestra di progettazione.
-      InitializeComponent()
-
-      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
-      m_sPosX = PosX
-      m_sPosY = PosY
-      m_dPrevOffsetX = OffsetX
-      m_dPrevOffsetY = OffsetY
-      m_SelIndex = OtherRefMode
-   End Sub
-
-   Private Sub OtherRrefTabWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
-      ' costruisco il riferimento alla pagina Raw
-      m_RawPartPage = m_MainWindow.m_RawPartPage
-      ' posiziono la finestra
-      Me.Top = Owner.Top + Owner.Height / 4 - Me.Height / 2
-      Me.Left = Owner.Left + Owner.Width / 6 - Me.Width / 2
-      RefRawTxbl.Text = "Raw reference"
-      RefTabXTxbl.Text = "Position X"
-      RefTabYTxbl.Text = "Position Y"
-      RefTabModeCmBx.ItemsSource = m_RawPartPage.m_OtherRefTabList
-      RefTabModeCmBx.SelectedIndex = m_RawPartPage.m_OtherRefTabPos
-   End Sub
-
-   Private Sub OtherRrefTabWD_Load(sender As Object, e As EventArgs) Handles Me.Loaded
-      RefTabXTxBx.Text = m_sPosX
-      RefTabYTxBx.Text = m_sPosY
-   End Sub
-
-   Private Sub RefTabModeCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles RefTabModeCmBx.SelectionChanged
-      m_RawPartPage.m_OtherRefTabPos = RefTabModeCmBx.SelectedIndex
-      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABPOS, m_RawPartPage.m_OtherRefTabPos.ToString, m_MainWindow.GetIniFile())
-      m_RawPartPage.RefTabModeChange()
-   End Sub
-
-   Private Sub RefTabXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RefTabXTxBx.EgtClosed
-      Dim ptMin, ptMax As Point3d
-      If EgtGetTableArea(1, ptMin, ptMax) Then
-         Dim dX As Double = 0
-         StringToLen(RefTabXTxBx.Text, dX)
-         If Not (dX > 0 And dX < ptMax.x - ptMin.x) Then
-            If dX > 0 Then
-               dX = ptMax.x - ptMin.x
-            Else
-               dX = 0
-            End If
-            RefTabXTxBx.Text = LenToString(dX, 2)
-            ' errore, posizione fuori dalla tavola
-         End If
-         m_RawPartPage.m_OtherRefTabX = dX
-         m_RawPartPage.RefTabModeChange()
-      End If
-   End Sub
-
-   Private Sub RefTabYTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RefTabYTxBx.EgtClosed
-      Dim ptMin, ptMax As Point3d
-      If EgtGetTableArea(1, ptMin, ptMax) Then
-         Dim dY As Double = 0
-         StringToLen(RefTabYTxBx.Text, dY)
-         If Not (dY > 0 And dY < ptMax.y - ptMin.y) Then
-            If dY > 0 Then
-               dY = ptMax.y - ptMin.y
-            Else
-               dY = 0
-            End If
-            RefTabYTxBx.Text = LenToString(dY, 2)
-            ' errore, posizione fuori dalla tavola
-         End If
-         m_RawPartPage.m_OtherRefTabY = dY
-         m_RawPartPage.RefTabModeChange()
-      End If
-   End Sub
-
-   Private Sub OkBtn_Click() Handles OkBtn.Click
-      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABX, DoubleToString(RefTabXTxBx.Text, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABY, DoubleToString(RefTabYTxBx.Text, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABPOS, m_RawPartPage.m_OtherRefTabPos.ToString, m_MainWindow.GetIniFile())
-      Me.Close()
-   End Sub
-
-   Private Sub ExitBtn_Click() Handles ExitBtn.Click
-      ' riposiziono l'origine
-      m_RawPartPage.m_OtherRefTabX = m_sPosX
-      m_RawPartPage.m_OtherRefTabY = m_sPosY
-      ' ripristino il valore della combobox
-      m_RawPartPage.m_OtherRefTabPos = m_SelIndex
-      m_RawPartPage.RefTabModeChange()
-   End Sub
-
-End Class

RawPhoto/RawPartPageUC.xaml

@@ -6,76 +6,76 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
    mc:Ignorable="d" 
    d:DesignHeight="853.3" d:DesignWidth="1280" Loaded="RawPartPage_Loaded" Initialized="RawPartPage_Initialized" Unloaded="RawPartPage_Unloaded">
-
-    <!-- Definizione della RowPartPage -->
-    <Grid Name="RowPartPageGrid" >
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*"/>
-            <ColumnDefinition Width="12*"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
+      
+   <!-- Definizione della RowPartPage -->
+   <Grid Name="RowPartPageGrid" >
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="3*"/>
+         <ColumnDefinition Width="12*"/>
+      </Grid.ColumnDefinitions>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="8*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+      
+      <!-- Definizione della Grid superiore -->
+      <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="7*"/>
+         </Grid.ColumnDefinitions>
+         
+      </Grid>
+      
+      <!-- Definizione della Grid Laterale -->
+      <Grid Name="LeftButtonGrid" Grid.RowSpan="3">
+      
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1.5*"/>
+            <ColumnDefinition Width="1.5*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
-            <RowDefinition Height="8*"/>
+            <RowDefinition Height="4*"/>
             <RowDefinition Height="1*"/>
-        </Grid.RowDefinitions>
+            <RowDefinition Height="1.5*"/>
+            <RowDefinition Height="1.*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
 
-        <!-- Definizione della Grid superiore -->
-        <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="5*"/>
-                <ColumnDefinition Width="7*"/>
-            </Grid.ColumnDefinitions>
-
-        </Grid>
-
-        <!-- Definizione della Grid Laterale -->
-        <Grid Name="LeftButtonGrid" Grid.RowSpan="3">
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1.5*"/>
-                <ColumnDefinition Width="1.5*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="4*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1.5*"/>
-                <RowDefinition Height="1.*"/>
-                <RowDefinition Height="0.5*"/>
-                <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-
-            <RadioButton Name="OutlineBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
+         <RadioButton Name="OutlineBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
                GroupName="DefinitionMethod_GrezzoUC"/>
-            <RadioButton Name="DamagedBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
+         <RadioButton Name="DamagedBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
                Grid.Column="1" GroupName="DefinitionMethod_GrezzoUC"/>
 
-            <!-- Definizione della Grid per definizione grezzo -->
-            <Grid Name="RawMeasureGrd" Grid.Row="1" Grid.ColumnSpan="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                    <RowDefinition Height="0.5*"/>
-                </Grid.RowDefinitions>
+         <!-- Definizione della Grid per definizione grezzo -->
+         <Grid Name="RawMeasureGrd" Grid.Row="1" Grid.ColumnSpan="2">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="0.5*"/>
+               <RowDefinition Height="0.5*"/>
+            </Grid.RowDefinitions>
 
-                <ComboBox Name="RawModeCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
+            <ComboBox Name="RawModeCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
                MaxDropDownHeight="300" Margin="6,0,6,0">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
+               <ComboBox.ItemTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                  </DataTemplate>
+               </ComboBox.ItemTemplate>
+            </ComboBox>
 
-                <ComboBox Name="RawModeDamagedCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
+            <ComboBox Name="RawModeDamagedCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
                MaxDropDownHeight="300" Margin="6,0,6,0">
                     <ComboBox.ItemTemplate>
                         <DataTemplate>
@@ -85,123 +85,114 @@
                 </ComboBox>
 
                 <TextBlock Name="LengthTxBl" Grid.Row="1" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="LengthTxBx" Grid.Column="1" Grid.Row="1" Margin="13,0,6,0"
+            <EgtWPFLib:EgtTextBox Name="LengthTxBx" Grid.Column="1" Grid.Row="1" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                <TextBlock Name="WidthTxBl" Grid.Row="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="2" Margin="13,0,6,0"
+            <TextBlock Name="WidthTxBl" Grid.Row="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="2" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                <TextBlock Name="HeightTxBl" Grid.Row="3" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="3" Margin="13,0,6,0"
+            <TextBlock Name="HeightTxBl" Grid.Row="3" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="3" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                <TextBlock Name="OffsetXTxBl" Grid.Row="4" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="OffsetXTxBx" Grid.Column="1" Grid.Row="4" Margin="13,0,6,0"
+            <TextBlock Name="OffsetXTxBl" Grid.Row="4" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="OffsetXTxBx" Grid.Column="1" Grid.Row="4" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                <TextBlock Name="OffsetYTxBl" Grid.Row="5" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="OffsetYTxBx" Grid.Column="1" Grid.Row="5" Margin="13,0,6,0"
+            <TextBlock Name="OffsetYTxBl" Grid.Row="5" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="OffsetYTxBx" Grid.Column="1" Grid.Row="5" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                <TextBlock Name="KerfTxBl" Grid.Row="6" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-                <EgtWPFLib:EgtTextBox Name="KerfTxBx" Grid.Column="1" Grid.Row="6" Margin="13,0,6,0"
+            <TextBlock Name="KerfTxBl" Grid.Row="6" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="KerfTxBx" Grid.Column="1" Grid.Row="6" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
+         </Grid>
+                  
+         <!-- Definizione della Grid per il materiale -->
+         <GroupBox Name="MaterialGpBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
+
+            <ComboBox Name="MaterialsCmbx" Style="{StaticResource OmagCut_ComboBox}"
+               MaxDropDownHeight="600">
+               <ComboBox.ItemTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding sName}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                  </DataTemplate>
+               </ComboBox.ItemTemplate>
+            </ComboBox>
+
+         </GroupBox>
+
+         <!-- Definizione della Grid per Punti -->
+         <GroupBox Name="PointsGpBx" Grid.Row="3" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}" >
+
+            <Grid >
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="1.5*"/>
+                  <ColumnDefinition Width="1.5*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
+
+               <ToggleButton Name="AddBtn"
+                  Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+               <ToggleButton Name="RemoveBtn" Grid.Column="1"
+                  Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+               <Button Name="CloseBtn" Grid.Row="1" Grid.ColumnSpan="2" 
+                  Style="{DynamicResource OmagCut_YellowTextButton}"/>
+            </Grid>
+            
+         </GroupBox>
+
+         <!-- Definizione della Grid per Zona rovinata -->
+         <GroupBox Name="DamagedAreaGpBx" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
+
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+
+               <ToggleButton Name="NewBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+               <ToggleButton Name="DeleteBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
             </Grid>
 
-            <!-- Definizione della Grid per il materiale -->
-            <GroupBox Name="MaterialGpBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
+         </GroupBox>
 
-                <ComboBox Name="MaterialsCmbx" Style="{StaticResource OmagCut_ComboBox}"
-               MaxDropDownHeight="600">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                            <TextBlock Text="{Binding sName}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
-
-            </GroupBox>
-
-            <!-- Definizione della Grid per Punti -->
-            <GroupBox Name="PointsGpBx" Grid.Row="3" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}" >
-
-                <Grid >
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1.5*"/>
-                        <ColumnDefinition Width="1.5*"/>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                    </Grid.RowDefinitions>
-
-                    <ToggleButton Name="AddBtn"
-                  Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-                    <ToggleButton Name="RemoveBtn" Grid.Column="1"
-                  Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-                    <Button Name="CloseBtn" Grid.Row="1" Grid.ColumnSpan="2" 
-                  Style="{DynamicResource OmagCut_YellowTextButton}"/>
-                </Grid>
-
-            </GroupBox>
-
-            <!-- Definizione della Grid per Zona rovinata -->
-            <GroupBox Name="DamagedAreaGpBx" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
-
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <ToggleButton Name="NewBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-                    <ToggleButton Name="DeleteBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-                </Grid>
-
-            </GroupBox>
-
-            <TextBlock Name="OtherRefTabTxBl" Grid.Row="5" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <CheckBox Name="OtherRefTabChBx" Grid.Row="5" Grid.Column="1" Style="{StaticResource OmagCut_CheckBox}"
-                    HorizontalAlignment="Right" Margin="0,0,6,0"/>
-
-            <Button Name="ConfirmPhotoBtn" Grid.Row="4" Grid.ColumnSpan="2" Visibility="Hidden" 
+         <Button Name="ConfirmPhotoBtn" Grid.Row="4" Grid.ColumnSpan="2" Visibility="Hidden" 
             Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-        </Grid>
+      </Grid>
+      
+      <!-- Definizione della Grid Inferiore per i Button V e X -->
+      <Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="3">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="6*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
 
-        <!-- Definizione della Grid Inferiore per i Button V e X -->
-        <Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="3">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="5*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
+         <Button Name="RawProbingBtn" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+            <Image Source="{DynamicResource RawProbeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         </Button>
 
-            <Button Name="RawProbingBtn" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-                <Image Source="{DynamicResource RawProbeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
+         <Button Name="BarCodeBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+            <Image Source="{DynamicResource BarCodeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         </Button>
 
-            <Button Name="BarCodeBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-                <Image Source="{DynamicResource BarCodeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
+         <Button Name="SlabIdBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+            <Image Source="{DynamicResource SlabIdImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+         </Button>
 
-            <Button Name="SlabIdBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-                <Image Source="{DynamicResource SlabIdImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-
-            <Button Name="OtherRefTabBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-                <Image Source="{DynamicResource RefTabImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-
-            <Button Name="OkBtn" Grid.Column="6" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-                <Image Source="{DynamicResource VImg}" Width="65" Height="65" HorizontalAlignment="Center"
+         <Button Name="OkBtn" Grid.Column="5" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+            <Image Source="{DynamicResource VImg}" Width="65" Height="65" HorizontalAlignment="Center"
             VerticalAlignment="Center" />
-            </Button>
-
-        </Grid>
-
-    </Grid>
-
+         </Button>
+         
+      </Grid>
+      
+   </Grid>
+   
 </UserControl>

RawPhoto/RawPartPageUC.xaml.vb

@@ -1,9 +1,6 @@
 Imports System.Globalization
-Imports System.IO
-Imports System.Windows.Media.Animation
 Imports EgtUILib
 Imports EgtWPFLib
-Imports Microsoft.VisualBasic.Devices
 
 Public Class RawPartPageUC
 
@@ -81,16 +78,6 @@ Public Class RawPartPageUC
    ' Costante raggio cerchietto
    Private Const RAD_CIRCLE As Double = 30
 
-   ' Riferimento grezzo
-   Private m_bEnableOtherRefTab As Boolean = False
-   Private m_bOtherRefTab As Boolean
-   Public m_OtherRefTabX As Double = 0
-   Public m_OtherRefTabY As Double = 0
-   Public m_OtherRefTabList(3) As String
-   Public m_OtherRefTabPos As Integer = 0
-   Private m_nOtherRefTabLay As Integer = GDB_ID.NULL
-   Private m_OtherRefTabPoint As Point3d
-
    ' mostra la pagina delle lavorazioni
    Private m_SmartMachiningPage As Boolean = False
 
@@ -118,13 +105,6 @@ Public Class RawPartPageUC
       FROM_SAW = 7
    End Enum
 
-   Private Enum OTHERREFMODE As Integer
-      BL = 0
-      BR = 1
-      TR = 2
-      TL = 3
-   End Enum
-
    Private Sub RawPartPage_Initialized(sender As Object, e As EventArgs)
 
       'Creazione della Page UserControl e relative impostazioni
@@ -165,13 +145,6 @@ Public Class RawPartPageUC
          ReDim Preserve m_RawModeListEx(3)
       End If
       RawModeCmBx.ItemsSource = m_RawModeList
-
-      ' Creo la lista dei riferimenti tavola 
-      m_OtherRefTabList(OTHERREFMODE.BL) = "Bottom left"
-      m_OtherRefTabList(OTHERREFMODE.BR) = "Bottom right"
-      m_OtherRefTabList(OTHERREFMODE.TR) = "Top right"
-      m_OtherRefTabList(OTHERREFMODE.TL) = "Top left"
-
       ' lista per selezione RawModeDamaged
       m_RawModeDamagedList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 2)    'Per Punti
       m_RawModeDamagedList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 30)   'Da Laser
@@ -211,8 +184,6 @@ Public Class RawPartPageUC
       RemoveBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 15)        'Remove - Rimuovi
       CloseBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 31)         'Close - Chiudi
       ConfirmPhotoBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 24)  'Conferma
-
-      OtherRefTabTxBl.Text = "New Ref On Tab"
    End Sub
 
    Private Sub RawPartPage_Loaded(sender As Object, e As RoutedEventArgs)
@@ -306,12 +277,6 @@ Public Class RawPartPageUC
             Utility.SetBlockAndSlabNbr(sBlock, sSlabNbr)
          End If
       End If
-
-      ' Carico le info del riferimento alternativo della tavola
-      m_nOtherRefTabLay = EgtCreateGroup(GDB_ID.ROOT)
-      EgtSetLevel(m_nTempLay, GDB_LV.TEMP)
-      LoadOtherRefTab()
-
       ' Assegno dati grezzo rettangolare ai textbox
       LengthTxBx.Text = LenToString(m_RawLength, 2)
       WidthTxBx.Text = LenToString(m_RawWidth, 2)
@@ -355,36 +320,6 @@ Public Class RawPartPageUC
       Next
    End Sub
 
-   Private Sub LoadOtherRefTab()
-      m_bEnableOtherRefTab = (GetPrivateProfileInt(S_RAWPART, K_ENABLEOTHERREFTAB, 0, m_MainWindow.GetIniFile()) <> 0)
-      If Not m_bEnableOtherRefTab Then
-         OtherRefTabBtn.Visibility = Visibility.Collapsed
-         OtherRefTabChBx.Visibility = Visibility.Collapsed
-         OtherRefTabTxBl.Visibility = Visibility.Collapsed
-         Return
-      End If
-      m_bOtherRefTab = (GetPrivateProfileInt(S_RAWPART, K_OTHERREFTAB, 0, m_MainWindow.GetIniFile()) <> 0)
-      m_OtherRefTabX = GetPrivateProfileDouble(S_RAWPART, K_OTHERREFTABX, 0, m_MainWindow.GetIniFile())
-      m_OtherRefTabY = GetPrivateProfileDouble(S_RAWPART, K_OTHERREFTABY, 0, m_MainWindow.GetIniFile())
-      m_OtherRefTabPos = GetPrivateProfileInt(S_RAWPART, K_OTHERREFTABPOS, 0, m_MainWindow.GetIniFile())
-      ' RefTabPosCmbx.SelectedIndex = m_OtherRefTabPos
-      OtherRefTabChBx.IsChecked = m_bOtherRefTab
-      ' se riferimento tavola differente da quello atteso
-      If m_bOtherRefTab Then
-         ' dasibilito la modifica dei parametri di Offset
-         OffsetXTxBx.IsEnabled = False
-         OffsetYTxBx.IsEnabled = False
-         UpdateOffsetText()
-      End If
-
-      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
-      EgtEmptyGroup(m_nOtherRefTabLay)
-      ' Acquisisco punto da disegno
-      m_OtherRefTabPoint = New Point3d(m_ptTableMin.x + m_OtherRefTabX, m_ptTableMin.y + m_OtherRefTabY, m_ptTableMin.z + 0.15 + m_CurrentMachine.dAdditionalTable)
-      CreateOtherRefTab(m_nOtherRefTabLay, m_OtherRefTabPoint)
-      ' EgtDraw()
-   End Sub
-
    Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
       ' Verifico di essere il gestore attivo
       If Not m_bActive Then Return
@@ -995,13 +930,6 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
-            If m_bEnableOtherRefTab Then
-               OtherRefTabChBx.IsEnabled = True
-               OtherRefTabBtn.IsEnabled = True
-               ' disegno il riferimento
-               m_OtherRefTabPoint = New Point3d(m_ptTableMin.x + m_OtherRefTabX, m_ptTableMin.y + m_OtherRefTabY, m_ptTableMin.z + 0.15 + m_CurrentMachine.dAdditionalTable)
-               CreateOtherRefTab(m_nOtherRefTabLay, m_OtherRefTabPoint)
-            End If
          Case RAWMODE.BY_POINTS
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -1018,12 +946,6 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
-            ' disettivo la possibilità di modificare il riferimento 
-            If m_bEnableOtherRefTab Then
-               OtherRefTabChBx.IsEnabled = False
-               OtherRefTabBtn.IsEnabled = False
-               EgtEmptyGroup(m_nOtherRefTabLay)
-            End If
          Case RAWMODE.FROM_LASER
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -1040,11 +962,6 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
-            If m_bEnableOtherRefTab Then
-               OtherRefTabChBx.IsEnabled = False
-               OtherRefTabBtn.IsEnabled = False
-               EgtEmptyGroup(m_nOtherRefTabLay)
-            End If
          Case RAWMODE.DAMAGED
             RawModeCmBx.IsEnabled = False
             RawModeDamagedCmBx.Visibility = Visibility.Visible
@@ -1063,11 +980,6 @@ Public Class RawPartPageUC
             DamagedAreaGpBx.Visibility = Windows.Visibility.Visible
             ' Disattivo bottoni foto
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
-            If m_bEnableOtherRefTab Then
-               OtherRefTabChBx.IsEnabled = False
-               OtherRefTabBtn.IsEnabled = False
-               EgtEmptyGroup(m_nOtherRefTabLay)
-            End If
          Case RAWMODE.FROM_PHOTO
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -1080,11 +992,6 @@ Public Class RawPartPageUC
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ' Visualizzo bottoni foto
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Visible
-            If m_bEnableOtherRefTab Then
-               OtherRefTabChBx.IsEnabled = False
-               OtherRefTabBtn.IsEnabled = False
-               EgtEmptyGroup(m_nOtherRefTabLay)
-            End If
          Case RAWMODE.DAMAGED_BY_LASER
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Visible
@@ -1101,11 +1008,6 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
-            If m_bEnableOtherRefTab Then
-               OtherRefTabChBx.IsEnabled = False
-               OtherRefTabBtn.IsEnabled = False
-               EgtEmptyGroup(m_nOtherRefTabLay)
-            End If
          Case RAWMODE.DAMAGED_BY_SAW
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Visible
@@ -1122,11 +1024,6 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
-            If m_bEnableOtherRefTab Then
-               OtherRefTabChBx.IsEnabled = False
-               OtherRefTabBtn.IsEnabled = False
-               EgtEmptyGroup(m_nOtherRefTabLay)
-            End If
          Case RAWMODE.FROM_SAW
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -1143,26 +1040,11 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
-            If m_bEnableOtherRefTab Then
-               OtherRefTabChBx.IsEnabled = False
-               OtherRefTabBtn.IsEnabled = False
-               EgtEmptyGroup(m_nOtherRefTabLay)
-            End If
       End Select
-      ' se abilitato nuovo riferimento del grezzo disabilito le text per offset
-      If OtherRefTabChBx.IsChecked Then
-         OffsetXTxBx.IsEnabled = False
-         OffsetYTxBx.IsEnabled = False
-      End If
    End Sub
 
    Private Sub OutlineBtn_Click(sender As Object, e As RoutedEventArgs) Handles OutlineBtn.Click
       If m_ActiveRawMode = RAWMODE.DAMAGED Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_SAW Then
-         If m_bEnableOtherRefTab Then
-            OtherRefTabTxBl.Visibility = Visibility.Visible
-            OtherRefTabBtn.Visibility = Visibility.Visible
-            OtherRefTabChBx.Visibility = Visibility.Visible
-         End If
          ' m_ActiveRawMode = RAWMODE.BY_POINTS
          m_ActiveRawMode = m_PrecActiveRawMode
          RawModeCmBx.SelectedIndex = m_ActiveRawMode
@@ -1173,12 +1055,6 @@ Public Class RawPartPageUC
    End Sub
 
    Private Sub DamagedBtn_Click(sender As Object, e As RoutedEventArgs) Handles DamagedBtn.Click
-      If m_bEnableOtherRefTab Then
-         OtherRefTabTxBl.Visibility = Visibility.Hidden
-         OtherRefTabBtn.Visibility = Visibility.Hidden
-         OtherRefTabChBx.Visibility = Visibility.Hidden
-         OtherRefTabBtn.IsEnabled = False
-      End If
       m_PrecActiveRawMode = m_ActiveRawMode
       If m_PrecActiveRawMode = RAWMODE.FROM_LASER Then
          m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER
@@ -1967,7 +1843,6 @@ Public Class RawPartPageUC
          WidthTxBx.Text = LenToString(m_RawWidth, 2)
          m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 17) & " " & LenToString(dMaxWidth, 2))   'Massima larghezza =
       End If
-      RefTabModeChange()
    End Sub
 
    Private Sub HeightTxBx_EgtClosed(sender As Object, e As EventArgs) Handles HeightTxBx.EgtClosed
@@ -1997,7 +1872,6 @@ Public Class RawPartPageUC
          HeightTxBx.Text = LenToString(m_RawHeight, 3)
          m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 18)) 'Non sono ammessi spessori negativi
       End If
-      RefTabModeChange()
    End Sub
 
    Private Sub OffsetXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffsetXTxBx.EgtClosed
@@ -2044,108 +1918,6 @@ Public Class RawPartPageUC
       End If
    End Sub
 
-#Region "OTHERREFTAB"
-
-   Private Sub OtherRefTabChBx_Click(sender As Object, e As EventArgs) Handles OtherRefTabChBx.Click
-      If OtherRefTabChBx.IsChecked Then
-         m_bOtherRefTab = True
-         MoveRawToOtherRefTab()
-      Else
-         m_bOtherRefTab = False
-         'MoveRawToMaiRefTab()
-      End If
-      UpdateOffsetText()
-      RawModeView()
-      WritePrivateProfileString(S_RAWPART, K_OTHERREFTAB, If(m_bOtherRefTab, "1", "0"), m_MainWindow.GetIniFile())
-   End Sub
-
-   Public Sub RefTabModeChange()
-      MoveRawToMaiRefTab()
-      MoveRawToOtherRefTab()
-      UpdateRefTabDraw()
-      UpdateOffsetText()
-   End Sub
-
-   Public Sub UpdateRefTabDraw()
-      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
-      EgtEmptyGroup(m_nOtherRefTabLay)
-      ' Acquisisco punto da disegno
-      m_OtherRefTabPoint = New Point3d(m_ptTableMin.x + m_OtherRefTabX, m_ptTableMin.y + m_OtherRefTabY, m_ptTableMin.z + 0.15)
-      CreateOtherRefTab(m_nOtherRefTabLay, m_OtherRefTabPoint)
-      EgtDraw()
-   End Sub
-
-   Private Sub UpdateOffsetText()
-      Dim ptRawMin, ptRawMax As Point3d
-      Dim dInvertKerf As Double = 1
-      If GetRawBox(ptRawMin, ptRawMax) Then
-         ' kerf
-         EgtGetInfo(EgtGetFirstRawPart(), KEY_KERF, m_RawKerf)
-         ' verifico se il kerf è negativo
-         EgtGetInfo(EgtGetFirstRawPart(), KEY_INVERT_KERF, dInvertKerf)
-         ' aggiorno dati grezzo
-         If dInvertKerf < 0 Then
-            m_RawOffsX = ptRawMin.x - m_ptTableMin.x
-            m_RawOffsY = ptRawMin.y - m_ptTableMin.y
-         Else
-            m_RawOffsX = ptRawMin.x - m_ptTableMin.x + m_RawKerf * dInvertKerf
-            m_RawOffsY = ptRawMin.y - m_ptTableMin.y + m_RawKerf * dInvertKerf
-         End If
-         OffsetXTxBx.Text = LenToString(m_RawOffsX, 2)
-         OffsetYTxBx.Text = LenToString(m_RawOffsY, 2)
-      End If
-   End Sub
-
-   Private Sub MoveRawToOtherRefTab()
-      Dim dKerf As Double = 0
-      StringToLen(KerfTxBx.Text, dKerf)
-      Select Case m_OtherRefTabPos
-         Case OTHERREFMODE.BL
-            m_RawOffsX = m_OtherRefTabX + If((dKerf < 0), -dKerf, dKerf)
-            m_RawOffsY = m_OtherRefTabY + If((dKerf < 0), -dKerf, dKerf)
-         Case OTHERREFMODE.BR
-            m_RawOffsX = m_OtherRefTabX - m_RawLength - If((dKerf < 0), -dKerf, dKerf)
-            m_RawOffsY = m_OtherRefTabY + If((dKerf < 0), -dKerf, dKerf)
-         Case OTHERREFMODE.TR
-            m_RawOffsX = m_OtherRefTabX - m_RawLength - If((dKerf < 0), -dKerf, dKerf)
-            m_RawOffsY = m_OtherRefTabY - m_RawWidth - If((dKerf < 0), -dKerf, dKerf)
-         Case OTHERREFMODE.TL
-            m_RawOffsX = m_OtherRefTabX + If((dKerf < 0), -dKerf, dKerf)
-            m_RawOffsY = m_OtherRefTabY - m_RawWidth - If((dKerf < 0), -dKerf, dKerf)
-         Case Else
-      End Select
-      UpdateRawPart()
-   End Sub
-
-   Private Sub MoveRawToMaiRefTab()
-      Dim dKerf As Double = 0
-      StringToLen(KerfTxBx.Text, dKerf)
-      Select Case m_OtherRefTabPos
-         Case OTHERREFMODE.BR
-            m_RawOffsX = If((dKerf < 0), 0, dKerf)
-            m_RawOffsY = If((dKerf < 0), 0, dKerf)
-         Case OTHERREFMODE.BL
-            m_RawOffsX = If((dKerf < 0), 0, dKerf)
-            m_RawOffsY = If((dKerf < 0), 0, dKerf)
-         Case OTHERREFMODE.TL
-            m_RawOffsX = If((dKerf < 0), 0, dKerf)
-            m_RawOffsY = If((dKerf < 0), 0, dKerf)
-         Case OTHERREFMODE.TR
-            m_RawOffsX = If((dKerf < 0), 0, dKerf)
-            m_RawOffsY = If((dKerf < 0), 0, dKerf)
-         Case Else
-      End Select
-      UpdateRawPart()
-   End Sub
-
-   Private Sub OtherRefTabBtn_Click(sender As Object, e As EventArgs) Handles OtherRefTabBtn.Click
-      ' apro la finestra per gestire il riferimento
-      Dim OthWD As New OtherRefTabWD(m_MainWindow, LenToString(m_OtherRefTabX, 2), LenToString(m_OtherRefTabY, 2), m_RawOffsX, m_RawOffsY, m_OtherRefTabPos)
-      OthWD.ShowDialog()
-   End Sub
-
-#End Region    ' OtherRefTab
-
    Private Sub KerfTxBx_EgtClosed(sender As Object, e As EventArgs) Handles KerfTxBx.EgtClosed
       Dim dKerf As Double
       If Not StringToLen(KerfTxBx.Text, dKerf) Then
@@ -2188,8 +1960,6 @@ Public Class RawPartPageUC
          Else
             CreateRawFromPhotoContour()
          End If
-         ' Forzo il riposizionamento del grezzo
-         RefTabModeChange()
          ' Ridisegno
          EgtDraw()
       ElseIf dKerf >= dMinKerf And dKerf < 0 Then
@@ -2252,8 +2022,6 @@ Public Class RawPartPageUC
          Else
             CreateRawFromPhotoContour()
          End If
-         ' Forzo il riposizionamento del grezzo
-         RefTabModeChange()
          ' Ridisegno
          EgtDraw()
       ElseIf dKerf < dMinKerf Then
@@ -2499,7 +2267,6 @@ Public Class RawPartPageUC
    Private Sub RawPartPage_Unloaded(sender As Object, e As RoutedEventArgs)
       ' Rimuovo layer temporaneo per crocette
       EgtErase(m_nTempLay)
-      EgtErase(m_nOtherRefTabLay)
       ' Dichiaro pagina non attiva
       m_bActive = False
    End Sub
@@ -2815,44 +2582,4 @@ Public Class RawPartPageUC
       Return True
    End Function
 
-   Private Function CreateOtherRefTab(nLayerId As Integer, ptP As Point3d) As Boolean
-      EgtEmptyGroup(m_nOtherRefTabLay)
-      If Not m_bOtherRefTab Or Not OtherRefTabChBx.IsEnabled Then
-         EgtDraw()
-         Return False
-      End If
-
-      If File.Exists(m_MainWindow.GetResourcesDir() & "\" & "RefTabBL.nge") Then
-         ' Aggiungo disegno staffa fermo pezzo
-         EgtInsertFile(m_MainWindow.GetResourcesDir() & "\" & "RefTabBL.nge")
-         Dim nLastPart As Integer = EgtGetLastPart()
-         Dim Lay As Integer = EgtGetFirstInGroup(nLastPart)
-         Dim Ent As Integer = EgtGetFirstInGroup(Lay)
-         While Ent <> -1
-            Dim NextEnt As Integer = EgtGetNext(Ent)
-            EgtRelocate(Ent, nLayerId)
-            EgtMove(Ent, ptP - Point3d.ORIG)
-            EgtRotate(Ent, ptP, Vector3d.Z_AX, 90 * m_OtherRefTabPos)
-            Ent = NextEnt
-         End While
-         EgtErase(nLastPart)
-      Else
-         ' Aggiungo crocette
-         ptP += New Vector3d(0, 0, 0.15)
-         Dim vtCrossX As New Vector3d(100, 0, 0)
-         Dim vtCrossY As New Vector3d(0, 100, 0)
-         Dim vtCrossZ As New Vector3d(0, 0, 100)
-         Dim nCrossId1 = EgtCreateLine(nLayerId, ptP, ptP + vtCrossX)
-         EgtSetColor(nCrossId1, New Color3d(245, 0, 0))
-         Dim nCrossId2 = EgtCreateLine(nLayerId, ptP, ptP + vtCrossY)
-         EgtSetColor(nCrossId2, New Color3d(0, 245, 0))
-         Dim nCrossId3 = EgtCreateLine(nLayerId, ptP, ptP + vtCrossZ)
-         EgtSetColor(nCrossId3, New Color3d(0, 0, 245))
-      End If
-
-      EgtDraw()
-      'EgtSaveFile("C:\EgtData\OmagCUT\Temp\MyTest.nge", NGE.BIN)
-      Return True
-   End Function
-
 End Class

Simulation/SimulationPageUC.xaml.vb

@@ -567,55 +567,16 @@ Public Class SimulationPageUC
    End Sub
 
    Private Sub GenerateXPIUC_Click(sender As Object, e As RoutedEventArgs)
+      ' eventualmente fermo la simulazione
+      m_nStatus = MCH_SIM_ST.UI_STOP
+      m_bPlay = False
+      PlayPauseBtn_Click(Nothing, Nothing)
+
       ' se il bottone Shift è premuto apro il file CadCut1 nel programma NotePad
       Dim IsPressedShiftKey As Boolean = False
       If Keyboard.Modifiers And ModifierKeys.Shift Then
          IsPressedShiftKey = True
       End If
-
-      ' Se nella pagina di tagli diretti
-      If m_MainWindow.DirectCutBtn.IsChecked And Not m_MainWindow.CadCutBtn.IsChecked Then
-         ' Genero file CNC (lancio anche se errore in precedenza)
-         Dim sCncPathDirect As String = m_MainWindow.GetCncDir() & "\DirectCut" & m_MainWindow.m_CurrentMachine.sIsoFileExt
-         Dim bOkDirect As Boolean = EgtGenerate(sCncPathDirect, "OmagCut ver." & m_MainWindow.GetVersion())
-
-         ' Costringo ad aggiornare UI
-         UpdateUI()
-         ' Ripristino come fase corrente quella iniziale
-         EgtSetCurrPhase(1)
-         If bOkDirect Then
-            m_CurrProjPage.SetInfoMessage("Genarato file " & "DirectCut" & m_MainWindow.m_CurrentMachine.sIsoFileExt)
-         Else
-            m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
-         End If
-         ' procedo all'apertura del file CadCut1 apenna generato (solo se generazione corretta)
-         If bOkDirect And IsPressedShiftKey Then
-            Try
-               Process.Start("Notepad.exe", sCncPathDirect)
-            Catch ex As Exception
-               EgtOutLog(ex.ToString)
-            End Try
-         End If
-         ' ricarico la pagina di simulazione
-         EgtSetCurrPhase(1)
-         ' nascondo i pezzi in parcheggio
-         HideParkedParts(True)
-         ' Avvio ambiente di simulazione
-         EgtSimInit()
-         EgtSimStart()
-         ' Imposto stato corrente
-         SetStatus(MCH_SIM_ST.UI_STOP)
-         m_bPlay = True
-         ' Costringo ad aggiornare UI
-         UpdateUI()
-         ' esco 
-         Return
-      End If
-
-      ' eventualmente fermo la simulazione
-      m_nStatus = MCH_SIM_ST.UI_STOP
-      m_bPlay = False
-      PlayPauseBtn_Click(Nothing, Nothing)
       Dim bOk As Boolean = True
       EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
       ' Elimino eventuale attrezzaggio da OmagOFFICE

Utility/Utility.vb

@@ -6,36 +6,6 @@ Imports EgtWPFLib
 Imports EgtUILib
 
 Module Utility
-
-   '--------------------------------------------------------------------------------------------------
-#Region "COMPO SOLID3d"
-
-   Friend Function CreateSolid3D(sIniFile As String) As Boolean
-      EgtSaveFile("C:\EgtData\OmagCUT\Temp\Ribasso.nge", NGE.TEXT)
-      Dim bOk As Boolean = False
-      Dim dRawHeight As Double = GetPrivateProfileDouble(S_RAWPART, K_RAWHEIGHT, 30, sIniFile)
-      ' se abilitato e dimensione solido da sotto: creo il solido
-      Dim sPathSOLID As String = String.Empty
-      If GetPrivateProfileString(S_SIDES, "CreateSOLID", "", sPathSOLID, sIniFile) <> 0 And
-         GetPrivateProfileInt(S_SIDES, K_SIZEALWAYSONTOP, 0, sIniFile) = 0 Then
-         ' Recupero file LUA
-         EgtLuaExecFile(sPathSOLID)
-         Dim dThick As Double = dRawHeight
-         EgtLuaSetGlobNumVar("CMP.THICK", dThick)
-         bOk = EgtLuaExecLine("CMP_Draw(false)")
-         Dim nErr As Integer = 0
-         EgtLuaGetGlobIntVar("CMP.ERR", nErr)
-         ' Reset lua
-         EgtLuaResetGlobVar("CMP")
-      Else
-         EgtOutLog("CreateSolid3d Failed: file '" & sPathSOLID & "' not found or parameter 'SizeAlwaysOnTop' is TRUE")
-      End If
-      Return bOk
-   End Function
-
-#End Region    ' Compo Solid3d
-   '--------------------------------------------------------------------------------------------------
-
    Friend Function CompoColor(sIniFile As String) As Color3d
       Dim InsertColor As New Color3d(89, 210, 210, 25)
       Dim IndexColor As Integer = GetPrivateProfileInt(S_COMPO, K_LASTCOLOR, 1, sIniFile)
@@ -48,7 +18,7 @@ Module Utility
    End Function
 
 
-   Friend StopWatch As Stopwatch
+    Friend StopWatch As Stopwatch
 
    Friend Sub TimeSpanInit()
       StopWatch = New Stopwatch
@@ -56,20 +26,20 @@ Module Utility
    End Sub
 
    Friend Function TimeSpanEnd()
-      Dim sTime As String = ""
-      If Not IsNothing(StopWatch) Then
-         StopWatch.Stop()
-         Dim ts As TimeSpan = StopWatch.Elapsed
-         sTime = String.Format("{0:00}:{1:00}:{2:00}.{3:000}", ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds)
-      End If
-      Return sTime
-   End Function
+        Dim sTime As String = ""
+        If Not IsNothing(StopWatch) Then
+            StopWatch.Stop()
+            Dim ts As TimeSpan = StopWatch.Elapsed
+            sTime = String.Format("{0:00}:{1:00}:{2:00}.{3:000}", ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds)
+        End If
+        Return sTime
+    End Function
 
-   '--------------------------------------------------------------------------------------------------
-   Friend Sub UpdateUI()
+    '--------------------------------------------------------------------------------------------------
+    Friend Sub UpdateUI()
       ' Costringo ad aggiornare UI
       Dim nDummy As Integer
-      Application.Current.Dispatcher.Invoke(Windows.Threading.DispatcherPriority.Background,
+      Application.Current.Dispatcher.Invoke(Windows.Threading.DispatcherPriority.Background, _
                                              New Action(Function() nDummy = 0))
    End Sub
 
@@ -396,20 +366,20 @@ Module Utility
       If bOldEnMod Then EgtEnableModified()
    End Sub
 
-   Friend Function SetTextColor(nGroup As Integer) As Boolean
+   Friend Function SetTextColor( nGroup As Integer) As Boolean
       ' Recupero il colore da assegnare ai testi
-      Dim colText As New Color3d(0, 0, 0)
+      Dim colText As New Color3d( 0, 0, 0)
       Dim sTextColor As String = " "
       Dim MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
       If GetPrivateProfileString(S_NEST, K_TEXTCOLOR, " ", sTextColor, MainWindow.GetIniFile()) <> 0 Then
          Dim sTextColorArray() As String = sTextColor.Split(",")
-         Dim nRed As Integer = 0 : Integer.TryParse(sTextColorArray(0), nRed)
-         Dim nGreen As Integer = 0 : Integer.TryParse(sTextColorArray(1), nGreen)
-         Dim nBlue As Integer = 0 : Integer.TryParse(sTextColorArray(2), nBlue)
-         colText.Setup(nRed, nGreen, nBlue)
+         Dim nRed As Integer = 0 : Integer.TryParse( sTextColorArray(0), nRed)
+         Dim nGreen As Integer = 0 : Integer.TryParse( sTextColorArray(1), nGreen)
+         Dim nBlue As Integer = 0 : Integer.TryParse( sTextColorArray(2), nBlue)
+         colText.Setup( nRed, nGreen, nBlue)
       End If
       ' Assegno questo colore ai testi del layer indicato
-      Dim nId As Integer = EgtGetFirstInGroup(nGroup)
+      Dim nId As Integer = EgtGetFirstInGroup( nGroup)
       While nId <> GDB_ID.NULL
          If EgtGetType(nId) = GDB_TY.EXT_TEXT Then
             EgtSetColor(nId, colText)
@@ -419,62 +389,62 @@ Module Utility
       Return True
    End Function
 
-   Friend Function AddTopToPartRegion(nRegId As Integer) As Boolean
-      Dim frReg As New Frame3d : EgtGetGroupGlobFrame(nRegId, frReg)
-      Dim b3Reg As New BBox3d : EgtGetBBoxGlob(nRegId, GDB_BB.STANDARD, b3Reg)
+   Friend Function AddTopToPartRegion( nRegId As Integer) As Boolean
+      Dim frReg As New Frame3d : EgtGetGroupGlobFrame( nRegId, frReg)
+      Dim b3Reg As New BBox3d : EgtGetBBoxGlob( nRegId, GDB_BB.STANDARD, b3Reg)
       Dim dH As Double = Math.Min(0.1 * b3Reg.DimY(), 30)
-      Dim ptIns As New Point3d(b3Reg.Center().x, b3Reg.Max().y - dH, b3Reg.Max().z)
-      ptIns.ToLoc(frReg)
-      Dim nSfrId As Integer = EgtGetFirstInGroup(nRegId)
-      While nSfrId <> GDB_ID.NULL
-         If EgtGetType(nSfrId) = GDB_TY.SRF_FRGN Then Exit While
-         nSfrId = EgtGetNext(nSfrId)
+      Dim ptIns As New Point3d( b3Reg.Center().x, b3Reg.Max().y - dH, b3Reg.Max().z)
+      ptIns.ToLoc( frReg)
+      Dim nSfrId As Integer = EgtGetFirstInGroup( nRegId)
+      While nSfrId <> GDB_ID.NULL 
+         If EgtGetType( nSfrId) = GDB_TY.SRF_FRGN Then Exit While
+         nSfrId = EgtGetNext( nSfrId)
       End While
       If nSfrId <> GDB_ID.NULL Then
-         Dim ptStart As New Point3d(b3Reg.Min().x, b3Reg.Max().y - dH, b3Reg.Max().z)
-         ptStart.ToLoc(frReg)
-         Dim ptEnd As New Point3d(b3Reg.Max().x, b3Reg.Max().y - dH, b3Reg.Max().z)
-         ptEnd.ToLoc(frReg)
-         Dim nLineId As Integer = EgtCreateLine(nRegId, ptStart, ptEnd)
+         Dim ptStart As New Point3d ( b3Reg.Min().x, b3Reg.Max().y - dH, b3Reg.Max().z)
+         ptStart.ToLoc( frReg)
+         Dim ptEnd As New Point3d ( b3Reg.Max().x, b3Reg.Max().y - dH, b3Reg.Max().z)
+         ptEnd.ToLoc( frReg)
+         Dim nLineId As Integer = EgtCreateLine( nRegId, ptStart, ptEnd)
          Dim nCount As Integer = 0
-         Dim nNewId As Integer = EgtTrimCurveWithRegion(nLineId, nSfrId, True, False, nCount)
+         Dim nNewId As Integer = EgtTrimCurveWithRegion( nLineId, nSfrId, True, False, nCount) 
          If nNewId <> GDB_ID.NULL Then
-            If nCount > 0 Then EgtMidPoint(nNewId, ptIns)
+            If nCount > 0 Then EgtMidPoint( nNewId, ptIns)
             For nTmpId As Integer = nNewId To nNewId + nCount - 1
-               EgtErase(nTmpId)
-            Next
+               EgtErase( nTmpId)
+            Next 
          Else
-            EgtErase(nLineId)
+            EgtErase( nLineId)
          End If
       End If
-      Dim vtDir As New Vector3d(1, 0, 0)
-      vtDir.ToLoc(frReg)
+      Dim vtDir As New Vector3d( 1, 0, 0)
+      vtDir.ToLoc( frReg)
       Dim dLen, dAngV, dAngH As Double
-      vtDir.ToSpherical(dLen, dAngV, dAngH)
+      vtDir.ToSpherical( dLen, dAngV, dAngH)
       Dim nText As Integer = EgtCreateTextAdv(nRegId, ptIns, dAngH, "*TOP*", "", 500, False, dH, 1, 0, INS_POS.MC)
-      Return (nText <> GDB_ID.NULL)
+      Return ( nText <> GDB_ID.NULL)
    End Function
 
-   Friend Function SetBlockAndSlabNbr(sBlock As String, sSlabNbr As String) As Boolean
+   Friend Function SetBlockAndSlabNbr( sBlock As String, sSlabNbr As String) As Boolean
       Dim nRawId As Integer = GetCurrentRaw()
       If nRawId = GDB_ID.NULL Then Return False
       If String.IsNullOrWhiteSpace(sBlock) Then sSlabNbr = ""
       ' Assegno info
-      EgtSetInfo(nRawId, INFO_RAW_BLOCK, sBlock)
-      EgtSetInfo(nRawId, INFO_RAW_SLABNBR, sSlabNbr)
+      EgtSetInfo( nRawId, INFO_RAW_BLOCK, sBlock)
+      EgtSetInfo( nRawId, INFO_RAW_SLABNBR, sSlabNbr)
       ' Cancello eventuale vecchio BarCode
-      EgtErase(EgtGetFirstNameInGroup(nRawId, NAME_BARCODE))
+      EgtErase( EgtGetFirstNameInGroup( nRawId, NAME_BARCODE))
       ' Se definito, inserisco nuovo BarCode
       Dim sBarCode As String = sBlock & " - " & sSlabNbr
       If sBarCode <> " - " Then
          Dim ptRawCen As Point3d
-         GetRawCenter(ptRawCen)
+         GetRawCenter( ptRawCen)
          Dim ptRawMin, ptRawMax As Point3d
-         GetRawBox(ptRawMin, ptRawMax)
-         Dim ptText As New Point3d(ptRawCen.x, ptRawCen.y, ptRawMax.z)
-         Dim nText As Integer = EgtCreateTextAdv(nRawId, ptText, 0, sBarCode, "", 500, False, 50.0, 1, 0, INS_POS.MC, GDB_RT.GLOB)
-         EgtSetName(nText, NAME_BARCODE)
-         EgtSetColor(nText, New Color3d(255, 0, 0))
+         GetRawBox( ptRawMin, ptRawMax)
+         Dim ptText As New Point3d( ptRawCen.x, ptRawCen.y, ptRawMax.z)
+         Dim nText As Integer = EgtCreateTextAdv( nRawId, ptText, 0, sBarCode, "", 500, False, 50.0, 1, 0, INS_POS.MC, GDB_RT.GLOB)
+         EgtSetName( nText, NAME_BARCODE)
+         EgtSetColor( nText, New Color3d(255, 0, 0))
       End If
       Return True
    End Function
@@ -510,7 +480,7 @@ Module Utility
 
    End Class
 
-   Public Function GetPrivateProfileLanguage(lpAppName As String, lpKeyName As String, lpFileName As String) As Language
+   Public Function GetPrivateProfileLanguage( lpAppName As String, lpKeyName As String, lpFileName As String) As Language
       Dim sVal As String = String.Empty
       GetPrivateProfileString(lpAppName, lpKeyName, "", sVal, lpFileName)
       Dim sItems() As String = sVal.Split(",".ToCharArray)

VeinMatching/VeinMatchingWindow.xaml.vb

@@ -4,7 +4,6 @@ Imports System.Collections.ObjectModel
 Imports System.Runtime.InteropServices
 Imports EgtUILib
 Imports EgtWPFLib
-Imports OmagCUT.VeinMatchingWindow
 
 Public Class VeinMatchingWindow
 
@@ -20,11 +19,6 @@ Public Class VeinMatchingWindow
    Private m_nIdToSel As Integer = GDB_ID.NULL
    Private m_nIdToDesel As Integer = GDB_ID.NULL
 
-   Enum ALETTE
-      F = 2
-      A = 1
-   End Enum
-
    Private Sub Window_Initialized(sender As Object, e As EventArgs)
       ' Assegnazione scena all'host e posizionamento nella PlacePageGrid
       VeinMatchingSceneHost.Child = VeinMatchingScene
@@ -273,7 +267,7 @@ Friend Module VeinMatching
       Dim nRegId As Integer = EgtGetFirstInGroup(nRegLayId)
       While nRegId <> GDB_ID.NULL
          If EgtGetType(nRegId) = GDB_TY.SRF_FRGN Then
-            Exit While
+               Exit While
          End If
          nRegId = EgtGetNext(nRegId)
       End While
@@ -370,21 +364,19 @@ Friend Module VeinMatching
       ' Imposto il contesto del progetto
       EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
       ' Riattivo il gruppo di lavoro
-      EgtSetCurrMachGroup(EgtGetFirstMachGroup())
+      EgtSetCurrMachGroup( EgtGetFirstMachGroup())
       ' Verifico quali pezzi sono nel grezzo, per dichiararlo al VM
-      nId = EgtGetFirstPartInRawPart(CamAuto.GetCurrentRaw())
+      nId = EgtGetFirstPartInRawPart( CamAuto.GetCurrentRaw())
       While nId <> GDB_ID.NULL
          ' Dichiaro pezzo nel grezzo per VM
-         VeinMatching.OnInsertPartInRaw(nId)
+         VeinMatching.OnInsertPartInRaw( nId)
          ' Passo al pezzo successivo
          nId = EgtGetNextPartInRawPart(nId)
       End While
       ' Ripristino visualizzazione di eventuali pezzi in parcheggio
       ShowParkedParts()
       ' Ripristino il contesto corrente
-      EgtSetCurrentContext(nCurrCtx)
-
-      ' EgtSaveFile("C:\EgtData\OmagCUT\Temp\MyVeinMatch.nge", NGE.TEXT)
+      EgtSetCurrentContext( nCurrCtx)
       Return True
    End Function
 
@@ -430,11 +422,11 @@ Friend Module VeinMatching
       nCurrId = EgtGetFirstNameInGroup(nVeinId2, NAME_PREVIEW)
       EgtSetStatus(nCurrId, GDB_ST.OFF)
       ' Se esiste OutLoop.orig OutLoop -> OutLoop.mach e OutLoop.orig -> OutLoop
-      Dim nOutLoopOrig As Integer = EgtGetFirstNameInGroup(nVeinId2, NAME_OUTLOOP & ".orig")
+      Dim nOutLoopOrig As Integer = EgtGetFirstNameInGroup( nVeinId2, NAME_OUTLOOP & ".orig")
       If nOutLoopOrig <> GDB_ID.NULL Then
-         Dim nOutLoop As Integer = EgtGetFirstNameInGroup(nVeinId2, NAME_OUTLOOP)
-         EgtSetName(nOutLoop, NAME_OUTLOOP & ".mach")
-         EgtSetName(nOutLoopOrig, NAME_OUTLOOP)
+         Dim nOutLoop As Integer = EgtGetFirstNameInGroup( nVeinId2, NAME_OUTLOOP)
+         EgtSetName( nOutLoop, NAME_OUTLOOP & ".mach")
+         EgtSetName( nOutLoopOrig, NAME_OUTLOOP)
       End If
       ' Se necessario, ripristino il contesto originale
       If nCurrCtx > 0 Then EgtSetCurrentContext(nCurrCtx)
@@ -563,8 +555,8 @@ Friend Module VeinMatching
 
          ' Se richiesto, eseguo deselezione
          If bDeselect Then EgtDeselectObj(nId)
-      End If
-      EgtDraw()
+         End If
+         EgtDraw()
       EgtSetCurrentContext(nMainCtx)
       Return True
    End Function
@@ -1047,44 +1039,37 @@ Friend Module VeinMatching
    End Function
 
    Friend Function MoveAlettaSolid(ByRef Item As Aletta, ByRef ThicknessRaw As Double) As Boolean
-      ' A: alzatina, F: frontalino
+
       Dim nType As Integer
       If Not EgtGetInfo(Item.IdSideRef, "AF", nType) Then Return False
 
-      Dim ptSRef, ptERef, ptS, ptE As Point3d
-      ' Piano cucina
+      Dim ptSRef, ptERef, ptE As Point3d
       If Not EgtStartPoint(Item.IdSideRef, GDB_ID.ROOT, ptSRef) Then Return False
       If Not EgtEndPoint(Item.IdSideRef, GDB_ID.ROOT, ptERef) Then Return False
-      ' AlzFront
-      If Not EgtStartPoint(Item.SideId, GDB_ID.ROOT, ptS) Then Return False
       If Not EgtEndPoint(Item.SideId, GDB_ID.ROOT, ptE) Then Return False
 
-      ' vettore lato cucina
-      Dim vtRotRef As Vector3d = ptERef - ptSRef
-      ' vettore lato AlzFront
-      Dim vtRot As Vector3d = ptE - ptS
-
       ' ruoto il solido intorno al lato di riferimento
-      If nType = ALETTE.A Then
-         EgtRotate(Item.PartId, ptE, vtRot, 90, GDB_RT.GLOB)
-      ElseIf nType = ALETTE.F Then
+      Dim vtRot As Vector3d = ptERef - ptSRef
+      If nType = 1 Then
          EgtRotate(Item.PartId, ptE, vtRot, -90, GDB_RT.GLOB)
+      ElseIf nType = 2 Then
+         EgtRotate(Item.PartId, ptE, vtRot, 90, GDB_RT.GLOB)
       End If
 
       ' punto di riferimento per la traslazione sul solido
       Dim ptSolid As Point3d
-      If nType = ALETTE.A Then
+      If nType = 1 Then
          ' cerco id della curva che definisce la front face
          Dim nSolidGrp As Integer = EgtGetFirstNameInGroup(Item.PartId, NAME_VM_SOLID)
          Dim nFrontCrvId As Integer = EgtGetFirstInGroup(nSolidGrp)
-         EgtStartPoint(nFrontCrvId, GDB_ID.ROOT, ptSolid)
-      ElseIf nType = ALETTE.F Then
-         EgtStartPoint(Item.SideId, GDB_ID.ROOT, ptSolid)
+         EgtStartPoint(nFrontCrvId, ptSolid)
+      ElseIf nType = 2 Then
+         EgtStartPoint(Item.SideId, ptSolid)
       End If
 
-      ' Dim ItemFrame As New Frame3d
-      ' If Not EgtGetGroupGlobFrame(Item.PartId, ItemFrame) Then Return False
-      ' ptSolid.ToGlob(ItemFrame)
+      Dim ItemFrame As New Frame3d
+      If Not EgtGetGroupGlobFrame(Item.PartId, ItemFrame) Then Return False
+      ptSolid.ToGlob(ItemFrame)
 
       'punto di riferimento per la traslazione sul piano cucina
       Dim ptKitchen As Point3d = ptERef
@@ -1092,16 +1077,6 @@ Friend Module VeinMatching
       Dim vtMove As Vector3d = ptKitchen - ptSolid
       EgtMove(Item.PartId, vtMove, GDB_RT.GLOB)
 
-      ' eventualmente ruoto per allineare l'alzatina al piano cucina
-      Dim dLRef, dAngVRef, dAngHRef As Double
-      vtRotRef.ToSpherical(dLRef, dAngVRef, dAngHRef)
-      Dim dL, dAngV, dAngH As Double
-      vtRot.Rotate(Vector3d.Z_AX, 180)
-      vtRot.ToSpherical(dL, dAngV, dAngH)
-      Dim dDelta As Double = dAngHRef - dAngH
-      If Math.Abs(dDelta) < EPS_ANG_SMALL Then Return True
-      EgtRotate(Item.PartId, ptKitchen, Vector3d.Z_AX, dDelta, GDB_RT.GLOB)
-
       Return True
    End Function
 
@@ -1231,7 +1206,7 @@ Friend Module VeinMatching
       ' Se necessario, cambio contesto
       If m_nVeinCtx <> nCurrCtx Then
          If EgtSetCurrentContext(m_nVeinCtx) Then
-            Return If(nCurrCtx > 0, nCurrCtx, -2)
+            Return If( nCurrCtx > 0, nCurrCtx, -2)
          Else
             Return 0
          End If
@@ -1293,7 +1268,7 @@ Friend Module VeinMatching
       While nId <> GDB_ID.NULL
          Dim nOriId As Integer
          If EgtGetInfo(nId, KEY_ORI_ID, nOriId) AndAlso nOriId = nPartId Then
-            Exit While
+               Exit While
          End If
          nId = EgtGetNextPart(nId)
       End While