diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2018-12-20 08:47:18 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2018-12-20 08:47:18 +0000 |
| commit | eafb481c43bece190b24e55caac88570a37f961f (patch) | |
| tree | aeeeb4641fcc416279ddf314cf48f443c1ea755e | |
| parent | a945ffef98895c126dbb06ee6e6957b7ab36bf69 (diff) | |
| download | ports-eafb481c43bece190b24e55caac88570a37f961f.tar.gz ports-eafb481c43bece190b24e55caac88570a37f961f.zip | |
Notes
3 files changed, 45 insertions, 0 deletions
diff --git a/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp b/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp new file mode 100644 index 000000000000..c58a884e850b --- /dev/null +++ b/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp @@ -0,0 +1,25 @@ +--- qtiplot/src/core/ApplicationWindow.cpp.orig 2018-12-20 07:24:36 UTC ++++ qtiplot/src/core/ApplicationWindow.cpp +@@ -10933,11 +10933,11 @@ QStringList ApplicationWindow::depending + foreach(Graph *g, layers){ + QStringList onPlot = g->curveNamesList(); + onPlot = onPlot.grep (name,TRUE); +- if (int(onPlot.count()) && plots.contains(w->objectName())<=0) ++ if (onPlot.count() && !plots.contains(w->objectName())) + plots << w->objectName(); + } + }else if (w->isA("Graph3D")){ +- if ((((Graph3D*)w)->formula()).contains(name,TRUE) && plots.contains(w->objectName())<=0) ++ if ((((Graph3D*)w)->formula()).contains(name,TRUE) && !plots.contains(w->objectName())) + plots << w->objectName(); + } + } +@@ -10954,7 +10954,7 @@ QStringList ApplicationWindow::multilaye + for (int j=0; j<onPlot.count(); j++) + { + QStringList tl = onPlot[j].split("_", QString::SkipEmptyParts); +- if (tables.contains(tl[0])<=0) ++ if (!tables.contains(tl[0])) + tables << tl[0]; + } + } diff --git a/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp b/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp new file mode 100644 index 000000000000..c35361d0a2e0 --- /dev/null +++ b/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp @@ -0,0 +1,11 @@ +--- qtiplot/src/plot3D/Graph3D.cpp.orig 2011-08-24 10:25:10 UTC ++++ qtiplot/src/plot3D/Graph3D.cpp +@@ -3283,7 +3283,7 @@ Graph3D* Graph3D::restore(ApplicationWin + return 0; + plot->addRibbon(t, l[0], l[1], fList[2].toDouble(), fList[3].toDouble(), + fList[4].toDouble(), fList[5].toDouble(), fList[6].toDouble(), fList[7].toDouble()); +- } else if (formula.contains("(Z)",true) > 0){ ++ } else if (formula.contains("(Z)",true)){ + formula.remove("(X)").remove("(Y)").remove("(Z)"); + QStringList l = formula.split(","); + if (l.size() < 3) diff --git a/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp b/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp index 64e8352532e3..bf6465f11f27 100644 --- a/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp +++ b/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp @@ -16,3 +16,12 @@ Index: qtiplot/qtiplot/src/table/Table.cpp mup->defineVariable("j", (double)col); mup->defineVariable("sr", startRow + 1.0); mup->defineVariable("er", endRow + 1.0); +@@ -1080,7 +1080,7 @@ void Table::setColName(int col, const QS + if (enumerateRight) + newLabel += QString::number(n); + +- if (col_label.contains(newLabel) > 0){ ++ if (col_label.contains(newLabel)){ + if (warn){ + QMessageBox::critical(0, tr("QtiPlot - Error"), + tr("There is already a column called : <b>"+newLabel+"</b> in table <b>"+caption+"</b>!<p>Please choose another name!")); |