Aggiornamento versione 2.6f1

Constants/ConstGen.vb

@@ -223,8 +223,6 @@ Module ConstGen
    Public Const INFO_DEPTH2 As String = "Depth2"
    Public Const INFO_AGG2 As String = "Agg2"
    Public Const INFO_ROUNDOFF As String = "RoundOff"
-   Public Const INFO_DIRECTCUT As String = "DirectCut"
-   Public Const INFO_STEP_TYPE As String = "StepType"
    ' Info in entità da tagliare per taglio ristretto
    Public Const INFO_STRICT As String = "Strict"
    ' Info in entità da tagliare per angolo di lato e tallone

DirectCuts/FlatteningCut.xaml.vb

@@ -1,5 +1,4 @@
 Imports EgtUILib
-Imports EgtUILib.EgtInterface
 
 Public Class FlatteningCut
 
@@ -39,7 +38,7 @@ Public Class FlatteningCut
    ' Array delle modalità di acquisizione dei punti
    Private m_PointsModeArray(2) As String
    ' Array delle tipologia di lavorazione della spianatura
-   Private m_TypeArray(2) As String
+   Private m_TypeArray(1) As String
    ' Punto selezionato nel disegno
    Private m_ptPrev As Point3d
    ' Layer per crocette temporanee
@@ -58,9 +57,8 @@ Public Class FlatteningCut
    End Enum
    ' Costanti che indicano la tipologia di lavorazione della spianatura
    Private Enum MACH_TYPE As Integer
-      ZIGZAG = 0
-      ONEWAY = 1
-      SPIRAL = 2
+      ONEWAY = 0
+      ZIGZAG = 1
    End Enum
    'Costante che indica il lato in cui posizionare i tagli
    Private Enum CutSide As Integer
@@ -77,9 +75,8 @@ Public Class FlatteningCut
       ' la associo alla combobox
       PointModeCmBx.ItemsSource = m_PointsModeArray
       ' Creo lista tipo lavorazione
-      m_TypeArray(MACH_TYPE.ZIGZAG) = EgtMsg(MSG_COMBOBOXPARAM + 38)
       m_TypeArray(MACH_TYPE.ONEWAY) = EgtMsg(MSG_COMBOBOXPARAM + 39)
-      m_TypeArray(MACH_TYPE.SPIRAL) = EgtMsg(MSG_COMBOBOXPARAM + 51)
+      m_TypeArray(MACH_TYPE.ZIGZAG) = EgtMsg(MSG_COMBOBOXPARAM + 38)
       ' la associo alla combobox
       TypeCmBx.ItemsSource = m_TypeArray
       ' assegno messaggi
@@ -96,16 +93,16 @@ Public Class FlatteningCut
       SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
       OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
       ' Carico i dati dell'ultimo taglio
-      m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
-      m_dAngO = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_ANGH, m_dAngO, m_MainWindow.GetIniFile())
-      m_dLen = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_LENGTH, m_dLen, m_MainWindow.GetIniFile())
-      m_dWid = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_WIDTH, m_dWid, m_MainWindow.GetIniFile())
+      m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
+      m_dAngO = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_ANGH, m_dAngO, m_MainWindow.GetIniFile())
+      m_dLen = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_LENGTH, m_dLen, m_MainWindow.GetIniFile())
+      m_dWid = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_WIDTH, m_dWid, m_MainWindow.GetIniFile())
       m_dOverlap = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_OVERLAP, m_dOverlap, m_MainWindow.GetIniFile())
       m_dZReleased = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_Z_RELEASED, m_dZReleased, m_MainWindow.GetIniFile())
       m_bHeadSide = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_FLATT_HEADSIDE, 0, m_MainWindow.GetIniFile()) <> 0)
-      m_nMachType = GetPrivateProfileInt(S_DIRECTCUTS, K_DC_FLATT_MACHTYPE, m_nMachType, m_MainWindow.GetIniFile())
-      m_bRotLock = (GetPrivateProfileInt(S_DIRECTCUTS, K_DC_FLATT_ROTLOCK, 0, m_MainWindow.GetIniFile()) <> 0)
-      m_ptTipP1.x = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_POSX, m_ptTipP1.x, m_MainWindow.GetIniFile())
+      m_nMachType = GetPrivateProfileInt( S_DIRECTCUTS, K_DC_FLATT_MACHTYPE, m_nMachType, m_MainWindow.GetIniFile())
+      m_bRotLock = ( GetPrivateProfileInt( S_DIRECTCUTS, K_DC_FLATT_ROTLOCK, 0, m_MainWindow.GetIniFile()) <> 0)
+      m_ptTipP1.x = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_POSX, m_ptTipP1.x, m_MainWindow.GetIniFile())
       m_ptTipP1.y = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_POSY, m_ptTipP1.y, m_MainWindow.GetIniFile())
    End Sub
 
@@ -128,16 +125,16 @@ Public Class FlatteningCut
       ' Disabilito registrazione progetto modificato
       EgtDisableModified()
       ' Creo layer temporaneo per crocette
-      m_nTempLay = EgtCreateGroup(GDB_ID.ROOT)
-      EgtSetLevel(m_nTempLay, GDB_LV.TEMP)
+      m_nTempLay = EgtCreateGroup( GDB_ID.ROOT)
+      EgtSetLevel( m_nTempLay, GDB_LV.TEMP)
       ' Origine tavola
       m_bRawOk = True
-      If Not EgtGetTableRef(1, m_ptTabOri) Then
+      If Not EgtGetTableRef( 1, m_ptTabOri) Then
          m_bRawOk = False
          EgtOutLog("Error on TableRef1")
       End If
       ' Dati del grezzo
-      If Not GetRawBox(m_ptRawMin, m_ptRawMax) Then
+      If Not GetRawBox( m_ptRawMin, m_ptRawMax) Then
          m_bRawOk = False
          EgtOutLog("Error on RawBox")
       End If
@@ -145,7 +142,7 @@ Public Class FlatteningCut
       m_bPointP1Ok = False
       m_bPointP2Ok = False
       ' Inizializzo primo punto acquisito dal disegno
-      m_ptPrev = m_ptTipP1 + (m_ptTabOri - Point3d.ORIG())
+      m_ptPrev = m_ptTipP1 + ( m_ptTabOri - Point3d.ORIG())
       m_ptPrev.z = m_ptRawMax.z
       ' Disegno crocetta che indica il punto acquisito
       CreateCross(m_nTempLay, m_ptPrev)
@@ -154,10 +151,10 @@ Public Class FlatteningCut
       SetCoordVisibility(True)
       ShowCoord()
       ' Assegno parametri di lavorazione già definiti
-      DepthTxBx.Text = LenToString(m_dDepth, 1)
-      DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
-      LenghtTxBx.Text = LenToString(m_dLen, 1)
-      WidthTxBx.Text = LenToString(m_dWid, 2)
+      DepthTxBx.Text = LenToString( m_dDepth, 1)
+      DirectionTxBx.Text = DoubleToString( m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
+      LenghtTxBx.Text = LenToString( m_dLen, 1)
+      WidthTxBx.Text = LenToString( m_dWid, 2)
       OverlapTxBx.Text = LenToString(m_dOverlap, 2)
       ZReleasedTxBx.Text = LenToString(m_dZReleased, 2)
       ' carico la quota di svincolo per la spianatura
@@ -179,16 +176,16 @@ Public Class FlatteningCut
 
    Friend Sub FlatteningCut_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
       ' Salvo i dati correnti
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_DEPTH, DoubleToString(m_dDepth, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_ANGH, DoubleToString(m_dAngO, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_LENGTH, DoubleToString(m_dLen, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_WIDTH, DoubleToString(m_dWid, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_OVERLAP, DoubleToString(m_dOverlap, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_Z_RELEASED, DoubleToString(m_dZReleased, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_HEADSIDE, If(m_bHeadSide, "1", "0"), m_MainWindow.GetIniFile())
-      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_DEPTH, DoubleToString( m_dDepth, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_ANGH, DoubleToString( m_dAngO, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_LENGTH, DoubleToString( m_dLen, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_WIDTH, DoubleToString( m_dWid, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_OVERLAP, DoubleToString(m_dOverlap, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_Z_RELEASED, DoubleToString(m_dZReleased, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_HEADSIDE, If( m_bHeadSide, "1", "0"), m_MainWindow.GetIniFile())
+      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())
       ' Se non vado in simulazione
       If Not m_bSimul Then
@@ -299,7 +296,7 @@ Public Class FlatteningCut
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP1) Then Return
             ' Ora imposto la lama corrente
             If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-            ' Altrimenti da lama
+         ' Altrimenti da lama
          Else
             ' Imposto la lama corrente
             If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
@@ -317,7 +314,7 @@ Public Class FlatteningCut
          m_dAngO = dTAngO + 90
          DirectionTxBx.Text = DoubleToString(m_dAngO - m_MainWindow.m_CurrentMachine.dDeltaC, 2)
 
-         ' Altrimenti da disegno
+      ' Altrimenti da disegno
       Else
          ' Assegno punto selezionato nel disegno a m_ptTipP1
          m_ptTipP1 = m_ptPrev
@@ -381,7 +378,7 @@ Public Class FlatteningCut
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) Then Return
             ' Ora imposto la lama corrente
             If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
-            ' Altrimenti da lama
+         ' Altrimenti da lama
          Else
             ' Imposto la lama corrente
             If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
@@ -394,7 +391,7 @@ Public Class FlatteningCut
          m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP2Ok = True
 
-         ' Altrimenti da disegno
+      ' Altrimenti da disegno
       Else
          ' Assegno punto selezionato nel disegno a m_ptTipP2
          m_ptTipP2 = m_ptPrev
@@ -608,9 +605,9 @@ Public Class FlatteningCut
       m_CurrProjPage.SetWarningMessage("Trial Version")
 #Else
       ' Verifico non sia versione Ufficio
-      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
-         m_CurrProjPage.SetWarningMessage("Office Version")
-         Return
+      If m_MainWindow.GetKeyOption( MainWindow.KEY_OPT.OFFICE_TYPE) Then
+          m_CurrProjPage.SetWarningMessage( "Office Version")
+          Return
       End If
       ' Verifico ci sia un taglio valido
       If Not m_bCutOk Then Return
@@ -685,7 +682,6 @@ Public Class FlatteningCut
       Dim ptStart As Point3d = m_ptTipP1
       ptStart.z = 0
       Dim nCutId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, m_dLen)
-      EgtSetInfo(nCutId, INFO_DIRECTCUT, 1)
       ' Imposto affondamento e angolo di fianco sul taglio
       EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth)
       If (GetPrivateProfileInt(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, 1, m_MainWindow.GetMachIniFile()) <> 0) Then
@@ -698,7 +694,6 @@ Public Class FlatteningCut
       If RotLockChBx.IsChecked Then
          EgtSetInfo(nCutId, INFO_ENABLE_INVERT, False)
       End If
-      EgtSetInfo(nCutId, INFO_STEP_TYPE, m_nMachType)
       ' Funzione che crea i tagli successivi al primo
       MultiplyCut(nLayerId, nCutId)
       ' Creo layer per crocetta di riferimento

DirectCuts/SingleDrillUC.xaml.vb

@@ -72,10 +72,7 @@ Public Class SingleDrillUC
    Private Sub SingleDrill_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       m_sCurrDrill = m_CurrentMachine.sCurrDrill
       GetDrillFromDrilling(m_sCurrDrill, m_CurrentMachine.sCurrDrilling)
-      ' rimuovo utensile su uscite 1
-      EgtSetCalcTool("", "H1", 1)
-      ' imposto utensile su uscita 2
-      EgtSetCalcTool(m_sCurrDrill, "H1", 2)
+
       ' recupero informazioni del foretto usato
       EgtTdbSetCurrTool(m_sCurrDrill)
       EgtTdbGetCurrToolParam(MCH_TP.DIAM, m_dDiameter)
@@ -266,7 +263,7 @@ Public Class SingleDrillUC
          m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
          m_bPointP1Ok = True
          ' Imposto la lama corrente
-         If Not EgtSetCalcTool(sDrill, "H1", 2) Then Return
+         If Not EgtSetCalcTool(sDrill, "H1", 1) Then Return
       End If
 
       ' Disegno il taglio
@@ -446,9 +443,9 @@ Public Class SingleDrillUC
       ptIns.z = dRawHeight
       ' Inserisco il pezzo nel grezzo
       EgtAddPartToRawPart(nPartId, ptIns, m_MainWindow.m_CurrentProjectPageUC.m_nRawId)
-      EgtSetCurrPhase(1)
       ' Inserisco la lavorazione
       m_bCutOk = AddMachinings(nPartId) AndAlso UpdateAllMachiningsToolpaths()
+      EgtSetCurrPhase(1)
       ' Eventuale eliminazione Home finale
       If Not m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome Then
          RemoveFinalHome()

My Project/AssemblyInfo.vb

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

NcComm/CNCommunication.vb

@@ -275,7 +275,6 @@ Public Class CNCommunication
 
          ' Recupero e imposto le variabili per i dati del CN (feed, speed,...)
          GetPrivateProfileString(S_NCDATA, K_COMM, "XIP01, 0, 10, 0, 0, 0", sVal, m_MainWindow.GetMachIniFile())
-         EgtOutLog(" → Tipo di comunicazione: " & sVal)
          m_CN.SetCnDataVar(CN_generico.CnData.Comm, sVal)
          GetPrivateProfileString(S_NCDATA, K_REFRESH, "200", sVal, m_MainWindow.GetMachIniFile())
          m_CN.SetCnDataVar(CN_generico.CnData.Refresh, sVal)

NcComm/M_MMFiles.vb

@@ -345,9 +345,6 @@ Module M_MMFiles
    Function ActivateProgram(ByVal sz_part_program As String) As Short
       'EgtOutLog("ActivateProgram start dell'm_mmFiles")
 
-      EgtOutLog("Flag di comando: " & CMD.CMD_ActivateProgram.ToString)
-      EgtOutLog("Stringa di comando: " & sz_part_program.ToString)
-
       SiemensSend.n_Command = CMD.CMD_ActivateProgram
       SiemensSend.sz_string = sz_part_program
 

NcComm/M_Num_old.vb

@@ -289,7 +289,6 @@ Namespace Num
 
          ' Stringhe valide : "COM" o "XIP01, 0, 10, 0, 0, 0"
          Dim nret As Integer = NC_connect(m_szCnDataVar(CnData.Comm))
-         EgtOutLog(" → Risultatao apertura connessiione: " & nret)
          If nret <> 0 Then Return False
 
          n_state = 2
@@ -584,6 +583,7 @@ Namespace Num
       End Function
 
       Function Read_machine_pos() As Int16
+
          Dim nret As Int16
          Dim i, n As Integer
 

Project/CurrentProjectPageUC.xaml.vb

@@ -495,9 +495,7 @@ Public Class CurrentProjectPageUC
       ' Nuova geometria
       Dim nAddTabId As Integer = GDB_ID.NULL
       ' Se esiste geometria di riferimento
-      Dim sNameTable As String = MAIN_TAB
-      EgtGetTableName(sNameTable)
-      Dim nRefAddTabId = EgtGetFirstNameInGroup(EgtGetFirstNameInGroup(EgtGetTableId(sNameTable), "SOLID"), MACH_ADD_TABLE)
+      Dim nRefAddTabId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( EgtGetTableId( MAIN_TAB), "SOLID"), MACH_ADD_TABLE)
       If nRefAddTabId <> GDB_ID.NULL Then
          nAddTabId = EgtCopyGlob( nRefAddTabId, nFixtId)
          EgtSetStatus( nAddTabId, GDB_ST.ON_)

RawPhoto/RawPartPageUC.xaml

@@ -136,9 +136,7 @@
                   Style="{DynamicResource OmagCut_YellowToggleButton}"/>
                     <ToggleButton Name="RemoveBtn" Grid.Column="1"
                   Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-                    <Button Name="CloseBtn" Grid.Row="1" 
-                  Style="{DynamicResource OmagCut_YellowTextButton}"/>
-                    <Button Name="RectangleBtn" Grid.Row="1" Grid.Column="1"
+                    <Button Name="CloseBtn" Grid.Row="1" Grid.ColumnSpan="2" 
                   Style="{DynamicResource OmagCut_YellowTextButton}"/>
                 </Grid>
 

RawPhoto/RawPartPageUC.xaml.vb

@@ -210,7 +210,6 @@ Public Class RawPartPageUC
       AddBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 14)           'Add - Aggiungi
       RemoveBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 15)        'Remove - Rimuovi
       CloseBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 31)         'Close - Chiudi
-      RectangleBtn.Content = "Rectangle"
       ConfirmPhotoBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 24)  'Conferma
 
       OtherRefTabTxBl.Text = "New Ref On Tab"
@@ -329,7 +328,6 @@ Public Class RawPartPageUC
          RawModeCmBx.SelectedIndex = RAWMODE.BY_POINTS
          PointsGpBx.Visibility = Windows.Visibility.Visible
          CloseBtn.Visibility = Windows.Visibility.Hidden
-         RectangleBtn.Visibility = Windows.Visibility.Hidden
          ' Visualizzo crocette
          UpdateCircles()
          EgtZoom(ZM.ALL)
@@ -758,8 +756,6 @@ Public Class RawPartPageUC
    End Sub
 
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
-      CloseBtn.IsEnabled = False
-      RectangleBtn.IsEnabled = False
       ' Non è possibile uscire con tastatura in corso
       If m_bProbingOn Then Return
       ' reimposto il comando OutLine
@@ -925,7 +921,6 @@ Public Class RawPartPageUC
             RawModeView()
             ' Disattivo il bottone
             CloseBtn.IsEnabled = False
-            RectangleBtn.IsEnabled = False
             OkBtn.IsEnabled = False
          Case 3          ' Da Lama
             If Not m_MainWindow.m_CurrentMachine.bSaw Then    ' Da fotografia
@@ -958,7 +953,6 @@ Public Class RawPartPageUC
             RawModeView()
             ' Disattivo il bottone
             CloseBtn.IsEnabled = False
-            RectangleBtn.IsEnabled = False
             OkBtn.IsEnabled = False
          Case 4          ' Da fotografia
             ' Se ero in modalità da laser
@@ -1023,7 +1017,6 @@ Public Class RawPartPageUC
             AddBtn.SetValue(Grid.RowSpanProperty, 2)
             RemoveBtn.SetValue(Grid.RowSpanProperty, 2)
             CloseBtn.Visibility = Windows.Visibility.Hidden
-            RectangleBtn.Visibility = Windows.Visibility.Hidden
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
@@ -1046,7 +1039,6 @@ Public Class RawPartPageUC
             AddBtn.SetValue(Grid.RowSpanProperty, 1)
             RemoveBtn.SetValue(Grid.RowSpanProperty, 1)
             CloseBtn.Visibility = Windows.Visibility.Visible
-            RectangleBtn.Visibility = Windows.Visibility.Visible
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
@@ -1069,7 +1061,6 @@ Public Class RawPartPageUC
             AddBtn.SetValue(Grid.RowSpanProperty, 2)
             RemoveBtn.SetValue(Grid.RowSpanProperty, 2)
             CloseBtn.Visibility = Windows.Visibility.Hidden
-            RectangleBtn.Visibility = Windows.Visibility.Hidden
             ' Attivo bottoni zone rovinate
             DamagedAreaGpBx.Visibility = Windows.Visibility.Visible
             ' Disattivo bottoni foto
@@ -1109,7 +1100,6 @@ Public Class RawPartPageUC
             AddBtn.SetValue(Grid.RowSpanProperty, 1)
             RemoveBtn.SetValue(Grid.RowSpanProperty, 1)
             CloseBtn.Visibility = Windows.Visibility.Visible
-            RectangleBtn.Visibility = Windows.Visibility.Visible
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
@@ -1131,7 +1121,6 @@ Public Class RawPartPageUC
             AddBtn.SetValue(Grid.RowSpanProperty, 1)
             RemoveBtn.SetValue(Grid.RowSpanProperty, 1)
             CloseBtn.Visibility = Windows.Visibility.Visible
-            RectangleBtn.Visibility = Windows.Visibility.Visible
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
@@ -1153,7 +1142,6 @@ Public Class RawPartPageUC
             AddBtn.SetValue(Grid.RowSpanProperty, 1)
             RemoveBtn.SetValue(Grid.RowSpanProperty, 1)
             CloseBtn.Visibility = Windows.Visibility.Visible
-            RectangleBtn.Visibility = Windows.Visibility.Visible
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
@@ -1210,9 +1198,6 @@ Public Class RawPartPageUC
    End Sub
 
    Private Sub AddBtn_Click(sender As Object, e As RoutedEventArgs) Handles AddBtn.Click
-      ' disabilito i comandi di chiusura contorno
-      CloseBtn.IsEnabled = False
-      RectangleBtn.IsEnabled = False
       Select Case m_ActiveRawMode
          Case RAWMODE.RECTANGLE
             AddBtn.IsChecked = False
@@ -1261,15 +1246,9 @@ Public Class RawPartPageUC
                m_bptLast = True
             End If
             m_ptLast = ptAcquired
-            ' Se ho almeno un segmento allora deve essere la diagonale
-            If m_CurveXKerfList.Count = 1 Then
-               OkBtn.IsEnabled = True
-               RectangleBtn.IsEnabled = True
-            End If
             If m_CurveXKerfList.Count > 1 Then
                OkBtn.IsEnabled = True
                CloseBtn.IsEnabled = True
-               RectangleBtn.IsEnabled = False
             End If
             AddBtn.IsChecked = False
             EgtDraw()
@@ -1315,14 +1294,9 @@ Public Class RawPartPageUC
                m_bptLast = True
             End If
             m_ptLast = ptAcquired
-            If m_CurveXKerfList.Count = 1 Then
-               OkBtn.IsEnabled = True
-               RectangleBtn.IsEnabled = True
-            End If
             If m_CurveXKerfList.Count > 1 Then
                OkBtn.IsEnabled = True
                CloseBtn.IsEnabled = True
-               RectangleBtn.IsEnabled = False
             End If
             AddBtn.IsChecked = False
             EgtDraw()
@@ -1378,14 +1352,9 @@ Public Class RawPartPageUC
                m_bptLast = True
             End If
             m_ptLast = ptAcquired
-            If m_CurveXDamagedAreaList.Count = 1 Then
-               OkBtn.IsEnabled = True
-               RectangleBtn.IsEnabled = True
-            End If
             If m_CurveXDamagedAreaList.Count > 1 Then
                OkBtn.IsEnabled = True
                CloseBtn.IsEnabled = True
-               RectangleBtn.IsEnabled = False
             End If
             AddBtn.IsChecked = False
             EgtDraw()
@@ -1431,14 +1400,9 @@ Public Class RawPartPageUC
                m_bptLast = True
             End If
             m_ptLast = ptAcquired
-            If m_CurveXDamagedAreaList.Count = 1 Then
-               OkBtn.IsEnabled = True
-               RectangleBtn.IsEnabled = True
-            End If
             If m_CurveXDamagedAreaList.Count > 1 Then
                OkBtn.IsEnabled = True
                CloseBtn.IsEnabled = True
-               RectangleBtn.IsEnabled = False
             End If
             AddBtn.IsChecked = False
             EgtDraw()
@@ -1523,17 +1487,6 @@ Public Class RawPartPageUC
                   ' Aggiorno ptLast
                   EgtEndPoint(m_CurveXKerfList(m_CurveXKerfList.Count - 1), m_ptLast)
                End If
-               ' reset dei comandi di chiusura 
-               If m_CurveXKerfList.Count = 1 Then
-                  OkBtn.IsEnabled = True
-                  CloseBtn.IsEnabled = False
-                  RectangleBtn.IsEnabled = True
-               End If
-               If m_CurveXKerfList.Count > 1 Then
-                  OkBtn.IsEnabled = True
-                  CloseBtn.IsEnabled = True
-                  RectangleBtn.IsEnabled = False
-               End If
             Else
                m_bptLast = False
             End If
@@ -1554,17 +1507,6 @@ Public Class RawPartPageUC
                   ' Aggiorno ptLast
                   EgtEndPoint(m_CurveXKerfList(m_CurveXKerfList.Count - 1), m_ptLast)
                End If
-               ' reset dei comandi di chiusura 
-               If m_CurveXKerfList.Count = 1 Then
-                  OkBtn.IsEnabled = True
-                  CloseBtn.IsEnabled = False
-                  RectangleBtn.IsEnabled = True
-               End If
-               If m_CurveXKerfList.Count > 1 Then
-                  OkBtn.IsEnabled = True
-                  CloseBtn.IsEnabled = True
-                  RectangleBtn.IsEnabled = False
-               End If
             Else
                m_bptLast = False
             End If
@@ -1595,17 +1537,6 @@ Public Class RawPartPageUC
                   ' Aggiorno ptLast
                   EgtEndPoint(m_CurveXDamagedAreaList(m_CurveXDamagedAreaList.Count - 1), m_ptLast)
                End If
-               ' reset dei comandi di chiusura 
-               If m_CurveXDamagedAreaList.Count = 1 Then
-                  OkBtn.IsEnabled = True
-                  CloseBtn.IsEnabled = False
-                  RectangleBtn.IsEnabled = True
-               End If
-               If m_CurveXDamagedAreaList.Count > 1 Then
-                  OkBtn.IsEnabled = True
-                  CloseBtn.IsEnabled = True
-                  RectangleBtn.IsEnabled = False
-               End If
             Else
                m_bptLast = False
             End If
@@ -1626,17 +1557,6 @@ Public Class RawPartPageUC
                   ' Aggiorno ptLast
                   EgtEndPoint(m_CurveXDamagedAreaList(m_CurveXDamagedAreaList.Count - 1), m_ptLast)
                End If
-               ' reset dei comandi di chiusura 
-               If m_CurveXDamagedAreaList.Count = 1 Then
-                  OkBtn.IsEnabled = True
-                  CloseBtn.IsEnabled = False
-                  RectangleBtn.IsEnabled = True
-               End If
-               If m_CurveXDamagedAreaList.Count > 1 Then
-                  OkBtn.IsEnabled = True
-                  CloseBtn.IsEnabled = True
-                  RectangleBtn.IsEnabled = False
-               End If
             Else
                m_bptLast = False
             End If
@@ -2661,21 +2581,6 @@ Public Class RawPartPageUC
       EgtEmptyGroup(m_nTempLay)
    End Sub
 
-   Private Sub RectangleBtn_Click(sender As Object, e As RoutedEventArgs) Handles RectangleBtn.Click
-      Select Case m_ActiveRawMode
-         Case RAWMODE.DAMAGED_BY_LASER
-            CloseDamagedAreaByLaser_Rectangle()
-         Case RAWMODE.DAMAGED_BY_SAW
-            CloseDamagedAreaBySaw_Rectangle()
-         Case RAWMODE.FROM_SAW
-            CloseRawBySaw_Rectangle()
-         Case Else
-            CloseRawByLaser_Rectangle()
-      End Select
-      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
-      EgtEmptyGroup(m_nTempLay)
-   End Sub
-
    Private Sub CloseRawByLaser()
       ' Verifico ci siano punti
       If m_CurveXKerfList.Count() = 0 Then Return
@@ -2710,33 +2615,6 @@ Public Class RawPartPageUC
       EgtDraw()
       ' Disattivo il bottone chiudi grezzo
       CloseBtn.IsEnabled = False
-      RectangleBtn.IsEnabled = False
-   End Sub
-
-   Private Sub CloseRawByLaser_Rectangle()
-      ' Verifico ci siano punti
-      If m_CurveXKerfList.Count() <> 1 Then Return
-      ' Recupero punto iniziale prima e unica linea del grezzo
-      Dim ptStart As Point3d
-      EgtStartPoint(m_CurveXKerfList(0), ptStart)
-      ' Recupero punto finale prima e unica linea del grezzo
-      Dim ptEnd As Point3d
-      EgtEndPoint(m_CurveXKerfList(0), ptEnd)
-      ' Elimo il segmemnto usato come diagonale
-      EgtErase(m_CurveXKerfList(0))
-      ' Pulisco lista entità del grezzo (che contiene la diagonale)
-      m_CurveXKerfList.Clear()
-      ' Procedo a costruire il rettangolo
-      Dim pt_Temp As Point3d = New Point3d(ptEnd.x, ptStart.y, ptStart.z)
-      m_CurveXKerfList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, ptStart, pt_Temp))
-      m_CurveXKerfList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, pt_Temp, ptEnd))
-      pt_Temp = New Point3d(ptStart.x, ptEnd.y, ptStart.z)
-      m_CurveXKerfList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, ptEnd, pt_Temp))
-      ' salvo come ultimo punto, l'ultimo calcolato
-      m_ptLast = pt_Temp
-      'CurveXKerfArray(3) = EgtCreateLine(m_CurrProjPage.m_nRawId, pt_Temp, ptStart)
-      'm_CurveXKerfList.Add(CurveXKerfArray(3))
-      CloseRawByLaser()
    End Sub
 
    Private Sub CloseRawBySaw()
@@ -2773,33 +2651,6 @@ Public Class RawPartPageUC
       EgtDraw()
       ' Disattivo il bottone chiudi grezzo
       CloseBtn.IsEnabled = False
-      RectangleBtn.IsEnabled = False
-   End Sub
-
-   Private Sub CloseRawBySaw_Rectangle()
-      ' Verifico ci siano punti
-      If m_CurveXKerfList.Count() <> 1 Then Return
-      ' Recupero punto iniziale prima e unica linea del grezzo
-      Dim ptStart As Point3d
-      EgtStartPoint(m_CurveXKerfList(0), ptStart)
-      ' Recupero punto finale prima e unica linea del grezzo
-      Dim ptEnd As Point3d
-      EgtEndPoint(m_CurveXKerfList(0), ptEnd)
-      ' Elimo il segmemnto usato come diagonale
-      EgtErase(m_CurveXKerfList(0))
-      ' Pulisco lista entità del grezzo (che contiene la diagonale)
-      m_CurveXKerfList.Clear()
-      ' Procedo a costruire il rettangolo
-      Dim pt_Temp As Point3d = New Point3d(ptEnd.x, ptStart.y, ptStart.z)
-      m_CurveXKerfList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, ptStart, pt_Temp))
-      m_CurveXKerfList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, pt_Temp, ptEnd))
-      pt_Temp = New Point3d(ptStart.x, ptEnd.y, ptStart.z)
-      m_CurveXKerfList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, ptEnd, pt_Temp))
-      ' salvo come ultimo punto, l'ultimo calcolato
-      m_ptLast = pt_Temp
-      'CurveXKerfArray(3) = EgtCreateLine(m_CurrProjPage.m_nRawId, pt_Temp, ptStart)
-      'm_CurveXKerfList.Add(CurveXKerfArray(3))
-      CloseRawBySaw()
    End Sub
 
 #Region "Damaged Area"
@@ -2856,32 +2707,6 @@ Public Class RawPartPageUC
       EgtDraw()
       ' Disattivo il bottone chiudi grezzo
       CloseBtn.IsEnabled = False
-      RectangleBtn.IsEnabled = False
-   End Sub
-
-   Private Sub CloseDamagedAreaByLaser_Rectangle()
-      ' Verifico che esista una sola linea
-      If m_CurveXDamagedAreaList.Count() <> 1 Then Return
-      ' Recupero punto iniziale prima linea del grezzo
-      Dim ptStart As Point3d
-      EgtStartPoint(m_CurveXDamagedAreaList(0), ptStart)
-      ' Recupero punto finale prima e unica linea del grezzo
-      Dim ptEnd As Point3d
-      EgtEndPoint(m_CurveXDamagedAreaList(0), ptEnd)
-      ' Elimo il segmemnto usato come diagonale
-      EgtErase(m_CurveXDamagedAreaList(0))
-      ' Pulisco lista entità del grezzo (che contiene la diagonale)
-      m_CurveXDamagedAreaList.Clear()
-      ' Procedo a costruire il rettangolo
-      Dim pt_Temp As Point3d = New Point3d(ptEnd.x, ptStart.y, ptStart.z)
-      m_CurveXDamagedAreaList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, ptStart, pt_Temp))
-      m_CurveXDamagedAreaList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, pt_Temp, ptEnd))
-      pt_Temp = New Point3d(ptStart.x, ptEnd.y, ptStart.z)
-      m_CurveXDamagedAreaList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, ptEnd, pt_Temp))
-      ' salvo come ultimo punto, l'ultimo calcolato
-      m_ptLast = pt_Temp
-      ' procedo a costruire il rettangolo
-      CloseDamagedAreaByLaser()
    End Sub
 
    Private Sub CloseDamagedAreaBySaw()
@@ -2908,32 +2733,6 @@ Public Class RawPartPageUC
       EgtDraw()
       ' Disattivo il bottone chiudi grezzo
       CloseBtn.IsEnabled = False
-      RectangleBtn.IsEnabled = False
-   End Sub
-
-   Private Sub CloseDamagedAreaBySaw_Rectangle()
-      ' Verifico che esista una sola linea
-      If m_CurveXDamagedAreaList.Count() <> 1 Then Return
-      ' Recupero punto iniziale prima linea del grezzo
-      Dim ptStart As Point3d
-      EgtStartPoint(m_CurveXDamagedAreaList(0), ptStart)
-      ' Recupero punto finale prima e unica linea del grezzo
-      Dim ptEnd As Point3d
-      EgtEndPoint(m_CurveXDamagedAreaList(0), ptEnd)
-      ' Elimo il segmemnto usato come diagonale
-      EgtErase(m_CurveXDamagedAreaList(0))
-      ' Pulisco lista entità del grezzo (che contiene la diagonale)
-      m_CurveXDamagedAreaList.Clear()
-      ' Procedo a costruire il rettangolo
-      Dim pt_Temp As Point3d = New Point3d(ptEnd.x, ptStart.y, ptStart.z)
-      m_CurveXDamagedAreaList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, ptStart, pt_Temp))
-      m_CurveXDamagedAreaList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, pt_Temp, ptEnd))
-      pt_Temp = New Point3d(ptStart.x, ptEnd.y, ptStart.z)
-      m_CurveXDamagedAreaList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, ptEnd, pt_Temp))
-      ' salvo come ultimo punto, l'ultimo calcolato
-      m_ptLast = pt_Temp
-      ' procedo a costruire il rettangolo
-      CloseDamagedAreaBySaw()
    End Sub
 
    Private Sub RemoveDamagedArea()