- Aggiunti tooltip su statistiche ed ultimi bottoni aggiunti

- Aggiunto bottone cancella tutti i grezzi

EgtBEAMWALL.Core/BTLModel/BTLParamM.vb

@@ -146,6 +146,9 @@ Public Class BTLParamM
          Return m_nType
       End Get
    End Property
+   Public Sub SetType(value As BTLParamType)
+      m_nType = value
+   End Sub
 
    ' Feature a cui appartiene il parametro
    Protected m_ParentFeature As BTLFeatureM

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.4.8.2")>
-<Assembly: AssemblyFileVersion("2.4.8.2")>
+<Assembly: AssemblyVersion("2.4.11.1")>
+<Assembly: AssemblyFileVersion("2.4.11.1")>

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.4.8.2")]
-[assembly: AssemblyFileVersion("2.4.8.2")]
+[assembly: AssemblyVersion("2.4.11.1")]
+[assembly: AssemblyFileVersion("2.4.11.1")]

EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb

@@ -240,8 +240,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2407, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2407, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2411, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2411, 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.4.8.2")>
-<Assembly: AssemblyFileVersion("2.4.8.2")>
+<Assembly: AssemblyVersion("2.4.11.1")>
+<Assembly: AssemblyFileVersion("2.4.11.1")>

EgtBEAMWALL.Supervisor/Utility/DbControllers.vb

@@ -4,99 +4,99 @@ Imports EgtBEAMWALL.Core
 
 Module DbControllers
 
-    Friend m_SupervisorId As String = "1"
-    Public ReadOnly Property SupervisorId As String
-        Get
-            Return m_SupervisorId
-        End Get
-    End Property
+   Friend m_SupervisorId As String = "1"
+   Public ReadOnly Property SupervisorId As String
+      Get
+         Return m_SupervisorId
+      End Get
+   End Property
 
-    Private m_bNetwork As Boolean = False
-    Friend ReadOnly Property bNetwork As Boolean
-        Get
-            Return m_bNetwork
-        End Get
-    End Property
+   Private m_bNetwork As Boolean = False
+   Friend ReadOnly Property bNetwork As Boolean
+      Get
+         Return m_bNetwork
+      End Get
+   End Property
 
-    Public m_ProjController As DataLayer.Controllers.ProjController
-    Public m_ProdController As DataLayer.Controllers.ProdController
-    Public m_MachGroupController As DataLayer.Controllers.MachGroupController
-    Public m_PartController As DataLayer.Controllers.PartController
-    Public m_LogMachineController As DataLayer.Controllers.LogMachineController
-    Public m_StatusMapController As DataLayer.Controllers.StatusMapController
+   Public m_ProjController As DataLayer.Controllers.ProjController
+   Public m_ProdController As DataLayer.Controllers.ProdController
+   Public m_MachGroupController As DataLayer.Controllers.MachGroupController
+   Public m_PartController As DataLayer.Controllers.PartController
+   Public m_LogMachineController As DataLayer.Controllers.LogMachineController
+   Public m_StatusMapController As DataLayer.Controllers.StatusMapController
 
-    Sub New()
+   Sub New()
 
-        ' se demo--> server = db.steamware.net, nKey e sKey come le hai...
+      ' se demo--> server = db.steamware.net, nKey e sKey come le hai...
 
-        Dim sKey = "", sUser = "", sPwd = ""
+      Dim sKey = "", sUser = "", sPwd = ""
 
-        EgtGetKeyInfo(sKey)
-        sKey = sKey.Replace(" ", "")
-        If Not IsNothing(sKey) AndAlso sKey.Length > 11 Then
-            sUser = sKey.Substring(3, 6)
-            sPwd = sKey.Substring(10, sKey.Length - 10).Replace("(", "").Replace(")", "")
-        End If
-        Try
-            Dim DbAddress As String = "127.0.0.1"
-            Dim DbMasterKey As Integer = 0
-            Dim sDbMasterKey As String = ""
-            Dim sSharedFolder As String = ""
-            If Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) Then
-                GetMainPrivateProfileString(S_GENERAL, K_DBADDRESS, "", DbAddress)
-                DbMasterKey = GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0)
-                If DbMasterKey > 0 Then
-                    sDbMasterKey = DbMasterKey.ToString("000000")
-                End If
-                If String.IsNullOrWhiteSpace(DbAddress) OrElse DbMasterKey <= 0 Then
-                    DbAddress = "127.0.0.1"
-                    DbMasterKey = 0
-                Else
-                    m_bNetwork = True
-                End If
+      EgtGetKeyInfo(sKey)
+      sKey = sKey.Replace(" ", "")
+      If Not IsNothing(sKey) AndAlso sKey.Length > 11 Then
+         sUser = sKey.Substring(3, 6)
+         sPwd = sKey.Substring(10, sKey.Length - 10).Replace("(", "").Replace(")", "")
+      End If
+      Try
+         Dim DbAddress As String = "127.0.0.1"
+         Dim DbMasterKey As Integer = 0
+         Dim sDbMasterKey As String = ""
+         Dim sSharedFolder As String = ""
+         If Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) Then
+            GetMainPrivateProfileString(S_GENERAL, K_DBADDRESS, "", DbAddress)
+            DbMasterKey = GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0)
+            If DbMasterKey > 0 Then
+               sDbMasterKey = DbMasterKey.ToString("000000")
             End If
-            If Not m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.ANY_DB) Then
-                DbMasterKey = GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0)
-                If DbMasterKey > 0 Then
-                    sDbMasterKey = DbMasterKey.ToString("000000")
-                End If
-            ElseIf GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0) = 0 Then
-                Dim nKey As Integer = 0
-                If Integer.TryParse(sKey.Substring(3, 6), nKey) AndAlso nKey > 0 Then
-                    WriteMainPrivateProfileString(S_GENERAL, K_DBMASTERKEY, nKey)
-                End If
-            End If
-            DataLayer.DbConfig.InitDb(DbAddress, sUser, sPwd, sDbMasterKey)
-            DataLayer.DbConfig.SetupLogDir(Map.refMainWindowVM.MainWindowM.sTempDir)
-            DataLayer.DbConfig.CheckMigrateDb()
-            DataLayer.DbConfig.CheckUser(sUser, sPwd, Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK))
-            DataLayer.DbConfig.CheckViews(sUser, sPwd)
-            If Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) And bNetwork Then
-                ' imposto cartella condivisa
-                GetMainPrivateProfileString(S_GENERAL, K_SHAREDFOLDER, Map.refMainWindowVM.MainWindowM.sDataRoot, sSharedFolder)
-                Map.refMainWindowVM.MainWindowM.UpdatePathForNetwork(sSharedFolder)
-                Dim sSupervisorMachName As String = ""
-                GetMainPrivateProfileString(S_MACH, K_SUPERVISORMACH, "", sSupervisorMachName)
-                If Not String.IsNullOrWhiteSpace(sSupervisorMachName) Then m_SupervisorId = sSupervisorMachName
-            ElseIf Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.ANY_DB) Then
-                ' imposto cartella chiave master
-                Map.refMainWindowVM.MainWindowM.UpdatePathForKey(sDbMasterKey)
+            If String.IsNullOrWhiteSpace(DbAddress) OrElse DbMasterKey <= 0 Then
+               DbAddress = "127.0.0.1"
+               DbMasterKey = 0
             Else
-                ' imposto cartella chiave locale
-                Map.refMainWindowVM.MainWindowM.UpdatePathForKey(sKey.Substring(3, 6))
+               m_bNetwork = True
             End If
-        Catch ex As Exception
-            EgtOutLog("InitDb error: " & ex.ToString())
-            MessageBox.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
-            End
-        End Try
+         End If
+         If Not m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.ANY_DB) Then
+            DbMasterKey = GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0)
+            If DbMasterKey > 0 Then
+               sDbMasterKey = DbMasterKey.ToString("000000")
+            End If
+         ElseIf GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0) = 0 Then
+            Dim nKey As Integer = 0
+            If Integer.TryParse(sKey.Substring(3, 6), nKey) AndAlso nKey > 0 Then
+               WriteMainPrivateProfileString(S_GENERAL, K_DBMASTERKEY, nKey)
+            End If
+         End If
+         DataLayer.DbConfig.InitDb(DbAddress, sUser, sPwd, sDbMasterKey)
+         DataLayer.DbConfig.SetupLogDir(Map.refMainWindowVM.MainWindowM.sTempDir)
+         DataLayer.DbConfig.CheckMigrateDb()
+         DataLayer.DbConfig.CheckUser(sUser, sPwd, m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK))
+         DataLayer.DbConfig.CheckViews(sUser, sPwd)
+         If m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) Then
+            ' imposto cartella condivisa
+            GetMainPrivateProfileString(S_GENERAL, K_SHAREDFOLDER, Map.refMainWindowVM.MainWindowM.sDataRoot, sSharedFolder)
+            Map.refMainWindowVM.MainWindowM.UpdatePathForNetwork(sSharedFolder)
+            Dim sSupervisorMachName As String = ""
+            GetMainPrivateProfileString(S_MACH, K_SUPERVISORMACH, "", sSupervisorMachName)
+            If Not String.IsNullOrWhiteSpace(sSupervisorMachName) Then m_SupervisorId = sSupervisorMachName
+         ElseIf Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.ANY_DB) Then
+            ' imposto cartella chiave master
+            Map.refMainWindowVM.MainWindowM.UpdatePathForKey(sDbMasterKey)
+         Else
+            ' imposto cartella chiave locale
+            Map.refMainWindowVM.MainWindowM.UpdatePathForKey(sKey.Substring(3, 6))
+         End If
+      Catch ex As Exception
+         EgtOutLog("InitDb error: " & ex.ToString())
+         MessageBox.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
+         End
+      End Try
 
-        m_ProjController = New DataLayer.Controllers.ProjController
-        m_ProdController = New DataLayer.Controllers.ProdController
-        m_MachGroupController = New DataLayer.Controllers.MachGroupController
-        m_PartController = New DataLayer.Controllers.PartController
-        m_LogMachineController = New DataLayer.Controllers.LogMachineController
-        m_StatusMapController = New DataLayer.Controllers.StatusMapController
-    End Sub
+      m_ProjController = New DataLayer.Controllers.ProjController
+      m_ProdController = New DataLayer.Controllers.ProdController
+      m_MachGroupController = New DataLayer.Controllers.MachGroupController
+      m_PartController = New DataLayer.Controllers.PartController
+      m_LogMachineController = New DataLayer.Controllers.LogMachineController
+      m_StatusMapController = New DataLayer.Controllers.StatusMapController
+   End Sub
 
 End Module

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb

@@ -79,7 +79,8 @@ Public Class BTLStructureVM
             Map.refProjectVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.PartManager_Visibility))
          Case SelectionTypes.HIGHLIGHT
             If m_PrevSelectionType = SelectionTypes.SELECT_ Then
-
+               EgtBeamShowFacesName( False)
+               EgtBeamShowLoadingSide( False, False)
             End If
             If Not IsNothing(m_SelBTLPart) Then
                m_SelBTLPart = Nothing
@@ -181,6 +182,8 @@ Public Class BTLStructureVM
    End Sub
 
    Private Sub SelectBTLPart(BtlPart As BTLPartVM)
+      EgtBeamShowFacesName( False)
+      EgtBeamShowLoadingSide( False, False)
       m_SelBTLPart = BtlPart
       If Map.refMainMenuVM.SelPage = Pages.VIEW Then
          ' se modalità building, la tolgo
@@ -191,6 +194,10 @@ Public Class BTLStructureVM
          SceneSelPartSelection()
          ' seleziono pezzo in Db geometrico
          EgtBeamSetPart(BtlPart.nPartId)
+         EgtBeamShowFacesName( True)
+         Dim bLoadingSideShow As Boolean = (nPROJTYPE = BWType.BEAM)
+         Dim bLeftToRight As Boolean = Not ( CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE)
+         EgtBeamShowLoadingSide( bLoadingSideShow, bLeftToRight)
          ' seleziono pagina BottomPanel
          Map.refBottomPanelVM.SetSelPartFeatureTab(BottomPanelVM.PartFeatureTab.PART)
          '' mostro barra di gestione pezzo
@@ -239,6 +246,8 @@ Public Class BTLStructureVM
          Map.refProjectVM.BTLStructureVM.ShowSolid(False, BtlPart.nPartId)
       End If
       If m_SelBTLPart Is BtlPart Then
+         EgtBeamShowFacesName( False)
+         EgtBeamShowLoadingSide( False, False)
          m_SelBTLPart = Nothing
          NotifyPropertyChanged(NameOf(SelBTLPart))
       End If

EgtBEAMWALL.ViewerOptimizer/ChangeParameterWnd/ChangeParameterWndVM.vb

@@ -34,12 +34,6 @@ Public Class ChangeParameterWndVM
                m_ParamList.Add(New Parameters(NewBTLParam))
                ParamIndex += 1
             End While
-            '' leggo tutti i Q della feature
-            'ParamIndex = 1
-            'While BTLIniFile.GetBeamPrivateProfileParam(m_SelPRC.nGRP, m_SelPRC.nPRC, False, ParamIndex, Nothing, NewBTLParam)
-            '   m_ParamList.Add(New Parameters(NewBTLParam))
-            '   ParamIndex += 1
-            'End While
             ' aggiungo bDO come parametro
             m_ParamList.Add(New Parameters(NewBTLParam, True))
             ' seleziono parametro vuoto per dargli un valore iniziale ed evitare che visualizzi sia text che check
@@ -188,21 +182,21 @@ Public Class Parameters
    End Property
 
    Private m_bActualValue As Boolean
-   Public Property bActualValue As String
+   Public Property bActualValue As Boolean
       Get
          Return m_bActualValue
       End Get
-      Set(value As String)
+      Set(value As Boolean)
          m_bActualValue = value
       End Set
    End Property
 
-   Private m_bNewValue As String
-   Public Property bNewValue As String
+   Private m_bNewValue As Boolean
+   Public Property bNewValue As Boolean
       Get
          Return m_bNewValue
       End Get
-      Set(value As String)
+      Set(value As Boolean)
          m_bNewValue = value
       End Set
    End Property
@@ -234,6 +228,7 @@ Public Class Parameters
    Sub New(BTLParamM As BTLParamM, Optional IsCheckBox As Boolean = False)
       MyBase.New(BTLParamM)
       m_bIsCheckBox = IsCheckBox
+      If IsCheckBox Then m_BTLParamM.SetType(BTLParamType.CHECKBOX)
    End Sub
 
    'Shared Operator =(ByVal S1 As Parameters, ByVal S2 As BTLParam) As Boolean

EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj

@@ -949,6 +949,12 @@
   <ItemGroup>
     <Resource Include="Resources\PartManager\Clock.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\LeftPanel\NewRawPartAuto.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\TopPanel\RemoveAllRawPart.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe

EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelV.xaml

@@ -90,6 +90,13 @@
                  Style="{StaticResource LeftPanel_Button}">
             <Image Source="/Resources/LeftPanel/NewRawPart.png" Stretch="Uniform"/>
          </Button>
+         <Button Command="{Binding NewRawPartAuto_Command}"
+                 Visibility="{Binding MachiningPage_Visibility}"
+                 ToolTip="{Binding NewRawPartAuto_ToolTip}"
+                 IsEnabled="{Binding LeftPanel_IsEnabled}"
+                 Style="{StaticResource LeftPanel_Button}">
+            <Image Source="/Resources/LeftPanel/NewRawPartAuto.png" Stretch="Uniform"/>
+         </Button>
          <Button Command="{Binding AddToRawPart_Command}"
                  Visibility="{Binding MachiningPage_Visibility}"
                  ToolTip="{Binding AddToRawPart_ToolTip}"

EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb

@@ -100,6 +100,7 @@ Public Class LeftPanelVM
 
    ' Definizione comandi
    Private m_cmdNewRawPart As ICommand
+   Private m_cmdNewRawPartAuto As ICommand
    Private m_cmdAddToRawPart As ICommand
    Private m_cmdCopyPart As ICommand
    Private m_cmdAddPart As ICommand
@@ -155,6 +156,12 @@ Public Class LeftPanelVM
       End Get
    End Property
 
+   Public ReadOnly Property NewRawPartAuto_ToolTip As String
+      Get
+         Return EgtMsg(61977)
+      End Get
+   End Property
+
    Public ReadOnly Property AddToRawPart_ToolTip As String
       Get
          Return EgtMsg(61904)
@@ -353,34 +360,11 @@ Public Class LeftPanelVM
                   Else
                      Return
                   End If
-               ElseIf SParamlist.Count = 1 Then
-                  ' se premuto shift
-                  If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
-                     ' imposto finestra con anche edit
-                     If AddRawPartWnd(AddRawPartWndVM.EditTypes.TEXT_AND_COMBO, SParamlist, dRawW, dRawL, dStartOffset, dOffset, dKerf) Then
-                        WarehouseHelper.SetOffset(Map.refProjectVM.BTLStructureVM.nPROJTYPE, dOffset)
-                        If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
-                           WarehouseHelper.SetStartOffset(dStartOffset)
-                        Else
-                           WarehouseHelper.SetKerf(dKerf)
-                        End If
-                     Else
-                        Return
-                     End If
-                  Else
-                     ' creo grezzo con l'unico materiale
-                     dRawL = SParamlist(0).dL
-                     dRawW = SParamlist(0).dW
-                  End If
-               Else
-                  ' imposto finestra di sola scelta dimensione
-                  Dim EditType As AddRawPartWndVM.EditTypes = AddRawPartWndVM.EditTypes.ONLY_COMBO
-                  ' se premuto shift
-                  If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
-                     ' imposto finestra con anche edit
-                     EditType = AddRawPartWndVM.EditTypes.TEXT_AND_COMBO
-                  End If
-                  If AddRawPartWnd(EditType, SParamlist, dRawW, dRawL, dStartOffset, dOffset, dKerf) Then
+               ElseIf SParamlist.Count > 0 Then
+                  '' se premuto shift
+                  'If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+                  ' imposto finestra con anche edit
+                  If AddRawPartWnd(AddRawPartWndVM.EditTypes.TEXT_AND_COMBO, SParamlist, dRawW, dRawL, dStartOffset, dOffset, dKerf) Then
                      WarehouseHelper.SetOffset(Map.refProjectVM.BTLStructureVM.nPROJTYPE, dOffset)
                      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
                         WarehouseHelper.SetStartOffset(dStartOffset)
@@ -390,7 +374,30 @@ Public Class LeftPanelVM
                   Else
                      Return
                   End If
+                  'Else
+                  '   ' creo grezzo con l'unico materiale
+                  '   dRawL = SParamlist(0).dL
+                  '   dRawW = SParamlist(0).dW
                End If
+               'Else
+               '   ' imposto finestra di sola scelta dimensione
+               '   Dim EditType As AddRawPartWndVM.EditTypes = AddRawPartWndVM.EditTypes.ONLY_COMBO
+               '   ' se premuto shift
+               '   If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+               '      ' imposto finestra con anche edit
+               '      EditType = AddRawPartWndVM.EditTypes.TEXT_AND_COMBO
+               '   End If
+               '   If AddRawPartWnd(EditType, SParamlist, dRawW, dRawL, dStartOffset, dOffset, dKerf) Then
+               '      WarehouseHelper.SetOffset(Map.refProjectVM.BTLStructureVM.nPROJTYPE, dOffset)
+               '      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+               '         WarehouseHelper.SetStartOffset(dStartOffset)
+               '      Else
+               '         WarehouseHelper.SetKerf(dKerf)
+               '      End If
+               '   Else
+               '      Return
+               '   End If
+               'End If
          End Select
       End If
       If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
@@ -578,6 +585,290 @@ Public Class LeftPanelVM
 
 #End Region    ' NewRawPart
 
+#Region "NewRawPartAuto"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property NewRawPartAuto_Command As ICommand
+      Get
+         If m_cmdNewRawPartAuto Is Nothing Then
+            m_cmdNewRawPartAuto = New Command(AddressOf NewRawPartAuto)
+         End If
+         Return m_cmdNewRawPartAuto
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub NewRawPartAuto()
+      If IsNothing(Map.refProdManagerVM.CurrProd) Then Return
+      Dim SelPart As BTLPartVM = Map.refProjectVM.BTLStructureVM.SelBTLPart
+      Dim SelParts As List(Of BTLPartVM) = Map.refProjectVM.BTLStructureVM.SelBTLParts.ToList()
+      If IsNothing(SelParts) OrElse SelParts.Count <= 0 Then Return
+      ' verifico che abbiano tutti la stessa sezione
+      Dim dHSection As Double = SelParts(0).dH
+      Dim dWSection As Double = SelParts(0).dW
+      For PartIndex = 0 To SelParts.Count - 1
+         Dim Part As BTLPartVM = SelParts(PartIndex)
+         If Not IsNothing(Part) Then
+            If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+               If Part.dH <> dHSection OrElse Part.dW <> dWSection Then
+                  MessageBox.Show(EgtMsg(61970), EgtMsg(30007))
+                  Return
+               End If
+            ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL Then
+               If Part.dH <> dHSection Then
+                  MessageBox.Show(EgtMsg(61970), EgtMsg(30007))
+                  Return
+               End If
+            End If
+         Else
+            SelParts.Remove(Part)
+         End If
+      Next
+      ' se pareti e piu' di uno selezionato, esco
+      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL And SelParts.Count > 1 Then
+         MessageBox.Show(EgtMsg(61971), EgtMsg(30007))
+         Return
+      End If
+      ' se nessun grezzo, rendo tutti i pezzi visibili
+      If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then
+         Map.refProjectVM.BTLStructureVM.ShowAll(False)
+      End If
+      ' verifico se sono gia' stati messi tutti i pezzi richiesti
+      If Not VerifyPartCount(SelParts) Then Return
+      Dim dRawL As Double = SelParts(0).dL
+      Dim dRawW As Double = SelParts(0).dW
+      Dim dStartOffset As Double = 0
+      Dim dKerf As Double = 0
+      Dim dOffset As Double = WarehouseHelper.GetOffset(Map.refProjectVM.BTLStructureVM.nPROJTYPE)
+      ' se tipo di definizione grezzo esplicito
+      If WarehouseHelper.GetRawPartDef = 1 OrElse ((Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift AndAlso WarehouseHelper.GetWarehouseType = WarehouseType.BASIC) Then
+         ' chiedo lunghezza grezzo
+         Dim sWarehouseIniPath As String = Map.refMainWindowVM.MainWindowM.sWarehouseDir & "\" & WH_BASIC_INI_FILE_NAME
+         If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
+            dStartOffset = WarehouseHelper.GetStartOffset()
+            dRawL += dStartOffset
+         Else
+            dKerf = WarehouseHelper.GetKerf()
+            dRawL += 2 * dKerf
+            dRawW += 2 * dKerf
+         End If
+         Dim AddRawPartWndVM As New AddRawPartWndVM(Map.refProjectVM.BTLStructureVM.nPROJTYPE, dRawL, dRawW, dStartOffset)
+         Dim AddRawPartWnd As New AddRawPartWndV(Application.Current.MainWindow, AddRawPartWndVM)
+         If Not AddRawPartWnd.ShowDialog() Then Return
+         dRawL = AddRawPartWndVM.VariableList(0).dValue
+         dRawW = AddRawPartWndVM.VariableList(1).dValue
+         dStartOffset = AddRawPartWndVM.VariableList(1).dValue
+         ' se altrimenti definizione grezzo da warehouse
+      Else
+         If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+            dStartOffset = WarehouseHelper.GetStartOffset()
+         Else
+            dKerf = WarehouseHelper.GetKerf()
+         End If
+         ' se warehouse basic
+         Select Case WarehouseHelper.GetWarehouseType()
+            Case WarehouseType.BASIC
+               WarehouseHelper.GetCurrentDimensions(Map.refProjectVM.BTLStructureVM.nPROJTYPE, dRawW, dRawL)
+            Case WarehouseType.MEDIUM
+               Dim SectionList As List(Of SParam) = WarehouseHelper.GetSectionList()
+               Dim SParamlist As List(Of SParam) = SectionList.FindAll(Function(x) x.SectXMat = SelParts(0).Section)
+               'If SParamlist.Count = 0 Then
+               '   ' apro finestra con solo edit
+               '   If AddRawPartWnd(AddRawPartWndVM.EditTypes.ONLY_TEXT, SParamlist, dRawW, dRawL, dStartOffset, dOffset, dKerf) Then
+               '      WarehouseHelper.SetOffset(Map.refProjectVM.BTLStructureVM.nPROJTYPE, dOffset)
+               '      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+               '         WarehouseHelper.SetStartOffset(dStartOffset)
+               '      Else
+               '         WarehouseHelper.SetKerf(dKerf)
+               '      End If
+               '   Else
+               '      Return
+               '   End If
+               'ElseIf SParamlist.Count = 1 Then
+               If SParamlist.Count > 0 Then
+                  '' se premuto shift
+                  'If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+                  '   ' imposto finestra con anche edit
+                  '   If AddRawPartWnd(AddRawPartWndVM.EditTypes.TEXT_AND_COMBO, SParamlist, dRawW, dRawL, dStartOffset, dOffset, dKerf) Then
+                  '      WarehouseHelper.SetOffset(Map.refProjectVM.BTLStructureVM.nPROJTYPE, dOffset)
+                  '      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+                  '         WarehouseHelper.SetStartOffset(dStartOffset)
+                  '      Else
+                  '         WarehouseHelper.SetKerf(dKerf)
+                  '      End If
+                  '   Else
+                  '      Return
+                  '   End If
+                  'Else
+                  ' creo grezzo con l'unico materiale
+                  dRawL = SParamlist(0).dL
+                  dRawW = SParamlist(0).dW
+                  'End If
+                  'Else
+                  '   ' imposto finestra di sola scelta dimensione
+                  '   Dim EditType As AddRawPartWndVM.EditTypes = AddRawPartWndVM.EditTypes.ONLY_COMBO
+                  '   ' se premuto shift
+                  '   If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+                  '      ' imposto finestra con anche edit
+                  '      EditType = AddRawPartWndVM.EditTypes.TEXT_AND_COMBO
+                  '   End If
+                  '   If AddRawPartWnd(EditType, SParamlist, dRawW, dRawL, dStartOffset, dOffset, dKerf) Then
+                  '      WarehouseHelper.SetOffset(Map.refProjectVM.BTLStructureVM.nPROJTYPE, dOffset)
+                  '      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+                  '         WarehouseHelper.SetStartOffset(dStartOffset)
+                  '      Else
+                  '         WarehouseHelper.SetKerf(dKerf)
+                  '      End If
+                  '   Else
+                  '      Return
+                  '   End If
+               Else
+                  MessageBox.Show(EgtMsg(61975), EgtMsg(30007))
+                  Return
+               End If
+         End Select
+      End If
+      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
+         ' verifico se lunghezza barra e' maggiore della lunghezza dei pezzi
+         Dim dTotLen As Double = WarehouseHelper.GetStartOffset()
+         For PartIndex = 0 To SelParts.Count - 1
+            If PartIndex <> 0 Then
+               dTotLen += WarehouseHelper.GetOffset(BWType.BEAM)
+            End If
+            dTotLen += SelParts(PartIndex).dL
+         Next
+         If dTotLen > dRawL Then
+            MessageBox.Show(EgtMsg(61972), EgtMsg(30007))
+            Return
+         End If
+      End If
+      ' creo nuovo gruppo di lavorazione
+      Map.refMachGroupPanelVM.AddMachGroup()
+      Dim nCurrMachGroup As Integer = EgtGetCurrMachGroup()
+      Dim sCurrMachGroupName As String = ""
+      EgtGetMachGroupName(nCurrMachGroup, sCurrMachGroupName)
+      ' ordino i pezzi per lunghezza
+      SelParts = SelParts.OrderBy(Function(x) x.dL).ToList
+      ' creo copie dei pezzi
+      Dim nPartDuploIdList As New List(Of Integer)
+      For Each Part In SelParts
+         Dim nDuploId As Integer = EgtDuploNew(Part.nPartId)
+         ' elimino valori calcolo dell'originale
+         MyMachGroupPanelVM.DuploRemoveProjCalc(nDuploId)
+         ' lo rendo std
+         EgtSetMode(nDuploId, GDB_MD.STD)
+         nPartDuploIdList.Add(nDuploId)
+      Next
+      Dim sLogPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\RawPartLog.txt"
+      ' scrivo dati per variabili P di comunicazione con la macchina in gruppo di lavorazione
+      EgtSetInfo(nCurrMachGroup, MGR_RPT_PRODID, Map.refProdManagerVM.CurrProd.nProdId)
+      EgtSetInfo(nCurrMachGroup, MGR_RPT_PATTID, nCurrMachGroup)
+      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
+         ' scrivo dati costruzione grezzo in gruppo di lavorazione
+         EgtSetInfo(nCurrMachGroup, MGR_RPT_BARLEN, dRawL)
+         EgtSetInfo(nCurrMachGroup, MGR_RPT_MATERIAL, SelPart.sMATERIAL)
+         ' scrivo dati di tutti i pezzi
+         Dim dPosX As Double = WarehouseHelper.GetStartOffset()
+         ' ciclo sui pezzi
+         For nIndex = 0 To nPartDuploIdList.Count - 1
+            ' se non è primo, aggiungo offset tra barre standard
+            If nIndex <> 0 Then
+               dPosX += WarehouseHelper.GetOffset(BWType.BEAM)
+            End If
+            EgtSetInfo(nCurrMachGroup, MGR_RPT_PART & nIndex + 1, nPartDuploIdList(nIndex) & "," & DoubleToString(dPosX, 3))
+            ' incremento posizione della sua lunghezza
+            dPosX += SelParts(nIndex).dL
+         Next
+         Dim BeamMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.GetLastMachGroup()
+         ' eseguo script creazione grezzo
+         Dim nERR As Integer = 0
+         If Not ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then
+            ' elimino duplo e gruppo di lavorazione
+            For Each nDuploId In nPartDuploIdList
+               EgtErase(nDuploId)
+            Next
+            BeamMachGroup.DeleteMachGroup()
+            If File.Exists(sLogPath) Then
+               Dim LogFile As String() = File.ReadAllLines(sLogPath)
+               If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
+                  MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+               End If
+            Else
+               MessageBox.Show(EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+            End If
+            ' se nessun grezzo, rimetto tutti i pezzi invisibili
+            If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then
+               Map.refProjectVM.BTLStructureVM.HideAll()
+            End If
+            Return
+         End If
+         For nDuploIndex = 0 To SelParts.Count - 1
+            EgtSetInfo(nPartDuploIdList(nDuploIndex), MGR_PRT_ROT, SelParts(nDuploIndex).nROTATED)
+            EgtSetInfo(nPartDuploIdList(nDuploIndex), MGR_PRT_FLIP, SelParts(nDuploIndex).nINVERTED)
+         Next
+         ' aggiorno contatore pezzi usati in Prod
+         For Each SelPart In SelParts
+            SelPart.RefreshPartInProd()
+         Next
+         'aggiorno lista pezzi
+         BeamMachGroup.MyMachGroupM.RefreshPartList()
+         BeamMachGroup.MyMachGroupM.RefreshGroupData()
+         ' aggiorno dati utilizzo barra
+         BeamMachGroup.UpdateUsage()
+         Core.ViewPanelVM.BWSetView(VT.ISO_SW, False)
+      ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.WALL Then
+         Dim nPartDuploId As Integer = EgtDuploNew(SelPart.nPartId)
+         ' scrivo dati in gruppo di lavorazione
+         Dim dPosX As Double = dKerf
+         Dim dPosY As Double = dKerf
+         EgtSetInfo(nCurrMachGroup, MGR_RPT_PANELLEN, dRawL)
+         EgtSetInfo(nCurrMachGroup, MGR_RPT_PANELWIDTH, dRawW)
+         EgtSetInfo(nCurrMachGroup, MGR_RPT_MATERIAL, SelPart.sMATERIAL)
+         EgtSetInfo(nCurrMachGroup, MGR_RPT_PART & 1,
+                    nPartDuploId & "," & DoubleToString(dPosX, 3) & "," & DoubleToString(dPosY, 3) & ",0,0")
+         Dim WallMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.MachGroupVMList(Map.refMachGroupPanelVM.MachGroupVMList.Count - 1)
+         ' eseguo script creazione grezzo
+         If Not ExecWall(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False, False) Then
+            ' elimino duplo e gruppo di lavorazione
+            EgtErase(nPartDuploId)
+            WallMachGroup.DeleteMachGroup()
+            If File.Exists(sLogPath) Then
+               Dim LogFile As String() = File.ReadAllLines(sLogPath)
+               If LogFile.Count >= 2 AndAlso Not IsNothing(LogFile(1)) Then
+                  MessageBox.Show(LogFile(1), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+               End If
+            Else
+               MessageBox.Show(EgtMsg(61973), EgtMsg(30007), MessageBoxButton.OK, MessageBoxImage.Error)
+            End If
+            ' se nessun grezzo, rimetto tutti i pezzi invisibili
+            If Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.Count = 0 Then
+               Map.refProjectVM.BTLStructureVM.HideAll(True)
+            End If
+            Return
+         End If
+         ' scrivo dati pezzo
+         EgtSetInfo(nPartDuploId, MGR_PRT_POSX, dPosX)
+         EgtSetInfo(nPartDuploId, MGR_PRT_POSY, dPosY)
+         EgtSetInfo(nPartDuploId, MGR_PRT_ROT, SelPart.nROTATED)
+         EgtSetInfo(nPartDuploId, MGR_PRT_FLIP, SelPart.nINVERTED)
+         ' aggiorno contatore pezzi usati in Prod
+         SelPart.RefreshPartInProd()
+         ' aggiorno lista pezzi
+         WallMachGroup.MyMachGroupM.RefreshPartList()
+         WallMachGroup.MyMachGroupM.RefreshGroupData()
+         ' aggiorno dati ultilizzo barra
+         WallMachGroup.UpdateUsage()
+         Core.ViewPanelVM.BWSetView(VT.TOP, False)
+      End If
+      EgtZoom(ZM.ALL)
+   End Sub
+
+#End Region    ' NewRawPartAuto
+
 #Region "AddToRawPart"
 
    ''' <summary>

EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb

@@ -227,8 +227,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2408, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2408, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2411, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2411, 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())

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.4.8.2")>
-<Assembly: AssemblyFileVersion("2.4.8.2")>
+<Assembly: AssemblyVersion("2.4.11.1")>
+<Assembly: AssemblyFileVersion("2.4.11.1")>

EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelV.xaml

@@ -9,6 +9,7 @@
                               Style="{StaticResource ToolBar_EgtFloatingPanel}">
 
    <Border BorderThickness="2"
+           ToolTip="{Binding TotalTime_ToolTip}"
            BorderBrush="Crimson"
            Background="{StaticResource Omag_LightGray}"
            Padding="5,0,5,0"
@@ -21,6 +22,7 @@
                  VerticalAlignment="Center"/>
    </Border>
    <Border BorderThickness="2"
+           ToolTip="{Binding TotalTime_ToolTip}"
            BorderBrush="Crimson"
            Background="{StaticResource Omag_LightGray}"
            Padding="5,0,5,0"
@@ -33,6 +35,7 @@
                  VerticalAlignment="Center"/>
    </Border>
    <Border BorderThickness="2"
+           ToolTip="{Binding DoneTime_ToolTip}"
            BorderBrush="Gold"
            Padding="5,0,5,0"
            Margin="2"
@@ -44,6 +47,7 @@
                  VerticalAlignment="Center"/>
    </Border>
    <Border BorderThickness="2"
+           ToolTip="{Binding RemainingTime_ToolTip}"
            BorderBrush="White"
            Padding="5,0,5,0"
            Margin="2"

EgtBEAMWALL.ViewerOptimizer/StatisticsTimePanel/StatisticsTimePanelVM.vb

@@ -23,6 +23,24 @@ Public Class StatisticsTimePanelVM
 
 #Region "ToolTip"
 
+   Public ReadOnly Property TotalTime_ToolTip As String
+      Get
+         Return EgtMsg(61978)
+      End Get
+   End Property
+
+   Public ReadOnly Property DoneTime_ToolTip As String
+      Get
+         Return EgtMsg(61979)
+      End Get
+   End Property
+
+   Public ReadOnly Property RemainingTime_ToolTip As String
+      Get
+         Return EgtMsg(61980)
+      End Get
+   End Property
+
 #End Region ' ToolTip
 
 #End Region    ' Fields & Properties

EgtBEAMWALL.ViewerOptimizer/TopPanel/TopPanelV.xaml

@@ -58,6 +58,12 @@
                              Style="{StaticResource LeftPanel_Button}">
                         <Image Source="/Resources/TopPanel/RemoveRawPart.png" Stretch="Uniform"/>
                      </Button>
+                     <Button Command="{Binding RemoveAllRawPart_Command}"
+                             ToolTip="{Binding RemoveAllRawPart_ToolTip}"
+                             IsEnabled="{Binding TopPanel_IsEnabled}"
+                             Style="{StaticResource LeftPanel_Button}">
+                        <Image Source="/Resources/TopPanel/RemoveAllRawPart.png" Stretch="Uniform"/>
+                     </Button>
                      <Button Command="{Binding MovePartInRawPart_Command}"
                              ToolTip="{Binding MovePartInRawPart_ToolTip}"
                              IsEnabled="{Binding TopPanel_IsEnabled}"

EgtBEAMWALL.ViewerOptimizer/TopPanel/TopPanelVM.vb

@@ -80,6 +80,7 @@ Public Class TopPanelVM
    Private m_cmdProduceRawPart As ICommand
    Private m_cmdCopyRawPart As ICommand
    Private m_cmdRemoveRawPart As ICommand
+   Private m_cmdRemoveAllRawPart As ICommand
    Private m_cmdRemovePart As ICommand
    Private m_cmdMoveUpPart As ICommand
    Private m_cmdMoveDownPart As ICommand
@@ -127,6 +128,12 @@ Public Class TopPanelVM
       End Get
    End Property
 
+   Public ReadOnly Property RemoveAllRawPart_ToolTip As String
+      Get
+         Return EgtMsg(61976)
+      End Get
+   End Property
+
    Public ReadOnly Property ReOrderPart_ToolTip As String
       Get
          Return EgtMsg(61916)
@@ -365,7 +372,7 @@ Public Class TopPanelVM
    Public ReadOnly Property RemoveRawPart_Command As ICommand
       Get
          If m_cmdRemoveRawPart Is Nothing Then
-            m_cmdRemoveRawPart = New Command(AddressOf RemoveRawPart)
+            m_cmdRemoveRawPart = New Command(AddressOf RemoveRawPartCmd)
          End If
          Return m_cmdRemoveRawPart
       End Get
@@ -374,10 +381,14 @@ Public Class TopPanelVM
    ''' <summary>
    ''' Execute the Exec.  This method is invoked by the ExecCommand.
    ''' </summary>
-   Public Sub RemoveRawPart()
+   Public Sub RemoveRawPartCmd()
+      RemoveRawPart()
+   End Sub
+
+   Public Sub RemoveRawPart(Optional bAll As Boolean = False)
       If IsNothing(Map.refProdManagerVM.CurrProd) Then Return
       ' se premuto shift
-      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift Then
+      If bAll Then
          ' cancello tutti
          For Index = Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 To 0 Step -1
             Dim CurrMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.MachGroupVMList(Index)
@@ -400,6 +411,29 @@ Public Class TopPanelVM
 
 #End Region    ' RemoveRawPart
 
+#Region "RemoveAllRawPart"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property RemoveAllRawPart_Command As ICommand
+      Get
+         If m_cmdRemoveAllRawPart Is Nothing Then
+            m_cmdRemoveAllRawPart = New Command(AddressOf RemoveAllRawPart)
+         End If
+         Return m_cmdRemoveAllRawPart
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub RemoveAllRawPart()
+      RemoveRawPart(True)
+   End Sub
+
+#End Region    ' RemoveRawPart
+
 #Region "RemovePart"
 
    ''' <summary>

EgtBEAMWALL.ViewerOptimizer/Utility/CurrentMachine.vb

@@ -179,8 +179,8 @@ Public Module CurrentMachine
       ' crea l'elenco dei parametri della macchina corrente
       CreateMachParams()
 
-      ' leggo parametri macchina da WallData
-      If nType = MachineType.BEAM Then
+      ' leggo parametri macchina da BeamData
+      If nType = MachineType.BEAM OrElse nType = MachineType.BOTH Then
          ' Assegno i dati
          EgtLuaCreateGlobTable("GWD")
          EgtLuaSetGlobStringVar("GWD.BASEDIR", Map.refMainWindowVM.MainWindowM.sBeamRoot)
@@ -200,7 +200,7 @@ Public Module CurrentMachine
          End If
          If bOk Then
             EgtLuaGetGlobNumVar("GWD.OVM_MID", m_dMinOffset)
-            Dim nTemp As Integer
+            Dim nTemp As Integer = 0
             EgtLuaGetGlobIntVar("GWD.SIMUL_VIEW_DIR", nTemp)
             Select Case nTemp
                Case 0
@@ -222,8 +222,9 @@ Public Module CurrentMachine
          EgtLuaResetGlobVar("GWD")
          ' aggiorno parametro in gestore viste
          Core.ViewPanelVM.UpdateMachParam(m_nViewDir)
-      End If
-      If nType = MachineType.WALL Then
+      
+      ' leggo parametri macchina da WallData
+      ElseIf nType = MachineType.WALL Then
          ' Assegno i dati
          EgtLuaCreateGlobTable("GWD")
          EgtLuaSetGlobStringVar("GWD.BASEDIR", Map.refMainWindowVM.MainWindowM.sWallRoot)
@@ -243,9 +244,11 @@ Public Module CurrentMachine
          End If
          If bOk Then
             EgtLuaGetGlobIntVar("GWD.HOR_DRILL_DIAM", m_dHorDrillDiam)
-            Dim nTemp As Integer
+            Dim nTemp As Integer = 0
             EgtLuaGetGlobIntVar("GWD.SIMUL_VIEW_DIR", nTemp)
             Select Case nTemp
+               Case 0
+                  m_nViewDir = VT.ISO_SW
                Case 1
                   m_nViewDir = VT.ISO_NW
                Case 2

EgtBEAMWALL.ViewerOptimizer/Utility/DbControllers.vb

@@ -5,94 +5,94 @@ Imports EgtBEAMWALL.ViewerOptimizer
 
 Public Module DbControllers
 
-    Friend m_SupervisorId As String = "1"
-    Private m_bNetwork As Boolean = False
-    Friend ReadOnly Property bNetwork As Boolean
-        Get
-            Return m_bNetwork
-        End Get
-    End Property
+   Friend m_SupervisorId As String = "1"
+   Private m_bNetwork As Boolean = False
+   Friend ReadOnly Property bNetwork As Boolean
+      Get
+         Return m_bNetwork
+      End Get
+   End Property
 
-    Public m_ProjController As DataLayer.Controllers.ProjController
-    Public m_ProdController As DataLayer.Controllers.ProdController
-    Public m_MachGroupController As DataLayer.Controllers.MachGroupController
-    Public m_StatusMapController As DataLayer.Controllers.StatusMapController
-    Public m_PartController As DataLayer.Controllers.PartController
+   Public m_ProjController As DataLayer.Controllers.ProjController
+   Public m_ProdController As DataLayer.Controllers.ProdController
+   Public m_MachGroupController As DataLayer.Controllers.MachGroupController
+   Public m_StatusMapController As DataLayer.Controllers.StatusMapController
+   Public m_PartController As DataLayer.Controllers.PartController
 
-    Sub Init()
-    End Sub
+   Sub Init()
+   End Sub
 
-    Sub New()
+   Sub New()
 
-        ' se demo--> server = db.steamware.net, nKey e sKey come le hai...
+      ' se demo--> server = db.steamware.net, nKey e sKey come le hai...
 
-        Dim sKey = "", sUser = "", sPwd = ""
+      Dim sKey = "", sUser = "", sPwd = ""
 
-        EgtGetKeyInfo(sKey)
-        sKey = sKey.Replace(" ", "")
-        If Not IsNothing(sKey) AndAlso sKey.Length > 11 Then
-            sUser = sKey.Substring(3, 6)
-            sPwd = sKey.Substring(10, sKey.Length - 10).Replace("(", "").Replace(")", "")
-        End If
-        Try
-            Dim DbAddress As String = "127.0.0.1"
-            Dim DbMasterKey As Integer = 0
-            Dim sDbMasterKey As String = ""
-            Dim sSharedFolder As String = ""
-            If Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) Then
-                GetMainPrivateProfileString(S_GENERAL, K_DBADDRESS, "", DbAddress)
-                DbMasterKey = GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0)
-                If DbMasterKey > 0 Then
-                    sDbMasterKey = DbMasterKey.ToString("000000")
-                End If
-                If String.IsNullOrWhiteSpace(DbAddress) OrElse DbMasterKey <= 0 Then
-                    DbAddress = "127.0.0.1"
-                    DbMasterKey = 0
-                Else
-                    m_bNetwork = True
-                End If
+      EgtGetKeyInfo(sKey)
+      sKey = sKey.Replace(" ", "")
+      If Not IsNothing(sKey) AndAlso sKey.Length > 11 Then
+         sUser = sKey.Substring(3, 6)
+         sPwd = sKey.Substring(10, sKey.Length - 10).Replace("(", "").Replace(")", "")
+      End If
+      Try
+         Dim DbAddress As String = "127.0.0.1"
+         Dim DbMasterKey As Integer = 0
+         Dim sDbMasterKey As String = ""
+         Dim sSharedFolder As String = ""
+         If Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) Then
+            GetMainPrivateProfileString(S_GENERAL, K_DBADDRESS, "", DbAddress)
+            DbMasterKey = GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0)
+            If DbMasterKey > 0 Then
+               sDbMasterKey = DbMasterKey.ToString("000000")
             End If
-            If Not m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.ANY_DB) Then
-                DbMasterKey = GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0)
-                If DbMasterKey > 0 Then
-                    sDbMasterKey = DbMasterKey.ToString("000000")
-                End If
-            ElseIf GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0) = 0 Then
-                Dim nKey As Integer = 0
-                If Integer.TryParse(sKey.Substring(3, 6), nKey) AndAlso nKey > 0 Then
-                    WriteMainPrivateProfileString(S_GENERAL, K_DBMASTERKEY, nKey)
-                End If
-            End If
-            DataLayer.DbConfig.InitDb(DbAddress, sUser, sPwd, sDbMasterKey)
-            DataLayer.DbConfig.SetupLogDir(Map.refMainWindowVM.MainWindowM.sTempDir)
-            DataLayer.DbConfig.CheckMigrateDb()
-            DataLayer.DbConfig.CheckUser(sUser, sPwd, Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK))
-            DataLayer.DbConfig.CheckViews(sUser, sPwd)
-            If Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) And bNetwork Then
-                ' imposto cartella condivisa
-                GetMainPrivateProfileString(S_GENERAL, K_SHAREDFOLDER, Map.refMainWindowVM.MainWindowM.sDataDir, sSharedFolder)
-                Map.refMainWindowVM.MainWindowM.UpdatePathForNetwork(sSharedFolder)
-                Dim sSupervisorMachName As String = ""
-                GetMainPrivateProfileString(S_MACH, K_SUPERVISORMACH, "", sSupervisorMachName)
-                If Not String.IsNullOrWhiteSpace(sSupervisorMachName) Then m_SupervisorId = sSupervisorMachName
-            ElseIf Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.ANY_DB) Then
-                ' imposto cartella chiave master
-                Map.refMainWindowVM.MainWindowM.UpdatePathForKey(sDbMasterKey)
+            If String.IsNullOrWhiteSpace(DbAddress) OrElse DbMasterKey <= 0 Then
+               DbAddress = "127.0.0.1"
+               DbMasterKey = 0
             Else
-                ' imposto cartella chiave locale
-                Map.refMainWindowVM.MainWindowM.UpdatePathForKey(sKey.Substring(3, 6))
+               m_bNetwork = True
             End If
-        Catch ex As Exception
-            EgtOutLog("InitDb error: " & ex.ToString())
-            MessageBox.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
-            End
-        End Try
+         End If
+         If Not m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.ANY_DB) Then
+            DbMasterKey = GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0)
+            If DbMasterKey > 0 Then
+               sDbMasterKey = DbMasterKey.ToString("000000")
+            End If
+         ElseIf GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0) = 0 Then
+            Dim nKey As Integer = 0
+            If Integer.TryParse(sKey.Substring(3, 6), nKey) AndAlso nKey > 0 Then
+               WriteMainPrivateProfileString(S_GENERAL, K_DBMASTERKEY, nKey)
+            End If
+         End If
+         DataLayer.DbConfig.InitDb(DbAddress, sUser, sPwd, sDbMasterKey)
+         DataLayer.DbConfig.SetupLogDir(Map.refMainWindowVM.MainWindowM.sTempDir)
+         DataLayer.DbConfig.CheckMigrateDb()
+         DataLayer.DbConfig.CheckUser(sUser, sPwd, m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK))
+         DataLayer.DbConfig.CheckViews(sUser, sPwd)
+         If m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) Then
+            ' imposto cartella condivisa
+            GetMainPrivateProfileString(S_GENERAL, K_SHAREDFOLDER, Map.refMainWindowVM.MainWindowM.sDataDir, sSharedFolder)
+            Map.refMainWindowVM.MainWindowM.UpdatePathForNetwork(sSharedFolder)
+            Dim sSupervisorMachName As String = ""
+            GetMainPrivateProfileString(S_MACH, K_SUPERVISORMACH, "", sSupervisorMachName)
+            If Not String.IsNullOrWhiteSpace(sSupervisorMachName) Then m_SupervisorId = sSupervisorMachName
+         ElseIf Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.ANY_DB) Then
+            ' imposto cartella chiave master
+            Map.refMainWindowVM.MainWindowM.UpdatePathForKey(sDbMasterKey)
+         Else
+            ' imposto cartella chiave locale
+            Map.refMainWindowVM.MainWindowM.UpdatePathForKey(sKey.Substring(3, 6))
+         End If
+      Catch ex As Exception
+         EgtOutLog("InitDb error: " & ex.ToString())
+         MessageBox.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
+         End
+      End Try
 
-        m_ProjController = New DataLayer.Controllers.ProjController
-        m_ProdController = New DataLayer.Controllers.ProdController
-        m_MachGroupController = New DataLayer.Controllers.MachGroupController
-        m_StatusMapController = New DataLayer.Controllers.StatusMapController
-        m_PartController = New DataLayer.Controllers.PartController
-    End Sub
+      m_ProjController = New DataLayer.Controllers.ProjController
+      m_ProdController = New DataLayer.Controllers.ProdController
+      m_MachGroupController = New DataLayer.Controllers.MachGroupController
+      m_StatusMapController = New DataLayer.Controllers.StatusMapController
+      m_PartController = New DataLayer.Controllers.PartController
+   End Sub
 
 End Module