- Cambiato ordine colonne in tagella porte

- correzione su copia file ddf
- correzione scrittura parametri porta quando nuova
- aggiunta verifica isnothing su ricerca porta che potrebbe essere stata cancellata
- Aggiornati colori in Dictionary

Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml

@@ -64,10 +64,6 @@
                              Binding="{Binding nId}"
                              Width="Auto"
                              IsReadOnly="True"/>
-         <DataGridTextColumn Header="Line"
-                             Binding="{Binding nCSVLine}"
-                             Width="Auto"
-                             IsReadOnly="True"/>
          <DataGridTemplateColumn Header="DDF"
                                  Width="Auto">
             <DataGridTemplateColumn.CellTemplate>
@@ -86,27 +82,31 @@
          <!--<DataGridTextColumn Header="DDF"
                              Binding="{Binding sDDFName}"
                              Width="Auto"/>-->
-         <DataGridTextColumn Header="Quantity"
+         <!--<DataGridTextColumn Header="Quantity"
                              Binding="{Binding nQuantity}"
                              Width="Auto"
-                             IsReadOnly="True"/>
-         <DataGridTextColumn Header="State"
-                             Binding="{Binding nState}"
-                             Width="Auto"
-                             IsReadOnly="True"/>
-         <DataGridTextColumn Header="Height"
-                             Binding="{Binding dHeight}"
-                             Width="Auto"/>
+                             IsReadOnly="True"/>-->
          <DataGridTextColumn Header="Width"
                              Binding="{Binding dWidth}"
                              Width="Auto"/>
+         <DataGridTextColumn Header="Height"
+                             Binding="{Binding dHeight}"
+                             Width="Auto"/>
          <DataGridTextColumn Header="Thickness"
                              Binding="{Binding dThickness}"
                              Width="Auto"/>
+         <DataGridTextColumn Header="State"
+                             Binding="{Binding nState}"
+                             Width="Auto"
+                             IsReadOnly="True"/>
          <DataGridTextColumn Header="Csv"
                              Binding="{Binding sCSVName}"
                              Width="Auto"
                              IsReadOnly="True"/>
+         <DataGridTextColumn Header="Line"
+                             Binding="{Binding nCSVLine}"
+                             Width="Auto"
+                             IsReadOnly="True"/>
          <DataGridTextColumn Header="Production State"
                              Binding="{Binding nProdState}"
                              Width="Auto"

Effector.Plugin.DoorArreda/DoorListPage/DoorListPageVM.vb

@@ -343,7 +343,7 @@ Public Class DoorListPageVM
                         End If
                      Else
                         Try
-                           File.Copy(sGenDDFFilePath, sCopyDDFFilePath & "_" & nId & ".ddf")
+                           File.Copy(sGenDDFFilePath, sCopyDDFFilePath & "_" & nId & ".ddf", True)
                            bOk = True
                         Catch ex As Exception
 
@@ -869,8 +869,14 @@ Public Class Door
                Return
             End If
          ElseIf sExtension.ToLower() = ".ddt" Then
-            ' se file generato
-            If CreateDdfFromDdt(m_nId, value, m_dWidth, m_dHeight, m_dThickness) Then
+            If m_dWidth = 0 OrElse m_dHeight = 0 OrElse m_dThickness = 0 Then
+               m_sDDFName = value
+               ' riporto indietro stato a da verificare
+               Me.m_nState = DoorStates.LOADED_FROM_CSV
+               NotifyPropertyChanged(NameOf(nState))
+               Return
+               ' se file generato
+            ElseIf CreateDdfFromDdt(m_nId, value, m_dWidth, m_dHeight, m_dThickness) Then
                Me.m_sDDFName = value
                ' riporto indietro stato a da verificare
                Me.m_nState = DoorStates.LOADED_FROM_CSV
@@ -908,12 +914,24 @@ Public Class Door
          End If
          ' verifico se file ddf o ddt
          Dim sExtension As String = Path.GetExtension(m_sDDFName)
-         If sExtension.ToLower() = ".ddf" Then
+         If String.IsNullOrWhiteSpace(sExtension) Then
+            m_dWidth = dValue
+            ' riporto indietro stato a da verificare
+            Me.m_nState = DoorStates.LOADED_FROM_CSV
+            NotifyPropertyChanged(NameOf(nState))
+            Return
+         ElseIf sExtension.ToLower() = ".ddf" Then
             MessageBox.Show("ATTENZIONE! Questa modifica non cambia realmente le dimensioni della porta perchè è selezionato un file ddf!", "Attenzione!", MessageBoxButton.OK, MessageBoxImage.Warning)
             m_dWidth = dValue
             Return
          ElseIf sExtension.ToLower() = ".ddt" Then
-            If CreateDdfFromDdt(m_nId, m_sDDFName, dValue, m_dHeight, m_dThickness) Then
+            If String.IsNullOrWhiteSpace(m_sDDFName) OrElse m_dHeight = 0 OrElse m_dThickness = 0 Then
+               m_dWidth = dValue
+               ' riporto indietro stato a da verificare
+               Me.m_nState = DoorStates.LOADED_FROM_CSV
+               NotifyPropertyChanged(NameOf(nState))
+               Return
+            ElseIf CreateDdfFromDdt(m_nId, m_sDDFName, dValue, m_dHeight, m_dThickness) Then
                m_dWidth = dValue
                ' riporto indietro stato a da verificare
                Me.m_nState = DoorStates.LOADED_FROM_CSV
@@ -940,11 +958,23 @@ Public Class Door
          End If
          ' verifico se file ddf o ddt
          Dim sExtension As String = Path.GetExtension(m_sDDFName)
-         If sExtension.ToLower() = ".ddf" Then
+         If String.IsNullOrWhiteSpace(sExtension) Then
+            m_dHeight = dValue
+            ' riporto indietro stato a da verificare
+            Me.m_nState = DoorStates.LOADED_FROM_CSV
+            NotifyPropertyChanged(NameOf(nState))
+            Return
+         ElseIf sExtension.ToLower() = ".ddf" Then
             m_dHeight = dValue
             Return
          ElseIf sExtension.ToLower() = ".ddt" Then
-            If CreateDdfFromDdt(m_nId, m_sDDFName, m_dWidth, dValue, m_dThickness) Then
+            If String.IsNullOrWhiteSpace(m_sDDFName) OrElse m_dWidth = 0 OrElse m_dThickness = 0 Then
+               m_dHeight = dValue
+               ' riporto indietro stato a da verificare
+               Me.m_nState = DoorStates.LOADED_FROM_CSV
+               NotifyPropertyChanged(NameOf(nState))
+               Return
+            ElseIf CreateDdfFromDdt(m_nId, m_sDDFName, m_dWidth, dValue, m_dThickness) Then
                m_dHeight = dValue
                ' riporto indietro stato a da verificare
                Me.m_nState = DoorStates.LOADED_FROM_CSV
@@ -971,11 +1001,23 @@ Public Class Door
          End If
          ' verifico se file ddf o ddt
          Dim sExtension As String = Path.GetExtension(m_sDDFName)
-         If sExtension.ToLower() = ".ddf" Then
+         If String.IsNullOrWhiteSpace(sExtension) Then
+            m_dThickness = dValue
+            ' riporto indietro stato a da verificare
+            Me.m_nState = DoorStates.LOADED_FROM_CSV
+            NotifyPropertyChanged(NameOf(nState))
+            Return
+         ElseIf sExtension.ToLower() = ".ddf" Then
             m_dThickness = dValue
             Return
          ElseIf sExtension.ToLower() = ".ddt" Then
-            If CreateDdfFromDdt(m_nId, m_sDDFName, m_dWidth, m_dHeight, dValue) Then
+            If String.IsNullOrWhiteSpace(m_sDDFName) OrElse m_dWidth = 0 OrElse m_dHeight = 0 Then
+               m_dThickness = dValue
+               ' riporto indietro stato a da verificare
+               Me.m_nState = DoorStates.LOADED_FROM_CSV
+               NotifyPropertyChanged(NameOf(nState))
+               Return
+            ElseIf CreateDdfFromDdt(m_nId, m_sDDFName, m_dWidth, m_dHeight, dValue) Then
                m_dThickness = dValue
                ' riporto indietro stato a da verificare
                Me.m_nState = DoorStates.LOADED_FROM_CSV

Effector.Plugin.DoorArreda/MachinePage/MachinePageVM.vb

@@ -262,7 +262,7 @@ Public Class MachinePageVM
          If nId > 0 Then
             ' aggiorno dati in lista porte
             Dim Door As Door = Map.refDoorListPageVM.DoorList.FirstOrDefault(Function(x) x.nId = nId)
-            If nDoorState <> Door.nProdState Then
+            If Not IsNothing(Door) AndAlso nDoorState <> Door.nProdState Then
                Door.SetProdState(nDoorState)
                If lLoadTime > 0 Then Door.SetLoadTime(lLoadTime)
                If lMachining1Start > 0 Then Door.SetMachining1Start(lMachining1Start)

Effector.Plugin.DoorArreda/Utility/Dictionary.xaml

@@ -16,40 +16,31 @@
    <local:StatisticsPageVM x:Key="StatisticsPageVM"/>
 
    <!--Colori predefiniti-->
-   <SolidColorBrush x:Key="EgaltechBlue1" Color="#FF4D84C4" />
-   <SolidColorBrush x:Key="EgaltechBlue2" Color="#FF7096CE" />
-   <SolidColorBrush x:Key="EgaltechBlue3" Color="#FF90ABD9" />
-   <SolidColorBrush x:Key="EgaltechBlue4" Color="#FFB2C3E4" />
-   <SolidColorBrush x:Key="EgaltechWhite" Color="#FFFFFFFF" />
-   <SolidColorBrush x:Key="EgaltechGray" Color="#FF585858" />
-   <SolidColorBrush x:Key="EgaltechLightGray" Color="LightGray" />
-   <SolidColorBrush x:Key="EgaltechUltralightGray" Color="#FFF2F2F2" />
-   <SolidColorBrush x:Key="EgaltechGreen" Color="#FF00FF00" />
-
-   <SolidColorBrush x:Key="Roller" Color="#FF585858" />
-   <SolidColorBrush x:Key="TableFrame" Color="LightGray" />
-   <SolidColorBrush x:Key="Structure" Color="#61b0ff" />
-   <SolidColorBrush x:Key="Bridge" Color="LightBlue" />
-   <SolidColorBrush x:Key="Shuttle" Color="DarkGray" />
    
-   <!--#92908d-->
-   <Color x:Key="Icarus_Gray_Color" R="146" G="144" B="141" A="255"/>
-   <SolidColorBrush x:Key="Icarus_Gray" Color="{StaticResource Icarus_Gray_Color}" />
-   <!--#3c89c9-->
-   <Color x:Key="Icarus_LightBlue_Color" R="60" G="137" B="201" A="255"/>
-   <SolidColorBrush x:Key="Icarus_LightBlue" Color="{StaticResource Icarus_LightBlue_Color}" />
-   <!--#2e5a81-->
-   <Color x:Key="Icarus_Blue_Color" R="46" G="90" B="129" A="255"/>
-   <SolidColorBrush x:Key="Icarus_Blue" Color="{StaticResource Icarus_Blue_Color}" />
-   <!--#50A388-->
-   <Color x:Key="Icarus_Green_Color" R="80" G="163" B="136" A="255"/>
-   <SolidColorBrush x:Key="Icarus_Green" Color="{StaticResource Icarus_Green_Color}" />
-   <!--#BC373E-->
-   <Color x:Key="Icarus_Orange_Color" R="188" G="55" B="62" A="255"/>
-   <SolidColorBrush x:Key="Icarus_Orange" Color="{StaticResource Icarus_Orange_Color}" />
-   <!--#A74C77-->
-   <Color x:Key="Icarus_Purple_Color" R="167" G="76" B="119" A="255"/>
-   <SolidColorBrush x:Key="Icarus_Purple" Color="{StaticResource Icarus_Purple_Color}" />
+   <!--#92bde3-->
+   <Color x:Key="Effector_LightBlue_Color" R="146" G="189" B="227" A="255"/>
+   <SolidColorBrush x:Key="Effector_LightBlue" Color="{StaticResource Effector_LightBlue_Color}" />
+   <!--#5682a6-->
+   <Color x:Key="Effector_Blue_Color" R="86" G="130" B="166" A="255"/>
+   <SolidColorBrush x:Key="Effector_Blue" Color="{StaticResource Effector_Blue_Color}" />
+   <!--#cd5c5c-->
+   <Color x:Key="Effector_Red_Color" R="205" G="92" B="92" A="255"/>
+   <SolidColorBrush x:Key="Effector_Red" Color="{StaticResource Effector_Red_Color}" />
+   <!--#b1cbaa-->
+   <Color x:Key="Effector_Green_Color" R="177" G="203" B="170" A="255"/>
+   <SolidColorBrush x:Key="Effector_Green" Color="{StaticResource Effector_Green_Color}" />
+   <!--#9c9c9c-->
+   <Color x:Key="Effector_Gray_Color" R="156" G="156" B="156" A="255"/>
+   <SolidColorBrush x:Key="Effector_Gray" Color="{StaticResource Effector_Gray_Color}" />
+   <!--#ffd932-->
+   <Color x:Key="Effector_Yellow_Color" R="255" G="217" B="50" A="255"/>
+   <SolidColorBrush x:Key="Effector_Yellow" Color="{StaticResource Effector_Yellow_Color}" />
+   <!--#BC373E--><!--
+   <Color x:Key="Effector_Orange_Color" R="188" G="55" B="62" A="255"/>
+   <SolidColorBrush x:Key="Effector_Orange" Color="{StaticResource Effector_Orange_Color}" />
+   --><!--#A74C77--><!--
+   <Color x:Key="Effector_Purple_Color" R="167" G="76" B="119" A="255"/>
+   <SolidColorBrush x:Key="Effector_Purple" Color="{StaticResource Effector_Purple_Color}" />-->
 
    <!--Colori per EgtWPFLib5-->
    <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
@@ -65,6 +56,10 @@
    <Thickness x:Key="WindowBorder_Thickness">2</Thickness>
    <sys:Double x:Key="WindowBorder_Height">2</sys:Double>
 
+   <!--ToggleButton-->
+   <Style x:Key="MainMenu_ToggleButton" TargetType="ToggleButton">
+      <Setter Property="FontFamily" Value="/Resources/Fonts/#Roboto"/>
+   </Style>
    <!--Stili per disegno macchina con porte-->
    
    <Style x:Key="Table" TargetType="Border">