diff --git a/Integration.sln b/Integration.sln index cd0052b..2de0ffa 100644 --- a/Integration.sln +++ b/Integration.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2016 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.35027.167 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationEgaltech", "IntegrationEgaltech\IntegrationEgaltech.csproj", "{A80D9CFF-5312-40C7-8F67-AC5D62C18824}" EndProject diff --git a/IntegrationEgaltech/Generator.cs b/IntegrationEgaltech/Generator.cs index 2244b1d..1e9dadd 100644 --- a/IntegrationEgaltech/Generator.cs +++ b/IntegrationEgaltech/Generator.cs @@ -358,22 +358,29 @@ namespace ib.essetre.integration.egaltech //------------------------------------------------------------------------------------------------------------- private static void ProcessResults( string BtlPath, PatternInfo pattInfo, InOutParameters.UIModes UIMode) { - if ( UIMode == InOutParameters.UIModes.SHOWUI || UIMode == InOutParameters.UIModes.SIMULAZIONE) - return ; bool bErrors = false ; + bool bEdit = (UIMode == InOutParameters.UIModes.SHOWUI || UIMode == InOutParameters.UIModes.SIMULAZIONE); int nLastErr = 0 ; string sLastMsg = "" ; int nCurrCutId = 0 ; Dictionary dctErr = new Dictionary() ; Dictionary dctRot = new Dictionary() ; int nTotTime = 0 ; - if ( File.Exists( Path.ChangeExtension( BtlPath, ".txt"))) { + string TxtPath = Path.ChangeExtension(BtlPath, ".txt") ; + if ( File.Exists(TxtPath)) { + // se eseguito edit, verifico se file realmente modificato + if ( bEdit) { + string NgePath = Path.ChangeExtension(BtlPath, ".nge") ; + if ( File.GetLastWriteTime(TxtPath) > File.GetLastWriteTime(NgePath)) + return ; + } + // analizzo il file dei risultati int nErr = 0 ; string sMsg = "" ; double dRot = 0 ; int cutId = 0 ; int taskId = 0 ; - string[] lines = System.IO.File.ReadAllLines( Path.ChangeExtension( BtlPath, ".txt")) ; + string[] lines = System.IO.File.ReadAllLines(TxtPath) ; foreach ( string line in lines) { if ( line.StartsWith( "ERR=")) { int? nVal = GetVal(line, "ERR") ; @@ -418,8 +425,13 @@ namespace ib.essetre.integration.egaltech sLastMsg = sMsg ; } } + // se edit (possibile modifica utente) + if ( bEdit) { + pattInfo.SetTaskState(cutId, 0, PatternInfo.Results.NONE, "") ; + break ; + } // gestione errore per feature identificata - if ( taskId != 0) { + else if ( taskId != 0) { // verifiche per feature con più parti if ( dctErr.TryGetValue( taskId, out PatternInfo.Results resCurrExe)) { if ( resExe > resCurrExe) { diff --git a/IntegrationEgaltech/IntegrationEgaltech.csproj b/IntegrationEgaltech/IntegrationEgaltech.csproj index fe83ef3..30485f6 100644 --- a/IntegrationEgaltech/IntegrationEgaltech.csproj +++ b/IntegrationEgaltech/IntegrationEgaltech.csproj @@ -9,7 +9,7 @@ Properties ib.essetre.integration.egaltech ib.essetre.integration.egaltech - v4.0 + v4.8.1 512 true @@ -23,6 +23,7 @@ prompt 4 AnyCPU + false none @@ -33,6 +34,7 @@ prompt 4 false + false diff --git a/IntegrationEgaltech/Properties/AssemblyInfo.cs b/IntegrationEgaltech/Properties/AssemblyInfo.cs index bf1ab81..69072fc 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.6.4.4")] -[assembly: AssemblyFileVersion("2.6.4.4")] +[assembly: AssemblyVersion("2.6.7.5")] +[assembly: AssemblyFileVersion("2.6.7.5")] diff --git a/IntegrationEgaltech2/IntegrationEgaltech2.aps b/IntegrationEgaltech2/IntegrationEgaltech2.aps index 8967f9d..fbdb2e6 100644 Binary files a/IntegrationEgaltech2/IntegrationEgaltech2.aps and b/IntegrationEgaltech2/IntegrationEgaltech2.aps differ diff --git a/IntegrationEgaltech2/IntegrationEgaltech2.rc b/IntegrationEgaltech2/IntegrationEgaltech2.rc index c20cdc4..bfe7d37 100644 Binary files a/IntegrationEgaltech2/IntegrationEgaltech2.rc and b/IntegrationEgaltech2/IntegrationEgaltech2.rc differ