File labplot-kf5-gcc5-isnan.patch of Package labplot-kf5

Overview Repositories Revisions Requests Users Attributes Meta

File labplot-kf5-gcc5-isnan.patch of Package labplot-kf5 (Revision 70bb0e54d23aa0135be60ea978a03718)

Currently displaying revision 70bb0e54d23aa0135be60ea978a03718 , Show latest

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));

Places

File labplot-kf5-gcc5-isnan.patch of Package labplot-kf5 (Revision 70bb0e54d23aa0135be60ea978a03718)

Places