controllo errore script aggiunta pezzo

-correzione deleteduplo

EgtBEAMWALL.Core/BTLModel/BTLPartM.vb

@@ -587,7 +587,7 @@ Public Class BTLPartM
    Public ReadOnly Property nINPROD As Integer
       Get
          Dim INPROD As Integer = 0
-         EgtDuploCount(m_nPartId, INPROD)
+         EgtDuploInRawCount(m_nPartId, INPROD)
          Return INPROD
       End Get
    End Property

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -144,6 +144,8 @@
    Public Const BTL_PRT_INVERTED As String = "INVERTED"
    Public Const BTL_PRT_MATERIAL As String = "MATERIAL"
    Public Const BTL_PRT_VOLUME As String = "VOLUME"
+   Public Const BTL_PRT_ROT As String = "ROT"
+   Public Const BTL_PRT_FLIP As String = "FLIP"
    ' parametri pezzo
    Public Const BTL_PRT_SINGLEMEMBERNUM = "SINGLEMEMBERNUMBER"
    Public Const BTL_PRT_ASSEMBLYNUM = "ASSEMBLYNUMBER"

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -168,8 +168,6 @@ Public Module ConstIni
    Public Const K_EXTERNALFILEPATH As String = "ExternalFilePath"
    Public Const K_REMINDERFREQUENCY As String = "ReminderFrequency"
 
-   Public Const K_SPECIALPANEL As String = "SpecialPanel"
-
    Public Const S_SPECIAL As String = "Special"
    Public Const K_SPECIALENABLE As String = "SpecialEnable"
 

EgtBEAMWALL.Core/MachGroupModel/PartM.vb

@@ -482,6 +482,8 @@ Public Class PartM
       EgtGetInfo(nPartId, BTL_PRT_GROUP, NewPartM.m_sGROUP)
       EgtGetInfo(nPartId, BTL_PRT_STOREY, NewPartM.m_sSTOREY)
       EgtGetInfo(nPartId, BTL_PRT_MATERIAL, NewPartM.m_sMATERIAL)
+      EgtGetInfo(nPartId, BTL_PRT_ROT, NewPartM.m_dROT)
+      EgtGetInfo(nPartId, BTL_PRT_FLIP, NewPartM.m_nFLIP)
       Dim nTemp As Integer = 0
       If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
          nTemp = 0

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.8.1")>
-<Assembly: AssemblyFileVersion("2.5.8.1")>
+<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.5.12.2")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -32,6 +32,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       LAST3MONTHS = 1
       LAST6MONTHS = 2
       PERIOD = 3
+      ALWAYS = 4
    End Enum
 
    Public Enum RowQuantities As Integer
@@ -189,7 +190,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
    End Property
 
    Private m_DayTypeList As New List(Of String)({EgtMsg(62532), EgtMsg(62533), EgtMsg(62534), EgtMsg(62531)})
-   Public ReadOnly Property DayTypeList As List(Of String)
+   Public Overridable ReadOnly Property DayTypeList As List(Of String)
       Get
          Return m_DayTypeList
       End Get
@@ -209,13 +210,16 @@ Public MustInherit Class NewOpenProjectFileDialogVM
             Select Case PrevSelDayType
                Case DayTypes.LASTMONTH
                   m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31)
+                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
                Case DayTypes.LAST3MONTHS
                   m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31 * 3)
+                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 3)
                Case DayTypes.LAST6MONTHS
                   m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31 * 6)
+                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
+               Case DayTypes.ALWAYS
+                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+                  m_dtStartDate = New DateTime(2020, 1, 1)
             End Select
             NotifyPropertyChanged(NameOf(dtStartDate))
             NotifyPropertyChanged(NameOf(dtEndDate))
@@ -556,13 +560,13 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Select Case m_SelDayType
          Case DayTypes.LASTMONTH
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
          Case DayTypes.LAST3MONTHS
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31 * 3)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 3)
          Case DayTypes.LAST6MONTHS
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31 * 6)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
          Case DayTypes.PERIOD
             Dim sStartDate As String = "0"
             Dim lStartDate As Long = 0

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -167,7 +167,7 @@ Public MustInherit Class OpenProjectFileDialogVM
             Select Case PrevSelDayType
                Case DayTypes.LASTMONTH
                   m_dtStartDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtEndDate = m_dtStartDate - TimeSpan.FromDays(31)
+                  m_dtEndDate = m_dtStartDate - TimeSpan.FromDays(30.5)
                Case DayTypes.LAST3MONTHS
 
                Case DayTypes.LAST6MONTHS
@@ -413,13 +413,13 @@ Public MustInherit Class OpenProjectFileDialogVM
       Select Case m_SelDayType
          Case DayTypes.LASTMONTH
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
          Case DayTypes.LAST3MONTHS
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31 * 3)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 3)
          Case DayTypes.LAST6MONTHS
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31 * 6)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
          Case DayTypes.PERIOD
             Dim sStartDate As String = "0"
             Dim lStartDate As Long = 0

EgtBEAMWALL.Core/Utility/MachLog.vb

@@ -87,7 +87,6 @@
 
    Public ReadOnly Property sPROD As String
       Get
-
          Return m_VarValue
       End Get
    End Property

EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.8.1")]
-[assembly: AssemblyFileVersion("2.5.8.1")]
+[assembly: AssemblyVersion("2.5.12.2")]
+[assembly: AssemblyFileVersion("2.5.12.2")]

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml.vb

@@ -219,6 +219,7 @@ Friend Class MyComparer
                Return 0
             End If
       End Select
+      Return 0
    End Function
 
 End Class

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb

@@ -437,6 +437,10 @@ Public Class LeftPanelVM
                                                          New OPState("Reset", OPStates.End),
                                                          New OPState("Unspecified", OPStates.Unspecified)
          }
+         Case Else
+            m_OPStateList = New List(Of OPState) From {
+                                                         New OPState("Unspecified", OPStates.Unspecified)
+         }
       End Select
       ' seleziono in partenza unspecified
       Dim UnspecifiedState As OPState = m_OPStateList.FirstOrDefault(Function(x) x.Id = OPStates.Unspecified)

EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb

@@ -317,6 +317,7 @@ Public Class MyMachGroupVM
          ' segno pezzo da produrre
          MachGroup.m_bToBeProduced = True
          MachGroup.NotifyPropertyChanged(NameOf(MachGroup.Production_Background))
+         Map.refSupervisorMachGroupPanelVM.MachGroupVMList_View.Refresh()
 
          ' sposto MachGroup in lista come ultimo dei pronti da produrre
          Dim OldIndex As Integer = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.IndexOf(MachGroup)

EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb

@@ -248,8 +248,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2508, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2508, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2512, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & SUPGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb

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

EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -43,13 +43,13 @@ Public Class OpenProjectFileDialogVM
       Select Case m_SelDayType
          Case DayTypes.LASTMONTH
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(31)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5)
          Case DayTypes.LAST3MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(31 * 3)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3)
          Case DayTypes.LAST6MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(31 * 6)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 6)
          Case DayTypes.PERIOD
             dtStart = dtStartDate + TimeSpan.FromDays(1)
             dtEnd = dtEndDate

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb

@@ -93,10 +93,14 @@ Public Class BTLPartVM
                   Dim LSTValues() As String = sSwapItem.Split(","c)
                   If Not IsNothing(LSTValues(LSTValues.Count - 1)) AndAlso Integer.TryParse(LSTValues(LSTValues.Count - 1), nSwapItem) AndAlso nSwapItem > 0 Then
                      Dim nMachgroupId As Integer = EgtGetParent(EgtGetParent(EgtGetParent(nSwapItem)))
-                     Dim MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(Map.refProjManagerVM.CurrProj.nProdId, nMachgroupId)
-                     If MachGroupModel.State > ItemState.ND Then
-                        bDuploInProduction = True
-                        Exit For
+                     If nMachgroupId = GDB_ID.NULL Then
+                        EgtOutLog("Trovato Duplo Ghost")
+                     Else
+                        Dim MachGroupModel = DbControllers.m_MachGroupController.FindByMachGroupId(Map.refProjManagerVM.CurrProj.nProdId, nMachgroupId)
+                        If MachGroupModel.State > ItemState.ND Then
+                           bDuploInProduction = True
+                           Exit For
+                        End If
                      End If
                   End If
                Next

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb

@@ -398,7 +398,8 @@ Public Class BTLStructureVM
          End If
       End If
 
-      SelBTLParts.AddToList(SelBTLPart)
+      If Not IsNothing(SelBTLPart) Then SelBTLParts.AddToList(SelBTLPart)
+
       If bByOptim Then
          m_bOnlySelectItem = False
       End If

EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb

@@ -794,6 +794,12 @@ Public Class LeftPanelVM
          EgtSetMode(nDuploId, GDB_MD.STD)
          nPartDuploIdList.Add(nDuploId)
       Next
+      '' salvo lista info
+      Dim saveInfoBeamList As MyMachGroupVM = BeamMachGroup
+      'Dim saveInfoBeamList As New List(Of PartVM)
+      'For Each info As PartVM In BeamMachGroup.PartVMList
+      '   saveInfoBeamList.Add(info)
+      'Next
       ' calcolo posizione nuovo pezzo per rispettare ordine lunghezze
       Dim nInsertIndex As Integer
       ' scrivo dati di tutti i pezzi
@@ -852,7 +858,38 @@ Public Class LeftPanelVM
       End While
       Dim sLogPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\RawPartLog.txt"
       If Not ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then
-         Return False
+         EgtOutLog("Fallito inserimento grezzo nella barra in AddPartToBeam")
+
+         ' elimino duplo 
+         For Each nDuploId In nPartDuploIdList
+            EgtErase(nDuploId)
+            EgtRemoveRawPart(nDuploId)
+         Next
+
+         ' rimuovo info duplo e aggiorno info grezzo
+         nPartIndex = 0
+         For nIndex = 0 To BeamMachGroup.PartVMList.Count - 1
+            If nPartIndex < nPartDuploIdList.Count() AndAlso BeamMachGroup.PartVMList(nIndex).dL > PartsToAdd(0).dL Then
+               EgtRemoveInfo(BeamMachGroup.Id, MGR_RPT_PART & nIndex + 1)
+               nPartIndex += 1
+            ElseIf nPartIndex < nPartDuploIdList.Count() AndAlso BeamMachGroup.PartVMList(nIndex).dL < PartsToAdd(0).dL Then
+               EgtRemoveInfo(BeamMachGroup.Id, MGR_RPT_PART & nIndex + 1)
+               nPartIndex += 1
+            End If
+            EgtRemoveInfo(BeamMachGroup.Id, MGR_RPT_PART & nIndex + nPartIndex + 1)
+            EgtSetInfo(BeamMachGroup.Id, MGR_RPT_PART & nIndex + 1, BeamMachGroup.PartVMList(nIndex).nPartId & "," & DoubleToString(BeamMachGroup.PartVMList(nIndex).dPOSX, 3))
+         Next
+
+         ' elimino vecchio grezzo ed eseguo script creazione nuovo
+         nRawId = EgtGetFirstRawPart()
+         While nRawId <> GDB_ID.NULL
+            EgtRemoveRawPart(nRawId)
+            nRawId = EgtGetFirstRawPart()
+         End While
+
+         If Not ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then
+            EgtOutLog("Fallita esecuzione ExecBeam. ERRORE")
+         End If
       End If
       For nDuploIndex = 0 To PartsToAdd.Count - 1
          EgtSetInfo(nPartDuploIdList(nDuploIndex), MGR_PRT_ROT, PartsToAdd(nDuploIndex).nROTATED)
@@ -861,7 +898,11 @@ Public Class LeftPanelVM
       ' aggiorno lista pezzi
       BeamMachGroup.MyMachGroupM.RefreshPartList()
       ' seleziono pezzo aggiunto
-      If BeamMachGroup.PartVMList.Count > nInsertIndex Then BeamMachGroup.SelPart = BeamMachGroup.PartVMList(nInsertIndex)
+      If BeamMachGroup.PartVMList.Count > nInsertIndex Then
+         BeamMachGroup.SelPart = BeamMachGroup.PartVMList(nInsertIndex)
+      Else
+         BeamMachGroup.SelPart = BeamMachGroup.PartVMList(nInsertIndex - 1)
+      End If
       Return True
    End Function
 

EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -172,13 +172,17 @@ Public Class MyMachGroupPanelVM
                   ' elimino pezzo copia
                   EgtRemovePartFromRawPart(nDuploId)
                   EgtErase(nDuploId)
-                  '' recupero gruppo di lavorazione e trave dell'interfaccia
+                  ' recupero gruppo di lavorazione e trave dell'interfaccia
                   Dim BeamMachGroup As MyMachGroupVM = MachGroupVMList.FirstOrDefault(Function(x) x.Id = nMachGroupId)
                   If Not IsNothing(BeamMachGroup) Then
                      Dim Beam As PartVM = BeamMachGroup.PartVMList.FirstOrDefault(Function(x) x.nPartId = nDuploId)
                      EgtSetCurrMachGroup(BeamMachGroup.Id)
                      Beam.DeletePart()
                   End If
+                  ' reset necessario per poter ottenere nMachGroupId corretto
+                  EgtResetCurrMachGroup()
+                  ' aggiorno dati utilizzo barra
+                  BeamMachGroup.UpdateUsage()
                Next
                ' aggiorno quantita' in prod
                Dim BTLPart As BTLPartVM = CALCPanelVM.GetBTLPartVMFromBTLPartId(nPartId)

EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/PartVM.vb

@@ -201,19 +201,47 @@ Public Class PartVM
             ' recupero box del layer box
             Dim b3Box As New BBox3d
             EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
-            If EgtRotate(nPartId, b3Box.Center, Vector3d.X_AX, 180, GDB_RT.GLOB) Then
+            Dim vtAxes As Vector3d
+            ' se travi ruoto attorno all'asse Z
+            If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
+               vtAxes = Vector3d.Z_AX
+               ' se pareti ruoto attorno all'asse X
+            ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.WALL Then
+               vtAxes = Vector3d.X_AX
+            End If
+            If EgtRotate(nPartId, b3Box.Center, vtAxes, 180, GDB_RT.GLOB) Then
                m_PartM.nFLIP = If(value, 180, 0)
                EgtSetInfo(nPartId, MGR_PRT_FLIP, If(value, 180, 0))
             Else
                NotifyPropertyChanged(NameOf(bFLIP))
             End If
-            ' recupero box del pezzo
-            Dim b3Part As New BBox3d
-            EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, b3Part)
-            ' calcolo distanza tra i box
-            Dim vtDeltaBox As Vector3d = b3Box.Min - b3Part.Min
-            ' reinserisco il pezzo nel grezzo
-            EgtAddPartToRawPart(nPartId, New Point3d(dTempPosX - vtDeltaBox.x, dTempPosY - vtDeltaBox.y, 0), ParentMachGroupVM.MyMachGroupM.nRawPartId)
+            If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL Then
+               ' recupero box del pezzo
+               Dim b3Part As New BBox3d
+               EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, b3Part)
+               ' calcolo distanza tra i box
+               Dim vtDeltaBox As Vector3d = b3Box.Min - b3Part.Min
+               ' reinserisco il pezzo nel grezzo
+               EgtAddPartToRawPart(nPartId, New Point3d(dTempPosX - vtDeltaBox.x, dTempPosY - vtDeltaBox.y, 0), ParentMachGroupVM.MyMachGroupM.nRawPartId)
+            ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+               ' elimino vecchio grezzo ed eseguo script creazione nuovo
+               DeleteOldRaw()
+               Dim sLogPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\RawPartLog.txt"
+               If Not ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then
+                  EgtOutLog("Fallita creazione barra nell'ExecBeam in bFlip")
+                  ' elimino vecchio grezzo ed eseguo script creazione nuovo
+                  DeleteOldRaw()
+                  If EgtRotate(nPartId, b3Box.Center, vtAxes, 180, GDB_RT.GLOB) Then
+                     m_PartM.nFLIP = 180
+                     EgtSetInfo(nPartId, MGR_PRT_FLIP, 180)
+                  Else
+                     NotifyPropertyChanged(NameOf(m_PartM.nFLIP))
+                  End If
+                  If Not ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then
+                     EgtOutLog("Fallita esecuzione ExecBeam. ERRORE")
+                  End If
+               End If
+            End If
             ' lo riseleziono
             EgtSelectObj(nPartId)
             ' resetto validazione del pezzo
@@ -289,66 +317,140 @@ Public Class PartVM
    End Sub
 
    Private Sub Rotate(IsPositive As Boolean)
-      ' salvo posizione 
-      Dim dTempPosX As Double = m_PartM.dPOSX
-      Dim dTempPosY As Double = m_PartM.dPOSY
-      ' tolgo il pezzo dal grezzo
-      EgtRemovePartFromRawPart(nPartId)
-      ' recupero layer del box
-      Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
-      ' recupero box del layer box
-      Dim b3Box As New BBox3d
-      EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
-      ' se invertito lo reinverto
-      Dim bFliped As Boolean = bFLIP
-      If bFliped Then EgtRotate(nPartId, b3Box.Center, Vector3d.X_AX, 180, GDB_RT.GLOB)
-      Dim dAng As Double = If(IsPositive, 90, -90)
-      ' eseguo rotazione
-      Dim bOk As Boolean = EgtRotate(nPartId, b3Box.Center, -Vector3d.Z_AX, dAng, GDB_RT.GLOB)
-      If bOk Then
-         Dim TempRot = m_PartM.dROT
-         TempRot += dAng
-         If TempRot >= 360 Then
-            TempRot -= 360
-         ElseIf TempRot < 0 Then
-            TempRot += 360
+      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+         ' elimino vecchio grezzo ed eseguo script creazione nuovo
+         DeleteOldRaw()
+         ' recupero layer del box
+         Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
+         ' recupero box del layer box
+         Dim b3Box As New BBox3d
+         EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
+         ' se invertito lo reinverto
+         If bFLIP Then EgtRotate(nPartId, b3Box.Center, Vector3d.Z_AX, 180, GDB_RT.GLOB)
+         ' eseguo rotazione attorno asse X
+         Dim dRot As Integer = 0
+         If dW <> dH Then
+            dRot = If(IsPositive, 180, -180)
+         ElseIf dW = dH Then
+            dRot = If(IsPositive, 90, -90)
          End If
-         m_PartM.dROT = TempRot
-         EgtSetInfo(nPartId, MGR_PRT_ROT, m_PartM.dROT)
-      End If
-      ' ripristino eventuale inversione
-      If bFliped Then EgtRotate(nPartId, b3Box.Center, Vector3d.X_AX, 180, GDB_RT.GLOB)
-      ' recupero box del pezzo
-      Dim b3Part As New BBox3d
-      EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, b3Part)
-      'aggiorno box del box con rotazione
-      EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
-      ' calcolo distanza tra i box
-      Dim vtDeltaBox As Vector3d = b3Box.Min - b3Part.Min   ' Vector3d.NULL
-      ' calcolo posizione rispetto al riferimento
-      Select Case Map.refProjectVM.BTLStructureVM.nPROJTYPE
-         Case BWType.WALL
-            ' se parete, valuto angolo di posizionamento
-            Select Case CurrentMachine.NestingCorner
-               Case MCH_CR.TL
-                  'vtDeltaBox = New Vector3d(b3Box.Min.x - b3Part.Min.x, b3Box.Max.y - b3Part.Max.y, 0)
-                  dTempPosY = dTempPosY - dW + dL
-               Case MCH_CR.BL
+         Dim bOk As Boolean = EgtRotate(nPartId, b3Box.Center, Vector3d.X_AX, dRot, GDB_RT.GLOB)
+         If bOk Then
+            Dim TempRot = m_PartM.dROT
+            TempRot += dRot
+            If TempRot >= 360 Then
+               TempRot -= 360
+            ElseIf TempRot < 0 Then
+               TempRot += 360
+            End If
+            m_PartM.dROT = TempRot
+            EgtSetInfo(nPartId, MGR_PRT_ROT, m_PartM.dROT)
+         End If
+         ' ripristino eventuale inversione
+         If bFLIP Then EgtRotate(nPartId, b3Box.Center, Vector3d.Z_AX, 180, GDB_RT.GLOB)
+         Dim sLogPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\RawPartLog.txt"
+         If Not ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then
+            EgtOutLog("Fallita creazione barra nell'ExecBeam in Rotate")
+            ' elimino vecchio grezzo ed eseguo script creazione nuovo
+            DeleteOldRaw()
+            ' annullo Flip
+            If bFLIP Then EgtRotate(nPartId, b3Box.Center, Vector3d.Z_AX, 180, GDB_RT.GLOB)
+            ' ripristino rotazione
+            Dim dRotation As Integer = 0
+            If dW <> dH Then
+               dRotation = m_PartM.dROT + dRot
+               m_PartM.dROT = dRotation
+               If dRotation >= 360 Then
+                  dRotation = dRot
+                  m_PartM.dROT = 0
+               End If
+            ElseIf dW = dH Then
+               dRotation = m_PartM.dROT - dRot
+               If dRotation = 0 Then
+                  dRotation = 3 * dRot
+                  m_PartM.dROT = 0
+               ElseIf dRotation = 90 Then
+                  dRotation += 2 * dRot
+                  m_PartM.dROT = 90
+               ElseIf dRotation = 180 Then
+                  dRotation += dRot
+                  m_PartM.dROT = 180
+               ElseIf dRotation < 0 Then
+                  dRotation += 4 * dRot
+                  m_PartM.dROT = 270
+               End If
+            End If
+            EgtRotate(nPartId, b3Box.Center, Vector3d.X_AX, dRotation, GDB_RT.GLOB)
+            ' salvo informazione
+            EgtSetInfo(nPartId, MGR_PRT_ROT, m_PartM.dROT)
+            ' annullo Flip
+            If bFLIP Then EgtRotate(nPartId, b3Box.Center, Vector3d.Z_AX, 180, GDB_RT.GLOB)
+            If Not ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then
+               EgtOutLog("Fallita esecuzione ExecBeam. ERRORE")
+            End If
+            NotifyPropertyChanged(NameOf(m_PartM.dROT))
+         End If
+      ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL Then
+         ' salvo posizione 
+         Dim dTempPosX As Double = m_PartM.dPOSX
+         Dim dTempPosY As Double = m_PartM.dPOSY
+         ' tolgo il pezzo dal grezzo
+         EgtRemovePartFromRawPart(nPartId)
+         ' recupero layer del box
+         Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
+         ' recupero box del layer box
+         Dim b3Box As New BBox3d
+         EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
+         ' se invertito lo reinverto
+         If bFLIP Then EgtRotate(nPartId, b3Box.Center, Vector3d.X_AX, 180, GDB_RT.GLOB)
+         Dim dAng As Double = If(IsPositive, 90, -90)
+         ' eseguo rotazione
+         Dim bOk As Boolean = EgtRotate(nPartId, b3Box.Center, -Vector3d.Z_AX, dAng, GDB_RT.GLOB)
+         If bOk Then
+            Dim TempRot = m_PartM.dROT
+            TempRot += dAng
+            If TempRot >= 360 Then
+               TempRot -= 360
+            ElseIf TempRot < 0 Then
+               TempRot += 360
+            End If
+            m_PartM.dROT = TempRot
+            EgtSetInfo(nPartId, MGR_PRT_ROT, m_PartM.dROT)
+         End If
+         ' ripristino eventuale inversione
+         If bFLIP Then EgtRotate(nPartId, b3Box.Center, Vector3d.X_AX, 180, GDB_RT.GLOB)
+         ' recupero box del pezzo
+         Dim b3Part As New BBox3d
+         EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, b3Part)
+         'aggiorno box del box con rotazione
+         EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
+         ' calcolo distanza tra i box
+         Dim vtDeltaBox As Vector3d = b3Box.Min - b3Part.Min   ' Vector3d.NULL
+         ' calcolo posizione rispetto al riferimento
+         Select Case Map.refProjectVM.BTLStructureVM.nPROJTYPE
+            Case BWType.WALL
+               ' se parete, valuto angolo di posizionamento
+               Select Case CurrentMachine.NestingCorner
+                  Case MCH_CR.TL
+                     'vtDeltaBox = New Vector3d(b3Box.Min.x - b3Part.Min.x, b3Box.Max.y - b3Part.Max.y, 0)
+                     dTempPosY = dTempPosY - dW + dL
+                  Case MCH_CR.BL
                   'vtDeltaBox = b3Box.Min - b3Part.Min
                   ' non cambio posizioni
-               Case MCH_CR.TR
-                  'vtDeltaBox = b3Box.Max - b3Part.Max
-                  dTempPosX = dTempPosX - dL + dW
-                  dTempPosY = dTempPosY - dW + dL
-               Case MCH_CR.BR
-                  'vtDeltaBox = New Vector3d(b3Box.Max.x - b3Part.Max.x, b3Box.Min.y - b3Part.Min.y, 0)
-                  dTempPosX = dTempPosX - dL + dW
-            End Select
-         Case Else
-            ' non cambio nulla
-      End Select
-      ' reinserisco il pezzo nel grezzo
-      EgtAddPartToRawPart(nPartId, New Point3d(dTempPosX - vtDeltaBox.x, dTempPosY - vtDeltaBox.y, 0), ParentMachGroupVM.MyMachGroupM.nRawPartId)
+                  Case MCH_CR.TR
+                     'vtDeltaBox = b3Box.Max - b3Part.Max
+                     dTempPosX = dTempPosX - dL + dW
+                     dTempPosY = dTempPosY - dW + dL
+                  Case MCH_CR.BR
+                     'vtDeltaBox = New Vector3d(b3Box.Max.x - b3Part.Max.x, b3Box.Min.y - b3Part.Min.y, 0)
+                     dTempPosX = dTempPosX - dL + dW
+               End Select
+            Case Else
+               ' non cambio nulla
+         End Select
+         ' reinserisco il pezzo nel grezzo
+         EgtAddPartToRawPart(nPartId, New Point3d(dTempPosX - vtDeltaBox.x, dTempPosY - vtDeltaBox.y, 0), ParentMachGroupVM.MyMachGroupM.nRawPartId)
+      End If
       ' lo riseleziono
       EgtSelectObj(nPartId)
       ' resetto validazione del pezzo
@@ -356,6 +458,14 @@ Public Class PartVM
       NotifyPropertyChanged(NameOf(sROT))
    End Sub
 
+   Private Sub DeleteOldRaw()
+      Dim nRawId As Integer = EgtGetFirstRawPart()
+      While nRawId <> GDB_ID.NULL
+         EgtRemoveRawPart(nRawId)
+         nRawId = EgtGetFirstRawPart()
+      End While
+   End Sub
+
    Friend Sub SelectBTLPart()
       ' eseguo la selezione nella lista pezzi
       Dim nBTLPartId As Integer = MyMachGroupPanelM.DuploGetOriginal(nPartId)

EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb

@@ -242,8 +242,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2508, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2508, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2512, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & VWOPTGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
@@ -286,7 +286,7 @@ Public Class MainWindowM
       ' Leggo e imposto livello utilizzatore
       m_nUserLevel = Math.Min(m_nKeyLevel, GetMainPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
       ' Recupero flag SpecialPanel
-      m_bSpecialPanel = GetMainPrivateProfileInt(S_GENERAL, K_SPECIALPANEL, 0) = 1
+      m_bSpecialPanel = GetMainPrivateProfileInt(S_SPECIAL, K_SPECIALENABLE, 0) = 1
       ' Imposto dir font Nfe e font default
       Dim sNfeDir As String = String.Empty
       GetMainPrivateProfileString(S_GEOMDB, K_NFEFONTDIR, "", sNfeDir)

EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb

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

EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -8,6 +8,16 @@ Imports EgtWPFLib5
 Public Class NewOpenProjectFileDialogVM
    Inherits Core.NewOpenProjectFileDialogVM
 
+   Public Overrides ReadOnly Property DayTypeList As List(Of String)
+      Get
+         Dim CurrDayTypeList As New List(Of String)({EgtMsg(62532), EgtMsg(62533), EgtMsg(62534), EgtMsg(62531)})
+         If Map.refMainWindowVM.MainWindowM.nUserLevel > 5 Then
+            CurrDayTypeList.Add("Always")
+         End If
+         Return CurrDayTypeList
+      End Get
+   End Property
+
 #Region "METHODS"
 
    Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
@@ -44,24 +54,27 @@ Public Class NewOpenProjectFileDialogVM
       Select Case m_SelDayType
          Case DayTypes.LASTMONTH
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(30)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5)
          Case DayTypes.LAST3MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(30 * 3)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3)
          Case DayTypes.LAST6MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(30 * 6)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 6)
          Case DayTypes.PERIOD
             dtEnd = dtEndDate + TimeSpan.FromDays(1)
             dtStart = dtStartDate
+         Case DayTypes.ALWAYS
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = New DateTime(2020, 1, 1)
       End Select
       ' leggo da db
       If m_ProjectType = ProjectType.PROJ Then
          Dim DbProjList As New List(Of ProjFileM)
          If m_SelBTLDateType = BTLDateTypes.CREATEDATE Then
-            DbProjList = DbControllers.m_ProjController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True, bViewArchived)
+            DbProjList = DbControllers.m_ProjController.GetLastDesc(dtStart, dtEnd, nRowQuantity * 3, True, bViewArchived)
          Else
-            DbProjList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity, True, bViewArchived)
+            DbProjList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity * 3, True, bViewArchived)
          End If
          For Each Project In DbProjList
             If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For

EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -46,13 +46,13 @@ Public Class OpenProjectFileDialogVM
       Select Case m_SelDayType
          Case DayTypes.LASTMONTH
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(30)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5)
          Case DayTypes.LAST3MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(30 * 3)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3)
          Case DayTypes.LAST6MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(30 * 6)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 6)
          Case DayTypes.PERIOD
             dtEnd = dtEndDate + TimeSpan.FromDays(1)
             dtStart = dtStartDate

EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb

@@ -198,7 +198,7 @@ Public Class ProjectVM
 
    Public ReadOnly Property SpecialPanel_Visibility As Visibility
       Get
-         Return If(Map.refMainWindowVM.MainWindowM.bSpecialPanel AndAlso Map.refMainWindowVM.MainWindowM.nUserLevel = 5, Visibility.Visible, Visibility.Collapsed)
+         Return If(Map.refMainWindowVM.MainWindowM.bSpecialPanel AndAlso Map.refMainWindowVM.MainWindowM.nUserLevel > 5, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 

EgtBEAMWALL.ViewerOptimizer/ProjectFileVM/ProdFileVM.vb

@@ -1,6 +1,7 @@
 Imports System.IO
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class ProdFileVM
    Inherits Core.ProdFileVM
@@ -155,7 +156,7 @@ Public Class ProdFileVM
                   End Try
                   Map.refProdManagerVM.m_MruFiles.Remove(CurrProject.sProdPath)
                   Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.MruFileNames))
-                  DbControllers.m_ProdController.DeleteProd(CurrProject.nProdId, True)
+                  DbControllers.m_ProdController.DeleteProd(CurrProject.nProdId, False)
                   If CurrProject.nProdId = Map.refProjManagerVM.CurrProj.nProdId Then
                      ' reset prod in path proj
                      Map.refProjManagerVM.UpdateCurrProj()

EgtBEAMWALL.ViewerOptimizer/SpecialPanel/SpecialPanelVM.vb

@@ -16,7 +16,7 @@ Public Class SpecialPanelVM
       ' Creo riferimento a questa classe in Map
       Map.SetRefSpecialPanelVM(Me)
       ' se attivo, inizializzo i bottoni leggendoli da file ini
-      If IsActiveSpecialPanel() Then
+      If Map.refMainWindowVM.MainWindowM.bSpecialPanel Then
          Dim BtnIndex As Integer = 1
          Dim CurrBtn As ButtonItem = Nothing
          While GetPrivateProfileButton(S_SPECIAL, K_BUTTON & BtnIndex, "", CurrBtn)
@@ -58,11 +58,6 @@ Public Class SpecialPanelVM
       Next
    End Sub
 
-   Friend Function IsActiveSpecialPanel() As Boolean
-      Dim btDummy As ButtonItem = Nothing
-      Return GetMainPrivateProfileInt(S_SPECIAL, K_SPECIALENABLE, 0) <> 0 AndAlso GetPrivateProfileButton(S_SPECIAL, K_BUTTON & "1", "", btDummy)
-   End Function
-
    Public Function GetPrivateProfileButton(sSection As String, sKey As String, sBaseDir As String, ByRef ReadButtonItem As ButtonItem) As Boolean
       ReadButtonItem = Nothing
       Dim sVal As String = String.Empty