Skip to content

Commit

Permalink
Merge branch 'kdchart-3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen Winter committed Oct 24, 2023
2 parents a0bca94 + b2b041f commit 4e3634f
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 12 deletions.
4 changes: 3 additions & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[codespell]
skip = ./build-*,.git,*.kdx
skip = ./build-*,.git,*.kdx,*.pdf
interactive = 3
#ignore-words-list = ba,currect,ro,siz
ignore-regex = \b([a-z]+[A-Z0-9][a-z0-9]*|siz|implementor|re-use)\b
15 changes: 9 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
ci:
autoupdate_schedule: monthly

exclude: ^(cmake/ECM/|cmake/KDAB/)
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -13,21 +16,21 @@ repos:
args: [--allow-multiple-documents]
- id: check-json
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v15.0.7
rev: v17.0.3
hooks:
- id: clang-format
- repo: https://github.com/PyCQA/pylint
rev: v2.16.2
rev: v3.0.1
hooks:
- id: pylint
exclude: ^(.cmake-format.py|conan/conanfile.py|scripts/genignore.py)
- repo: https://github.com/pre-commit/mirrors-autopep8
rev: v2.0.1
rev: v2.0.4
hooks:
- id: autopep8
exclude: ^(.cmake-format.py|conan/conanfile.py)
- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
rev: v2.2.6
hooks:
- id: codespell
- repo: https://github.com/cheshirekow/cmake-format-precommit
Expand All @@ -45,6 +48,6 @@ repos:
language: ruby
files: \.(md|mdown|markdown)$
- repo: https://github.com/fsfe/reuse-tool
rev: v1.1.2
rev: v2.1.0
hooks:
- id: reuse
2 changes: 1 addition & 1 deletion src/KDChart/Cartesian/KDChartCartesianAxis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ bool TickIterator::areAlmostEqual(qreal r1, qreal r2) const
// which needs this function to perform a reasonable comparison.
span = qFuzzyIsNull(m_dimension.start) ? 1 : qAbs(m_dimension.start);
}
return qAbs(r2 - r1) < ( span )*1e-6;
return qAbs(r2 - r1) < (span) * 1e-6;
} else {
return qAbs(r2 - r1) < qMax(qAbs(r1), qAbs(r2)) * 0.01;
}
Expand Down
2 changes: 1 addition & 1 deletion src/KDChart/Cartesian/KDChartStockDiagram_p.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ QPolygonF StockDiagram::Private::ThreeDPainter::drawTwoDLine(const QLineF &line,
// The z coordinate to use (i.e., at what depth to draw the line)
const qreal z = props.depth / 2.0;

// Projec the 2D points of the line in 3D
// Project the 2D points of the line in 3D
const QPointF deepP1 = projectPoint(line.p1(), z, props.angle);
const QPointF deepP2 = projectPoint(line.p2(), z, props.angle);

Expand Down
2 changes: 1 addition & 1 deletion src/KDChart/KDChartAbstractDiagram.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class KDCHART_EXPORT AbstractDiagram : public QAbstractItemView

/**
* Called by the widget's sizeEvent. Adjust all internal structures,
* that are calculated, dependending on the size of the widget.
* that are calculated, depending on the size of the widget.
*
* @param area Size of the widget
*/
Expand Down
2 changes: 1 addition & 1 deletion src/KDChart/KDChartRelativePosition.h
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class KDCHART_EXPORT RelativePosition
const QPointF referencePoint(qreal *polarDegrees = nullptr) const;

/**
* \brief Calculate a point, accordin to the reference area/position and the padding.
* \brief Calculate a point, according to the reference area/position and the padding.
*
* This method is called at drawing time: The returned point is used as anchor point.
* Note that it is the task of the calling code to place the content, taking the alignment
Expand Down
2 changes: 1 addition & 1 deletion src/KDGantt/kdganttabstractrowcontroller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using namespace KDGantt;
/*!\class KDGantt::AbstractRowController kdganttabstractrowcontroller.h KDGanttAbstractRowController
* \ingroup KDGantt
* \brief Abstract baseclass for row controllers. A row controller is used
* by the GraphicsView to nagivate the model and to determine the
* by the GraphicsView to navigate the model and to determine the
* row geometries
*/

Expand Down

0 comments on commit 4e3634f

Please sign in to comment.