diff --git a/BtlGeomCoStru.h b/BtlGeomCoStru.h index 991cbb2..f59fe57 100644 --- a/BtlGeomCoStru.h +++ b/BtlGeomCoStru.h @@ -51,8 +51,8 @@ static const std::string IKEY_AUXID = "AUXID" ; static const std::string IKEY_START_FACE = "FCS" ; static const std::string IKEY_END_FACE = "FCE" ; // costanti di approssimazione per curve -const double CRV_LIN_APPROX = 0.1 ; -const double CRV_ANG_APPROX_DEG = 30.0 ; +const double CRV_LIN_APPROX = 0.02 ; +const double CRV_ANG_APPROX_DEG = 22.5 ; // minima dimensione trasversale di faccia per non essere eliminata const double FACE_MIN_CROSS_DIM = 1.0 ; // raggio fresa di default diff --git a/BtlGeomProc.cpp b/BtlGeomProc.cpp index cd01ed8..44eb55a 100644 --- a/BtlGeomProc.cpp +++ b/BtlGeomProc.cpp @@ -763,9 +763,9 @@ BtlGeom::AddCut( int nGroup, int nProc, int nSide, const string& sDes, int nProc if ( ! CreatePolygonInBox( ptP, vtN, nSide, plyCut)) return false ; if ( plyCut.GetSideCount() < 3) { - string sOut = " Warning : Empty Process (" + ToString( nGroup) + "-" + ToString( nProc) + "-" + ToString( nSide) + + string sOut = " Warning : Empty Process (" + ToString( nGroup) + "-" + ToString( nProc, 3) + "-" + ToString( nSide) + ") on line " + ToString( m_nBtlLine) ; - LOG_INFO( GetEExLogger(), sOut.c_str()) + LOG_WARN( GetEExLogger(), sOut.c_str()) return true ; } // creo la trimesh con questo contorno @@ -2007,8 +2007,12 @@ BtlGeom::AddDrill( int nGroup, int nProc, int nSide, const string& sDes, int nPr Point3d ptStart = ptP ; Point3d ptEnd = ptP - vtN * dDepth ; // limito i punti, tenendo conto del raggio - if ( ! TrimSegmentWithBox( ptStart, ptEnd, dRad)) - return false ; + if ( ! TrimSegmentWithBox( ptStart, ptEnd, dRad)) { + string sOut = " Warning : Empty Process (" + ToString( nGroup) + "-" + ToString( nProc, 3) + "-" + ToString( nSide) + + ") on line " + ToString( m_nBtlLine) ; + LOG_WARN( GetEExLogger(), sOut.c_str()) + return true ; + } dDepth = ( ptStart - ptEnd) * vtN ; // creo la circonferenza PtrOwner pArc( CreateCurveArc()) ; @@ -3152,9 +3156,9 @@ BtlGeom::AddMarking( int nGroup, int nProc, int nSide, const string& sDes, int n } // altrimenti emetto segnalazione else { - string sOut = " Warning : Empty Process (" + ToString( nGroup) + "-" + ToString( nProc) + "-" + ToString( nSide) + + string sOut = " Warning : Empty Process (" + ToString( nGroup) + "-" + ToString( nProc, 3) + "-" + ToString( nSide) + ") on line " + ToString( m_nBtlLine) ; - LOG_INFO( GetEExLogger(), sOut.c_str()) + LOG_WARN( GetEExLogger(), sOut.c_str()) } return true ; diff --git a/EgtExchange.vcxproj b/EgtExchange.vcxproj index ce250a2..1a86739 100644 --- a/EgtExchange.vcxproj +++ b/EgtExchange.vcxproj @@ -155,14 +155,14 @@ copy $(TargetPath) \EgtProg\DllD64 true true true + false Windows false - true true C:\EgtDev\Extern\OxySec\Lib\x32\xnodus32.obj;%(AdditionalDependencies) - UseLinkTimeCodeGeneration + Default copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\ @@ -187,14 +187,14 @@ copy $(TargetPath) \EgtProg\Dll32 true true true + false Windows false - true true C:\EgtDev\Extern\OxySec\Lib\x64\xnodus.obj;%(AdditionalDependencies) - UseLinkTimeCodeGeneration + Default copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\ diff --git a/ImportBtl.cpp b/ImportBtl.cpp index 0a5be86..cac0b5d 100644 --- a/ImportBtl.cpp +++ b/ImportBtl.cpp @@ -748,7 +748,7 @@ ImportBtl::GetProcessParams( const string& sText, const string& sProcType, if ( ! GetParamP( sText, vnDPar[i], vdPar[i])) { string sOut = " Info : P" + ToString( vnDPar[i], 2) + " missing in Process (" + sProcType + ") on line " + ToString( m_theScanner.GetCurrLineNbr()) ; - LOG_INFO( GetEExLogger(), sOut.c_str()) + LOG_DBG_INFO( GetEExLogger(), sOut.c_str()) } } // leggo l'eventuale parametro stringa @@ -756,7 +756,7 @@ ImportBtl::GetProcessParams( const string& sText, const string& sProcType, if ( ! GetParamP( sText, nSPar, sPar)) { string sOut = " Info : P" + ToString( nSPar, 2) + " missing in Process (" + sProcType + ") on line " + ToString( m_theScanner.GetCurrLineNbr()) ; - LOG_INFO( GetEExLogger(), sOut.c_str()) + LOG_DBG_INFO( GetEExLogger(), sOut.c_str()) } } diff --git a/ImportDxfBlocks.cpp b/ImportDxfBlocks.cpp index 388caf7..45d6a09 100644 --- a/ImportDxfBlocks.cpp +++ b/ImportDxfBlocks.cpp @@ -52,7 +52,7 @@ ImportDxf::ReadBlocks( bool& bFileEnd) else { string sOut = "ImportDxf : Skip entity " + sEntName + " at line " + ToString( m_theScanner.GetCurrLineNbr()) ; - LOG_INFO( GetEExLogger(), sOut.c_str()) + LOG_WARN( GetEExLogger(), sOut.c_str()) if ( ! SkipEntity( bFileEnd)) bOkLoc = false ; } diff --git a/ImportDxfEnts.cpp b/ImportDxfEnts.cpp index fb2bb62..56f093a 100644 --- a/ImportDxfEnts.cpp +++ b/ImportDxfEnts.cpp @@ -57,7 +57,7 @@ ImportDxf::ReadEntities( bool& bFileEnd) else { string sOut = "ImportDxf : Skip entity " + sEntName + " at line " + ToString( m_theScanner.GetCurrLineNbr()) ; - LOG_INFO( GetEExLogger(), sOut.c_str()) + LOG_WARN( GetEExLogger(), sOut.c_str()) if ( ! SkipEntity( bFileEnd)) bOkLoc = false ; }