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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
@@ -340,72 +135,20 @@
Text="Sent 1"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -481,6 +224,18 @@
CommandParameter="2,1,1363/2,2,983->2,1,1364/2,2,984"
Style="{StaticResource Advancement_Button}"/>
+ -->
+
+
+
+
+
+
+
+
-
-
+
-
-
+ Grid.Row="3"
+ Visibility="{Binding VariableOnDraw_Visibility}">
+
-
-
-
-
-
@@ -533,7 +279,7 @@
Style="{StaticResource Table}"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -690,49 +333,22 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
@@ -745,18 +361,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -785,49 +389,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -957,150 +518,6 @@
-
-
diff --git a/Effector.Plugin.DoorArreda/MachinePage/MachinePageVM.vb b/Effector.Plugin.DoorArreda/MachinePage/MachinePageVM.vb
index 69d5446..909caf6 100644
--- a/Effector.Plugin.DoorArreda/MachinePage/MachinePageVM.vb
+++ b/Effector.Plugin.DoorArreda/MachinePage/MachinePageVM.vb
@@ -4,7 +4,7 @@ Imports System.Globalization
Imports System.Reflection
Imports System.Windows.Threading
Imports Newtonsoft.Json.Linq
-Imports Effector.Plugin.FiveLakes.Variable
+Imports Effector.Plugin.DoorArreda.Variable
Imports Effector.Plugin.Interface
Public Class MachinePageVM
@@ -108,61 +108,50 @@ Public Class MachinePageVM
Sub New()
' imposto riferimento in Map
Map.SetRefMachinePageVM(Me)
- m_VariableList = New ObservableCollection(Of Variable)({New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_00", "980", 1),
- New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_01", "981", 1),
+ 'm_VariableList = New ObservableCollection(Of Variable)({New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_00", "980", 1),
+ ' New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_01", "981", 1),
+ ' New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_02", "982", 1),
+ ' New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_03", "983", 1),
+ ' New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_04", "984", 1),
+ ' New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S0", "1360", 1),
+ ' New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S1", "1361", 1),
+ ' New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S2", "1362", 1),
+ ' New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S3", "1363", 1),
+ ' New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S4", "1364", 1),
+ ' New Variable(Variable.VariableTypes.INTEGER, "@SENT_1", "1350", 1),
+ ' New Variable(Variable.VariableTypes.INTEGER, "@SENT_2", "1351", 1),
+ ' New Variable(Variable.VariableTypes.INTEGER, "@STATE", "1352", 1),
+ ' New Variable(Variable.VariableTypes.INTEGER, "@RESET_ON", "1365", 1),
+ ' New Variable(Variable.VariableTypes.INTEGER, "@MAST_OK", "1366", 1),
+ ' New Variable(Variable.VariableTypes.INTEGER, "@START_OK", "1367", 1),
+ ' New Variable(Variable.VariableTypes.BOOLEAN, "@BF00", "901.0", 1),
+ ' New Variable(Variable.VariableTypes.BOOLEAN, "@BF01", "901.1", 1),
+ ' New Variable(Variable.VariableTypes.BOOLEAN, "@BF02", "901.2", 1),
+ ' New Variable(Variable.VariableTypes.BOOLEAN, "@BF03", "901.3", 1),
+ ' New Variable(Variable.VariableTypes.BOOLEAN, "@BF04", "901.4", 1),
+ ' New Variable(Variable.VariableTypes.BOOLEAN, "@BF05", "901.5", 1),
+ ' New Variable(Variable.VariableTypes.BOOLEAN, "@BF06", "901.6", 1),
+ ' New Variable(Variable.VariableTypes.BOOLEAN, "@BF07", "901.7", 1)})
+ m_VariableList = New ObservableCollection(Of Variable)({New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_01", "981", 1),
New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_02", "982", 1),
New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_03", "983", 1),
- New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_04", "984", 1),
- New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S0", "1360", 1),
- New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S1", "1361", 1),
- New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S2", "1362", 1),
- New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S3", "1363", 1),
- New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S4", "1364", 1),
New Variable(Variable.VariableTypes.INTEGER, "@SENT_1", "1350", 1),
New Variable(Variable.VariableTypes.INTEGER, "@SENT_2", "1351", 1),
New Variable(Variable.VariableTypes.INTEGER, "@STATE", "1352", 1),
- New Variable(Variable.VariableTypes.INTEGER, "@RESET_ON", "1365", 1),
- New Variable(Variable.VariableTypes.INTEGER, "@MAST_OK", "1366", 1),
- New Variable(Variable.VariableTypes.INTEGER, "@START_OK", "1367", 1),
- New Variable(Variable.VariableTypes.BOOLEAN, "@BF00", "901.0", 1),
New Variable(Variable.VariableTypes.BOOLEAN, "@BF01", "901.1", 1),
New Variable(Variable.VariableTypes.BOOLEAN, "@BF02", "901.2", 1),
New Variable(Variable.VariableTypes.BOOLEAN, "@BF03", "901.3", 1),
New Variable(Variable.VariableTypes.BOOLEAN, "@BF04", "901.4", 1),
New Variable(Variable.VariableTypes.BOOLEAN, "@BF05", "901.5", 1),
New Variable(Variable.VariableTypes.BOOLEAN, "@BF06", "901.6", 1),
- New Variable(Variable.VariableTypes.BOOLEAN, "@BF07", "901.7", 1),
- New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_00", "980", 2),
- New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_01", "981", 2),
- New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_02", "982", 2),
- New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_03", "983", 2),
- New Variable(Variable.VariableTypes.DOUBLE, "@WP_PR_04", "984", 2),
- New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S0", "1360", 2),
- New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S1", "1361", 2),
- New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S2", "1362", 2),
- New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S3", "1363", 2),
- New Variable(Variable.VariableTypes.INTEGER, "@DOORN_S4", "1364", 2),
- New Variable(Variable.VariableTypes.INTEGER, "@SENT_1", "1350", 2),
- New Variable(Variable.VariableTypes.INTEGER, "@SENT_2", "1351", 2),
- New Variable(Variable.VariableTypes.INTEGER, "@STATE", "1352", 2),
- New Variable(Variable.VariableTypes.INTEGER, "@RESET_ON", "1365", 2),
- New Variable(Variable.VariableTypes.INTEGER, "@MAST_OK", "1366", 2),
- New Variable(Variable.VariableTypes.INTEGER, "@START_OK", "1367", 2),
- New Variable(Variable.VariableTypes.BOOLEAN, "@BF00", "901.0", 2),
- New Variable(Variable.VariableTypes.BOOLEAN, "@BF01", "901.1", 2),
- New Variable(Variable.VariableTypes.BOOLEAN, "@BF02", "901.2", 2),
- New Variable(Variable.VariableTypes.BOOLEAN, "@BF03", "901.3", 2),
- New Variable(Variable.VariableTypes.BOOLEAN, "@BF04", "901.4", 2),
- New Variable(Variable.VariableTypes.BOOLEAN, "@BF05", "901.5", 2),
- New Variable(Variable.VariableTypes.BOOLEAN, "@BF06", "901.6", 2),
- New Variable(Variable.VariableTypes.BOOLEAN, "@BF07", "901.7", 2)})
+ New Variable(Variable.VariableTypes.INTEGER, "@P1000_END", "1353", 1),
+ New Variable(Variable.VariableTypes.INTEGER, "@P2000_END", "1354", 1)})
AddHandler m_VarTimer.Tick, AddressOf VarTimer_Tick
m_VarTimer.Interval = New TimeSpan(100)
m_VarTimer.Start()
- m_DoorOnMachineList.Add(New Door(35, 1, "Test.ddf", "Produzione2024", 1, 800, 1800, 40, {""}, {""}))
Dim sResourcesDirPath As String = ""
GetPluginPrivateProfileString(S_GENERAL, K_RESOURCESDIR, "", sResourcesDirPath)
- m_sMachineImagePath = sResourcesDirPath & "\FiveLakesMachine.png"
+ m_sMachineImagePath = sResourcesDirPath & "\Machine.png"
' creo posti in lista descrizioni
For nIndex As Integer = 0 To 8
m_DoorOnMachineArray.Add(Nothing)
@@ -218,25 +207,6 @@ Public Class MachinePageVM
Map.refSupervisorFunction.ComWriteDoubleVar(nIndex, 2, Machine1Var.nMachine)
End If
Next
- ' se presente un sent
- Dim Sent1Var As Variable = m_VariableList.FirstOrDefault(Function(x) x.sName = "@SENT_1" AndAlso x.nMachine = 2)
- Dim Sent2Var As Variable = m_VariableList.FirstOrDefault(Function(x) x.sName = "@SENT_2" AndAlso x.nMachine = 2)
- If Sent1Var.nValue = 1 OrElse Sent2Var.nValue = 1 Then
- ' aggiorno stato porta su rulliera intermedia da 2 a 1
- For nMachineIndex = 1 To 2
- Dim nMachineId As Integer = nMachineIndex
- Dim sVariableName As String = "@WP_PR_04"
- If nMachineIndex = 2 Then
- sVariableName = "@WP_PR_00"
- End If
- Dim Machine1Var As Variable = m_VariableList.FirstOrDefault(Function(x) x.sName = sVariableName AndAlso x.nMachine = nMachineId)
- If Not IsNothing(Machine1Var) AndAlso Machine1Var.dValue = 2 Then
- Dim nIndex As Integer = -1
- Integer.TryParse(Machine1Var.sIndex, nIndex)
- Map.refSupervisorFunction.ComWriteDoubleVar(nIndex, 1, Machine1Var.nMachine)
- End If
- Next
- End If
End If
' leggo stato calcolo da lua
Dim nState As Integer = -1
@@ -312,26 +282,6 @@ Public Class MachinePageVM
End If
End If
Next
- 'For nVarIndex As Integer = 0 To m_VariableList.Count - 1
- ' Dim Var As Variable = m_VariableList(nVarIndex)
- ' If nVarIndex >= 5 AndAlso nVarIndex <= 9 Then
- ' Dim nId As Integer = -1
- ' If Var.nValue > 0 Then
- ' m_DoorOnMachineArray(nVarIndex - 5) = m_LuaDoorList(Var.nValue - 1)
- ' Else
- ' m_DoorOnMachineArray(nVarIndex - 5) = Nothing
- ' End If
- ' End If
- ' If nVarIndex >= 30 AndAlso nVarIndex <= 33 Then
- ' Dim nId As Integer = -1
- ' If Var.nValue > 0 Then
- ' m_DoorOnMachineArray(nVarIndex - 25) = m_LuaDoorList(Var.nValue - 1)
- ' Else
- ' m_DoorOnMachineArray(nVarIndex - 25) = Nothing
- ' End If
- ' End If
- 'Next
-
NotifyPropertyChanged(NameOf(DoorOnMachineArray))
End Sub