Egalware/egtbeamwall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiunta gestione percorso del file ini dei Parametri Macchina in base a tipo Macchina (Beam o Wall)

Browse Source
This commit is contained in:
RenzoL
2021-05-31 10:38:36 +02:00
parent b977e106ef
commit bb55e2acb4
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.ViewerOptimizer/Constants/ConstMachIni.vb
+1
View File
@@ -3,6 +3,7 @@
Public Const MACH_INI_FILE_NAME As String = "MachData.ini"
Public Const K_BEAM As String = "Beam"
Public Const K_WALL As String = "Wall"
Public Const K_NAME As String = "Name"
Public Const K_SCRIPT As String = "Scripts"
Public Const K_SETUP As String = "Setup"
EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb
+3 -2
View File
@@ -44,7 +44,7 @@ Public Class MachinePanelVM
' inizializzo la macchina selezionata come macchina corrente
Dim nMachType As MachineType = DirectCast(m_SelectedMachine, MyMachine).nType
SectionXMaterial.SetType(nMachType)
InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, value.Name)
InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, value.Name, nMachType)
' mostro bottone tabella beam o wall a seconda del tipo
If nMachType = MachineType.BEAM Then
m_BeamTable_Visibility = Visibility.Visible
@@ -186,7 +186,8 @@ Public Class MachinePanelVM
End If
If Not IsNothing(SelectedMachine) Then
If EgtSetCurrMachine(SelectedMachine.Name) Then
InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, SelectedMachine.Name)
Dim nMachType As MachineType = DirectCast(m_SelectedMachine, MyMachine).nType
InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, SelectedMachine.Name, nMachType)
End If
End If
End Sub
EgtBEAMWALL.ViewerOptimizer/Utility/CurrentMachine.vb
+6 -2
View File
@@ -68,7 +68,7 @@ Public Module CurrentMachine
#Region "Init"
Sub InitCurrentMachine(sMachinesRootDir As String, sMachineName As String)
Sub InitCurrentMachine(sMachinesRootDir As String, sMachineName As String, nMachineType As MachineType)
' Nome macchina corrente
m_sMachineName = sMachineName
' Impostazione direttorio macchina
@@ -76,7 +76,11 @@ Public Module CurrentMachine
' Impostazione path MachIni file
m_sMachIniFile = sMachinesRootDir & "\" & sMachineName & "\" & sMachineName & ".ini"
' Impostazione path MachParamIni file
m_sMachParamIniFile = sMachinesRootDir & "\" & sMachineName & "\" & K_BEAM & "\" & MACH_INI_FILE_NAME
If nMachineType = MachineType.BEAM Then
m_sMachParamIniFile = sMachinesRootDir & "\" & sMachineName & "\" & K_BEAM & "\" & MACH_INI_FILE_NAME
ElseIf nMachineType = MachineType.WALL Then
m_sMachParamIniFile = sMachinesRootDir & "\" & sMachineName & "\" & K_WALL & "\" & MACH_INI_FILE_NAME
End If
' Impostazione path Script dir
m_sMachScriptDir = sMachinesRootDir & "\" & sMachineName & "\" & K_SCRIPT
' Impostazione path Setup dir