From 72d481466fa707fb641fbd965ea6a6b41933dc95 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 18 Jul 2016 17:46:19 +0000 Subject: [PATCH] EgtCAM5 1.6s6 : - gestione flag batch per doors. --- My Project/AssemblyInfo.vb | 4 ++-- ProjectPage/ProjectViewModel.vb | 4 ++-- Special/Doors.vb | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index bb3a39e..f580f82 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ProjectPage/ProjectViewModel.vb b/ProjectPage/ProjectViewModel.vb index 1a452dc..fa1ca4d 100644 --- a/ProjectPage/ProjectViewModel.vb +++ b/ProjectPage/ProjectViewModel.vb @@ -282,12 +282,12 @@ Namespace EgtCAM5 nPar2 = CInt(Environment.GetCommandLineArgs(2)) End If Dim bNcGen As Boolean = (nPar2 >= 1) + Dim bExit As Boolean = (nPar2 >= 2) ' Esecuzione - CreateDoors(sFile, bNcGen) + CreateDoors(sFile, bNcGen, bExit) EgtZoom(ZM.ALL) Application.Msn.NotifyColleagues(Application.EMITTITLE) ' Se richiesta uscita immediata - Dim bExit As Boolean = (nPar2 >= 2) If bExit Then Application.Msn.NotifyColleagues(Application.CLOSEAPPLICATIONCOMMAND) End If diff --git a/Special/Doors.vb b/Special/Doors.vb index 1c77ae9..348a1d8 100644 --- a/Special/Doors.vb +++ b/Special/Doors.vb @@ -37,7 +37,7 @@ Public Module Doors ' Cursore attesa scene.Cursor = System.Windows.Forms.Cursors.WaitCursor ' Creazione porta - Dim bOk As Boolean = CreateDoors(sFile, False) + Dim bOk As Boolean = CreateDoors(sFile, False, False) ' Aggiorno la visualizzazione EgtZoom(ZM.ALL) ' Cursore standard @@ -46,7 +46,7 @@ Public Module Doors Return bOk End Function - Function CreateDoors(ByRef sDdfFile As String, bNcGen As Boolean) As Boolean + Function CreateDoors(ByRef sDdfFile As String, bNcGen As Boolean, bBatch As Boolean) As Boolean ' Carico il file Dim sExecPath As String = String.Empty GetPrivateProfileString(S_DOORS, K_DDFEXEC, "", sExecPath) @@ -54,6 +54,7 @@ Public Module Doors ' Lancio la creazione EgtLuaSetGlobStringVar("DGD.FILE", sDdfFile) EgtLuaSetGlobBoolVar("DGD.NCGEN", bNcGen) + EgtLuaSetGlobBoolVar("DGD.BATCH", bBatch) Dim sFunction As String = String.Empty GetPrivateProfileString(S_DOORS, K_DDFFUNCTION, "", sFunction) Dim bOk As Boolean = EgtLuaExecLine(sFunction)