diff --git a/EgtBEAMWALL.Core/BTLModel/BTLPartM.vb b/EgtBEAMWALL.Core/BTLModel/BTLPartM.vb
index 95806694..788c9d6c 100644
--- a/EgtBEAMWALL.Core/BTLModel/BTLPartM.vb
+++ b/EgtBEAMWALL.Core/BTLModel/BTLPartM.vb
@@ -802,14 +802,36 @@ Public Class BTLPartM
NewBTLPart.ocREFSIDEFIXCLAMP)
End If
+ Dim EnumIndex As Integer = 0
EgtGetInfo(nPartId, BTL_PRT_PROCESSINGQUALITY, sValue)
- NewBTLPart.m_SelPROCESSINGQUALITY = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue, NewBTLPart.ocPROCESSINGQUALITY),
- NewBTLPart.ocPROCESSINGQUALITY)
+ For ind = 1 To NewBTLPart.ocPROCESSINGQUALITY.Count
+ Dim sEnumName = [Enum].GetName(GetType(ProcessingQuality), ind)
+ If sEnumName.Equals(sValue) Then
+ EnumIndex = ind
+ Exit For
+ End If
+ Next
+ NewBTLPart.m_SelPROCESSINGQUALITY = EnumIndex - 1
EgtGetInfo(nPartId, BTL_PRT_RECESS, sValue)
- NewBTLPart.m_SelRECESS = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue, NewBTLPart.ocRECESS), NewBTLPart.ocRECESS)
+ EnumIndex = 0
+ For ind = 1 To NewBTLPart.ocRECESS.Count
+ Dim sEnumName = [Enum].GetName(GetType(Recess), ind)
+ If sEnumName.Equals(sValue) Then
+ EnumIndex = ind
+ Exit For
+ End If
+ Next
+ NewBTLPart.m_SelRECESS = EnumIndex - 1
EgtGetInfo(nPartId, BTL_PRT_STOREYTYPE, sValue)
- NewBTLPart.m_SelSTOREYTYPE = IdNameStruct.IndFromId(IdNameStruct.IdFromName(sValue, NewBTLPart.ocSTOREYTYPE),
- NewBTLPart.ocSTOREYTYPE)
+ EnumIndex = 0
+ For ind = 1 To NewBTLPart.ocSTOREYTYPE.Count
+ Dim sEnumName = [Enum].GetName(GetType(StoreyType), ind)
+ If sEnumName.Equals(sValue) Then
+ EnumIndex = ind
+ Exit For
+ End If
+ Next
+ NewBTLPart.m_SelSTOREYTYPE = EnumIndex - 1
EgtGetInfo(nPartId, BTL_PRT_ELEMENTNUM, NewBTLPart.m_sELEMENTNUM)
EgtGetInfo(nPartId, BTL_PRT_LAYER, NewBTLPart.m_nLAYER)
EgtGetInfo(nPartId, BTL_PRT_MODULENUM, NewBTLPart.m_sMODULENUM)
diff --git a/EgtBEAMWALL.Core/Constants/ConstGen.vb b/EgtBEAMWALL.Core/Constants/ConstGen.vb
index 3101c6cb..87f76fed 100644
--- a/EgtBEAMWALL.Core/Constants/ConstGen.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstGen.vb
@@ -30,6 +30,8 @@ Public Module ConstGen
MACHINING = 1
SUPERVISOR = 2
CONFIG = 3
+ INPUTS = 4
+ OUTPUTS = 5
End Enum
' Abilitazioni licenza
diff --git a/EgtBEAMWALL.Core/Constants/ConstMachIni.vb b/EgtBEAMWALL.Core/Constants/ConstMachIni.vb
index 0b874795..50bb4585 100644
--- a/EgtBEAMWALL.Core/Constants/ConstMachIni.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstMachIni.vb
@@ -11,4 +11,6 @@
Public Const K_SETUP As String = "Setup"
Public Const K_FLOW As String = "Flow"
+ Public Const TS3DATA_FILE As String = "Ts3Data.lua"
+
End Module
diff --git a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
index 0d177a54..d39e6a37 100644
--- a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
+++ b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
@@ -235,6 +235,14 @@
+
+ OutputsPageV.xaml
+
+
+
+ InputsPageV.xaml
+
+
ConfigurationPageV.xaml
@@ -335,6 +343,14 @@
MSBuild:Compile
Designer
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
diff --git a/EgtBEAMWALL.Supervisor/InputsPage/InputsPageV.xaml b/EgtBEAMWALL.Supervisor/InputsPage/InputsPageV.xaml
new file mode 100644
index 00000000..af9803ff
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/InputsPage/InputsPageV.xaml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/EgtBEAMWALL.Supervisor/InputsPage/InputsPageV.xaml.vb b/EgtBEAMWALL.Supervisor/InputsPage/InputsPageV.xaml.vb
new file mode 100644
index 00000000..f84ad39e
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/InputsPage/InputsPageV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class InputsPageV
+
+End Class
diff --git a/EgtBEAMWALL.Supervisor/InputsPage/InputsPageVM.vb b/EgtBEAMWALL.Supervisor/InputsPage/InputsPageVM.vb
new file mode 100644
index 00000000..4cf26b23
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/InputsPage/InputsPageVM.vb
@@ -0,0 +1,20 @@
+Public Class InputsPageVM
+
+#Region "Messages"
+
+#End Region ' Messages
+
+#Region "Constructor"
+
+ Sub New()
+ '' imposto riferimento in Map
+ 'Map.SetRefInputsPageVM(Me)
+ End Sub
+
+#End Region ' Constructor
+
+#Region "Methods"
+
+#End Region ' Methods
+
+End Class
\ No newline at end of file
diff --git a/EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml b/EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml
index 06e3b4cb..161146c1 100644
--- a/EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml
+++ b/EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml
@@ -9,10 +9,16 @@
+
+
-
+
diff --git a/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb
index 67f6c373..89963475 100644
--- a/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb
+++ b/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb
@@ -35,6 +35,24 @@ Public Class MainMenuVM
End Set
End Property
+ Public Property Inputs_IsChecked As Boolean
+ Get
+ Return m_SelPage = Pages.INPUTS
+ End Get
+ Set(value As Boolean)
+ If value Then SelPage = Pages.INPUTS
+ End Set
+ End Property
+
+ Public Property Outputs_IsChecked As Boolean
+ Get
+ Return m_SelPage = Pages.OUTPUTS
+ End Get
+ Set(value As Boolean)
+ If value Then SelPage = Pages.OUTPUTS
+ End Set
+ End Property
+
Private m_SelPage As Integer = -1
Public Property SelPage As Integer
Get
@@ -55,6 +73,10 @@ Public Class MainMenuVM
bOk = ExitSUPERVISOR(bVerifyModification)
Case Pages.CONFIG
bOk = ExitCONFIG()
+ Case Pages.INPUTS
+ bOk = ExitINPUTS()
+ Case Pages.OUTPUTS
+ bOk = ExitOUTPUTS()
End Select
If bOk Then
' Entro nel nuovo stato
@@ -69,11 +91,17 @@ Public Class MainMenuVM
'Map.refMachGroupPanelVM.SetMachGroupState(False)
'Map.refCONFIGTabVM.InitCONFIGation()
'Map.refTopCommandBarVM.IsEnabled = False
+ Case Pages.INPUTS
+ InitINPUTS()
+ Case Pages.OUTPUTS
+ InitOUTPUTS()
End Select
End If
' aggiorno visualizzazione RadioButton
NotifyPropertyChanged(NameOf(Supervisor_IsChecked))
NotifyPropertyChanged(NameOf(Config_IsChecked))
+ NotifyPropertyChanged(NameOf(Inputs_IsChecked))
+ NotifyPropertyChanged(NameOf(Outputs_IsChecked))
End Sub
#Region "Messages"
@@ -95,6 +123,18 @@ Public Class MainMenuVM
Return EgtMsg(61832)
End Get
End Property
+
+ Public ReadOnly Property Inputs_Msg As String
+ Get
+ Return EgtMsg(61930)
+ End Get
+ End Property
+
+ Public ReadOnly Property Outputs_Msg As String
+ Get
+ Return EgtMsg(61931)
+ End Get
+ End Property
#End Region ' Messages
#End Region ' Fields & Properties
@@ -200,6 +240,24 @@ Public Class MainMenuVM
Return True
End Function
+ Private Function InitINPUTS() As Boolean
+ Map.refMainWindowVM.NotifyPropertyChanged(NameOf(Map.refMainWindowVM.nSelTabPage))
+ Return True
+ End Function
+
+ Private Function ExitINPUTS() As Boolean
+ Return True
+ End Function
+
+ Private Function InitOUTPUTS() As Boolean
+ Map.refMainWindowVM.NotifyPropertyChanged(NameOf(Map.refMainWindowVM.nSelTabPage))
+ Return True
+ End Function
+
+ Private Function ExitOUTPUTS() As Boolean
+ Return True
+ End Function
+
#End Region ' METHODS
End Class
\ No newline at end of file
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
index 5d57ea3a..95f6041a 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
@@ -31,6 +31,12 @@
+
+
+
+
+
+
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
index f465e9fd..1ee1ae09 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
@@ -27,7 +27,15 @@ Public Class MainWindowVM
' proprietà che seleziona la giusta pagina del TabControl
Public Property nSelTabPage As Integer
Get
- Return If(IsNothing(Map.refMainMenuVM.SelPage) OrElse Map.refMainMenuVM.SelPage = -1 OrElse Map.refMainMenuVM.SelPage = Pages.SUPERVISOR, 0, 1)
+ If IsNothing(Map.refMainMenuVM.SelPage) OrElse Map.refMainMenuVM.SelPage = -1 OrElse Map.refMainMenuVM.SelPage = Pages.SUPERVISOR Then
+ Return 0 ' Supervisor
+ ElseIf Map.refMainMenuVM.SelPage = Pages.INPUTS Then
+ Return 1 ' Ingressi
+ ElseIf Map.refMainMenuVM.SelPage = Pages.OUTPUTS Then
+ Return 2 ' Uscite
+ Else
+ Return 3 ' Configurazione
+ End If
End Get
Set(value As Integer)
End Set
diff --git a/EgtBEAMWALL.Supervisor/OutputsPage/OutputsPageV.xaml b/EgtBEAMWALL.Supervisor/OutputsPage/OutputsPageV.xaml
new file mode 100644
index 00000000..0c5b5879
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/OutputsPage/OutputsPageV.xaml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/EgtBEAMWALL.Supervisor/OutputsPage/OutputsPageV.xaml.vb b/EgtBEAMWALL.Supervisor/OutputsPage/OutputsPageV.xaml.vb
new file mode 100644
index 00000000..2a4c0141
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/OutputsPage/OutputsPageV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class OutputsPageV
+
+End Class
diff --git a/EgtBEAMWALL.Supervisor/OutputsPage/OutputsPageVM.vb b/EgtBEAMWALL.Supervisor/OutputsPage/OutputsPageVM.vb
new file mode 100644
index 00000000..51a8a408
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/OutputsPage/OutputsPageVM.vb
@@ -0,0 +1,20 @@
+Public Class OutputsPageVM
+
+#Region "Messages"
+
+#End Region ' Messages
+
+#Region "Constructor"
+
+ Sub New()
+ '' imposto riferimento in Map
+ 'Map.SetRefOutputsPageVM(Me)
+ End Sub
+
+#End Region ' Constructor
+
+#Region "Methods"
+
+#End Region ' Methods
+
+End Class
\ No newline at end of file
diff --git a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
index 158aeaa2..996eac84 100644
--- a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
@@ -30,6 +30,8 @@
+
+