From 2afaf0d608b5a5bdfb9e7213b480e38fdb238ab8 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 4 Feb 2020 07:38:11 +0000 Subject: [PATCH] EgtNesting 2.2b1 : - aggiunta funzione SetReportFile. --- AutoNester.cpp | 11 +++++++++++ AutoNester.h | 2 ++ EgtNesting.rc | Bin 11638 -> 11638 bytes 3 files changed, 13 insertions(+) diff --git a/AutoNester.cpp b/AutoNester.cpp index 0cc35bc..61e0e8e 100644 --- a/AutoNester.cpp +++ b/AutoNester.cpp @@ -238,6 +238,14 @@ AutoNester::SetInterpartGap( double dGap) return true ; } +//---------------------------------------------------------------------------- +bool +AutoNester::SetReportFile( const string& sReportFile) +{ + m_sReportFile = sReportFile ; + return true ; +} + //---------------------------------------------------------------------------- bool AutoNester::Compute( bool bMinimizeOnXvsY, int nMaxTime) @@ -263,6 +271,9 @@ AutoNester::Compute( bool bMinimizeOnXvsY, int nMaxTime) return false ; // passo i codici al nester CNS_UnLockLaunchingOrderOxy( m_pOrder, sKeyId.c_str(), sKeySign.c_str()) ; + // se richiesto debug + if ( ! IsEmptyOrSpaces( m_sReportFile)) + CNS_GenerateLaunchingOrderProblem( m_pOrder, m_sReportFile.c_str()) ; // lancio l'esecuzione m_pComp = CNS_LaunchLocalComputation( m_pOrder, nMaxTime) ; return ( m_pComp != nullptr) ; diff --git a/AutoNester.h b/AutoNester.h index 19f71d7..12ca3e9 100644 --- a/AutoNester.h +++ b/AutoNester.h @@ -34,6 +34,7 @@ class AutoNester : public IAutoNester bool AddAnotherOutlineToPart( int nPartId, const PolyArc& AnotherOutline) override ; bool AddToolOutlineToPart( int nPartId, const PolyArc& ToolOutline) override ; bool SetInterpartGap( double dGap) override ; + bool SetReportFile( const std::string& sReportFile) override ; bool Compute( bool bMinimizeOnXvsY, int nMaxTime) override ; bool CancelComputation( void) override ; bool GetComputationStatus( int& nStatus) override ; @@ -56,4 +57,5 @@ class AutoNester : public IAutoNester IDSHEETPTR_UMAP m_IdSheetPtr ; // map dei pannelli basato su identificativi IDPARTPTR_UMAP m_IdPartPtr ; // map dei pannelli basato su identificativi double m_dInterpartGap ; // distanza minima tra i pezzi + std::string m_sReportFile ; // file di report dei dati da inviare a Optalog in caso di problemi } ; diff --git a/EgtNesting.rc b/EgtNesting.rc index 4b6ba756f5e69b07dfdef7e7018954a300c100fb..0d0ca6fc1ac1dacb541e33d1fa0b97ab352aa194 100644 GIT binary patch delta 126 zcmews^(|_{H#Sxy1|0^&&AoE_nI`Yz%wkSrFq~{CsJod*%8POHJZ>XqxB^{fBuNj( V%~irC2uTdxH7qza8Y#PQ0RZrMAoc(N delta 126 zcmews^(|_{H#Sy71|0^Y&AoE_nI`Yz%wkStFq&*AsJod*%8POHJZ>XqxB^{fBuNj( V%~irC2uTdxH7qza8Y#PQ0RZq}Aoc(N