From 8147d86f820924f50466e9794300a524b0101b56 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 19 Sep 2019 06:25:00 +0000 Subject: [PATCH] =?UTF-8?q?Integration=202.1i1=20:=20-=20si=20recupera=20p?= =?UTF-8?q?rogramma=20CN=20anche=20con=20modalit=C3=A0=20SHOWUI=20-=20in?= =?UTF-8?q?=20BTL=20si=20scrive=20anche=20il=20PatternId.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IntegrationEgaltech/BTL.cs | 1 + IntegrationEgaltech/Generator.cs | 5 +++-- IntegrationEgaltech/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/IntegrationEgaltech/BTL.cs b/IntegrationEgaltech/BTL.cs index 83f9534..9c6004e 100644 --- a/IntegrationEgaltech/BTL.cs +++ b/IntegrationEgaltech/BTL.cs @@ -49,6 +49,7 @@ namespace ib.essetre.integration.egaltech tw.WriteLine( Constants.PROJECT_NUMBER + this.projectNumber) ; tw.WriteLine( Constants.SCALE_UNIT + Constants.scaleUnit.ToString()) ; tw.WriteLine( Constants.USERATTRIBUTE + "\"PRODID\":" + "\"" + ( IsFromProject ? 0 : productionId) + "\"") ; + tw.WriteLine( Constants.USERATTRIBUTE + "\"PATTID\":" + "\"" + ( IsFromProject ? 0 : patternId) + "\"") ; barLength = barLength.Replace( ",", ".") ; tw.WriteLine( Constants.USERATTRIBUTE + "\"BARLEN\":" + "\"" + barLength + "\"") ; diff --git a/IntegrationEgaltech/Generator.cs b/IntegrationEgaltech/Generator.cs index 7a784e8..989b291 100644 --- a/IntegrationEgaltech/Generator.cs +++ b/IntegrationEgaltech/Generator.cs @@ -285,8 +285,9 @@ namespace ib.essetre.integration.egaltech } pattInfo.EstimatedTime = nTotTime ; - // Lettura OutputFilename e scrittura nel parametro stringa Iso (solo nel caso UIModes.HIDDEN) - if ( ! bErrors && parameters.UIMode == InOutParameters.UIModes.HIDDEN) { + // Lettura OutputFilename e scrittura nel parametro stringa Iso (casi UIModes.HIDDEN e UIModes.SHOWUI) + if ( ! bErrors && + ( parameters.UIMode == InOutParameters.UIModes.HIDDEN || parameters.UIMode == InOutParameters.UIModes.SHOWUI)) { string CncPath = Path.ChangeExtension( BtlPath, ".cnc") ; if ( File.Exists( CncPath)) { diff --git a/IntegrationEgaltech/Properties/AssemblyInfo.cs b/IntegrationEgaltech/Properties/AssemblyInfo.cs index 3230a53..2dd97ef 100644 --- a/IntegrationEgaltech/Properties/AssemblyInfo.cs +++ b/IntegrationEgaltech/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.7.8")] -[assembly: AssemblyFileVersion("2.1.7.8")] +[assembly: AssemblyVersion("2.1.9.1")] +[assembly: AssemblyFileVersion("2.1.9.1")]