EgtBEAMWALL 2.5f2 :

- aggiornamento versioni

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -120,6 +120,13 @@ Public Module ConstIni
    Public Const K_WALLBASEDIR As String = "BaseDir"
    Public Const K_WALLBWEEXEC As String = "BweExec"
 
+   Public Const S_MACHINELOGFILTER As String = "MachineLogFilters"
+   Public Const K_PARTEVENTTYPE As String = "PartEventType"
+   Public Const K_ENTITYTYPE As String = "EntityType"
+   Public Const K_DAYTYPE As String = "DayType"
+   Public Const K_STARTDATE As String = "StartDate"
+   Public Const K_ENDDATE As String = "EndDate"
+
    'Public Const S_NEST As String = "Nest"
    Public Const K_NESTEXEC As String = "NestExec"
    Public Const K_FLIPROT As String = "FlipRot"

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.5.4")>
-<Assembly: AssemblyFileVersion("2.5.5.4")>
+<Assembly: AssemblyVersion("2.5.6.2")>
+<Assembly: AssemblyFileVersion("2.5.6.2")>

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.5.4")]
-[assembly: AssemblyFileVersion("2.5.5.4")]
+[assembly: AssemblyVersion("2.5.6.2")]
+[assembly: AssemblyFileVersion("2.5.6.2")]

EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml

@@ -25,16 +25,37 @@
       </Grid>
 
       <StackPanel Orientation="Horizontal" Height="30">
+         <TextBlock Text="{Binding Entity_Msg}"
+                    Style="{StaticResource Log_TextBlock}"/>
          <ComboBox ItemsSource="{Binding EntityTypeList}"
                    SelectedIndex="{Binding SelEntityType}"
                    Width="70"
                    Margin="0,0,2.5,0"
                    Style="{StaticResource PartParam_ComboBox}"/>
+         <TextBlock Text="{Binding Event_Msg}"
+                    Style="{StaticResource Log_TextBlock}"/>
          <ComboBox ItemsSource="{Binding PartEventTypeList}"
                    SelectedIndex="{Binding SelPartEventType}"
                    Width="70"
                    Margin="0,0,2.5,0"
                    Style="{StaticResource PartParam_ComboBox}"/>
+         <TextBlock Text="{Binding Date_Msg}"
+                    Style="{StaticResource Log_TextBlock}"/>
+         <ComboBox ItemsSource="{Binding DayTypeList}"
+                   SelectedIndex="{Binding SelDayType}"
+                   Width="70"
+                   Margin="0,0,2.5,0"
+                   Style="{StaticResource PartParam_ComboBox}"/>
+         <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
+            <TextBlock Text="{Binding From_Msg}"
+                       Style="{StaticResource Log_TextBlock}"/>
+            <DatePicker SelectedDate="{Binding dtStartDate}"
+                        Style="{StaticResource Log_DatePicker}"/>
+            <TextBlock Text="{Binding To_Msg}"
+                       Style="{StaticResource Log_TextBlock}"/>
+            <DatePicker SelectedDate="{Binding dtEndDate}"
+                        Style="{StaticResource Log_DatePicker}"/>
+         </StackPanel>
          <!--<TextBox Text="{Binding MaxRowNumber}"/>-->
          <Button Grid.Column="1"
                  Command="{Binding Refresh_Command}"

EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageVM.vb

@@ -9,6 +9,12 @@ Imports EgtBEAMWALL.Core.MachLog
 Public Class MachineLogPageVM
    Inherits VMBase
 
+   Private Enum DayTypes As Integer
+      TODAY = 0
+      YESTERDAY = 1
+      PERIOD = 2
+   End Enum
+
    Private m_colMachineLog_Type As EgtDataGridColumn
    Public ReadOnly Property colMachineLog_Type As EgtDataGridColumn
       Get
@@ -62,7 +68,7 @@ Public Class MachineLogPageVM
       End Set
    End Property
 
-   Private m_PartEventTypeList As New List(Of String)({"", "Inizio", "Fine"})
+   Private m_PartEventTypeList As New List(Of String)({"", EgtMsg(62527), EgtMsg(62528)})
    Public ReadOnly Property PartEventTypeList As List(Of String)
       Get
          Return m_PartEventTypeList
@@ -76,11 +82,12 @@ Public Class MachineLogPageVM
       End Get
       Set(value As Integer)
          m_SelPartEventType = value
+         WriteMainPrivateProfileString(S_MACHINELOGFILTER, K_PARTEVENTTYPE, m_SelPartEventType.ToString())
          m_MachineLogList_View.Refresh()
       End Set
    End Property
 
-   Private m_EntityTypeList As New List(Of String)({"", "Pezzo", "Barra"})
+   Private m_EntityTypeList As New List(Of String)({"", EgtMsg(62525), EgtMsg(62526)})
    Public ReadOnly Property EntityTypeList As List(Of String)
       Get
          Return m_EntityTypeList
@@ -94,10 +101,75 @@ Public Class MachineLogPageVM
       End Get
       Set(value As Integer)
          m_SelEntityType = value
+         WriteMainPrivateProfileString(S_MACHINELOGFILTER, K_ENTITYTYPE, m_SelEntityType.ToString())
          m_MachineLogList_View.Refresh()
       End Set
    End Property
 
+   Private m_DayTypeList As New List(Of String)({EgtMsg(62529), EgtMsg(62530), EgtMsg(62531)})
+   Public ReadOnly Property DayTypeList As List(Of String)
+      Get
+         Return m_DayTypeList
+      End Get
+   End Property
+
+   Private m_SelDayType As DayTypes = DayTypes.TODAY
+   Public Property SelDayType As Integer
+      Get
+         Return m_SelDayType
+      End Get
+      Set(value As Integer)
+         Dim PrevSelDayType As DayTypes = m_SelDayType
+         m_SelDayType = value
+         WriteMainPrivateProfileString(S_MACHINELOGFILTER, K_DAYTYPE, Convert.ToInt32(m_SelDayType))
+         m_Date_Visibility = If(m_SelDayType = DayTypes.PERIOD, Visibility.Visible, Visibility.Collapsed)
+         If m_SelDayType = DayTypes.PERIOD Then
+            m_dtStartDate = If(PrevSelDayType = DayTypes.TODAY, DateTime.Today, DateTime.Today - TimeSpan.FromDays(1))
+            m_dtEndDate = If(PrevSelDayType = DayTypes.TODAY, DateTime.Today, DateTime.Today - TimeSpan.FromDays(1))
+            NotifyPropertyChanged(NameOf(dtStartDate))
+            NotifyPropertyChanged(NameOf(dtEndDate))
+         End If
+         NotifyPropertyChanged(NameOf(Date_Visibility))
+         ' aggiorno lista da Db
+         UpdateMachineLogList()
+      End Set
+   End Property
+
+   Private m_dtStartDate As DateTime = DateTime.Today
+   Public Property dtStartDate As DateTime
+      Get
+         Return m_dtStartDate
+      End Get
+      Set(value As DateTime)
+         m_dtStartDate = value
+         Dim lStartDate As Long = m_dtStartDate.ToFileTimeUtc()
+         WriteMainPrivateProfileString(S_MACHINELOGFILTER, K_STARTDATE, lStartDate.ToString())
+         ' aggiorno lista da Db
+         UpdateMachineLogList()
+      End Set
+   End Property
+
+   Private m_dtEndDate As DateTime = DateTime.Today
+   Public Property dtEndDate As DateTime
+      Get
+         Return m_dtEndDate
+      End Get
+      Set(value As DateTime)
+         m_dtEndDate = value
+         Dim lEndDate As Long = m_dtEndDate.ToFileTimeUtc()
+         WriteMainPrivateProfileString(S_MACHINELOGFILTER, K_ENDDATE, lEndDate.ToString())
+         ' aggiorno lista da Db
+         UpdateMachineLogList()
+      End Set
+   End Property
+
+   Private m_Date_Visibility As Visibility = Visibility.Collapsed
+   Public ReadOnly Property Date_Visibility As Visibility
+      Get
+         Return m_Date_Visibility
+      End Get
+   End Property
+
    ' Definizione comandi
    Private m_cmdRefresh As ICommand
 
@@ -151,6 +223,35 @@ Public Class MachineLogPageVM
       End Get
    End Property
 
+   Public ReadOnly Property Entity_Msg As String
+      Get
+         Return EgtMsg(62520)
+      End Get
+   End Property
+
+   Public ReadOnly Property Event_Msg As String
+      Get
+         Return EgtMsg(62521)
+      End Get
+   End Property
+
+   Public ReadOnly Property Date_Msg As String
+      Get
+         Return EgtMsg(62522)
+      End Get
+   End Property
+
+   Public ReadOnly Property From_Msg As String
+      Get
+         Return EgtMsg(62523)
+      End Get
+   End Property
+
+   Public ReadOnly Property To_Msg As String
+      Get
+         Return EgtMsg(62524)
+      End Get
+   End Property
 
 #End Region    ' Messages
 
@@ -167,6 +268,30 @@ Public Class MachineLogPageVM
       m_colMachineLog_Type = m_MachineLogColumns.FirstOrDefault(Function(x) x.Name = COL_TYPE)
       m_colMachineLog_Description = m_MachineLogColumns.FirstOrDefault(Function(x) x.Name = COL_DESCRIPTION)
       m_colMachineLog_SupervisorId = m_MachineLogColumns.FirstOrDefault(Function(x) x.Name = COL_SUPERVISORID)
+      ' imposto valori filtri da ini
+      m_SelPartEventType = GetMainPrivateProfileInt(S_MACHINELOGFILTER, K_PARTEVENTTYPE, 2)
+      m_SelEntityType = GetMainPrivateProfileInt(S_MACHINELOGFILTER, K_ENTITYTYPE, 1)
+      m_SelDayType = GetMainPrivateProfileInt(S_MACHINELOGFILTER, K_DAYTYPE, 0)
+      Select Case m_SelDayType
+         Case DayTypes.TODAY
+            m_dtStartDate = DateTime.Today
+            m_dtEndDate = DateTime.Today
+         Case DayTypes.YESTERDAY
+            m_dtStartDate = DateTime.Today - TimeSpan.FromDays(1)
+            m_dtEndDate = DateTime.Today - TimeSpan.FromDays(1)
+         Case DayTypes.PERIOD
+            Dim sStartDate As String = "0"
+            Dim lStartDate As Long = 0
+            GetMainPrivateProfileString(S_MACHINELOGFILTER, K_STARTDATE, 0, sStartDate)
+            Long.TryParse(sStartDate, lStartDate)
+            m_dtStartDate = If(lStartDate > 0, DateTime.FromFileTimeUtc(lStartDate), DateTime.Today)
+            Dim sEndDate As String = "0"
+            Dim lEndDate As Long = 0
+            GetMainPrivateProfileString(S_MACHINELOGFILTER, K_ENDDATE, 0, sEndDate)
+            Long.TryParse(sEndDate, lEndDate)
+            m_dtEndDate = If(lEndDate > 0, DateTime.FromFileTimeUtc(lEndDate), DateTime.Today)
+            m_Date_Visibility = Visibility.Visible
+      End Select
    End Sub
 
 #End Region    ' CONSTRUCTORS
@@ -215,7 +340,15 @@ Public Class MachineLogPageVM
    End Sub
 
    Friend Sub UpdateMachineLogList()
-      m_MachineLogList = New ObservableCollection(Of LogEvent)(DbControllers.m_LogMachineController.GetCoreDesc(DateTime.Now - TimeSpan.FromDays(300), DateTime.Now).Select(Of LogEvent)(Function(x) New LogEvent(x)).ToList())
+      'm_MachineLogList = New ObservableCollection(Of LogEvent)(DbControllers.m_LogMachineController.GetCoreDesc(DateTime.Now - TimeSpan.FromDays(300), DateTime.Now).Select(Of LogEvent)(Function(x) New LogEvent(x)).ToList())
+      Select Case m_SelDayType
+         Case DayTypes.TODAY
+            m_MachineLogList = New ObservableCollection(Of LogEvent)(DbControllers.m_LogMachineController.GetCoreDesc(DateTime.Today, DateTime.Today + TimeSpan.FromDays(1)).Select(Of LogEvent)(Function(x) New LogEvent(x)).ToList())
+         Case DayTypes.YESTERDAY
+            m_MachineLogList = New ObservableCollection(Of LogEvent)(DbControllers.m_LogMachineController.GetCoreDesc(DateTime.Today - TimeSpan.FromDays(1), DateTime.Today).Select(Of LogEvent)(Function(x) New LogEvent(x)).ToList())
+         Case DayTypes.PERIOD
+            m_MachineLogList = New ObservableCollection(Of LogEvent)(DbControllers.m_LogMachineController.GetCoreDesc(m_dtStartDate, m_dtEndDate + TimeSpan.FromDays(1)).Select(Of LogEvent)(Function(x) New LogEvent(x)).ToList())
+      End Select
       NotifyPropertyChanged(NameOf(MachineLogList))
       m_MachineLogList_View = CollectionViewSource.GetDefaultView(m_MachineLogList)
       m_MachineLogList_View.Filter = AddressOf MachineLogFilter

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, 2505, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2505, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2506, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2506, 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.5.4")>
-<Assembly: AssemblyFileVersion("2.5.5.4")>
+<Assembly: AssemblyVersion("2.5.6.2")>
+<Assembly: AssemblyFileVersion("2.5.6.2")>

EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml

@@ -342,6 +342,11 @@
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="10,0,10,0"/>
    </Style>
+   
+   <Style x:Key="Log_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="5,0,5,0"/>
+   </Style>
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -720,4 +725,13 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+
+   <!-- DatePicker -->
+
+   <Style x:Key="Log_DatePicker" TargetType="{x:Type DatePicker}">
+      <Setter Property="Height" Value="22" />
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
 </ResourceDictionary>

EgtBEAMWALL.Supervisor/Utility/LogEvent.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5
+Imports EgtUILib
+Imports EgtWPFLib5
 Imports EgtBEAMWALL.Core
 
 Public Class LogEvent
@@ -77,9 +78,9 @@ Public Class LogEvent
       Get
          Select Case m_Status
             Case 1
-               Return "Inizio"
+               Return EgtMsg(62527)
             Case 2
-               Return "Fine"
+               Return EgtMsg(62528)
             Case Else
                Return ""
          End Select

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb

@@ -120,9 +120,17 @@ Public Class BTLFeatureVM
       End Get
       Set(value As String)
          Dim nTemp As Integer = 0
-         If Integer.TryParse(value, nTemp) Then 
-            m_BTLFeatureM.nPriority = nTemp
-            EgtSetInfo( nFeatureId, BTL_FTR_PRIORITY, m_BTLFeatureM.nPriority)
+         If Integer.TryParse(value, nTemp) Then
+            If EgtSetInfo(nFeatureId, BTL_FTR_PRIORITY, nTemp) Then
+               m_BTLFeatureM.nPriority = nTemp
+               ' setto feature da ricalcolare
+               ResetCalcFeature()
+               ' se in View
+               If Map.refMainMenuVM.SelPage = Pages.VIEW Then
+                  ' imposto modificato per copie
+                  EgtDuploSetModified(m_BTLPartM.nPartId)
+               End If
+            End If
          End If
          NotifyPropertyChanged(NameOf(sPriority))
       End Set

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb

@@ -2164,7 +2164,7 @@ Public Class BTLPartVM
             ' imposto path disegno da mostrare in BottomPanel
             Dim SelPBTLParam As BTLParamVM = Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SelPBTLParam
             If Not IsNothing(SelPBTLParam) Then Map.refBottomPanelVM.SetCurrDraw(SelPBTLParam.sDrawPath)
-         Case NameOf(sender.bDO)
+         Case NameOf(sender.bDO), NameOf(sender.sPriority)
             NotifyPropertyChanged(NameOf(bDOALL))
             ' setto pezzo da ricalcolare
             'ResetCalcTotalPart()

EgtBEAMWALL.ViewerOptimizer/FeatureManager/FeatureManagerVM.vb

@@ -29,7 +29,7 @@ Public Class FeatureManagerVM
 
    Public ReadOnly Property Priority_Visibility As Visibility
       Get
-         Return if(CurrentMachine.nType = Core.ConstBeam.MachineType.WALL, Visibility.Visible, Visibility.Collapsed)
+         Return If(CurrentMachine.nType = Core.ConstBeam.MachineType.WALL AndAlso CurrentMachine.bIsEnabledPriority, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 

EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListVM.vb

@@ -62,7 +62,7 @@ Public Class FeatureInPartInRawPartListVM
 
    Friend Sub UpdateColumns(nMachType As MachineType)
       If Not IsNothing(m_colFeatureInPartInRawPart_Priority) Then
-         m_colFeatureInPartInRawPart_Priority.Visible = (nMachType=MachineType.WALL)
+         m_colFeatureInPartInRawPart_Priority.Visible = (nMachType = MachineType.WALL AndAlso CurrentMachine.bIsEnabledPriority)
       End If
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb

@@ -235,8 +235,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2505, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2505, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2506, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2506, 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.5.5.4")>
-<Assembly: AssemblyFileVersion("2.5.5.4")>
+<Assembly: AssemblyVersion("2.5.6.2")>
+<Assembly: AssemblyFileVersion("2.5.6.2")>

EgtBEAMWALL.ViewerOptimizer/Utility/CurrentMachine.vb

@@ -87,6 +87,13 @@ Public Module CurrentMachine
          Return m_dMinOffset
       End Get
    End Property
+   ' Attivazione Priority pareti
+   Private m_bIsEnabledPriority As Boolean = 0
+   Public ReadOnly Property bIsEnabledPriority As Boolean
+      Get
+         Return m_bIsEnabledPriority
+      End Get
+   End Property
 
 #Region "Proprietà che leggono e scrivono i valori anche da o su file ini"
 
@@ -300,6 +307,11 @@ Public Module CurrentMachine
             End Select
             EgtLuaGetGlobNumVar("GWD.MIN_HEIGHT", m_dMinRawH)
             EgtLuaGetGlobNumVar("GWD.MAX_HEIGHT", m_dMaxRawH)
+            If EgtLuaGetGlobNumVar("GWD.BTL_PRIORITY", nTemp) Then
+               m_bIsEnabledPriority = nTemp > 0
+            Else
+               m_bIsEnabledPriority = False
+            End If
          Else
             m_nViewDir = VT.ISO_SW
             m_OrigCorner = MCH_CR.BR
@@ -308,6 +320,7 @@ Public Module CurrentMachine
             m_NestingCorner = MCH_CR.BR
             m_dMinRawH = 5
             m_dMaxRawH = 500
+            m_bIsEnabledPriority = False
          End If
          ' Cancello tavola globale
          EgtLuaResetGlobVar("GWD")