Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
dxf export: merge doxymentation updates (followup 4c4ad05)
  • Loading branch information
jef-n committed Jun 27, 2016
1 parent 4c4ad05 commit 07113b0
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 3 deletions.
22 changes: 19 additions & 3 deletions python/core/dxf/qgsdxfexport.sip
Expand Up @@ -117,7 +117,7 @@ class QgsDxfExport
* Get DXF palette index of nearest entry for given color
* @param color
*/
static int closestColorMatch( QRgb pixel );
static int closestColorMatch( QRgb color );

/**
* Get layer name for feature
Expand Down Expand Up @@ -215,7 +215,7 @@ class QgsDxfExport
* @param line polyline
* @param layer layer name to use
* @param lineStyleName line type to use
* @param color coolor to use
* @param color color to use
* @param width line width to use
*/
void writePolyline( const QgsPolyline &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
Expand All @@ -225,7 +225,7 @@ class QgsDxfExport
* @param polygon polygon
* @param layer layer name to use
* @param hatchPattern hatchPattern to use
* @param color coolor to use
* @param color color to use
*/
void writePolygon( const QgsPolygon &polygon, const QString &layer, const QString &hatchPattern, const QColor& color );

Expand Down Expand Up @@ -270,4 +270,20 @@ class QgsDxfExport
//! return list of available DXF encodings
static QStringList encodings();

/** Output the label
* @param layerId id of the layer
* @param context render context
* @param label position of label
* @param settings label settings
* @note not available in Python bindings
*/
// void drawLabel( QString layerId, QgsRenderContext& context, pal::LabelPosition* label, const QgsPalLayerSettings &settings );

/** Register name of layer for feature
* @param layerId id of layer
* @param fid id of feature
* @param layer dxf layer of feature
*/
void registerDxfLayer( QString layerId, QgsFeatureId fid, QString layer );

};
13 changes: 13 additions & 0 deletions src/core/dxf/qgsdxfexport.h
Expand Up @@ -290,7 +290,20 @@ class CORE_EXPORT QgsDxfExport
//! return list of available DXF encodings
static QStringList encodings();

/** Output the label
* @param layerId id of the layer
* @param context render context
* @param label position of label
* @param settings label settings
* @note not available in Python bindings
*/
void drawLabel( QString layerId, QgsRenderContext& context, pal::LabelPosition* label, const QgsPalLayerSettings &settings );

/** Register name of layer for feature
* @param layerId id of layer
* @param fid id of feature
* @param layer dxf layer of feature
*/
void registerDxfLayer( QString layerId, QgsFeatureId fid, QString layer );

private:
Expand Down

0 comments on commit 07113b0

Please sign in to comment.