Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix dox and layout
  • Loading branch information
3nids committed May 6, 2020
1 parent 971d107 commit 28c20cf
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion python/core/auto_generated/layout/qgslayouttable.sip.in
Expand Up @@ -491,7 +491,7 @@ Returns a reference to the list of QgsLayoutTableSortColumns shown in the table
%Docstring
Replaces the sorting columns in the table with a specified list of QgsLayoutTableSortColumns.

:param columns: list of QgsLayoutTableColumns used to sort the table.
:param sortColumns: list of QgsLayoutTableColumns used to sort the table.

.. seealso:: :py:func:`sortColumns`

Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayouttable.h
Expand Up @@ -456,7 +456,7 @@ class CORE_EXPORT QgsLayoutTable: public QgsLayoutMultiFrame

/**
* Replaces the sorting columns in the table with a specified list of QgsLayoutTableSortColumns.
* \param columns list of QgsLayoutTableColumns used to sort the table.
* \param sortColumns list of QgsLayoutTableColumns used to sort the table.
* \see sortColumns()
* \since QGIS 3.14
*/
Expand Down
13 changes: 8 additions & 5 deletions src/gui/layout/qgslayoutattributeselectiondialog.h
Expand Up @@ -65,13 +65,16 @@ class GUI_EXPORT QgsLayoutAttributeTableColumnModelBase: public QAbstractTableMo
ShiftDown //!< Shift the row/column down
};

/**
* Available columns for the configuration table to be used by the model
*/
enum Column
{
Attribute,
Heading,
Alignment,
Width,
SortOrder
Attribute, //!< Attribute for a field or an expression
Heading, //!< Defines the title of the column
Alignment, //!< Defines the alignment of the column
Width, //!< Defines the width of the column
SortOrder //!< Defines the sort order
};

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/src/core/testqgslayouttable.cpp
Expand Up @@ -1594,7 +1594,7 @@ void TestQgsLayoutTable::testBaseSort()
table->setDisplayOnlyVisibleFeatures( false );
table->setMaximumNumberOfFeatures( 1 );
QgsLayoutTableColumn col;
col.setAttribute(table->columns()[2].attribute());
col.setAttribute( table->columns()[2].attribute() );
col.setSortOrder( Qt::DescendingOrder );
table->sortColumns() = {col};
table->refresh();
Expand Down

0 comments on commit 28c20cf

Please sign in to comment.