sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-12 00:06:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

indentation fixes

Browse Source
This commit is contained in:
Juergen E. Fischer 2016-12-26 23:28:10 +01:00
parent e5a4426dce
commit 8fb37aa666
15 changed files with 544 additions and 539 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/plugins/processing/algs/qgis/IdwInterpolation.py
View File

@ -33,7 +33,7 @@ from qgis.core import QgsRectangle
from qgis.analysis import (QgsInterpolator,
QgsIDWInterpolator,
QgsGridFileWriter
)
)
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@ -41,7 +41,7 @@ from processing.core.parameters import (Parameter,
ParameterNumber,
ParameterExtent,
_splitParameterOptions
)
)
from processing.core.outputs import OutputRaster
from processing.tools import dataobjects
@ -82,8 +82,8 @@ class IdwInterpolation(GeoAlgorithm):
return True
if value == '':
if not self.optional:
return False
if not self.optional:
return False
if isinstance(value, str):
self.value = value if value != '' else None
@ -103,7 +103,7 @@ class IdwInterpolation(GeoAlgorithm):
def fromScriptCode(self, line):
isOptional, name, definition = _splitParameterOptions(line)
descName = _createDescriptiveName(name)
parent = definition.lower().strip()[len('interpolation data') + 1:]
parent = definition.lower().strip()[len('interpolation data') + 1:]
return ParameterInterpolationData(name, description, parent)
@staticmethod

12
python/plugins/processing/algs/qgis/TinInterpolation.py
View File

@ -33,7 +33,7 @@ from qgis.core import QgsRectangle
from qgis.analysis import (QgsInterpolator,
QgsTINInterpolator,
QgsGridFileWriter
)
)
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@ -42,10 +42,10 @@ from processing.core.parameters import (Parameter,
ParameterExtent,
ParameterSelection,
_splitParameterOptions
)
)
from processing.core.outputs import (OutputRaster,
OutputVector
)
)
from processing.tools import dataobjects
pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
@ -90,8 +90,8 @@ class TinInterpolation(GeoAlgorithm):
return True
if value == '':
if not self.optional:
return False
if not self.optional:
return False
if isinstance(value, str):
self.value = value if value != '' else None
@ -111,7 +111,7 @@ class TinInterpolation(GeoAlgorithm):
def fromScriptCode(self, line):
isOptional, name, definition = _splitParameterOptions(line)
descName = _createDescriptiveName(name)
parent = definition.lower().strip()[len('interpolation data') + 1:]
parent = definition.lower().strip()[len('interpolation data') + 1:]
return ParameterInterpolationData(name, description, parent)
@staticmethod

14
python/plugins/processing/algs/qgis/ui/InterpolationDataWidget.py
View File

@ -34,12 +34,12 @@ from qgis.PyQt.QtGui import (QIcon,
QColor)
from qgis.PyQt.QtWidgets import (QTreeWidgetItem,
QComboBox
)
)
from qgis.core import (QgsApplication,
QgsMapLayer,
QgsMapLayerProxyModel,
QgsWkbTypes
)
)
from qgis.gui import QgsFieldProxyModel
from qgis.analysis import QgsInterpolator
@ -103,7 +103,7 @@ class InterpolationDataWidget(BASE, WIDGET):
def addLayerData(self, layerName, attribute):
item = QTreeWidgetItem()
item.setText(0, layerName);
item.setText(0, layerName)
item.setText(1, attribute)
self.layersTree.addTopLevelItem(item)
@ -111,7 +111,7 @@ class InterpolationDataWidget(BASE, WIDGET):
comboBox.addItem(self.tr('Points'))
comboBox.addItem(self.tr('Structure lines'))
comboBox.addItem(self.tr('Break lines'))
comboBox.setCurrentIndex( 0 )
comboBox.setCurrentIndex(0)
self.layersTree.setItemWidget(item, 2, comboBox)
def setValue(self, value):
@ -156,9 +156,9 @@ class InterpolationDataWidget(BASE, WIDGET):
inputType = QgsInterpolator.BREAK_LINES
layers += '{},{},{:d},{:d};'.format(layer.source(),
zCoord,
fieldIndex,
inputType)
zCoord,
fieldIndex,
inputType)
return layers[:-1]

2
python/plugins/processing/algs/qgis/ui/ReliefColorsWidget.py
View File

@ -38,7 +38,7 @@ from qgis.PyQt.QtWidgets import (QTreeWidgetItem,
QMessageBox,
QInputDialog,
QColorDialog
)
)
from qgis.PyQt.QtXml import QDomDocument
from qgis.core import QgsApplication, QgsMapLayer

116
src/app/dwg/libdxfrw/drw_base.h
View File

@ -68,33 +68,33 @@ namespace DRW
//! Version numbers for the DXF Format.
enum Version
{
UNKNOWNV, /*!< UNKNOWN VERSION. */
AC1006, /*!< R10. */
AC1009, /*!< R11 & R12. */
AC1012, /*!< R13. */
AC1014, /*!< R14. */
AC1015, /*!< ACAD 2000. */
AC1018, /*!< ACAD 2004. */
AC1021, /*!< ACAD 2007. */
AC1024, /*!< ACAD 2010. */
AC1027 /*!< ACAD 2013. */
UNKNOWNV, //!< UNKNOWN VERSION.
AC1006, //!< R10.
AC1009, //!< R11 & R12.
AC1012, //!< R13.
AC1014, //!< R14.
AC1015, //!< ACAD 2000.
AC1018, //!< ACAD 2004.
AC1021, //!< ACAD 2007.
AC1024, //!< ACAD 2010.
AC1027 //!< ACAD 2013.
};
enum error
{
BAD_NONE, /*!< No error. */
BAD_UNKNOWN, /*!< UNKNOWN. */
BAD_OPEN, /*!< error opening file. */
BAD_VERSION, /*!< unsupported version. */
BAD_READ_METADATA, /*!< error reading matadata. */
BAD_READ_FILE_HEADER, /*!< error in file header read process. */
BAD_READ_HEADER, /*!< error in header vars read process. */
BAD_READ_HANDLES, /*!< error in object map read process. */
BAD_READ_CLASSES, /*!< error in classes read process. */
BAD_READ_TABLES, /*!< error in tables read process. */
BAD_READ_BLOCKS, /*!< error in block read process. */
BAD_READ_ENTITIES, /*!< error in entities read process. */
BAD_READ_OBJECTS /*!< error in objects read process. */
BAD_NONE, //!< No error.
BAD_UNKNOWN, //!< UNKNOWN.
BAD_OPEN, //!< Error opening file.
BAD_VERSION, //!< Unsupported version.
BAD_READ_METADATA, //!< Error reading matadata.
BAD_READ_FILE_HEADER, //!< Error in file header read process.
BAD_READ_HEADER, //!< Error in header vars read process.
BAD_READ_HANDLES, //!< Error in object map read process.
BAD_READ_CLASSES, //!< Error in classes read process.
BAD_READ_TABLES, //!< Error in tables read process.
BAD_READ_BLOCKS, //!< Error in block read process.
BAD_READ_ENTITIES, //!< Error in entities read process.
BAD_READ_OBJECTS //!< Error in objects read process.
};
enum DBG_LEVEL
@ -171,7 +171,7 @@ class DRW_Coord
z = data.z;
return *this;
}
/** < convert to unitary vector */
//! < convert to unitary vector
void unitize()
{
double dist;
@ -204,11 +204,11 @@ class DRW_Vertex2D
DRW_Vertex2D( double sx, double sy, double b ): x( sx ), y( sy ), stawidth( 0 ), endwidth( 0 ), bulge( b ) {}
public:
double x; /*!< x coordinate, code 10 */
double y; /*!< y coordinate, code 20 */
double stawidth; /*!< Start width, code 40 */
double endwidth; /*!< End width, code 41 */
double bulge; /*!< bulge, code 42 */
double x; //!< X coordinate, code 10
double y; //!< Y coordinate, code 20
double stawidth; //!< Start width, code 40
double endwidth; //!< End width, code 41
double bulge; //!< Bulge, code 42
};
@ -261,7 +261,7 @@ class DRW_Variant
void setCoordY( double d ) { if ( vType == COORD ) vdata.y = d;}
void setCoordZ( double d ) { if ( vType == COORD ) vdata.z = d;}
enum TYPE type() { return vType;}
int code() { return vCode;} /*!< returns dxf code of this value*/
int code() { return vCode;} //!< Returns dxf code of this value
private:
std::string sdata;
@ -285,7 +285,7 @@ class DRW_Variant
DRW_VarContent content;
private:
enum TYPE vType;
int vCode; /*!< dxf code of this value*/
int vCode; //!< Dxf code of this value
};
@ -317,33 +317,33 @@ class DRW_LW_Conv
public:
enum lineWidth
{
width00 = 0, /*!< 0.00mm (dxf 0)*/
width01 = 1, /*!< 0.05mm (dxf 5)*/
width02 = 2, /*!< 0.09mm (dxf 9)*/
width03 = 3, /*!< 0.13mm (dxf 13)*/
width04 = 4, /*!< 0.15mm (dxf 15)*/
width05 = 5, /*!< 0.18mm (dxf 18)*/
width06 = 6, /*!< 0.20mm (dxf 20)*/
width07 = 7, /*!< 0.25mm (dxf 25)*/
width08 = 8, /*!< 0.30mm (dxf 30)*/
width09 = 9, /*!< 0.35mm (dxf 35)*/
width10 = 10, /*!< 0.40mm (dxf 40)*/
width11 = 11, /*!< 0.50mm (dxf 50)*/
width12 = 12, /*!< 0.53mm (dxf 53)*/
width13 = 13, /*!< 0.60mm (dxf 60)*/
width14 = 14, /*!< 0.70mm (dxf 70)*/
width15 = 15, /*!< 0.80mm (dxf 80)*/
width16 = 16, /*!< 0.90mm (dxf 90)*/
width17 = 17, /*!< 1.00mm (dxf 100)*/
width18 = 18, /*!< 1.06mm (dxf 106)*/
width19 = 19, /*!< 1.20mm (dxf 120)*/
width20 = 20, /*!< 1.40mm (dxf 140)*/
width21 = 21, /*!< 1.58mm (dxf 158)*/
width22 = 22, /*!< 2.00mm (dxf 200)*/
width23 = 23, /*!< 2.11mm (dxf 211)*/
widthByLayer = 29, /*!< by layer (dxf -1) */
widthByBlock = 30, /*!< by block (dxf -2) */
widthDefault = 31 /*!< by default (dxf -3) */
width00 = 0, //!< 0.00mm (dxf 0)
width01 = 1, //!< 0.05mm (dxf 5)
width02 = 2, //!< 0.09mm (dxf 9)
width03 = 3, //!< 0.13mm (dxf 13)
width04 = 4, //!< 0.15mm (dxf 15)
width05 = 5, //!< 0.18mm (dxf 18)
width06 = 6, //!< 0.20mm (dxf 20)
width07 = 7, //!< 0.25mm (dxf 25)
width08 = 8, //!< 0.30mm (dxf 30)
width09 = 9, //!< 0.35mm (dxf 35)
width10 = 10, //!< 0.40mm (dxf 40)
width11 = 11, //!< 0.50mm (dxf 50)
width12 = 12, //!< 0.53mm (dxf 53)
width13 = 13, //!< 0.60mm (dxf 60)
width14 = 14, //!< 0.70mm (dxf 70)
width15 = 15, //!< 0.80mm (dxf 80)
width16 = 16, //!< 0.90mm (dxf 90)
width17 = 17, //!< 1.00mm (dxf 100)
width18 = 18, //!< 1.06mm (dxf 106)
width19 = 19, //!< 1.20mm (dxf 120)
width20 = 20, //!< 1.40mm (dxf 140)
width21 = 21, //!< 1.58mm (dxf 158)
width22 = 22, //!< 2.00mm (dxf 200)
width23 = 23, //!< 2.11mm (dxf 211)
widthByLayer = 29, //!< By layer (dxf -1)
widthByBlock = 30, //!< By block (dxf -2)
widthDefault = 31 //!< By default (dxf -3)
};
static int lineWidth2dxfInt( enum lineWidth lw )

14
src/app/dwg/libdxfrw/drw_classes.h
View File

@ -48,13 +48,13 @@ class DRW_Class
private:
void toDwgType();
public:
UTF8STRING recName; /*!< record name, code 1 */
UTF8STRING className; /*!< C++ class name, code 2 */
UTF8STRING appName; /*!< app name, code 3 */
int proxyFlag; /*!< Proxy capabilities flag, code 90 */
int instanceCount; /*!< number of instances for a custom class, code 91*/
int wasaProxyFlag; /*!< proxy flag (app loaded on save), code 280 */
int entityFlag; /*!< entity flag, code 281 (0 object, 1 entity)*/
UTF8STRING recName; //!< Record name, code 1
UTF8STRING className; //!< C++ class name, code 2
UTF8STRING appName; //!< App name, code 3
int proxyFlag; //!< Proxy capabilities flag, code 90
int instanceCount; //!< Number of instances for a custom class, code 91
int wasaProxyFlag; //!< Proxy flag (app loaded on save), code 280
int entityFlag; //!< Entity flag, code 281 (0 object, 1 entity)
public: //only for read dwg
duint16 classNum;
int dwgType;

522
src/app/dwg/libdxfrw/drw_entities.h
View File

@ -209,27 +209,27 @@ class DRW_Entity
bool parseDxfGroups( int code, dxfReader *reader );
public:
enum DRW::ETYPE eType; /*!< enum: entity type, code 0 */
duint32 handle; /*!< entity identifier, code 5 */
duint32 parentHandle; /*!< Soft-pointer ID/handle to owner BLOCK_RECORD object, code 330 */
std::list<std::list<DRW_Variant> > appData; /*!< list of application data, code 102 */
DRW::Space space; /*!< space indicator, code 67*/
UTF8STRING layer; /*!< layer name, code 8 */
UTF8STRING lineType; /*!< line type, code 6 */
duint32 material; /*!< hard pointer id to material object, code 347 */
int color; /*!< entity color, code 62 */
enum DRW_LW_Conv::lineWidth lWeight; /*!< entity lineweight, code 370 */
double ltypeScale; /*!< linetype scale, code 48 */
bool visible; /*!< entity visibility, code 60 */
int numProxyGraph; /*!< Number of bytes in proxy graphics, code 92 */
std::string proxyGraphics; /*!< proxy graphics bytes, code 310 */
int color24; /*!< 24-bit color, code 420 */
std::string colorName; /*!< color name, code 430 */
int transparency; /*!< transparency, code 440 */
int plotStyle; /*!< hard pointer id to plot style object, code 390 */
DRW::ShadowMode shadow; /*!< shadow mode, code 284 */
bool haveExtrusion; /*!< set to true if the entity have extrusion*/
std::vector<DRW_Variant*> extData; /*!< FIFO list of extended data, codes 1000 to 1071*/
enum DRW::ETYPE eType; //!< Enum: entity type, code 0
duint32 handle; //!< Entity identifier, code 5
duint32 parentHandle; //!< Soft-pointer ID/handle to owner BLOCK_RECORD object, code 330
std::list<std::list<DRW_Variant> > appData; //!< List of application data, code 102
DRW::Space space; //!< Space indicator, code 67
UTF8STRING layer; //!< Layer name, code 8
UTF8STRING lineType; //!< Line type, code 6
duint32 material; //!< Hard pointer id to material object, code 347
int color; //!< Entity color, code 62
enum DRW_LW_Conv::lineWidth lWeight; //!< Entity lineweight, code 370
double ltypeScale; //!< Linetype scale, code 48
bool visible; //!< Entity visibility, code 60
int numProxyGraph; //!< Number of bytes in proxy graphics, code 92
std::string proxyGraphics; //!< Proxy graphics bytes, code 310
int color24; //!< 24-bit color, code 420
std::string colorName; //!< Color name, code 430
int transparency; //!< Transparency, code 440
int plotStyle; //!< Hard pointer id to plot style object, code 390
DRW::ShadowMode shadow; //!< Shadow mode, code 284
bool haveExtrusion; //!< Set to true if the entity have extrusion
std::vector<DRW_Variant*> extData; //!< FIFO list of extended data, codes 1000 to 1071
protected: //only for read dwg
duint8 haveNextLinks; // aka nolinks //B
@ -277,9 +277,9 @@ class DRW_Point : public DRW_Entity
virtual bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
DRW_Coord basePoint; /*!< base point, code 10, 20 & 30 */
double thickness; /*!< thickness, code 39 */
DRW_Coord extPoint; /*!< Dir extrusion normal vector, code 210, 220 & 230 */
DRW_Coord basePoint; //!< Base point, code 10, 20 & 30
double thickness; //!< Thickness, code 39
DRW_Coord extPoint; //!< Dir extrusion normal vector, code 210, 220 & 230
// TNick: we're not handling code 50 - Angle of the X axis for
// the UCS in effect when the point was drawn
};
@ -304,7 +304,7 @@ class DRW_Line : public DRW_Point
virtual bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
DRW_Coord secPoint; /*!< second point, code 11, 21 & 31 */
DRW_Coord secPoint; //!< Second point, code 11, 21 & 31
};
/** Class to handle ray entity
@ -354,7 +354,7 @@ class DRW_Circle : public DRW_Point
virtual bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
double mRadius; /*!< radius, code 40 */
double mRadius; //!< Radius, code 40
};
/** Class to handle arc entity
@ -394,9 +394,9 @@ class DRW_Arc : public DRW_Circle
virtual bool parseDwg( DRW::Version v, dwgBuffer *buf, duint32 bs = 0 );
public:
double staangle; /*!< start angle, code 50 in radians*/
double endangle; /*!< end angle, code 51 in radians */
int isccw; /*!< is counter clockwise arc?, only used in hatch, code 73 */
double staangle; //!< Start angle, code 50 in radians
double endangle; //!< End angle, code 51 in radians
int isccw; //!< Is counter clockwise arc?, only used in hatch, code 73
};
/** Class to handle ellipse and elliptic arc entity
@ -432,10 +432,10 @@ class DRW_Ellipse : public DRW_Line
void correctAxis();
public:
double ratio; /*!< ratio, code 40 */
double staparam; /*!< start parameter, code 41, 0.0 for full ellipse*/
double endparam; /*!< end parameter, code 42, 2*PI for full ellipse */
int isccw; /*!< is counter clockwise arc?, only used in hatch, code 73 */
double ratio; //!< Ratio, code 40
double staparam; //!< Start parameter, code 41, 0.0 for full ellipse
double endparam; //!< End parameter, code 42, 2*PI for full ellipse
int isccw; //!< Is counter clockwise arc?, only used in hatch, code 73
};
/** Class to handle trace entity
@ -460,8 +460,8 @@ class DRW_Trace : public DRW_Line
virtual bool parseDwg( DRW::Version v, dwgBuffer *buf, duint32 bs = 0 );
public:
DRW_Coord thirdPoint; /*!< third point, code 12, 22 & 32 */
DRW_Coord fourthPoint; /*!< four point, code 13, 23 & 33 */
DRW_Coord thirdPoint; //!< Third point, code 12, 22 & 32
DRW_Coord fourthPoint; //!< Four point, code 13, 23 & 33
};
/** Class to handle solid entity
@ -544,7 +544,7 @@ class DRW_3Dface : public DRW_Trace
virtual bool parseDwg( DRW::Version v, dwgBuffer *buf, duint32 bs = 0 );
public:
int invisibleflag; /*!< invisible edge flag, code 70 */
int invisibleflag; //!< Invisible edge flag, code 70
};
@ -570,8 +570,8 @@ class DRW_Block : public DRW_Point
virtual bool parseDwg( DRW::Version v, dwgBuffer *buf, duint32 bs = 0 );
public:
UTF8STRING name; /*!< block name, code 2 */
int flags; /*!< block type, code 70 */
UTF8STRING name; //!< Block name, code 2
int flags; //!< Block type, code 70
private:
bool isEnd; //for dwg parsing
};
@ -604,15 +604,15 @@ class DRW_Insert : public DRW_Point
virtual bool parseDwg( DRW::Version v, dwgBuffer *buf, duint32 bs = 0 );
public:
UTF8STRING name; /*!< block name, code 2 */
double xscale; /*!< x scale factor, code 41 */
double yscale; /*!< y scale factor, code 42 */
double zscale; /*!< z scale factor, code 43 */
double angle; /*!< rotation angle in radians, code 50 */
int colcount; /*!< column count, code 70 */
int rowcount; /*!< row count, code 71 */
double colspace; /*!< column space, code 44 */
double rowspace; /*!< row space, code 45 */
UTF8STRING name; //!< Block name, code 2
double xscale; //!< X scale factor, code 41
double yscale; //!< Y scale factor, code 42
double zscale; //!< Z scale factor, code 43
double angle; //!< Rotation angle in radians, code 50
int colcount; //!< Column count, code 70
int rowcount; //!< Row count, code 71
double colspace; //!< Column space, code 44
double rowspace; //!< Row space, code 45
public: //only for read dwg
dwgHandle blockRecH;
dwgHandle seqendH; //RLZ: on implement attrib remove this handle from obj list (see pline/vertex code)
@ -684,14 +684,14 @@ class DRW_LWPolyline : public DRW_Entity
bool parseDwg( DRW::Version v, dwgBuffer *buf, duint32 bs = 0 );
public:
std::vector<DRW_Vertex2D *>::size_type vertexnum; /*!< number of vertices, code 90 */
int flags; /*!< polyline flag, code 70, default 0 */
double width; /*!< constant width, code 43 */
double elevation; /*!< elevation, code 38 */
double thickness; /*!< thickness, code 39 */
DRW_Coord extPoint; /*!< Dir extrusion normal vector, code 210, 220 & 230 */
DRW_Vertex2D *vertex; /*!< current vertex to add data */
std::vector<DRW_Vertex2D *> vertlist; /*!< vertex list */
std::vector<DRW_Vertex2D *>::size_type vertexnum; //!< Number of vertices, code 90
int flags; //!< Polyline flag, code 70, default 0
double width; //!< Constant width, code 43
double elevation; //!< Elevation, code 38
double thickness; //!< Thickness, code 39
DRW_Coord extPoint; //!< Dir extrusion normal vector, code 210, 220 & 230
DRW_Vertex2D *vertex; //!< Current vertex to add data
std::vector<DRW_Vertex2D *> vertlist; //!< Vertex list
};
/** Class to handle insert entries
@ -704,21 +704,21 @@ class DRW_Text : public DRW_Line
//! Vertical alignments.
enum VAlign
{
VBaseLine = 0, /*!< Top = 0 */
VBottom, /*!< Bottom = 1 */
VMiddle, /*!< Middle = 2 */
VTop /*!< Top = 3 */
VBaseLine = 0, //!< Top = 0
VBottom, //!< Bottom = 1
VMiddle, //!< Middle = 2
VTop //!< Top = 3
};
//! Horizontal alignments.
enum HAlign
{
HLeft = 0, /*!< Left = 0 */
HCenter, /*!< Centered = 1 */
HRight, /*!< Right = 2 */
HAligned, /*!< Aligned = 3 (if VAlign==0) */
HMiddle, /*!< middle = 4 (if VAlign==0) */
HFit /*!< fit into point = 5 (if VAlign==0) */
HLeft = 0, //!< Left = 0
HCenter, //!< Centered = 1
HRight, //!< Right = 2
HAligned, //!< Aligned = 3 (if VAlign==0)
HMiddle, //!< Middle = 4 (if VAlign==0)
HFit //!< Fit into point = 5 (if VAlign==0)
};
DRW_Text( enum DRW::ETYPE type = DRW::TEXT )
@ -741,16 +741,16 @@ class DRW_Text : public DRW_Line
virtual bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
double height; /*!< height text, code 40 */
UTF8STRING text; /*!< text string, code 1 */
double angle; /*!< rotation angle in degrees (360), code 50 */
double widthscale; /*!< width factor, code 41 */
double oblique; /*!< oblique angle, code 51 */
UTF8STRING style; /*!< style name, code 7 */
int textgen; /*!< text generation, code 71 */
enum HAlign alignH; /*!< horizontal align, code 72 */
enum VAlign alignV; /*!< vertical align, code 73 */
dwgHandle styleH; /*!< handle for text style */
double height; //!< Height text, code 40
UTF8STRING text; //!< Text string, code 1
double angle; //!< Rotation angle in degrees (360), code 50
double widthscale; //!< Width factor, code 41
double oblique; //!< Oblique angle, code 51
UTF8STRING style; //!< Style name, code 7
int textgen; //!< Text generation, code 71
enum HAlign alignH; //!< Horizontal align, code 72
enum VAlign alignV; //!< Vertical align, code 73
dwgHandle styleH; //!< Handle for text style
};
/** Class to handle insert entries
@ -789,7 +789,7 @@ class DRW_MText : public DRW_Text
virtual bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
double interlin; /*!< width factor, code 44 */
double interlin; //!< Width factor, code 44
private:
bool haveXAxis;
};
@ -843,17 +843,17 @@ class DRW_Vertex : public DRW_Point
}
public:
double stawidth; /*!< Start width, code 40 */
double endwidth; /*!< End width, code 41 */
double bulge; /*!< bulge, code 42 */
double stawidth; //!< Start width, code 40
double endwidth; //!< End width, code 41
double bulge; //!< Bulge, code 42
int flags; /*!< vertex flag, code 70, default 0 */
double tgdir; /*!< curve fit tangent direction, code 50 */
int vindex1; /*!< polyface mesh vertex index, code 71, default 0 */
int vindex2; /*!< polyface mesh vertex index, code 72, default 0 */
int vindex3; /*!< polyface mesh vertex index, code 73, default 0 */
int vindex4; /*!< polyface mesh vertex index, code 74, default 0 */
int identifier; /*!< vertex identifier, code 91, default 0 */
int flags; //!< Vertex flag, code 70, default 0
double tgdir; //!< Curve fit tangent direction, code 50
int vindex1; //!< Polyface mesh vertex index, code 71, default 0
int vindex2; //!< Polyface mesh vertex index, code 72, default 0
int vindex3; //!< Polyface mesh vertex index, code 73, default 0
int vindex4; //!< Polyface mesh vertex index, code 74, default 0
int identifier; //!< Vertex identifier, code 91, default 0
};
/** Class to handle polyline entity
@ -904,16 +904,16 @@ class DRW_Polyline : public DRW_Point
virtual bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
int flags; /*!< polyline flag, code 70, default 0 */
double defstawidth; /*!< Start width, code 40, default 0 */
double defendwidth; /*!< End width, code 41, default 0 */
int vertexcount; /*!< polygon mesh M vertex or polyface vertex num, code 71, default 0 */
int facecount; /*!< polygon mesh N vertex or polyface face num, code 72, default 0 */
int smoothM; /*!< smooth surface M density, code 73, default 0 */
int smoothN; /*!< smooth surface M density, code 74, default 0 */
int curvetype; /*!< curves & smooth surface type, code 75, default 0 */
int flags; //!< Polyline flag, code 70, default 0
double defstawidth; //!< Start width, code 40, default 0
double defendwidth; //!< End width, code 41, default 0
int vertexcount; //!< Polygon mesh M vertex or polyface vertex num, code 71, default 0
int facecount; //!< Polygon mesh N vertex or polyface face num, code 72, default 0
int smoothM; //!< Smooth surface M density, code 73, default 0
int smoothN; //!< Smooth surface M density, code 74, default 0
int curvetype; //!< Curves & smooth surface type, code 75, default 0
std::vector<DRW_Vertex *> vertlist; /*!< vertex list */
std::vector<DRW_Vertex *> vertlist; //!< Vertex list
private:
std::list<duint32> handleList; // list of handles, only in 2004+
@ -962,34 +962,34 @@ class DRW_Spline : public DRW_Entity
virtual bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
// double ex; /*!< normal vector x coordinate, code 210 */
// double ey; /*!< normal vector y coordinate, code 220 */
// double ez; /*!< normal vector z coordinate, code 230 */
DRW_Coord normalVec; /*!< normal vector, code 210, 220, 230 */
DRW_Coord tgStart; /*!< start tangent, code 12, 22, 32 */
// double tgsx; /*!< start tangent x coordinate, code 12 */
// double tgsy; /*!< start tangent y coordinate, code 22 */
// double tgsz; /*!< start tangent z coordinate, code 32 */
DRW_Coord tgEnd; /*!< end tangent, code 13, 23, 33 */
// double tgex; /*!< end tangent x coordinate, code 13 */
// double tgey; /*!< end tangent y coordinate, code 23 */
// double tgez; /*!< end tangent z coordinate, code 33 */
int flags; /*!< spline flag, code 70 */
int degree; /*!< degree of the spline, code 71 */
dint32 nknots; /*!< number of knots, code 72, default 0 */
dint32 ncontrol; /*!< number of control points, code 73, default 0 */
dint32 nfit; /*!< number of fit points, code 74, default 0 */
double tolknot; /*!< knot tolerance, code 42, default 0.0000001 */
double tolcontrol; /*!< control point tolerance, code 43, default 0.0000001 */
double tolfit; /*!< fit point tolerance, code 44, default 0.0000001 */
// double ex; //!< Normal vector x coordinate, code 210
// double ey; //!< Normal vector y coordinate, code 220
// double ez; //!< Normal vector z coordinate, code 230
DRW_Coord normalVec; //!< Normal vector, code 210, 220, 230
DRW_Coord tgStart; //!< Start tangent, code 12, 22, 32
// double tgsx; //!< Start tangent x coordinate, code 12
// double tgsy; //!< Start tangent y coordinate, code 22
// double tgsz; //!< Start tangent z coordinate, code 32
DRW_Coord tgEnd; //!< End tangent, code 13, 23, 33
// double tgex; //!< End tangent x coordinate, code 13
// double tgey; //!< End tangent y coordinate, code 23
// double tgez; //!< End tangent z coordinate, code 33
int flags; //!< Spline flag, code 70
int degree; //!< Degree of the spline, code 71
dint32 nknots; //!< Number of knots, code 72, default 0
dint32 ncontrol; //!< Number of control points, code 73, default 0
dint32 nfit; //!< Number of fit points, code 74, default 0
double tolknot; //!< Knot tolerance, code 42, default 0.0000001
double tolcontrol; //!< Control point tolerance, code 43, default 0.0000001
double tolfit; //!< Fit point tolerance, code 44, default 0.0000001
std::vector<double> knotslist; /*!< knots list, code 40 */
std::vector<DRW_Coord *> controllist; /*!< control points list, code 10, 20 & 30 */
std::vector<DRW_Coord *> fitlist; /*!< fit points list, code 11, 21 & 31 */
std::vector<double> knotslist; //!< Knots list, code 40
std::vector<DRW_Coord *> controllist; //!< Control points list, code 10, 20 & 30
std::vector<DRW_Coord *> fitlist; //!< Fit points list, code 11, 21 & 31
private:
DRW_Coord *controlpoint; /*!< current control point to add data */
DRW_Coord *fitpoint; /*!< current fit point to add data */
DRW_Coord *controlpoint; //!< Current control point to add data
DRW_Coord *fitpoint; //!< Current fit point to add data
};
/** Class to handle hatch loop
@ -1024,11 +1024,11 @@ class DRW_HatchLoop
}
public:
int type; /*!< boundary path type, code 92, polyline=2, default=0 */
std::vector<DRW_Entity *>::size_type numedges; /*!< number of edges (if not a polyline), code 93 */
int type; //!< Boundary path type, code 92, polyline=2, default=0
std::vector<DRW_Entity *>::size_type numedges; //!< Number of edges (if not a polyline), code 93
//TODO: store lwpolylines as entities
// std::vector<DRW_LWPolyline *> pollist; /*!< polyline list */
std::vector<DRW_Entity *> objlist; /*!< entities list */
// std::vector<DRW_LWPolyline *> pollist; //!< Polyline list
std::vector<DRW_Entity *> objlist; //!< Entities list
};
/** Class to handle hatch entity
@ -1075,18 +1075,18 @@ class DRW_Hatch : public DRW_Point
virtual bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
UTF8STRING name; /*!< hatch pattern name, code 2 */
int solid; /*!< solid fill flag, code 70, solid=1, pattern=0 */
int associative; /*!< associativity, code 71, associatve=1, non-assoc.=0 */
int hstyle; /*!< hatch style, code 75 */
int hpattern; /*!< hatch pattern type, code 76 */
int doubleflag; /*!< hatch pattern double flag, code 77, double=1, single=0 */
std::vector<DRW_HatchLoop *>::size_type loopsnum; /*!< number of boundary paths (loops), code 91 */
double angle; /*!< hatch pattern angle, code 52 */
double scale; /*!< hatch pattern scale, code 41 */
int deflines; /*!< number of pattern definition lines, code 78 */
UTF8STRING name; //!< Hatch pattern name, code 2
int solid; //!< Solid fill flag, code 70, solid=1, pattern=0
int associative; //!< Associativity, code 71, associatve=1, non-assoc.=0
int hstyle; //!< Hatch style, code 75
int hpattern; //!< Hatch pattern type, code 76
int doubleflag; //!< Hatch pattern double flag, code 77, double=1, single=0
std::vector<DRW_HatchLoop *>::size_type loopsnum; //!< Number of boundary paths (loops), code 91
double angle; //!< Hatch pattern angle, code 52
double scale; //!< Hatch pattern scale, code 41
int deflines; //!< Number of pattern definition lines, code 78
std::vector<DRW_HatchLoop *> looplist; /*!< polyline list */
std::vector<DRW_HatchLoop *> looplist; //!< Polyline list
private:
void clearEntities()
@ -1140,7 +1140,7 @@ class DRW_Hatch : public DRW_Point
}
}
DRW_HatchLoop *loop; /*!< current loop to add data */
DRW_HatchLoop *loop; //!< Current loop to add data
DRW_Line *line;
DRW_Arc *arc;
DRW_Ellipse *ellipse;
@ -1176,15 +1176,15 @@ class DRW_Image : public DRW_Line
virtual bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
duint32 ref; /*!< Hard reference to imagedef object, code 340 */
DRW_Coord vVector; /*!< V-vector of single pixel, x coordinate, code 12, 22 & 32 */
double sizeu; /*!< image size in pixels, U value, code 13 */
double sizev; /*!< image size in pixels, V value, code 23 */
double dz; /*!< z coordinate, code 33 */
int clip; /*!< Clipping state, code 280, 0=off 1=on */
int brightness; /*!< Brightness value, code 281, (0-100) default 50 */
int contrast; /*!< Brightness value, code 282, (0-100) default 50 */
int fade; /*!< Brightness value, code 283, (0-100) default 0 */
duint32 ref; //!< Hard reference to imagedef object, code 340
DRW_Coord vVector; //!< V-vector of single pixel, x coordinate, code 12, 22 & 32
double sizeu; //!< Image size in pixels, U value, code 13
double sizev; //!< Image size in pixels, V value, code 23
double dz; //!< Z coordinate, code 33
int clip; //!< Clipping state, code 280, 0=off 1=on
int brightness; //!< Brightness value, code 281, (0-100) default 50
int contrast; //!< Brightness value, code 282, (0-100) default 50
int fade; //!< Brightness value, code 283, (0-100) default 0
};
@ -1253,28 +1253,28 @@ class DRW_Dimension : public DRW_Entity
}
public:
DRW_Coord getDefPoint() const {return defPoint;} /*!< Definition point, code 10, 20 & 30 */
DRW_Coord getDefPoint() const {return defPoint;} //!< Definition point, code 10, 20 & 30
void setDefPoint( const DRW_Coord &p ) {defPoint = p;}
DRW_Coord getTextPoint() const {return textPoint;} /*!< Middle point of text, code 11, 21 & 31 */
DRW_Coord getTextPoint() const {return textPoint;} //!< Middle point of text, code 11, 21 & 31
void setTextPoint( const DRW_Coord &p ) {textPoint = p;}
std::string getStyle() const {return style;} /*!< Dimension style, code 3 */
std::string getStyle() const {return style;} //!< Dimension style, code 3
void setStyle( const std::string &s ) {style = s;}
int getAlign() const { return align;} /*!< attachment point, code 71 */
int getAlign() const { return align;} //!< Attachment point, code 71
void setAlign( const int a ) { align = a;}
int getTextLineStyle() const { return linesty;} /*!< Dimension text line spacing style, code 72, default 1 */
int getTextLineStyle() const { return linesty;} //!< Dimension text line spacing style, code 72, default 1
void setTextLineStyle( const int l ) { linesty = l;}
std::string getText() const {return text;} /*!< Dimension text explicitly entered by the user, code 1 */
std::string getText() const {return text;} //!< Dimension text explicitly entered by the user, code 1
void setText( const std::string &t ) {text = t;}
double getTextLineFactor() const { return linefactor;} /*!< Dimension text line spacing factor, code 41, default 1? */
double getTextLineFactor() const { return linefactor;} //!< Dimension text line spacing factor, code 41, default 1?
void setTextLineFactor( const double l ) { linefactor = l;}
double getDir() const { return rot;} /*!< rotation angle of the dimension text, code 53 (optional) default 0 */
double getDir() const { return rot;} //!< Rotation angle of the dimension text, code 53 (optional) default 0
void setDir( const double d ) { rot = d;}
DRW_Coord getExtrusion() {return extPoint;} /*!< extrusion, code 210, 220 & 230 */
DRW_Coord getExtrusion() {return extPoint;} //!< Extrusion, code 210, 220 & 230
void setExtrusion( const DRW_Coord &p ) {extPoint = p;}
std::string getName() {return name;} /*!< Name of the block that contains the entities, code 2 */
std::string getName() {return name;} //!< Name of the block that contains the entities, code 2
void setName( const std::string &s ) {name = s;}
// int getType(){ return type;} /*!< Dimension type, code 70 */
// int getType(){ return type;} //!< Dimension type, code 70
protected:
DRW_Coord getPt2() const {return clonePoint;}
@ -1287,36 +1287,36 @@ class DRW_Dimension : public DRW_Entity
void setPt5( const DRW_Coord &p ) {circlePoint = p;}
DRW_Coord getPt6() const {return arcPoint;}
void setPt6( const DRW_Coord &p ) {arcPoint = p;}
double getAn50() const {return angle;} /*!< Angle of rotated, horizontal, or vertical dimensions, code 50 */
double getAn50() const {return angle;} //!< Angle of rotated, horizontal, or vertical dimensions, code 50
void setAn50( const double d ) {angle = d;}
double getOb52() const {return oblique;} /*!< oblique angle, code 52 */
double getOb52() const {return oblique;} //!< Oblique angle, code 52
void setOb52( const double d ) {oblique = d;}
double getRa40() const {return length;} /*!< Leader length, code 40 */
double getRa40() const {return length;} //!< Leader length, code 40
void setRa40( const double d ) {length = d;}
public:
int type; /*!< Dimension type, code 70 */
int type; //!< Dimension type, code 70
private:
std::string name; /*!< Name of the block that contains the entities, code 2 */
DRW_Coord defPoint; /*!< definition point, code 10, 20 & 30 (WCS) */
DRW_Coord textPoint; /*!< Middle point of text, code 11, 21 & 31 (OCS) */
UTF8STRING text; /*!< Dimension text explicitly entered by the user, code 1 */
UTF8STRING style; /*!< Dimension style, code 3 */
int align; /*!< attachment point, code 71 */
int linesty; /*!< Dimension text line spacing style, code 72, default 1 */
double linefactor; /*!< Dimension text line spacing factor, code 41, default 1? (value range 0.25 to 4.00) */
double rot; /*!< rotation angle of the dimension text, code 53 */
DRW_Coord extPoint; /*!< extrusion normal vector, code 210, 220 & 230 */
std::string name; //!< Name of the block that contains the entities, code 2
DRW_Coord defPoint; //!< Definition point, code 10, 20 & 30 (WCS)
DRW_Coord textPoint; //!< Middle point of text, code 11, 21 & 31 (OCS)
UTF8STRING text; //!< Dimension text explicitly entered by the user, code 1
UTF8STRING style; //!< Dimension style, code 3
int align; //!< Attachment point, code 71
int linesty; //!< Dimension text line spacing style, code 72, default 1
double linefactor; //!< Dimension text line spacing factor, code 41, default 1? (value range 0.25 to 4.00)
double rot; //!< Rotation angle of the dimension text, code 53
DRW_Coord extPoint; //!< Extrusion normal vector, code 210, 220 & 230
double hdir; /*!< horizontal direction for the dimension, code 51, default ? */
DRW_Coord clonePoint; /*!< Insertion point for clones (Baseline & Continue), code 12, 22 & 32 (OCS) */
DRW_Coord def1; /*!< Definition point 1for linear & angular, code 13, 23 & 33 (WCS) */
DRW_Coord def2; /*!< Definition point 2, code 14, 24 & 34 (WCS) */
double angle; /*!< Angle of rotated, horizontal, or vertical dimensions, code 50 */
double oblique; /*!< oblique angle, code 52 */
double hdir; //!< Horizontal direction for the dimension, code 51, default ?
DRW_Coord clonePoint; //!< Insertion point for clones (Baseline & Continue), code 12, 22 & 32 (OCS)
DRW_Coord def1; //!< Definition point 1for linear & angular, code 13, 23 & 33 (WCS)
DRW_Coord def2; //!< Definition point 2, code 14, 24 & 34 (WCS)
double angle; //!< Angle of rotated, horizontal, or vertical dimensions, code 50
double oblique; //!< Oblique angle, code 52
DRW_Coord circlePoint; /*!< Definition point for diameter, radius & angular dims code 15, 25 & 35 (WCS) */
DRW_Coord arcPoint; /*!< Point defining dimension arc, x coordinate, code 16, 26 & 36 (OCS) */
double length; /*!< Leader length, code 40 */
DRW_Coord circlePoint; //!< Definition point for diameter, radius & angular dims code 15, 25 & 35 (WCS)
DRW_Coord arcPoint; //!< Point defining dimension arc, x coordinate, code 16, 26 & 36 (OCS)
double length; //!< Leader length, code 40
protected:
dwgHandle dimStyleH;
@ -1341,14 +1341,14 @@ class DRW_DimAligned : public DRW_Dimension
eType = DRW::DIMALIGNED;
}
DRW_Coord getClonepoint() const {return getPt2();} /*!< Insertion for clones (Baseline & Continue), 12, 22 & 32 */
DRW_Coord getClonepoint() const {return getPt2();} //!< Insertion for clones (Baseline & Continue), 12, 22 & 32
void setClonePoint( DRW_Coord &c ) {setPt2( c );}
DRW_Coord getDimPoint() const {return getDefPoint();} /*!< dim line location point, code 10, 20 & 30 */
DRW_Coord getDimPoint() const {return getDefPoint();} //!< Dim line location point, code 10, 20 & 30
void setDimPoint( const DRW_Coord &p ) {setDefPoint( p );}
DRW_Coord getDef1Point() const {return getPt3();} /*!< Definition point 1, code 13, 23 & 33 */
DRW_Coord getDef1Point() const {return getPt3();} //!< Definition point 1, code 13, 23 & 33
void setDef1Point( const DRW_Coord &p ) {setPt3( p );}
DRW_Coord getDef2Point() const {return getPt4();} /*!< Definition point 2, code 14, 24 & 34 */
DRW_Coord getDef2Point() const {return getPt4();} //!< Definition point 2, code 14, 24 & 34
void setDef2Point( const DRW_Coord &p ) {setPt4( p );}
protected:
@ -1371,9 +1371,9 @@ class DRW_DimLinear : public DRW_DimAligned
eType = DRW::DIMLINEAR;
}
double getAngle() const {return getAn50();} /*!< Angle of rotated, horizontal, or vertical dimensions, code 50 */
double getAngle() const {return getAn50();} //!< Angle of rotated, horizontal, or vertical dimensions, code 50
void setAngle( const double d ) {setAn50( d );}
double getOblique() const {return getOb52();} /*!< oblique angle, code 52 */
double getOblique() const {return getOb52();} //!< Oblique angle, code 52
void setOblique( const double d ) {setOb52( d );}
};
@ -1394,11 +1394,11 @@ class DRW_DimRadial : public DRW_Dimension
eType = DRW::DIMRADIAL;
}
DRW_Coord getCenterPoint() const {return getDefPoint();} /*!< center point, code 10, 20 & 30 */
DRW_Coord getCenterPoint() const {return getDefPoint();} //!< Center point, code 10, 20 & 30
void setCenterPoint( const DRW_Coord &p ) {setDefPoint( p );}
DRW_Coord getDiameterPoint() const {return getPt5();} /*!< Definition point for radius, code 15, 25 & 35 */
DRW_Coord getDiameterPoint() const {return getPt5();} //!< Definition point for radius, code 15, 25 & 35
void setDiameterPoint( const DRW_Coord &p ) {setPt5( p );}
double getLeaderLength() const {return getRa40();} /*!< Leader length, code 40 */
double getLeaderLength() const {return getRa40();} //!< Leader length, code 40
void setLeaderLength( const double d ) {setRa40( d );}
protected:
@ -1422,11 +1422,11 @@ class DRW_DimDiametric : public DRW_Dimension
eType = DRW::DIMDIAMETRIC;
}
DRW_Coord getDiameter1Point() const {return getPt5();} /*!< First definition point for diameter, code 15, 25 & 35 */
DRW_Coord getDiameter1Point() const {return getPt5();} //!< First definition point for diameter, code 15, 25 & 35
void setDiameter1Point( const DRW_Coord &p ) {setPt5( p );}
DRW_Coord getDiameter2Point() const {return getDefPoint();} /*!< Oposite point for diameter, code 10, 20 & 30 */
DRW_Coord getDiameter2Point() const {return getDefPoint();} //!< Oposite point for diameter, code 10, 20 & 30
void setDiameter2Point( const DRW_Coord &p ) {setDefPoint( p );}
double getLeaderLength() const {return getRa40();} /*!< Leader length, code 40 */
double getLeaderLength() const {return getRa40();} //!< Leader length, code 40
void setLeaderLength( const double d ) {setRa40( d );}
protected:
@ -1450,15 +1450,15 @@ class DRW_DimAngular : public DRW_Dimension
eType = DRW::DIMANGULAR;
}
DRW_Coord getFirstLine1() const {return getPt3();} /*!< Definition point line 1-1, code 13, 23 & 33 */
DRW_Coord getFirstLine1() const {return getPt3();} //!< Definition point line 1-1, code 13, 23 & 33
void setFirstLine1( const DRW_Coord &p ) {setPt3( p );}
DRW_Coord getFirstLine2() const {return getPt4();} /*!< Definition point line 1-2, code 14, 24 & 34 */
DRW_Coord getFirstLine2() const {return getPt4();} //!< Definition point line 1-2, code 14, 24 & 34
void setFirstLine2( const DRW_Coord &p ) {setPt4( p );}
DRW_Coord getSecondLine1() const {return getPt5();} /*!< Definition point line 2-1, code 15, 25 & 35 */
DRW_Coord getSecondLine1() const {return getPt5();} //!< Definition point line 2-1, code 15, 25 & 35
void setSecondLine1( const DRW_Coord &p ) {setPt5( p );}
DRW_Coord getSecondLine2() const {return getDefPoint();} /*!< Definition point line 2-2, code 10, 20 & 30 */
DRW_Coord getSecondLine2() const {return getDefPoint();} //!< Definition point line 2-2, code 10, 20 & 30
void setSecondLine2( const DRW_Coord &p ) {setDefPoint( p );}
DRW_Coord getDimPoint() const {return getPt6();} /*!< Dimension definition point, code 16, 26 & 36 */
DRW_Coord getDimPoint() const {return getPt6();} //!< Dimension definition point, code 16, 26 & 36
void setDimPoint( const DRW_Coord &p ) {setPt6( p );}
protected:
@ -1483,13 +1483,13 @@ class DRW_DimAngular3p : public DRW_Dimension
eType = DRW::DIMANGULAR3P;
}
DRW_Coord getFirstLine() const {return getPt3();} /*!< Definition point line 1, code 13, 23 & 33 */
DRW_Coord getFirstLine() const {return getPt3();} //!< Definition point line 1, code 13, 23 & 33
void setFirstLine( const DRW_Coord &p ) {setPt3( p );}
DRW_Coord getSecondLine() const {return getPt4();} /*!< Definition point line 2, code 14, 24 & 34 */
DRW_Coord getSecondLine() const {return getPt4();} //!< Definition point line 2, code 14, 24 & 34
void setSecondLine( const DRW_Coord &p ) {setPt4( p );}
DRW_Coord getVertexPoint() const {return getPt5();} /*!< Vertex point, code 15, 25 & 35 */
DRW_Coord getVertexPoint() const {return getPt5();} //!< Vertex point, code 15, 25 & 35
void SetVertexPoint( const DRW_Coord &p ) {setPt5( p );}
DRW_Coord getDimPoint() const {return getDefPoint();} /*!< Dimension definition point, code 10, 20 & 30 */
DRW_Coord getDimPoint() const {return getDefPoint();} //!< Dimension definition point, code 10, 20 & 30
void setDimPoint( const DRW_Coord &p ) {setDefPoint( p );}
protected:
@ -1513,11 +1513,11 @@ class DRW_DimOrdinate : public DRW_Dimension
eType = DRW::DIMORDINATE;
}
DRW_Coord getOriginPoint() const {return getDefPoint();} /*!< Origin definition point, code 10, 20 & 30 */
DRW_Coord getOriginPoint() const {return getDefPoint();} //!< Origin definition point, code 10, 20 & 30
void setOriginPoint( const DRW_Coord &p ) {setDefPoint( p );}
DRW_Coord getFirstLine() const {return getPt3();} /*!< Feature location point, code 13, 23 & 33 */
DRW_Coord getFirstLine() const {return getPt3();} //!< Feature location point, code 13, 23 & 33
void setFirstLine( const DRW_Coord &p ) {setPt3( p );}
DRW_Coord getSecondLine() const {return getPt4();} /*!< Leader end point, code 14, 24 & 34 */
DRW_Coord getSecondLine() const {return getPt4();} //!< Leader end point, code 14, 24 & 34
void setSecondLine( const DRW_Coord &p ) {setPt4( p );}
protected:
@ -1564,26 +1564,26 @@ class DRW_Leader : public DRW_Entity
virtual bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
UTF8STRING style; /*!< Dimension style name, code 3 */
int arrow; /*!< Arrowhead flag, code 71, 0=Disabled; 1=Enabled */
int leadertype; /*!< Leader path type, code 72, 0=Straight line segments; 1=Spline */
int flag; /*!< Leader creation flag, code 73, default 3 */
int hookline; /*!< Hook line direction flag, code 74, default 1 */
int hookflag; /*!< Hook line flag, code 75 */
double textheight; /*!< Text annotation height, code 40 */
double textwidth; /*!< Text annotation width, code 41 */
int vertnum; /*!< Number of vertices, code 76 */
int coloruse; /*!< Color to use if leader's DIMCLRD = BYBLOCK, code 77 */
duint32 annotHandle; /*!< Hard reference to associated annotation, code 340 */
DRW_Coord extrusionPoint; /*!< Normal vector, code 210, 220 & 230 */
DRW_Coord horizdir; /*!< "Horizontal" direction for leader, code 211, 221 & 231 */
DRW_Coord offsetblock; /*!< Offset of last leader vertex from block, code 212, 222 & 232 */
DRW_Coord offsettext; /*!< Offset of last leader vertex from annotation, code 213, 223 & 233 */
UTF8STRING style; //!< Dimension style name, code 3
int arrow; //!< Arrowhead flag, code 71, 0=Disabled; 1=Enabled
int leadertype; //!< Leader path type, code 72, 0=Straight line segments; 1=Spline
int flag; //!< Leader creation flag, code 73, default 3
int hookline; //!< Hook line direction flag, code 74, default 1
int hookflag; //!< Hook line flag, code 75
double textheight; //!< Text annotation height, code 40
double textwidth; //!< Text annotation width, code 41
int vertnum; //!< Number of vertices, code 76
int coloruse; //!< Color to use if leader's DIMCLRD = BYBLOCK, code 77
duint32 annotHandle; //!< Hard reference to associated annotation, code 340
DRW_Coord extrusionPoint; //!< Normal vector, code 210, 220 & 230
DRW_Coord horizdir; //!< "Horizontal" direction for leader, code 211, 221 & 231
DRW_Coord offsetblock; //!< Offset of last leader vertex from block, code 212, 222 & 232
DRW_Coord offsettext; //!< Offset of last leader vertex from annotation, code 213, 223 & 233
std::vector<DRW_Coord *> vertexlist; /*!< vertex points list, code 10, 20 & 30 */
std::vector<DRW_Coord *> vertexlist; //!< Vertex points list, code 10, 20 & 30
private:
DRW_Coord *vertexpoint; /*!< current control point to add data */
DRW_Coord *vertexpoint; //!< Current control point to add data
dwgHandle dimStyleH;
dwgHandle AnnotH;
};
@ -1624,25 +1624,25 @@ class DRW_Viewport : public DRW_Point
virtual bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
double pswidth; /*!< Width in paper space units, code 40 */
double psheight; /*!< Height in paper space units, code 41 */
int vpstatus; /*!< Viewport status, code 68 */
int vpID; /*!< Viewport ID, code 69 */
double centerPX; /*!< view center point X, code 12 */
double centerPY; /*!< view center point Y, code 22 */
double snapPX; /*!< Snap base point X, code 13 */
double snapPY; /*!< Snap base point Y, code 23 */
double snapSpPX; /*!< Snap spacing X, code 14 */
double snapSpPY; /*!< Snap spacing Y, code 24 */
double pswidth; //!< Width in paper space units, code 40
double psheight; //!< Height in paper space units, code 41
int vpstatus; //!< Viewport status, code 68
int vpID; //!< Viewport ID, code 69
double centerPX; //!< View center point X, code 12
double centerPY; //!< View center point Y, code 22
double snapPX; //!< Snap base point X, code 13
double snapPY; //!< Snap base point Y, code 23
double snapSpPX; //!< Snap spacing X, code 14
double snapSpPY; //!< Snap spacing Y, code 24
//TODO: complete in dxf
DRW_Coord viewDir; /*!< View direction vector, code 16, 26 & 36 */
DRW_Coord viewTarget; /*!< View target point, code 17, 27, 37 */
double viewLength; /*!< Perspective lens length, code 42 */
double frontClip; /*!< Front clip plane Z value, code 43 */
double backClip; /*!< Back clip plane Z value, code 44 */
double viewHeight; /*!< View height in model space units, code 45 */
double snapAngle; /*!< Snap angle, code 50 */
double twistAngle; /*!< view twist angle, code 51 */
DRW_Coord viewDir; //!< View direction vector, code 16, 26 & 36
DRW_Coord viewTarget; //!< View target point, code 17, 27, 37
double viewLength; //!< Perspective lens length, code 42
double frontClip; //!< Front clip plane Z value, code 43
double backClip; //!< Back clip plane Z value, code 44
double viewHeight; //!< View height in model space units, code 45
double snapAngle; //!< Snap angle, code 50
double twistAngle; //!< View twist angle, code 51
private:
duint32 frozenLyCount;
@ -1650,30 +1650,30 @@ class DRW_Viewport : public DRW_Point
#if 0
//used
DRW_Coord basePoint; /*!< base point, code 10, 20 & 30 */
DRW_Coord basePoint; //!< Base point, code 10, 20 & 30
double thickness; /*!< thickness, code 39 */
DRW_Coord extPoint; /*!< Dir extrusion normal vector, code 210, 220 & 230 */
enum DRW::ETYPE eType; /*!< enum: entity type, code 0 */
duint32 handle; /*!< entity identifier, code 5 */
std::list<std::list<DRW_Variant> > appData; /*!< list of application data, code 102 */
duint32 parentHandle; /*!< Soft-pointer ID/handle to owner BLOCK_RECORD object, code 330 */
DRW::Space space; /*!< space indicator, code 67*/
UTF8STRING layer; /*!< layer name, code 8 */
UTF8STRING lineType; /*!< line type, code 6 */
duint32 material; /*!< hard pointer id to material object, code 347 */
int color; /*!< entity color, code 62 */
enum DRW_LW_Conv::lineWidth lWeight; /*!< entity lineweight, code 370 */
double ltypeScale; /*!< linetype scale, code 48 */
bool visible; /*!< entity visibility, code 60 */
int numProxyGraph; /*!< Number of bytes in proxy graphics, code 92 */
std::string proxyGraphics; /*!< proxy graphics bytes, code 310 */
int color24; /*!< 24-bit color, code 420 */
std::string colorName; /*!< color name, code 430 */
int transparency; /*!< transparency, code 440 */
int plotStyle; /*!< hard pointer id to plot style object, code 390 */
DRW::ShadowMode shadow; /*!< shadow mode, code 284 */
bool haveExtrusion; /*!< set to true if the entity have extrusion*/
double thickness; //!< Thickness, code 39
DRW_Coord extPoint; //!< Dir extrusion normal vector, code 210, 220 & 230
enum DRW::ETYPE eType; //!< Enum: entity type, code 0
duint32 handle; //!< Entity identifier, code 5
std::list<std::list<DRW_Variant> > appData; //!< List of application data, code 102
duint32 parentHandle; //!< Soft-pointer ID/handle to owner BLOCK_RECORD object, code 330
DRW::Space space; //!< Space indicator, code 67
UTF8STRING layer; //!< Layer name, code 8
UTF8STRING lineType; //!< Line type, code 6
duint32 material; //!< Hard pointer id to material object, code 347
int color; //!< Entity color, code 62
enum DRW_LW_Conv::lineWidth lWeight; //!< Entity lineweight, code 370
double ltypeScale; //!< Linetype scale, code 48
bool visible; //!< Entity visibility, code 60
int numProxyGraph; //!< Number of bytes in proxy graphics, code 92
std::string proxyGraphics; //!< Proxy graphics bytes, code 310
int color24; //!< 24-bit color, code 420
std::string colorName; //!< Color name, code 430
int transparency; //!< Transparency, code 440
int plotStyle; //!< Hard pointer id to plot style object, code 390
DRW::ShadowMode shadow; //!< Shadow mode, code 284
bool haveExtrusion; //!< Set to true if the entity have extrusion
#endif
#endif

76
src/app/dwg/libdxfrw/drw_interface.h
View File

@ -36,20 +36,20 @@ class DRW_Interface
{
}
/** Called when header is parsed. */
//! Called when header is parsed.
virtual void addHeader( const DRW_Header* data ) = 0;
/** Called for every line Type. */
//! Called for every line Type.
virtual void addLType( const DRW_LType& data ) = 0;
/** Called for every layer. */
//! Called for every layer.
virtual void addLayer( const DRW_Layer& data ) = 0;
/** Called for every dim style. */
//! Called for every dim style.
virtual void addDimStyle( const DRW_Dimstyle& data ) = 0;
/** Called for every VPORT table. */
//! Called for every VPORT table.
virtual void addVport( const DRW_Vport& data ) = 0;
/** Called for every text style. */
//! Called for every text style.
virtual void addTextStyle( const DRW_Textstyle& data ) = 0;
/** Called for every AppId entry. */
//! Called for every AppId entry.
virtual void addAppId( const DRW_AppId& data ) = 0;
/**
@ -69,98 +69,98 @@ class DRW_Interface
*/
virtual void setBlock( const int handle ) = 0;
/** Called to end the current block */
//! Called to end the current block
virtual void endBlock() = 0;
/** Called for every point */
//! Called for every point
virtual void addPoint( const DRW_Point& data ) = 0;
/** Called for every line */
//! Called for every line
virtual void addLine( const DRW_Line& data ) = 0;
/** Called for every ray */
//! Called for every ray
virtual void addRay( const DRW_Ray& data ) = 0;
/** Called for every xline */
//! Called for every xline
virtual void addXline( const DRW_Xline& data ) = 0;
/** Called for every arc */
//! Called for every arc
virtual void addArc( const DRW_Arc& data ) = 0;
/** Called for every circle */
//! Called for every circle
virtual void addCircle( const DRW_Circle& data ) = 0;
/** Called for every ellipse */
//! Called for every ellipse
virtual void addEllipse( const DRW_Ellipse& data ) = 0;
/** Called for every lwpolyline */
//! Called for every lwpolyline
virtual void addLWPolyline( const DRW_LWPolyline& data ) = 0;
/** Called for every polyline start */
//! Called for every polyline start
virtual void addPolyline( const DRW_Polyline& data ) = 0;
/** Called for every spline */
//! Called for every spline
virtual void addSpline( const DRW_Spline* data ) = 0;
/** Called for every spline knot value */
//! Called for every spline knot value
virtual void addKnot( const DRW_Entity& data ) = 0;
/** Called for every insert. */
//! Called for every insert.
virtual void addInsert( const DRW_Insert& data ) = 0;
/** Called for every trace start */
//! Called for every trace start
virtual void addTrace( const DRW_Trace& data ) = 0;
/** Called for every 3dface start */
//! Called for every 3dface start
virtual void add3dFace( const DRW_3Dface& data ) = 0;
/** Called for every solid start */
//! Called for every solid start
virtual void addSolid( const DRW_Solid& data ) = 0;
/** Called for every Multi Text entity. */
//! Called for every Multi Text entity.
virtual void addMText( const DRW_MText& data ) = 0;
/** Called for every Text entity. */
//! Called for every Text entity.
virtual void addText( const DRW_Text& data ) = 0;
/** Called for every aligned dimension entity. */
//! Called for every aligned dimension entity.
virtual void addDimAlign( const DRW_DimAligned *data ) = 0;
/** Called for every linear or rotated dimension entity. */
//! Called for every linear or rotated dimension entity.
virtual void addDimLinear( const DRW_DimLinear *data ) = 0;
/** Called for every radial dimension entity. */
//! Called for every radial dimension entity.
virtual void addDimRadial( const DRW_DimRadial *data ) = 0;
/** Called for every diametric dimension entity. */
//! Called for every diametric dimension entity.
virtual void addDimDiametric( const DRW_DimDiametric *data ) = 0;
/** Called for every angular dimension (2 lines version) entity. */
//! Called for every angular dimension (2 lines version) entity.
virtual void addDimAngular( const DRW_DimAngular *data ) = 0;
/** Called for every angular dimension (3 points version) entity. */
//! Called for every angular dimension (3 points version) entity.
virtual void addDimAngular3P( const DRW_DimAngular3p *data ) = 0;
/** Called for every ordinate dimension entity. */
//! Called for every ordinate dimension entity.
virtual void addDimOrdinate( const DRW_DimOrdinate *data ) = 0;
/** Called for every leader start. */
//! Called for every leader start.
virtual void addLeader( const DRW_Leader *data ) = 0;
/** Called for every hatch entity. */
//! Called for every hatch entity.
virtual void addHatch( const DRW_Hatch *data ) = 0;
/** Called for every viewport entity. */
//! Called for every viewport entity.
virtual void addViewport( const DRW_Viewport& data ) = 0;
/** Called for every image entity. */
//! Called for every image entity.
virtual void addImage( const DRW_Image *data ) = 0;
/** Called for every image definition. */
//! Called for every image definition.
virtual void linkImage( const DRW_ImageDef *data ) = 0;
/** Called for every comment in the DXF file (code 999). */
//! Called for every comment in the DXF file (code 999).
virtual void addComment( const char* comment ) = 0;
virtual void writeHeader( DRW_Header& data ) = 0;

263
src/app/dwg/libdxfrw/drw_objects.h
View File

@ -106,12 +106,12 @@ class DRW_TableEntry
}
public:
enum DRW::TTYPE tType; /*!< enum: entity type, code 0 */
duint32 handle; /*!< entity identifier, code 5 */
int parentHandle; /*!< Soft-pointer ID/handle to owner object, code 330 */
UTF8STRING name; /*!< entry name, code 2 */
int flags; /*!< Flags relevant to entry, code 70 */
std::vector<DRW_Variant*> extData; /*!< FIFO list of extended data, codes 1000 to 1071*/
enum DRW::TTYPE tType; //!< Enum: entity type, code 0
duint32 handle; //!< Entity identifier, code 5
int parentHandle; //!< Soft-pointer ID/handle to owner object, code 330
UTF8STRING name; //!< Entry name, code 2
int flags; //!< Flags relevant to entry, code 70
std::vector<DRW_Variant*> extData; //!< FIFO list of extended data, codes 1000 to 1071
private:
DRW_Variant *curr;
@ -166,75 +166,75 @@ class DRW_Dimstyle : public DRW_TableEntry
public:
//V12
UTF8STRING dimpost; /*!< code 3 */
UTF8STRING dimapost; /*!< code 4 */
UTF8STRING dimpost; //!< Code 3
UTF8STRING dimapost; //!< Code 4
/* handle are code 105 */
UTF8STRING dimblk; /*!< code 5, code 342 V2000+ */
UTF8STRING dimblk1; /*!< code 6, code 343 V2000+ */
UTF8STRING dimblk2; /*!< code 7, code 344 V2000+ */
double dimscale; /*!< code 40 */
double dimasz; /*!< code 41 */
double dimexo; /*!< code 42 */
double dimdli; /*!< code 43 */
double dimexe; /*!< code 44 */
double dimrnd; /*!< code 45 */
double dimdle; /*!< code 46 */
double dimtp; /*!< code 47 */
double dimtm; /*!< code 48 */
double dimfxl; /*!< code 49 V2007+ */
double dimtxt; /*!< code 140 */
double dimcen; /*!< code 141 */
double dimtsz; /*!< code 142 */
double dimaltf; /*!< code 143 */
double dimlfac; /*!< code 144 */
double dimtvp; /*!< code 145 */
double dimtfac; /*!< code 146 */
double dimgap; /*!< code 147 */
double dimaltrnd; /*!< code 148 V2000+ */
int dimtol; /*!< code 71 */
int dimlim; /*!< code 72 */
int dimtih; /*!< code 73 */
int dimtoh; /*!< code 74 */
int dimse1; /*!< code 75 */
int dimse2; /*!< code 76 */
int dimtad; /*!< code 77 */
int dimzin; /*!< code 78 */
int dimazin; /*!< code 79 V2000+ */
int dimalt; /*!< code 170 */
int dimaltd; /*!< code 171 */
int dimtofl; /*!< code 172 */
int dimsah; /*!< code 173 */
int dimtix; /*!< code 174 */
int dimsoxd; /*!< code 175 */
int dimclrd; /*!< code 176 */
int dimclre; /*!< code 177 */
int dimclrt; /*!< code 178 */
int dimadec; /*!< code 179 V2000+ */
int dimunit; /*!< code 270 R13+ (obsolete 2000+, use dimlunit & dimfrac) */
int dimdec; /*!< code 271 R13+ */
int dimtdec; /*!< code 272 R13+ */
int dimaltu; /*!< code 273 R13+ */
int dimalttd; /*!< code 274 R13+ */
int dimaunit; /*!< code 275 R13+ */
int dimfrac; /*!< code 276 V2000+ */
int dimlunit; /*!< code 277 V2000+ */
int dimdsep; /*!< code 278 V2000+ */
int dimtmove; /*!< code 279 V2000+ */
int dimjust; /*!< code 280 R13+ */
int dimsd1; /*!< code 281 R13+ */
int dimsd2; /*!< code 282 R13+ */
int dimtolj; /*!< code 283 R13+ */
int dimtzin; /*!< code 284 R13+ */
int dimaltz; /*!< code 285 R13+ */
int dimaltttz; /*!< code 286 R13+ */
int dimfit; /*!< code 287 R13+ (obsolete 2000+, use dimatfit & dimtmove)*/
int dimupt; /*!< code 288 R13+ */
int dimatfit; /*!< code 289 V2000+ */
int dimfxlon; /*!< code 290 V2007+ */
UTF8STRING dimtxsty; /*!< code 340 R13+ */
UTF8STRING dimldrblk; /*!< code 341 V2000+ */
int dimlwd; /*!< code 371 V2000+ */
int dimlwe; /*!< code 372 V2000+ */
UTF8STRING dimblk; //!< Code 5, code 342 V2000+
UTF8STRING dimblk1; //!< Code 6, code 343 V2000+
UTF8STRING dimblk2; //!< Code 7, code 344 V2000+
double dimscale; //!< Code 40
double dimasz; //!< Code 41
double dimexo; //!< Code 42
double dimdli; //!< Code 43
double dimexe; //!< Code 44
double dimrnd; //!< Code 45
double dimdle; //!< Code 46
double dimtp; //!< Code 47
double dimtm; //!< Code 48
double dimfxl; //!< Code 49 V2007+
double dimtxt; //!< Code 140
double dimcen; //!< Code 141
double dimtsz; //!< Code 142
double dimaltf; //!< Code 143
double dimlfac; //!< Code 144
double dimtvp; //!< Code 145
double dimtfac; //!< Code 146
double dimgap; //!< Code 147
double dimaltrnd; //!< Code 148 V2000+
int dimtol; //!< Code 71
int dimlim; //!< Code 72
int dimtih; //!< Code 73
int dimtoh; //!< Code 74
int dimse1; //!< Code 75
int dimse2; //!< Code 76
int dimtad; //!< Code 77
int dimzin; //!< Code 78
int dimazin; //!< Code 79 V2000+
int dimalt; //!< Code 170
int dimaltd; //!< Code 171
int dimtofl; //!< Code 172
int dimsah; //!< Code 173
int dimtix; //!< Code 174
int dimsoxd; //!< Code 175
int dimclrd; //!< Code 176
int dimclre; //!< Code 177
int dimclrt; //!< Code 178
int dimadec; //!< Code 179 V2000+
int dimunit; //!< Code 270 R13+ (obsolete 2000+, use dimlunit & dimfrac)
int dimdec; //!< Code 271 R13+
int dimtdec; //!< Code 272 R13+
int dimaltu; //!< Code 273 R13+
int dimalttd; //!< Code 274 R13+
int dimaunit; //!< Code 275 R13+
int dimfrac; //!< Code 276 V2000+
int dimlunit; //!< Code 277 V2000+
int dimdsep; //!< Code 278 V2000+
int dimtmove; //!< Code 279 V2000+
int dimjust; //!< Code 280 R13+
int dimsd1; //!< Code 281 R13+
int dimsd2; //!< Code 282 R13+
int dimtolj; //!< Code 283 R13+
int dimtzin; //!< Code 284 R13+
int dimaltz; //!< Code 285 R13+
int dimaltttz; //!< Code 286 R13+
int dimfit; //!< Code 287 R13+ (obsolete 2000+, use dimatfit & dimtmove)
int dimupt; //!< Code 288 R13+
int dimatfit; //!< Code 289 V2000+
int dimfxlon; //!< Code 290 V2007+
UTF8STRING dimtxsty; //!< Code 340 R13+
UTF8STRING dimldrblk; //!< Code 341 V2000+
int dimlwd; //!< Code 371 V2000+
int dimlwe; //!< Code 372 V2000+
};
@ -264,12 +264,12 @@ class DRW_LType : public DRW_TableEntry
void update();
public:
UTF8STRING desc; /*!< descriptive string, code 3 */
// int align; /*!< align code, always 65 ('A') code 72 */
std::vector<double>::size_type size; /*!< element number, code 73 */
double length; /*!< total length of pattern, code 40 */
// int haveShape; /*!< complex linetype type, code 74 */
std::vector<double> path; /*!< trace, point or space length sequence, code 49 */
UTF8STRING desc; //!< Descriptive string, code 3
// int align; //!< Align code, always 65 ('A') code 72
std::vector<double>::size_type size; //!< Element number, code 73
double length; //!< Total length of pattern, code 40
// int haveShape; //!< Complex linetype type, code 74
std::vector<double> path; //!< Trace, point or space length sequence, code 49
private:
int pathIdx;
};
@ -300,14 +300,14 @@ class DRW_Layer : public DRW_TableEntry
bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
UTF8STRING lineType; /*!< line type, code 6 */
int color; /*!< layer color, code 62 */
int color24; /*!< 24-bit color, code 420 */
int transparency; /*!< Transparency, code 440 */
bool plotF; /*!< Plot flag, code 290 */
enum DRW_LW_Conv::lineWidth lWeight; /*!< layer lineweight, code 370 */
std::string handlePlotS; /*!< Hard-pointer ID/handle of plotstyle, code 390 */
std::string handleMaterialS; /*!< Hard-pointer ID/handle of materialstyle, code 347 */
UTF8STRING lineType; //!< Line type, code 6
int color; //!< Layer color, code 62
int color24; //!< 24-bit color, code 420
int transparency; //!< Transparency, code 440
bool plotF; //!< Plot flag, code 290
enum DRW_LW_Conv::lineWidth lWeight; //!< Layer lineweight, code 370
std::string handlePlotS; //!< Hard-pointer ID/handle of plotstyle, code 390
std::string handleMaterialS; //!< Hard-pointer ID/handle of materialstyle, code 347
/*only used for read dwg*/
dwgHandle lTypeH;
};
@ -334,8 +334,8 @@ class DRW_Block_Record : public DRW_TableEntry
public:
//Note: int DRW_TableEntry::flags; contains code 70 of block
int insUnits; /*!< block insertion units, code 70 of block_record*/
DRW_Coord basePoint; /*!< block insertion base point dwg only */
int insUnits; //!< Block insertion units, code 70 of block_record
DRW_Coord basePoint; //!< Block insertion base point dwg only
protected:
//dwg parser
private:
@ -371,14 +371,14 @@ class DRW_Textstyle : public DRW_TableEntry
bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
double height; /*!< Fixed text height (0 not set), code 40 */
double width; /*!< Width factor, code 41 */
double oblique; /*!< Oblique angle, code 50 */
int genFlag; /*!< Text generation flags, code 71 */
double lastHeight; /*!< Last height used, code 42 */
UTF8STRING font; /*!< primary font file name, code 3 */
UTF8STRING bigFont; /*!< bigfont file name or blank if none, code 4 */
int fontFamily; /*!< ttf font family, italic and bold flags, code 1071 */
double height; //!< Fixed text height (0 not set), code 40
double width; //!< Width factor, code 41
double oblique; //!< Oblique angle, code 50
int genFlag; //!< Text generation flags, code 71
double lastHeight; //!< Last height used, code 42
UTF8STRING font; //!< Primary font file name, code 3
UTF8STRING bigFont; //!< Bigfont file name or blank if none, code 4
int fontFamily; //!< Ttf font family, italic and bold flags, code 1071
};
/** Class to handle vport symbol table entries
@ -416,30 +416,31 @@ class DRW_Vport : public DRW_TableEntry
bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
DRW_Coord lowerLeft; /*!< Lower left corner, code 10 & 20 */
DRW_Coord UpperRight; /*!< Upper right corner, code 11 & 21 */
DRW_Coord center; /*!< center point in WCS, code 12 & 22 */
DRW_Coord snapBase; /*!< snap base point in DCS, code 13 & 23 */
DRW_Coord snapSpacing; /*!< snap Spacing, code 14 & 24 */
DRW_Coord gridSpacing; /*!< grid Spacing, code 15 & 25 */
DRW_Coord viewDir; /*!< view direction from target point, code 16, 26 & 36 */
DRW_Coord viewTarget; /*!< view target point, code 17, 27 & 37 */
double height; /*!< view height, code 40 */
double ratio; /*!< viewport aspect ratio, code 41 */
double lensHeight; /*!< lens height, code 42 */
double frontClip; /*!< front clipping plane, code 43 */
double backClip; /*!< back clipping plane, code 44 */
double snapAngle; /*!< snap rotation angle, code 50 */
double twistAngle; /*!< view twist angle, code 51 */
int viewMode; /*!< view mode, code 71 */
int circleZoom; /*!< circle zoom percent, code 72 */
int fastZoom; /*!< fast zoom setting, code 73 */
int ucsIcon; /*!< UCSICON setting, code 74 */
int snap; /*!< snap on/off, code 75 */
int grid; /*!< grid on/off, code 76 */
int snapStyle; /*!< snap style, code 77 */
int snapIsopair; /*!< snap isopair, code 78 */
int gridBehavior; /*!< grid behavior, code 60, undocumented */
DRW_Coord lowerLeft; //!< Lower left corner, code 10 & 20
DRW_Coord UpperRight; //!< Upper right corner, code 11 & 21
DRW_Coord center; //!< Center point in WCS, code 12 & 22
DRW_Coord snapBase; //!< Snap base point in DCS, code 13 & 23
DRW_Coord snapSpacing; //!< Snap Spacing, code 14 & 24
DRW_Coord gridSpacing; //!< Grid Spacing, code 15 & 25
DRW_Coord viewDir; //!< View direction from target point, code 16, 26 & 36
DRW_Coord viewTarget; //!< View target point, code 17, 27 & 37
double height; //!< View height, code 40
double ratio; //!< Viewport aspect ratio, code 41
double lensHeight; //!< Lens height, code 42
double frontClip; //!< Front clipping plane, code 43
double backClip; //!< Back clipping plane, code 44
double snapAngle; //!< Snap rotation angle, code 50
double twistAngle; //!< View twist angle, code 51
int viewMode; //!< View mode, code 71
int circleZoom; //!< Circle zoom percent, code 72
int fastZoom; //!< Fast zoom setting, code 73
int ucsIcon; //!< UCSICON setting, code 74
int snap; //!< Snap on/off, code 75
int grid; //!< Grid on/off, code 76
int snapStyle; //!< Snap style, code 77
int snapIsopair; //!< Snap isopair, code 78
int gridBehavior; //!< Grid behavior, code 60, undocumented
/** Code 60, bit coded possible value are
* bit 1 (1) show out of limits
* bit 2 (2) adaptive grid
@ -473,15 +474,15 @@ class DRW_ImageDef : public DRW_TableEntry //
bool parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs = 0 );
public:
// std::string handle; /*!< entity identifier, code 5 */
UTF8STRING name; /*!< File name of image, code 1 */
int imgVersion; /*!< class version, code 90, 0=R14 version */
double u; /*!< image size in pixels U value, code 10 */
double v; /*!< image size in pixels V value, code 20 */
double up; /*!< default size of one pixel U value, code 11 */
double vp; /*!< default size of one pixel V value, code 12 really is 21*/
int loaded; /*!< image is loaded flag, code 280, 0=unloaded, 1=loaded */
int resolution; /*!< resolution units, code 281, 0=no, 2=centimeters, 5=inch */
// std::string handle; //!< Entity identifier, code 5
UTF8STRING name; //!< File name of image, code 1
int imgVersion; //!< Class version, code 90, 0=R14 version
double u; //!< Image size in pixels U value, code 10
double v; //!< Image size in pixels V value, code 20
double up; //!< Default size of one pixel U value, code 11
double vp; //!< Default size of one pixel V value, code 12 really is 21
int loaded; //!< Image is loaded flag, code 280, 0=unloaded, 1=loaded
int resolution; //!< Resolution units, code 281, 0=no, 2=centimeters, 5=inch
std::map<std::string, std::string> reactors;
};

2
src/app/dwg/libdxfrw/intern/dwgreader18.cpp
View File

@ -762,6 +762,7 @@ bool dwgReader18::readDwgClasses()
/*********** objects map ************************/
/** Note: object map are split in sections with max size 2035?
* heach section are 2 bytes size + data bytes + 2 bytes crc
* size value are data bytes + 2 and to calculate crc are used
@ -796,6 +797,7 @@ bool dwgReader18::readDwgHandles()
/*********** objects ************************/
/**
* Reads all the object referenced in the object map section of the DWG file
* (using their object file offsets)

1
src/app/dwg/libdxfrw/intern/dwgreader21.cpp
View File

@ -621,6 +621,7 @@ bool dwgReader21::readDwgHandles()
}
/*********** objects ************************/
/**
* Reads all the object referenced in the object map section of the DWG file
* (using their object file offsets)

42
src/app/dwg/libdxfrw/intern/dwgutil.h
View File

@ -72,27 +72,27 @@ class secEnum
public:
enum DWGSection
{
UNKNOWNS, /*!< UNKNOWN section. */
FILEHEADER, /*!< File Header (in R3-R15*/
HEADER, /*!< AcDb:Header */
CLASSES, /*!< AcDb:Classes */
SUMARYINFO, /*!< AcDb:SummaryInfo */
PREVIEW, /*!< AcDb:Preview */
VBAPROY, /*!< AcDb:VBAProject */
APPINFO, /*!< AcDb:AppInfo */
FILEDEP, /*!< AcDb:FileDepList */
REVHISTORY, /*!< AcDb:RevHistory */
SECURITY, /*!< AcDb:Security */
OBJECTS, /*!< AcDb:AcDbObjects */
OBJFREESPACE, /*!< AcDb:ObjFreeSpace */
TEMPLATE, /*!< AcDb:Template */
HANDLES, /*!< AcDb:Handles */
PROTOTYPE, /*!< AcDb:AcDsPrototype_1b */
AUXHEADER, /*!< AcDb:AuxHeader, in (R13-R15) second file header */
SIGNATURE, /*!< AcDb:Signature */
APPINFOHISTORY, /*!< AcDb:AppInfoHistory (in ac1021 may be a renamed section?*/
EXTEDATA, /*!< Extended Entity Data */
PROXYGRAPHICS /*!< PROXY ENTITY GRAPHICS */
UNKNOWNS, //!< UNKNOWN section.
FILEHEADER, //!< File Header (in R3-R15
HEADER, //!< AcDb:Header
CLASSES, //!< AcDb:Classes
SUMARYINFO, //!< AcDb:SummaryInfo
PREVIEW, //!< AcDb:Preview
VBAPROY, //!< AcDb:VBAProject
APPINFO, //!< AcDb:AppInfo
FILEDEP, //!< AcDb:FileDepList
REVHISTORY, //!< AcDb:RevHistory
SECURITY, //!< AcDb:Security
OBJECTS, //!< AcDb:AcDbObjects
OBJFREESPACE, //!< AcDb:ObjFreeSpace
TEMPLATE, //!< AcDb:Template
HANDLES, //!< AcDb:Handles
PROTOTYPE, //!< AcDb:AcDsPrototype_1b
AUXHEADER, //!< AcDb:AuxHeader, in (R13-R15) second file header
SIGNATURE, //!< AcDb:Signature
APPINFOHISTORY, //!< AcDb:AppInfoHistory (in ac1021 may be a renamed section?
EXTEDATA, //!< Extended Entity Data
PROXYGRAPHICS //!< PROXY ENTITY GRAPHICS
};
secEnum() {}

2
src/app/dwg/libdxfrw/intern/rscodec.cpp
View File

@ -424,7 +424,7 @@ bool RScodec::encode( unsigned char *data, unsigned char *parity )
symbols will be okay and that if we are in luck, the errors are in the
parity part of the transmitted codeword). Of course, these insoluble cases
can be returned as error flags to the calling routine if desired. */
/** Return value: number of corrected errors or -1 if can't correct it */
//! Return value: number of corrected errors or -1 if can't correct it
int RScodec::decode( unsigned char *data )
{
if ( !isOk ) return -1;

1
src/app/dwg/libdxfrw/intern/rscodec.h
View File

@ -28,6 +28,7 @@
#ifndef RSCODEC_H
#define RSCODEC_H
/**
mm: RS code over GF(2^4)
nn: nn= (2^mm) - 1 length of codeword

6
src/app/dwg/libdxfrw/libdxfrw.h
View File

@ -70,7 +70,7 @@ class dxfRW
DRW_ImageDef *writeImage( DRW_Image *ent, std::string name );
bool writeLeader( DRW_Leader *ent );
bool writeDimension( DRW_Dimension *ent );
void setEllipseParts( int parts ) {elParts = parts;} /*!< set parts number when convert ellipse to polyline */
void setEllipseParts( int parts ) {elParts = parts;} //!< Set parts number when convert ellipse to polyline
private:
/// used by read() to parse the content of the file
@ -138,9 +138,9 @@ class dxfRW
bool dimstyleStd;
bool applyExt;
bool writingBlock;
int elParts; /*!< parts number when convert ellipse to polyline */
int elParts; //!< Parts number when convert ellipse to polyline
std::map<std::string, int> blockMap;
std::vector<DRW_ImageDef*> imageDef; /*!< imageDef list */
std::vector<DRW_ImageDef*> imageDef; //!< ImageDef list
int currHandle;
};