Hello community, here is the log from the commit of package labplot-kf5 for openSUSE:Factory checked in at 2016-06-05 14:20:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/labplot-kf5 (Old) and /work/SRC/openSUSE:Factory/.labplot-kf5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "labplot-kf5" Changes: -------- --- /work/SRC/openSUSE:Factory/labplot-kf5/labplot-kf5.changes 2015-11-12 19:40:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.labplot-kf5.new/labplot-kf5.changes 2016-06-05 14:20:42.000000000 +0200 @@ -1,0 +2,15 @@ +Sun May 8 10:58:41 UTC 2016 - [email protected] + +- Add labplot-kf5-gcc5-isnan.patch: Replace isnan by std::isnan + to fix building with gcc5. + +------------------------------------------------------------------- +Wed May 4 05:06:30 UTC 2016 - [email protected] + +- Update to version 2.2.0 + * Added the DataPicker which converts input graph (images) into numbers. + * A new custom point was implemented + * LabPlot now acccepts now drag&drop-events + * Rendering of the image view of the matrix recieved a speed up + +------------------------------------------------------------------- Old: ---- labplot-kf5-2.1.0.tar.xz New: ---- labplot-2.2.0-kf5.tar.xz labplot-kf5-gcc5-isnan.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ labplot-kf5.spec ++++++ --- /var/tmp/diff_new_pack.pPanPT/_old 2016-06-05 14:20:43.000000000 +0200 +++ /var/tmp/diff_new_pack.pPanPT/_new 2016-06-05 14:20:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package labplot-kf5 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,22 @@ Name: labplot-kf5 -Version: 2.1.0 +Version: 2.2.0 Release: 0 -Summary: KDE Frameworosk 5 data analysis and visualization application +Summary: KDE Framework 5 data analysis and visualization application License: GPL-2.0+ Group: Productivity/Scientific/Other Url: https://edu.kde.org/applications/science/labplot/ -Source: http://download.kde.org/stable/labplot/%{version}/src/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/labplot/%{version}/labplot-%{version}-kf5.tar.xz +# PATCH-FIX-UPSTREAM labplot-kf5-gcc5-isnan.patch [email protected] -- Replace isnan by std::isnan to fix building with gcc5 +Patch0: labplot-kf5-gcc5-isnan.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: extra-cmake-modules BuildRequires: fdupes +BuildRequires: hdf5-devel +BuildRequires: hicolor-icon-theme +BuildRequires: kf5-filesystem +BuildRequires: update-desktop-files BuildRequires: cmake(KF5Archive) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5KDE4Support) @@ -41,11 +48,6 @@ BuildRequires: pkgconfig(netcdf) BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(zlib) -BuildRequires: extra-cmake-modules -BuildRequires: hdf5-devel -BuildRequires: hicolor-icon-theme -BuildRequires: kf5-filesystem -BuildRequires: update-desktop-files Conflicts: labplot %lang_package @@ -60,7 +62,10 @@ This version is based on KDE Frameworks 5 %prep -%setup -q +%setup -q -n labplot-%{version}-kf5 +%if 0%{?suse_version} > 1320 +%patch0 -p1 +%endif %build %cmake_kf5 -d build @@ -105,6 +110,8 @@ %files lang -f labplot2.lang %defattr(-,root,root,-) +%{_kf5_htmldir}/*/labplot2/ +%{_kf5_htmldir}/pt_BR/ ## These belong in the main package %exclude %{_kf5_htmldir}/en/labplot2/ ++++++ labplot-kf5-gcc5-isnan.patch ++++++ Index: labplot-2.2.0-kf5/src/backend/analysis/StatisticsFilter.cpp =================================================================== --- labplot-2.2.0-kf5.orig/src/backend/analysis/StatisticsFilter.cpp +++ labplot-2.2.0-kf5/src/backend/analysis/StatisticsFilter.cpp @@ -148,7 +148,7 @@ void StatisticsFilter::inputDataChanged( // iterate over all rows, determining first_valid_row, last_valid_row, N, min, max and sum for (int row = 0; row <= column->rowCount(); row++) { double val = m_inputs.at(port)->valueAt(row); - if (isnan(val)) continue; + if (std::isnan(val)) continue; if (s->first_valid_row == -1) s->first_valid_row = row; s->last_valid_row = row; s->N++; @@ -167,7 +167,7 @@ void StatisticsFilter::inputDataChanged( s->variance = 0; for (int row = 0; row <= column->rowCount(); row++) { double val = column->valueAt(row); - if (isnan(val)) continue; + if (std::isnan(val)) continue; s->variance += pow(val - mean, 2); } s->variance /= double(s->N); Index: labplot-2.2.0-kf5/src/backend/core/AbstractColumn.cpp =================================================================== --- labplot-2.2.0-kf5.orig/src/backend/core/AbstractColumn.cpp +++ labplot-2.2.0-kf5/src/backend/core/AbstractColumn.cpp @@ -213,7 +213,7 @@ void AbstractColumn::clear() {} bool AbstractColumn::isValid(int row) const { switch (columnMode()) { case AbstractColumn::Numeric: - return !isnan(valueAt(row)); + return !std::isnan(valueAt(row)); case AbstractColumn::Text: return !textAt(row).isNull(); case AbstractColumn::DateTime: @@ -467,7 +467,7 @@ double AbstractColumn::minimum() const{ double min = INFINITY; for (int row = 0; row < rowCount(); row++) { val = valueAt(row); - if (isnan(val)) + if (std::isnan(val)) continue; if (val < min) @@ -481,7 +481,7 @@ double AbstractColumn::maximum() const{ double max = -INFINITY; for (int row = 0; row < rowCount(); row++) { val = valueAt(row); - if (isnan(val)) + if (std::isnan(val)) continue; if (val > max) Index: labplot-2.2.0-kf5/src/backend/core/datatypes/Double2DateTimeFilter.h =================================================================== --- labplot-2.2.0-kf5.orig/src/backend/core/datatypes/Double2DateTimeFilter.h +++ labplot-2.2.0-kf5/src/backend/core/datatypes/Double2DateTimeFilter.h @@ -43,13 +43,13 @@ class Double2DateTimeFilter : public Abs virtual QDate dateAt(int row) const { if (!m_inputs.value(0)) return QDate(); double inputValue = m_inputs.value(0)->valueAt(row); - if (isnan(inputValue)) return QDate(); + if (std::isnan(inputValue)) return QDate(); return QDate::fromJulianDay(qRound(inputValue)); } virtual QTime timeAt(int row) const { if (!m_inputs.value(0)) return QTime(); double inputValue = m_inputs.value(0)->valueAt(row); - if (isnan(inputValue)) return QTime(); + if (std::isnan(inputValue)) return QTime(); // we only want the digits behind the dot and // convert them from fraction of day to milliseconds return QTime(12,0,0,0).addMSecs(int( (inputValue - int(inputValue)) * 86400000.0 )); Index: labplot-2.2.0-kf5/src/backend/core/datatypes/Double2DayOfWeekFilter.h =================================================================== --- labplot-2.2.0-kf5.orig/src/backend/core/datatypes/Double2DayOfWeekFilter.h +++ labplot-2.2.0-kf5/src/backend/core/datatypes/Double2DayOfWeekFilter.h @@ -42,7 +42,7 @@ class Double2DayOfWeekFilter : public Ab virtual QDate dateAt(int row) const { if (!m_inputs.value(0)) return QDate(); double inputValue = m_inputs.value(0)->valueAt(row); - if (isnan(inputValue)) return QDate(); + if (std::isnan(inputValue)) return QDate(); // Don't use Julian days here since support for years < 1 is bad // Use 1900-01-01 instead (a Monday) return QDate(1900,1,1).addDays(qRound(inputValue - 1.0)); Index: labplot-2.2.0-kf5/src/backend/core/datatypes/Double2MonthFilter.h =================================================================== --- labplot-2.2.0-kf5.orig/src/backend/core/datatypes/Double2MonthFilter.h +++ labplot-2.2.0-kf5/src/backend/core/datatypes/Double2MonthFilter.h @@ -48,7 +48,7 @@ class Double2MonthFilter : public Abstra virtual QDateTime dateTimeAt(int row) const { if (!m_inputs.value(0)) return QDateTime(); double inputValue = m_inputs.value(0)->valueAt(row); - if (isnan(inputValue)) return QDateTime(); + if (std::isnan(inputValue)) return QDateTime(); // Don't use Julian days here since support for years < 1 is bad // Use 1900-01-01 instead QDate result_date = QDate(1900,1,1).addMonths(qRound(inputValue - 1.0)); Index: labplot-2.2.0-kf5/src/backend/core/datatypes/Double2StringFilter.h =================================================================== --- labplot-2.2.0-kf5.orig/src/backend/core/datatypes/Double2StringFilter.h +++ labplot-2.2.0-kf5/src/backend/core/datatypes/Double2StringFilter.h @@ -74,7 +74,7 @@ class Double2StringFilter : public Abstr if (!m_inputs.value(0)) return QString(); if (m_inputs.value(0)->rowCount() <= row) return QString(); double inputValue = m_inputs.value(0)->valueAt(row); - if (isnan(inputValue)) return QString(); + if (std::isnan(inputValue)) return QString(); return QLocale().toString(inputValue, m_format, m_digits); } Index: labplot-2.2.0-kf5/src/backend/worksheet/plots/cartesian/Axis.cpp =================================================================== --- labplot-2.2.0-kf5.orig/src/backend/worksheet/plots/cartesian/Axis.cpp +++ labplot-2.2.0-kf5/src/backend/worksheet/plots/cartesian/Axis.cpp @@ -1210,7 +1210,7 @@ void AxisPrivate::retransformTicks(){ } } else { majorTickPos = majorTicksColumn->valueAt(iMajor); - if (isnan(majorTickPos)) + if (std::isnan(majorTickPos)) break; //stop iterating after the first non numerical value in the column } @@ -1265,7 +1265,7 @@ void AxisPrivate::retransformTicks(){ minorTickPos = majorTickPos + (iMinor+1)*minorTicksSpacing; } else { minorTickPos = minorTicksColumn->valueAt(iMinor); - if (isnan(minorTickPos)) + if (std::isnan(minorTickPos)) break; //stop iterating after the first non numerical value in the column //in the case a custom column is used for the minor ticks, we draw them _once_ for the whole range of the axis. Index: labplot-2.2.0-kf5/src/backend/worksheet/plots/cartesian/CartesianCoordinateSystem.cpp =================================================================== --- labplot-2.2.0-kf5.orig/src/backend/worksheet/plots/cartesian/CartesianCoordinateSystem.cpp +++ labplot-2.2.0-kf5/src/backend/worksheet/plots/cartesian/CartesianCoordinateSystem.cpp @@ -557,7 +557,7 @@ QList<QLineF> CartesianCoordinateSystem: if (flags & MarkGaps) { - if (!isnan(xGapBefore)) { + if (!std::isnan(xGapBefore)) { if (clipResult.xClippedLeft[0]) { QLineF gapMarker(QPointF(x1 + xGapBefore / 4, y1 - xGapBefore / 2), QPointF(x1 - xGapBefore / 4, y1 + xGapBefore / 2)); @@ -572,7 +572,7 @@ QList<QLineF> CartesianCoordinateSystem: } } - if (!isnan(xGapAfter)) { + if (!std::isnan(xGapAfter)) { if (clipResult.xClippedRight[0]) { QLineF gapMarker(QPointF(x1 + xGapAfter / 4, y1 - xGapAfter / 2), QPointF(x1 - xGapAfter / 4, y1 + xGapAfter / 2)); @@ -587,7 +587,7 @@ QList<QLineF> CartesianCoordinateSystem: } } - if (!isnan(yGapBefore)) { + if (!std::isnan(yGapBefore)) { if (clipResult.yClippedTop[0]) { QLineF gapMarker(QPointF(x1 + yGapBefore / 2, y1 - yGapBefore / 4), QPointF(x1 - yGapBefore / 2, y1 + yGapBefore / 4)); @@ -602,7 +602,7 @@ QList<QLineF> CartesianCoordinateSystem: } } - if (!isnan(yGapAfter)) { + if (!std::isnan(yGapAfter)) { if (clipResult.yClippedBottom[0]) { QLineF gapMarker(QPointF(x1 + yGapAfter / 2, y1 - yGapAfter / 4), QPointF(x1 - yGapAfter / 2, y1 + yGapAfter / 4)); Index: labplot-2.2.0-kf5/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp =================================================================== --- labplot-2.2.0-kf5.orig/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp +++ labplot-2.2.0-kf5/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp @@ -216,7 +216,7 @@ int func_f(const gsl_vector* paramValues char var[]="x"; for (int i = 0; i < n; i++) { - if (isnan(x[i]) || isnan(y[i])) + if (std::isnan(x[i]) || std::isnan(y[i])) continue; double Yi=0; @@ -555,14 +555,14 @@ void XYFitCurvePrivate::recalculate() { QVector<double> sigmaVector; for (int row=0; row<xDataColumn->rowCount(); ++row) { //only copy those data where _all_ values (for x, y and sigma, if given) are valid - if (!isnan(xDataColumn->valueAt(row)) && !isnan(yDataColumn->valueAt(row)) + if (!std::isnan(xDataColumn->valueAt(row)) && !std::isnan(yDataColumn->valueAt(row)) && !xDataColumn->isMasked(row) && !yDataColumn->isMasked(row)) { if (!weightsColumn) { xdataVector.append(xDataColumn->valueAt(row)); ydataVector.append(yDataColumn->valueAt(row)); } else { - if (!isnan(weightsColumn->valueAt(row))) { + if (!std::isnan(weightsColumn->valueAt(row))) { xdataVector.append(xDataColumn->valueAt(row)); ydataVector.append(yDataColumn->valueAt(row));
