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

EgtExchange :

Browse Source 
- in import BTL non c'è più errore ma solo warning se foro completamente fuori dal pezzo
- in import BTL rese più strette tolleranze approssimazione curve
- migliorate segnalazioni ora LOG_WARN, LOG_INFO e LOG_DBG_INFO.
This commit is contained in:
Dario Sassi
2019-03-28 08:27:46 +00:00
parent 34a2034400
commit a7163a4ac6
6 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BtlGeomCoStru.h
+2 -2
View File
@@ -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
BtlGeomProc.cpp
+10 -6
View File
@@ -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<ICurveArc> 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 ;
EgtExchange.vcxproj
+4 -4
View File
@@ -155,14 +155,14 @@ copy $(TargetPath) \EgtProg\DllD64</Command>
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>C:\EgtDev\Extern\OxySec\Lib\x32\xnodus32.obj;%(AdditionalDependencies)</AdditionalDependencies>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
</Link>
<PostBuildEvent>
<Command>copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
@@ -187,14 +187,14 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>C:\EgtDev\Extern\OxySec\Lib\x64\xnodus.obj;%(AdditionalDependencies)</AdditionalDependencies>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
</Link>
<PostBuildEvent>
<Command>copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
ImportBtl.cpp
+2 -2
View File
@@ -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())
}
}
ImportDxfBlocks.cpp
+1 -1
View File
@@ -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 ;
}
ImportDxfEnts.cpp
+1 -1
View File
@@ -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 ;
}