aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libdxfrw. C++14 support

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-11-20 12:23:56 +02:00
parent d704cf9322
commit f5256c514c
8 changed files with 1556 additions and 1543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/libs/vdxf/libdxfrw/drw_entities.cpp
View File

@ -71,7 +71,7 @@ void DRW_Entity::extrudePoint(DRW_Coord extPoint, DRW_Coord *point) const
point->z = pz; point->z = pz;
} }
auto DRW_Entity::parseCode(int code, dxfReader *reader) -> bool auto DRW_Entity::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -160,7 +160,7 @@ auto DRW_Entity::parseCode(int code, dxfReader *reader) -> bool
} }
// parses dxf 102 groups to read entity // parses dxf 102 groups to read entity
auto DRW_Entity::parseDxfGroups(int code, dxfReader *reader) -> bool auto DRW_Entity::parseDxfGroups(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
std::list<DRW_Variant> ls; std::list<DRW_Variant> ls;
DRW_Variant c; DRW_Variant c;
@ -206,7 +206,7 @@ auto DRW_Entity::parseDxfGroups(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Point::parseCode(int code, dxfReader *reader) -> bool auto DRW_Point::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -239,7 +239,7 @@ auto DRW_Point::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_ASTMNotch::parseCode(int code, dxfReader *reader) -> bool auto DRW_ASTMNotch::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -253,7 +253,7 @@ auto DRW_ASTMNotch::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Line::parseCode(int code, dxfReader *reader) -> bool auto DRW_Line::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -284,7 +284,7 @@ void DRW_Circle::applyExtrusion()
} }
} }
auto DRW_Circle::parseCode(int code, dxfReader *reader) -> bool auto DRW_Circle::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -321,7 +321,7 @@ void DRW_Arc::applyExtrusion()
} }
} }
auto DRW_Arc::parseCode(int code, dxfReader *reader) -> bool auto DRW_Arc::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -338,7 +338,7 @@ auto DRW_Arc::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Ellipse::parseCode(int code, dxfReader *reader) -> bool auto DRW_Ellipse::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -453,7 +453,7 @@ void DRW_Trace::applyExtrusion()
} }
} }
auto DRW_Trace::parseCode(int code, dxfReader *reader) -> bool auto DRW_Trace::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -482,7 +482,7 @@ auto DRW_Trace::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_3Dface::parseCode(int code, dxfReader *reader) -> bool auto DRW_3Dface::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -496,7 +496,7 @@ auto DRW_3Dface::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Block::parseCode(int code, dxfReader *reader) -> bool auto DRW_Block::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -513,7 +513,7 @@ auto DRW_Block::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Insert::parseCode(int code, dxfReader *reader) -> bool auto DRW_Insert::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -568,7 +568,7 @@ void DRW_LWPolyline::applyExtrusion()
} }
} }
auto DRW_LWPolyline::parseCode(int code, dxfReader *reader) -> bool auto DRW_LWPolyline::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -627,7 +627,7 @@ auto DRW_LWPolyline::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Text::parseCode(int code, dxfReader *reader) -> bool auto DRW_Text::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -665,7 +665,7 @@ auto DRW_Text::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_MText::parseCode(int code, dxfReader *reader) -> bool auto DRW_MText::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -758,7 +758,7 @@ void DRW_MText::updateAngle()
} }
} }
auto DRW_Polyline::parseCode(int code, dxfReader *reader) -> bool auto DRW_Polyline::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -793,7 +793,7 @@ auto DRW_Polyline::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Vertex::parseCode(int code, dxfReader *reader) -> bool auto DRW_Vertex::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -834,7 +834,7 @@ auto DRW_Vertex::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Hatch::parseCode(int code, dxfReader *reader) -> bool auto DRW_Hatch::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -974,7 +974,7 @@ auto DRW_Hatch::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Spline::parseCode(int code, dxfReader *reader) -> bool auto DRW_Spline::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -1072,7 +1072,7 @@ auto DRW_Spline::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Image::parseCode(int code, dxfReader *reader) -> bool auto DRW_Image::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -1113,7 +1113,7 @@ auto DRW_Image::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Dimension::parseCode(int code, dxfReader *reader) -> bool auto DRW_Dimension::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -1236,7 +1236,7 @@ auto DRW_Dimension::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Leader::parseCode(int code, dxfReader *reader) -> bool auto DRW_Leader::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {
@ -1331,7 +1331,7 @@ auto DRW_Leader::parseCode(int code, dxfReader *reader) -> bool
return true; return true;
} }
auto DRW_Viewport::parseCode(int code, dxfReader *reader) -> bool auto DRW_Viewport::parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool
{ {
switch (code) switch (code)
{ {

49
src/libs/vdxf/libdxfrw/drw_entities.h
View File

@ -18,6 +18,7 @@
#include <QtGlobal> #include <QtGlobal>
#include <algorithm> #include <algorithm>
#include <list> #include <list>
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
@ -195,14 +196,14 @@ public:
protected: protected:
// parses dxf pair to read entity // parses dxf pair to read entity
virtual auto parseCode(int code, dxfReader *reader) -> bool; virtual auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool;
// calculates extrusion axis (normal vector) // calculates extrusion axis (normal vector)
void calculateAxis(DRW_Coord extPoint); void calculateAxis(DRW_Coord extPoint);
// apply extrusion to @extPoint and return data in @point // apply extrusion to @extPoint and return data in @point
void extrudePoint(DRW_Coord extPoint, DRW_Coord *point) const; void extrudePoint(DRW_Coord extPoint, DRW_Coord *point) const;
// parses dxf 102 groups to read entity // parses dxf 102 groups to read entity
auto parseDxfGroups(int code, dxfReader *reader) -> bool; auto parseDxfGroups(int code, const std::unique_ptr<dxfReader> &reader) -> bool;
public: public:
DRW::ETYPE eType; /*!< enum: entity type, code 0 */ DRW::ETYPE eType; /*!< enum: entity type, code 0 */
@ -249,7 +250,7 @@ public:
void applyExtrusion() override {} void applyExtrusion() override {}
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
DRW_Coord basePoint{}; /*!< base point, code 10, 20 & 30 */ DRW_Coord basePoint{}; /*!< base point, code 10, 20 & 30 */
@ -267,7 +268,7 @@ public:
DRW_ASTMNotch() { eType = DRW::ASTMNOTCH; } DRW_ASTMNotch() { eType = DRW::ASTMNOTCH; }
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
double angle{0}; /*!< angle, code 50 */ double angle{0}; /*!< angle, code 50 */
@ -292,7 +293,7 @@ public:
void applyExtrusion() override {} void applyExtrusion() override {}
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
DRW_Coord secPoint; /*!< second point, code 11, 21 & 31 */ DRW_Coord secPoint; /*!< second point, code 11, 21 & 31 */
@ -341,7 +342,7 @@ public:
void applyExtrusion() override; void applyExtrusion() override;
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
double radious; /*!< radius, code 40 */ double radious; /*!< radius, code 40 */
@ -382,7 +383,7 @@ public:
protected: protected:
//! interpret code in dxf reading process or dispatch to inherited class //! interpret code in dxf reading process or dispatch to inherited class
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
double staangle; /*!< start angle, code 50 in radians*/ double staangle; /*!< start angle, code 50 in radians*/
@ -416,7 +417,7 @@ public:
protected: protected:
//! interpret code in dxf reading process or dispatch to inherited class //! interpret code in dxf reading process or dispatch to inherited class
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
private: private:
void correctAxis(); void correctAxis();
@ -448,7 +449,7 @@ public:
void applyExtrusion() override; void applyExtrusion() override;
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
DRW_Coord thirdPoint; /*!< third point, code 12, 22 & 32 */ DRW_Coord thirdPoint; /*!< third point, code 12, 22 & 32 */
@ -525,7 +526,7 @@ public:
protected: protected:
//! interpret code in dxf reading process or dispatch to inherited class //! interpret code in dxf reading process or dispatch to inherited class
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
int invisibleflag; /*!< invisible edge flag, code 70 */ int invisibleflag; /*!< invisible edge flag, code 70 */
@ -552,7 +553,7 @@ public:
void applyExtrusion() override {} void applyExtrusion() override {}
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
UTF8STRING name; /*!< block name, code 2 */ UTF8STRING name; /*!< block name, code 2 */
@ -584,7 +585,7 @@ public:
} }
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
UTF8STRING name; /*!< block name, code 2 */ UTF8STRING name; /*!< block name, code 2 */
@ -664,7 +665,7 @@ public:
} }
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
int vertexnum; /*!< number of vertex, code 90 */ int vertexnum; /*!< number of vertex, code 90 */
@ -727,7 +728,7 @@ public:
void applyExtrusion() override {} // RLZ TODO void applyExtrusion() override {} // RLZ TODO
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
double height; /*!< height text, code 40 */ double height; /*!< height text, code 40 */
@ -775,7 +776,7 @@ public:
} }
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
void updateAngle(); // recalculate angle if 'haveXAxis' is true void updateAngle(); // recalculate angle if 'haveXAxis' is true
public: public:
@ -828,7 +829,7 @@ public:
} }
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
double stawidth; /*!< Start width, code 40 */ double stawidth; /*!< Start width, code 40 */
@ -910,7 +911,7 @@ public:
void appendVertex(DRW_Vertex *v) { vertlist.push_back(v); } void appendVertex(DRW_Vertex *v) { vertlist.push_back(v); }
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
int flags; /*!< polyline flag, code 70, default 0 */ int flags; /*!< polyline flag, code 70, default 0 */
@ -1003,7 +1004,7 @@ public:
void applyExtrusion() override {} void applyExtrusion() override {}
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
// double ex; /*!< normal vector x coordinate, code 210 */ // double ex; /*!< normal vector x coordinate, code 210 */
@ -1119,7 +1120,7 @@ public:
void applyExtrusion() override {} void applyExtrusion() override {}
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
UTF8STRING name; /*!< hatch pattern name, code 2 */ UTF8STRING name; /*!< hatch pattern name, code 2 */
@ -1225,7 +1226,7 @@ public:
} }
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
duint32 ref; /*!< Hard reference to imagedef object, code 340 */ duint32 ref; /*!< Hard reference to imagedef object, code 340 */
@ -1307,12 +1308,12 @@ public:
eType = DRW::DIMENSION; eType = DRW::DIMENSION;
// RLZ needed a def value for this: hdir = ??? // RLZ needed a def value for this: hdir = ???
} }
virtual ~DRW_Dimension() = default; ~DRW_Dimension() override = default;
void applyExtrusion() override {} void applyExtrusion() override {}
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
auto getDefPoint() const -> DRW_Coord { return defPoint; } /*!< Definition point, code 10, 20 & 30 */ auto getDefPoint() const -> DRW_Coord { return defPoint; } /*!< Definition point, code 10, 20 & 30 */
@ -1671,7 +1672,7 @@ public:
void applyExtrusion() override {} void applyExtrusion() override {}
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
UTF8STRING style; /*!< Dimension style name, code 3 */ UTF8STRING style; /*!< Dimension style name, code 3 */
@ -1734,7 +1735,7 @@ public:
void applyExtrusion() override {} void applyExtrusion() override {}
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool override; auto parseCode(int code, const std::unique_ptr<dxfReader> &reader) -> bool override;
public: public:
double pswidth; /*!< Width in paper space units, code 40 */ double pswidth; /*!< Width in paper space units, code 40 */

746
src/libs/vdxf/libdxfrw/drw_header.cpp
View File

File diff suppressed because it is too large Load Diff

5
src/libs/vdxf/libdxfrw/drw_header.h
View File

@ -16,6 +16,7 @@
#include <map> #include <map>
#include <memory>
#include "drw_base.h" #include "drw_base.h"
class dxfReader; class dxfReader;
@ -111,11 +112,11 @@ public:
void addStr(std::string key, const std::string &value, int code); void addStr(std::string key, const std::string &value, int code);
void addCoord(std::string key, const DRW_Coord &value, int code); void addCoord(std::string key, const DRW_Coord &value, int code);
auto getComments() const -> std::string { return comments; } auto getComments() const -> std::string { return comments; }
void write(dxfWriter *writer, DRW::Version ver); void write(const std::unique_ptr<dxfWriter>& writer, DRW::Version ver);
void addComment(const std::string &c); void addComment(const std::string &c);
protected: protected:
auto parseCode(int code, dxfReader *reader) -> bool; auto parseCode(int code, const std::unique_ptr<dxfReader>& reader) -> bool;
private: private:
auto getDouble(const std::string &key, double *varDouble) const -> bool; auto getDouble(const std::string &key, double *varDouble) const -> bool;

1117
src/libs/vdxf/libdxfrw/drw_objects.cpp
View File

File diff suppressed because it is too large Load Diff

1114
src/libs/vdxf/libdxfrw/drw_objects.h
View File

File diff suppressed because it is too large Load Diff

18
src/libs/vdxf/libdxfrw/libdxfrw.cpp
View File

@ -40,8 +40,6 @@ dxfRW::dxfRW(const char *name)
dxfRW::~dxfRW() dxfRW::~dxfRW()
{ {
delete reader;
delete writer;
for (auto &it : imageDef) for (auto &it : imageDef)
{ {
delete it; delete it;
@ -92,19 +90,19 @@ auto dxfRW::read(DRW_Interface *interface_, bool ext) -> bool
binFile = true; binFile = true;
// skip sentinel // skip sentinel
filestr.seekg(22, std::ios::beg); filestr.seekg(22, std::ios::beg);
reader = new dxfReaderBinary(&filestr); reader = std::make_unique<dxfReaderBinary>(&filestr);
DRW_DBG("dxfRW::read binary file\n"); DRW_DBG("dxfRW::read binary file\n");
} }
else else
{ {
binFile = false; binFile = false;
filestr.open(fileName.c_str(), std::ios_base::in); filestr.open(fileName.c_str(), std::ios_base::in);
reader = new dxfReaderAscii(&filestr); reader = std::make_unique<dxfReaderAscii>(&filestr);
} }
bool isOk = processDxf(); bool isOk = processDxf();
filestr.close(); filestr.close();
delete reader; reader.reset();
reader = nullptr; reader = nullptr;
return isOk; return isOk;
} }
@ -124,13 +122,13 @@ auto dxfRW::write(DRW_Interface *interface_, DRW::Version ver, bool bin) -> bool
filestr.open(fileName.c_str(), std::ios_base::out | std::ios::binary | std::ios::trunc); filestr.open(fileName.c_str(), std::ios_base::out | std::ios::binary | std::ios::trunc);
// write sentinel // write sentinel
filestr << "AutoCAD Binary DXF\r\n" << static_cast<char>(26) << '\0'; filestr << "AutoCAD Binary DXF\r\n" << static_cast<char>(26) << '\0';
writer = new dxfWriterBinary(&filestr); writer = std::make_unique<dxfWriterBinary>(&filestr);
DRW_DBG("dxfRW::read binary file\n"); DRW_DBG("dxfRW::read binary file\n");
} }
else else
{ {
filestr.open(fileName.c_str(), std::ios_base::out | std::ios::trunc); filestr.open(fileName.c_str(), std::ios_base::out | std::ios::trunc);
writer = new dxfWriterAscii(&filestr); writer = std::make_unique<dxfWriterAscii>(&filestr);
std::string comm = std::string("dxfrw ") + std::string(DRW_VERSION); std::string comm = std::string("dxfrw ") + std::string(DRW_VERSION);
writer->writeString(999, comm); writer->writeString(999, comm);
} }
@ -174,13 +172,11 @@ auto dxfRW::write(DRW_Interface *interface_, DRW::Version ver, bool bin) -> bool
catch (std::ofstream::failure &writeErr) catch (std::ofstream::failure &writeErr)
{ {
errorString = writeErr.what(); errorString = writeErr.what();
delete writer; writer.reset();
writer = nullptr;
return isOk; return isOk;
} }
isOk = true; isOk = true;
delete writer; writer.reset();
writer = nullptr;
return isOk; return isOk;
} }

4
src/libs/vdxf/libdxfrw/libdxfrw.h
View File

@ -146,8 +146,8 @@ private:
std::string codePage{}; std::string codePage{};
bool binFile{false}; bool binFile{false};
bool m_xSpaceBlock{true}; bool m_xSpaceBlock{true};
dxfReader *reader{nullptr}; std::unique_ptr<dxfReader> reader{};
dxfWriter *writer{nullptr}; std::unique_ptr<dxfWriter> writer{};
DRW_Interface *iface{nullptr}; DRW_Interface *iface{nullptr};
DRW_Header header{}; DRW_Header header{};
// int section; // int section;