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

Integration 2.1g7 :

Browse Source 
- aggiunta gestione collisione per singola feature
- migliorie generali sullo stato del calcolo.
This commit is contained in:
Dario Sassi
2019-07-22 07:52:06 +00:00
parent f4ecdbe6da
commit 4b529b581f
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IntegrationEgaltech/Generator.cs
+26 -8
View File
@@ -204,8 +204,17 @@ namespace ib.essetre.integration.egaltech
int? nVal = GetVal( line, "TASKID") ;
taskId = ( nVal != null ? nVal.Value : 0) ;
PatternInfo.Results resExe = PatternInfo.Results.OK ;
if ( nErr > 0) {
resExe = PatternInfo.Results.ERROR ;
if ( nErr == 22) {
resExe = PatternInfo.Results.COLLISION ;
bErrors = true ;
// se non assegnata a feature la dichiaro globale
if ( cutId == 0 || taskId == 0) {
nLastErr = nErr ;
sLastMsg = sMsg ;
}
}
else if ( nErr > 0) {
resExe = PatternInfo.Results.WARNING ;
bErrors = true ;
nLastErr = nErr ;
sLastMsg = sMsg ;
@@ -229,14 +238,22 @@ namespace ib.essetre.integration.egaltech
pattInfo.DetailResult = PatternInfo.DetailResults.MEMORY ;
}
else {
if ( nLastErr != 17) {
// Sezione oltre i limiti
if ( nLastErr == 17) {
pattInfo.Result = PatternInfo.Results.ERROR ;
pattInfo.DetailResult = PatternInfo.DetailResults.MEMORY ;
pattInfo.DetailResult = PatternInfo.DetailResults.ALL_WARNING ;
pattInfo.Message = sLastMsg ;
}
// Collisione non assegnata ad una feature
else if ( nLastErr == 22 ) {
pattInfo.Result = PatternInfo.Results.ERROR ;
pattInfo.DetailResult = PatternInfo.DetailResults.ALL_COLLISION ;
pattInfo.Message = sLastMsg ;
}
// Altro
else {
pattInfo.Result = PatternInfo.Results.ERROR ;
pattInfo.DetailResult = PatternInfo.DetailResults.ALL_KO ;
pattInfo.Message = sLastMsg ;
pattInfo.DetailResult = PatternInfo.DetailResults.MEMORY ;
}
}
pattInfo.EstimatedTime = nTotTime ;
@@ -254,7 +271,7 @@ namespace ib.essetre.integration.egaltech
else {
pattInfo.Iso = "" ;
pattInfo.Result = PatternInfo.Results.ERROR ;
pattInfo.DetailResult = PatternInfo.DetailResults.ALL_KO ;
pattInfo.DetailResult = PatternInfo.DetailResults.ALL_ERROR ;
}
}
}
@@ -595,6 +612,7 @@ namespace ib.essetre.integration.egaltech
// Visualizzazione finestra gestione DB utensili
public bool ShowTools( InOutParameters parameters)
{
// Recupero dati
string ExePath = GetExePath( parameters) ;
string BtlDir = GetBtlDir( parameters) ;
string BtlPath = Path.Combine( BtlDir, "QQQ.btl") ;
@@ -622,7 +640,7 @@ namespace ib.essetre.integration.egaltech
string BtlPath = Path.Combine( BtlDir, "QQQ.btl") ;
// Esecuzione di EgtCAM5 con parametri path BTL, nome macchina e modo
Process process = new Process() ;
process.StartInfo.FileName = "C:\\EgtProg\\EgtCAM5\\EgtCam5R32.exe" ;
process.StartInfo.FileName = ExePath ;
process.StartInfo.Arguments = "\"" + BtlPath + "\" " + parameters.MachineName + " 12" ;
process.StartInfo.UseShellExecute = false ;
process.Start() ;
IntegrationEgaltech/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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.5")]
[assembly: AssemblyFileVersion("2.1.7.5")]
[assembly: AssemblyVersion("2.1.7.7")]
[assembly: AssemblyFileVersion("2.1.7.7")]