Up to R12 DXF allows not to define default layer "0".
--HG-- branch : feature
This commit is contained in:
parent
2dd8519433
commit
c84f7ef828
|
@ -25,7 +25,6 @@ dx_iface::dx_iface(const std::string &file, DRW::Version v, VarMeasurement varMe
|
|||
version(v)
|
||||
{
|
||||
InitHeader(varMeasurement, varInsunits);
|
||||
InitDefLayers();
|
||||
InitTextstyles();
|
||||
InitAppId();
|
||||
}
|
||||
|
@ -277,7 +276,7 @@ void dx_iface::AddAAMALayers()
|
|||
// cData.layers.push_back(layer);
|
||||
}
|
||||
|
||||
void dx_iface::InitDefLayers()
|
||||
void dx_iface::AddDefLayers()
|
||||
{
|
||||
DRW_Layer defLayer;
|
||||
defLayer.name = "0";
|
||||
|
|
|
@ -121,6 +121,7 @@ public:
|
|||
void AddBlock(dx_ifaceBlock* block);
|
||||
|
||||
void AddQtLTypes();
|
||||
void AddDefLayers();
|
||||
void AddAAMALayers();
|
||||
|
||||
private:
|
||||
|
@ -130,7 +131,6 @@ private:
|
|||
DRW::Version version;
|
||||
|
||||
void InitHeader(VarMeasurement varMeasurement, VarInsunits varInsunits);
|
||||
void InitDefLayers();
|
||||
void InitTextstyles();
|
||||
void InitAppId();
|
||||
|
||||
|
|
|
@ -1478,7 +1478,7 @@ bool dxfRW::writeTables() {
|
|||
writer->writeInt16(70, 1); //end table def
|
||||
wlayer0 =false;
|
||||
iface->writeLayers();
|
||||
if (!wlayer0) {
|
||||
if (!wlayer0 && version > DRW::AC1009) {
|
||||
DRW_Layer lay0;
|
||||
lay0.name = "0";
|
||||
writeLayer(&lay0);
|
||||
|
|
|
@ -111,6 +111,7 @@ bool VDxfEngine::begin(QPaintDevice *pdev)
|
|||
|
||||
input = QSharedPointer<dx_iface>(new dx_iface(fileName.toStdString(), m_version, varMeasurement, varInsunits));
|
||||
input->AddQtLTypes();
|
||||
input->AddDefLayers();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -612,6 +613,10 @@ bool VDxfEngine::ExportToAAMA(const QVector<VLayoutPiece> &details)
|
|||
}
|
||||
|
||||
input = QSharedPointer<dx_iface>(new dx_iface(fileName.toStdString(), m_version, varMeasurement, varInsunits));
|
||||
if (m_version > DRW::AC1009)
|
||||
{
|
||||
input->AddDefLayers();
|
||||
}
|
||||
input->AddAAMALayers();
|
||||
|
||||
ExportAAMAGlobalText(input, details);
|
||||
|
|
Loading…
Reference in New Issue
Block a user