diff --git a/Effector.Plugin.DoorArreda/Constants/ConstIni.vb b/Effector.Plugin.DoorArreda/Constants/ConstIni.vb index 1a61f13..1b3ac02 100644 --- a/Effector.Plugin.DoorArreda/Constants/ConstIni.vb +++ b/Effector.Plugin.DoorArreda/Constants/ConstIni.vb @@ -28,6 +28,7 @@ Module ConstIni Public Const K_WIDTH As String = "Width" Public Const K_THICKNESS As String = "Thickness" Public Const K_MANUALADDEDDOORNAME As String = "ManualAddedDoorName" + Public Const K_DELIMITER As String = "Delimiter" Public Const S_DEBUG As String = "Debug" Public Const K_VARIABLELIST As String = "VariableList" diff --git a/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml b/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml index 2cba8f1..f384493 100644 --- a/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml +++ b/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml @@ -138,5 +138,11 @@ --> + + + + diff --git a/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageVM.vb b/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageVM.vb index 1cb9962..6ff6e15 100644 --- a/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageVM.vb +++ b/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageVM.vb @@ -131,8 +131,14 @@ Public Class DoorListPageVM Dim JsonDoorList As List(Of JsonDoor) = JsonConvert.DeserializeObject(Of List(Of JsonDoor))(sReadedFile) JsonDoorList = JsonDoorList.OrderBy(Of Integer)(Function(x) x.nListIndex).ToList() - m_DoorList = New ObservableCollection(Of Door)((From JsonDoor In JsonDoorList - Select New Door(JsonDoor)).ToList()) + Dim TempDoorList As ObservableCollection(Of Door) = New ObservableCollection(Of Door)((From JsonDoor In JsonDoorList + Select New Door(JsonDoor)).ToList()) + For Each CurrDoor In TempDoorList + If CurrDoor.nState > Door.DoorStates.VERIFIED AndAlso CurrDoor.nState < Door.DoorStates.PRODUCED Then + CurrDoor.SetState(Door.DoorStates.VERIFIED) + End If + Next + m_DoorList = TempDoorList End Sub Public Sub Write(FilePath As String) @@ -224,6 +230,7 @@ Public Class DoorListPageVM End If Next End Sub + #End Region ' METHODS #Region "COMMANDS" @@ -252,7 +259,9 @@ Public Class DoorListPageVM Dim sCSVPath As String = OpenFileDialog.FileName Using MyReader As New Microsoft.VisualBasic.FileIO.TextFieldParser(sCSVPath) MyReader.TextFieldType = FileIO.FieldType.Delimited - MyReader.SetDelimiters(";") + Dim sDelimiter As String = "" + GetPluginPrivateProfileString(S_CSV, K_DELIMITER, ";", sDelimiter) + MyReader.SetDelimiters(sDelimiter) ' leggo intestazione Dim Headers As String() = MyReader.ReadFields() Dim sDDFName As String = "" @@ -337,7 +346,6 @@ Public Class DoorListPageVM If IsNothing(m_ExecProcessManager) Then bStartExecProcessManager = True m_ExecProcessManager = New ExecProcessManager(sCamExePath, """" & sMainLuaPath & """") - 'm_ExecProcessManager.SetPostProcess(AddressOf ExecProcessManager_PostProcess) AddHandler m_ExecProcessManager.m_AllArgsProcessed, AddressOf ExecProcessManager_AllArgsProcessed m_ExecProcessManager.SetMaxCamInstances(3) End If @@ -850,7 +858,10 @@ Public Class Door End Property Friend Sub SetState(value As DoorStates, Optional bUpdate As Boolean = True) m_nState = value - If bUpdate Then NotifyPropertyChanged(NameOf(nState)) + If bUpdate Then + NotifyPropertyChanged(NameOf(nState)) + NotifyPropertyChanged(NameOf(Background)) + End If End Sub #Region "Statistics" @@ -976,6 +987,28 @@ Public Class Door #End Region ' Statistics + Public ReadOnly Property Background As SolidColorBrush + Get + Select Case m_nState + Case DoorStates.LOADED_FROM_CSV + Return Brushes.White + Case DoorStates.VERIFICATION_FAILED + Return Brushes.Red + Case DoorStates.SKIPPED + Return Brushes.Orange + Case DoorStates.READY_FOR_PRODUCTION + Return Brushes.LightSkyBlue + Case DoorStates.MACHINE_1_START + Return Brushes.DodgerBlue + Case DoorStates.MACHINE_1_END, DoorStates.PRODUCED + Return Brushes.LightGray + Case Else ' ItemState.Scrapped + Return Brushes.White + End Select + End Get + End Property + + Sub New(nId As Integer, nCSVLine As Integer, sDDFName As String, sCSVName As String, nQuantity As Integer, dWidth As Double, dHeight As Double, dThickness As Double, HeaderList As String(), ValueList As String()) m_nId = nId m_nCSVLine = nCSVLine diff --git a/Effector.Plugin.DoorArreda/MachinePage/MachinePageV.xaml b/Effector.Plugin.DoorArreda/MachinePage/MachinePageV.xaml index 3b2c546..f693ff4 100644 --- a/Effector.Plugin.DoorArreda/MachinePage/MachinePageV.xaml +++ b/Effector.Plugin.DoorArreda/MachinePage/MachinePageV.xaml @@ -1,7 +1,7 @@  - + @@ -86,220 +85,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -