mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-12-25 01:51:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

reverted: - bugfix: JKQTPColumnConstIterator and JKQTPColumnIterator: getImagePositionX() and getImagePositionY() were switched

Browse Source
This commit is contained in:
jkriege2 2020-09-11 13:15:12 +02:00
parent a1c4f0c0d2
commit d6e6b1d53b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/dox/whatsnew.dox
View File

@ -20,7 +20,6 @@ Changes, compared to \ref page_whatsnew_V2019_11 "v2019.11" include:
<li> fixed issue <a href="https://github.com/jkriege2/JKQtPlotter/pull/41">#41: Build error when JKQtPlotter_BUILD_INCLUDE_XITS_FONTS set to OFF </a>, thanks to <a href="https://github.com/smistad">user:smistad</a></li>
<li> fixed issue <a href="https://github.com/jkriege2/JKQtPlotter/pull/37">#37: CMake installs things into $PREFIX/doc/*.txt </a>, thanks to <a href="https://github.com/certik">user:certik</a></li>
<li> fixed issue <a href="https://github.com/jkriege2/JKQtPlotter/pull/45">#45: Build error on mac jkqtfastplotter.cpp:342:28: Variable has incomplete type 'QPainterPath'</a>, thanks to <a href="https://github.com/abdedixit">user:abdedixit</a></li>
<li>fixed: JKQTPColumnConstIterator and JKQTPColumnIterator: getImagePositionX() and getImagePositionY() were switched</li>
<li>renamed/breaking change: renamed JKQTPColorPaletteStyleAndToolsMixin::setPalette() -> JKQTPColorPaletteStyleAndToolsMixin::setColorPalette()</li>
<li>removed/breaking change: removed the usage of some deprecated functions and objects (e.g. QMatrix)</li>
<li>removed/breaking change: removed the overlay elements (derived from JKQTPOverlayElement), which were not very well set up and are more confusing than useful.</li>

8
lib/jkqtplotter/jkqtpdatastorage.h
View File

@ -1871,12 +1871,12 @@ class JKQTPColumnIterator {
/** \brief returns the referenced position/row interpreted as an image pixel, x-component, returns -1 for an invalid operator */
inline int getImagePositionX() const {
if (!isValid()) return -1;
return pos_ / static_cast<int>(col_->getImageColumns());
return pos_ % static_cast<int>(col_->getImageColumns());
}
/** \brief returns the referenced position/row interpreted as an image pixel, y-component, returns -1 for an invalid operator */
inline int getImagePositionY() const {
if (!isValid()) return -1;
return pos_ % static_cast<int>(col_->getImageColumns());
return pos_ / static_cast<int>(col_->getImageColumns());
}
/*! \brief if the data in the column is interpreted as an image, this is the number of columns (x-dimension) of the image
\see JKQTPColumn::imageColumns */
@ -2202,12 +2202,12 @@ class JKQTPColumnConstIterator {
/** \brief returns the referenced position/row interpreted as an image pixel, x-component, returns -1 for an invalid operator */
inline int getImagePositionX() const {
if (!isValid()) return -1;
return pos_ / static_cast<int>(col_->getImageColumns());
return pos_ % static_cast<int>(col_->getImageColumns());
}
/** \brief returns the referenced position/row interpreted as an image pixel, y-component, returns -1 for an invalid operator */
inline int getImagePositionY() const {
if (!isValid()) return -1;
return pos_ % static_cast<int>(col_->getImageColumns());
return pos_ / static_cast<int>(col_->getImageColumns());
}
/*! \brief if the data in the column is interpreted as an image, this is the number of columns (x-dimension) of the image
\see JKQTPColumn::imageColumns */