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

EgtExchage 1.5f1 :

Browse Source 
- ricompilazione e piccole modifiche.
This commit is contained in:
Dario Sassi
2014-06-03 13:13:11 +00:00
parent 84bf486275
commit ded0bdc009
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtExchange.rc
BIN
View File
Binary file not shown.
ImportDxfBlocks.cpp
+13 -16
View File
@@ -132,10 +132,10 @@ ImportDxf::ReadBlock( bool& bFileEnd)
return false ;
}
// assegnazione punto di inserimento
if ( ! m_pGDB->SetInfo( m_nIdCurrBlock, POINT_INFO, ToString( ptP)))
if ( ! m_pGDB->SetInfo( m_nIdCurrBlock, POINT_INFO, ptP))
return false ;
// assegnazione flags
if ( ! m_pGDB->SetInfo( m_nIdCurrBlock, FLAGS_INFO, ToString( nFlags)))
if ( ! m_pGDB->SetInfo( m_nIdCurrBlock, FLAGS_INFO, nFlags))
return false ;
// reset numero blocchi inseriti ma non risolti nel blocco corrente
m_nNumNotBokInCurrBlock = 0 ;
@@ -150,7 +150,7 @@ ImportDxf::ReadEndBlock( bool& bFileEnd)
if ( ! SkipEntity( bFileEnd))
return false ;
if ( m_nNumNotBokInCurrBlock == 0)
m_pGDB->SetInfo( m_nIdCurrBlock, BLKOK_INFO, "1") ;
m_pGDB->SetInfo( m_nIdCurrBlock, BLKOK_INFO, 1) ;
m_nIdCurrBlock = GDB_ID_NULL ;
return true ;
}
@@ -220,7 +220,7 @@ ImportDxf::SolveBlockReferences( void)
}
// eventuale marcatura di blocco risolto
if ( bBok)
m_pGDB->SetInfo( pIBlo->GetId(), BLKOK_INFO, "1") ;
m_pGDB->SetInfo( pIBlo->GetId(), BLKOK_INFO, 1) ;
// passo al blocco successivo
bBlo = pIBlo->GoToNext() ;
}
@@ -237,13 +237,13 @@ ImportDxf::SaveInsertInfo( int nId, const InsertData& insData)
return false ;
if ( ! m_pGDB->SetInfo( nId, LAYER_INFO, insData.sLayer))
return false ;
if ( ! m_pGDB->SetInfo( nId, POINT_INFO, ToString( insData.ptP)))
if ( ! m_pGDB->SetInfo( nId, POINT_INFO, insData.ptP))
return false ;
if ( ! m_pGDB->SetInfo( nId, VTEXT_INFO, ToString( insData.vtExtr)))
if ( ! m_pGDB->SetInfo( nId, VTEXT_INFO, insData.vtExtr))
return false ;
if ( ! m_pGDB->SetInfo( nId, ROTAT_INFO, ToString( insData.dRotAngDeg)))
if ( ! m_pGDB->SetInfo( nId, ROTAT_INFO, insData.dRotAngDeg))
return false ;
if ( ! m_pGDB->SetInfo( nId, SCALE_INFO, ToString( insData.vtScale)))
if ( ! m_pGDB->SetInfo( nId, SCALE_INFO, insData.vtScale))
return false ;
return true ;
}
@@ -256,14 +256,13 @@ ImportDxf::LoadInsertInfo( int nId, InsertData& insData)
return false ;
if ( ! m_pGDB->GetInfo( nId, LAYER_INFO, insData.sLayer))
return false ;
string sTemp ;
if ( ! m_pGDB->GetInfo( nId, POINT_INFO, sTemp) || ! FromString( sTemp, insData.ptP))
if ( ! m_pGDB->GetInfo( nId, POINT_INFO, insData.ptP))
return false ;
if ( ! m_pGDB->GetInfo( nId, VTEXT_INFO, sTemp) || ! FromString( sTemp, insData.vtExtr))
if ( ! m_pGDB->GetInfo( nId, VTEXT_INFO, insData.vtExtr))
return false ;
if ( ! m_pGDB->GetInfo( nId, ROTAT_INFO, sTemp) || ! FromString( sTemp, insData.dRotAngDeg))
if ( ! m_pGDB->GetInfo( nId, ROTAT_INFO, insData.dRotAngDeg))
return false ;
if ( ! m_pGDB->GetInfo( nId, SCALE_INFO, sTemp) || ! FromString( sTemp, insData.vtScale))
if ( ! m_pGDB->GetInfo( nId, SCALE_INFO, insData.vtScale))
return false ;
return true ;
}
@@ -274,9 +273,7 @@ ImportDxf::InsertBlockInBlock( int nIdDest, int nIdIns, const InsertData& insDat
{
// recupero il punto base del blocco di inserimento per determinare lo spostamento
Point3d ptBase ;
string sInfo ;
if ( m_pGDB->GetInfo( nIdIns, POINT_INFO, sInfo))
FromString( sInfo, ptBase) ;
m_pGDB->GetInfo( nIdIns, POINT_INFO, ptBase) ;
Vector3d vtMove = insData.ptP - ptBase ;
// calcolo il riferimento OCS
Frame3d frOCS ;
ImportDxfEnts.cpp
+2 -4
View File
@@ -674,7 +674,7 @@ ImportDxf::ReadEllipse( bool& bFileEnd)
return true ;
// versore iniziale
Vector3d vtStart = vtMajorAx ;
vtStart.Rotate( vtExtr, dStartPar) ;
vtStart.Rotate( vtExtr, dStartPar * RADTODEG) ;
// gestisco il riferimento del gruppo di inserimento
if ( ! BlockReading()) {
ptCen.ToLoc( m_frGroup) ;
@@ -811,9 +811,7 @@ ImportDxf::ReadInsert( bool& bFileEnd)
}
// recupero il punto base del blocco per determinare lo spostamento
Point3d ptBase ;
string sInfo ;
if ( m_pGDB->GetInfo( nIdBlock, POINT_INFO, sInfo))
FromString( sInfo, ptBase) ;
m_pGDB->GetInfo( nIdBlock, POINT_INFO, ptBase) ;
Vector3d vtMove = insData.ptP - ptBase ;
// copio tutte le entità del blocco, trasformandole opportunamente
PtrOwner<IGdbIterator> pIter( CreateGdbIterator( m_pGDB)) ;
ImportDxfTabs.cpp
+1 -1
View File
@@ -182,7 +182,7 @@ ImportDxf::ReadLayer( bool& bFileEnd)
if ( ! m_pGDB->SetName( nId, sName))
return false ;
// assegnazione flag
if ( ! m_pGDB->SetInfo( nId, DXF_INFO, "1"))
if ( ! m_pGDB->SetInfo( nId, DXF_INFO, 1))
return false ;
// aggiorno Map dei Layer
m_lmLayer.insert( LayerMap::value_type( sName, nId)) ;