diff options
Diffstat (limited to 'math/qtiplot/files')
22 files changed, 0 insertions, 558 deletions
diff --git a/math/qtiplot/files/build.conf b/math/qtiplot/files/build.conf deleted file mode 100644 index abeeed258d18..000000000000 --- a/math/qtiplot/files/build.conf +++ /dev/null @@ -1,28 +0,0 @@ -isEmpty( QTI_ROOT ) { - message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) -} - -SYS_INCLUDEPATH = $$LOCALBASE/include -SYS_LIBS = -L$$LOCALBASE/lib - -MUPARSER_INCLUDEPATH = -MUPARSER_LIBS = -lmuparser - -GSL_INCLUDEPATH = -GSL_LIBS = -lgsl -lgslcblas - -QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src -QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a - -QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include -QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a -lGLU - -LIBPNG_INCLUDEPATH = -LIBPNG_LIBS = -lpng - -contains( TARGET, qtiplot ) { - SCRIPTING_LANGS += muParser - SCRIPTING_LANGS += Python - DEFINES += SCRIPTING_CONSOLE - CONFIG += CustomInstall -} diff --git a/math/qtiplot/files/patch-3rdparty__qwt__src__src.pro b/math/qtiplot/files/patch-3rdparty__qwt__src__src.pro deleted file mode 100644 index f4969c83a744..000000000000 --- a/math/qtiplot/files/patch-3rdparty__qwt__src__src.pro +++ /dev/null @@ -1,7 +0,0 @@ ---- ./3rdparty/qwt/src/src.pro.orig 2009-10-18 18:54:12.000000000 +0400 -+++ ./3rdparty/qwt/src/src.pro 2009-10-18 18:54:12.000000000 +0400 -@@ -221,4 +221,3 @@ - doc.files += $${QWT_ROOT}/doc/man - } - --INSTALLS = target headers doc diff --git a/math/qtiplot/files/patch-3rdparty__qwtplot3d__3rdparty__gl2ps__gl2ps.c b/math/qtiplot/files/patch-3rdparty__qwtplot3d__3rdparty__gl2ps__gl2ps.c deleted file mode 100644 index 3473b168685c..000000000000 --- a/math/qtiplot/files/patch-3rdparty__qwtplot3d__3rdparty__gl2ps__gl2ps.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c.orig 2011-08-23 11:57:54.000000000 +0200 -+++ 3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c 2012-05-09 13:20:35.000000000 +0200 -@@ -48,6 +48,7 @@ - - #if defined(GL2PS_HAVE_LIBPNG) - #include <png.h> -+#include <zlib.h> - #endif - - /********************************************************************* diff --git a/math/qtiplot/files/patch-3rdparty__qwtplot3d__include__qwt3d_openglhelper.h b/math/qtiplot/files/patch-3rdparty__qwtplot3d__include__qwt3d_openglhelper.h deleted file mode 100644 index 32d586863596..000000000000 --- a/math/qtiplot/files/patch-3rdparty__qwtplot3d__include__qwt3d_openglhelper.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ./3rdparty/qwtplot3d/include/qwt3d_openglhelper.h.orig 2011-08-24 10:25:09.000000000 +0000 -+++ ./3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-04-16 20:17:06.461052631 +0000 -@@ -6,6 +6,7 @@ - #include <qgl.h> - #else - #include <QtOpenGL/qgl.h> -+#include <GL/glu.h> - #endif - - namespace Qwt3D diff --git a/math/qtiplot/files/patch-3rdparty__qwtplot3d__qwtplot3d.pro b/math/qtiplot/files/patch-3rdparty__qwtplot3d__qwtplot3d.pro deleted file mode 100644 index 145515c4f917..000000000000 --- a/math/qtiplot/files/patch-3rdparty__qwtplot3d__qwtplot3d.pro +++ /dev/null @@ -1,7 +0,0 @@ ---- ./3rdparty/qwtplot3d/qwtplot3d.pro.orig 2011-10-15 23:30:37.027086494 +0000 -+++ ./3rdparty/qwtplot3d/qwtplot3d.pro 2011-10-15 23:30:37.069086007 +0000 -@@ -37,4 +37,3 @@ - - # install - target.path = lib --INSTALLS += target diff --git a/math/qtiplot/files/patch-3rdparty_qwtplot3d_src_qwt3d__lighting.cpp b/math/qtiplot/files/patch-3rdparty_qwtplot3d_src_qwt3d__lighting.cpp deleted file mode 100644 index 622edbe3e91f..000000000000 --- a/math/qtiplot/files/patch-3rdparty_qwtplot3d_src_qwt3d__lighting.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 3rdparty/qwtplot3d/src/qwt3d_lighting.cpp.orig 2011-08-24 10:25:10 UTC -+++ 3rdparty/qwtplot3d/src/qwt3d_lighting.cpp -@@ -175,7 +175,7 @@ void ExtGLWidget::applyLight(unsigned li - glRotatef( lights_[light].rot.x-90, 1.0, 0.0, 0.0 ); - glRotatef( lights_[light].rot.y , 0.0, 1.0, 0.0 ); - glRotatef( lights_[light].rot.z , 0.0, 0.0, 1.0 ); -- GLfloat lightPos[4] = { lights_[light].shift.x, lights_[light].shift.y, lights_[light].shift.z, 1.0}; -+ GLfloat lightPos[4] = { static_cast<GLfloat>(lights_[light].shift.x), static_cast<GLfloat>(lights_[light].shift.y), static_cast<GLfloat>(lights_[light].shift.z), 1.0}; - GLenum le = lightEnum(light); - glLightfv(le, GL_POSITION, lightPos); - } diff --git a/math/qtiplot/files/patch-archgit_c5e8e49 b/math/qtiplot/files/patch-archgit_c5e8e49 deleted file mode 100644 index bb9dd8bedbcc..000000000000 --- a/math/qtiplot/files/patch-archgit_c5e8e49 +++ /dev/null @@ -1,37 +0,0 @@ -Obtained from: -https://git.archlinux.org/svntogit/packages.git/tree/trunk/qtiplot-gsl2.patch?h=packages/qtiplot - -Description: adoptation to gsl2. -Author: Damir Islamov <damir@secretlaboratory.ru> -Last-Update: 2015-12-04 - ---- qtiplot/src/analysis/Fit.cpp -+++ qtiplot/src/analysis/Fit.cpp -@@ -126,10 +126,12 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl - break; - } - } -- -+ gsl_matrix *J = gsl_matrix_alloc(d_n, d_p); - if (status){ -- gsl_multifit_covar (s->J, 0.0, covar); -+ gsl_multifit_fdfsolver_jac(s, J); -+ gsl_multifit_covar (J, 0.0, covar); - iterations = 0; -+ gsl_matrix_free (J); - return s; - } - -@@ -154,9 +156,9 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl - - status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance); - } while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations); -- -- gsl_multifit_covar (s->J, 0.0, covar); -- -+ gsl_multifit_fdfsolver_jac(s, J); -+ gsl_multifit_covar (J, 0.0, covar); -+ gsl_matrix_free (J); - iterations = iter; - return s; - } diff --git a/math/qtiplot/files/patch-gentoogit_68af1bc_qtiplot-0.9.8.9-sip-4.19 b/math/qtiplot/files/patch-gentoogit_68af1bc_qtiplot-0.9.8.9-sip-4.19 deleted file mode 100644 index ed805d10c6e1..000000000000 --- a/math/qtiplot/files/patch-gentoogit_68af1bc_qtiplot-0.9.8.9-sip-4.19 +++ /dev/null @@ -1,46 +0,0 @@ -Obtained from: https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-visualization/qtiplot - -sci-visualization/qtiplot: Fix build with >=sip-4.19 -Thanks-to: Fabio Rossi <rossi.f@inwind.it> -Gentoo-bug: 609280 - -Package-Manager: Portage-2.3.3, Repoman-2.3.1 - ---- qtiplot/src/scripting/qti.sip 2017-02-13 17:01:03.123828499 +0100 -+++ qtiplot/src/scripting/qti.sip 2017-02-13 17:02:12.628828234 +0100 -@@ -148,14 +148,14 @@ - } - break; - case Table::Date: -- if (sipCanConvertToType(item, sipType_QDateTime, 0)) { -+ if (sipCanConvertToType(item, sipFindType("QDateTime"), 0)) { - int isErr = 0; -- QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipType_QDateTime, -+ QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipFindType("QDateTime"), - 0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr)); - if (isErr) - return 1; - table->setText(row, col, dateTime->toString(table->columnFormat(col))); -- delete dateTime; -+ //delete dateTime; - } - else { - if (PyType_Ready(item_type) == 0) -@@ -164,14 +164,14 @@ - } - break; - case Table::Time: -- if (sipCanConvertToType(item, sipType_QTime, 0)) { -+ if (sipCanConvertToType(item, sipFindType("QTime"), 0)) { - int isErr = 0; -- QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipType_QTime, -+ QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipFindType("QTime"), - 0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr)); - if (isErr) - return 1; - table->setText(row, col, time->toString(table->columnFormat(col))); -- delete time; -+ //delete time; - } - else { - if (PyType_Ready(item_type) == 0) diff --git a/math/qtiplot/files/patch-qtiplot.pro b/math/qtiplot/files/patch-qtiplot.pro deleted file mode 100644 index ef635e017033..000000000000 --- a/math/qtiplot/files/patch-qtiplot.pro +++ /dev/null @@ -1,10 +0,0 @@ ---- ./qtiplot.pro.orig 2010-07-03 12:35:53.000000000 +0400 -+++ ./qtiplot.pro 2010-07-03 12:38:00.709187950 +0400 -@@ -1,7 +1,6 @@ - TEMPLATE = subdirs - - SUBDIRS = fitPlugins \ -- manual \ - 3rdparty/qwt \ - 3rdparty/qwtplot3d \ - qtiplot diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro deleted file mode 100644 index e9359778cba8..000000000000 --- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro +++ /dev/null @@ -1,83 +0,0 @@ ---- ./qtiplot/qtiplot.pro.orig 2011-10-15 23:30:36.976081538 +0000 -+++ ./qtiplot/qtiplot.pro 2011-10-15 23:31:17.153088752 +0000 -@@ -45,14 +45,14 @@ - INSTALLS += documentation - unix:INSTALLS += man - -- unix: INSTALLBASE = /usr -+ unix: INSTALLBASE = $$PREFIX - win32: INSTALLBASE = C:/QtiPlot - - unix: target.path = $$INSTALLBASE/bin - unix: translations.path = $$INSTALLBASE/share/qtiplot/translations -- unix: manual.path = $$INSTALLBASE/share/doc/qtiplot/manual -+ unix: manual.path = $$INSTALLBASE/share/qtiplot/manual - unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot -- unix: man.path = $$INSTALLBASE/share/man/man1/ -+ unix: man.path = $$INSTALLBASE/man/man1/ - - win32: target.path = $$INSTALLBASE - win32: translations.path = $$INSTALLBASE/translations -@@ -101,17 +101,7 @@ - translations/qtiplot_ja.ts \ - translations/qtiplot_sv.ts - --translations.files += translations/qtiplot_cn.qm \ -- translations/qtiplot_cz.qm \ -- translations/qtiplot_de.qm \ -- translations/qtiplot_es.qm \ -- translations/qtiplot_el.qm \ -- translations/qtiplot_fr.qm \ -- translations/qtiplot_pt.qm \ -- translations/qtiplot_ro.qm \ -- translations/qtiplot_ru.qm \ -- translations/qtiplot_ja.qm \ -- translations/qtiplot_sv.qm -+translations.files += $$replace(TRANSLATIONS,".ts",".qm") - - isEmpty(LUPDATE): LUPDATE = lupdate - #system($$LUPDATE -verbose qtiplot.pro) -@@ -120,11 +110,7 @@ - - ###################### DOCUMENTATION ######################################## - --manual.files += ../manual/html \ -- ../manual/qtiplot-manual-en.pdf - --documentation.files += ../README.html \ -- ../gpl_licence.txt - - unix: man.files += ../qtiplot.1 - -@@ -133,6 +119,7 @@ - ############################################################### - - SOURCES += ../3rdparty/zlib/minigzip.c -+LIBS += -lz - - ############################################################### - ################# Default Modules ############################# -@@ -159,18 +146,19 @@ - qtiUtil.py \ - qti_wordlist.txt \ - -- unix: pythonconfig.path = /usr/local/qtiplot -+ unix: pythonconfig.path = $$INSTALLBASE/share/qtiplot - win32: pythonconfig.path = $$INSTALLBASE - DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\" - } - - unix { - isEmpty(PYTHON): PYTHON = python -- INCLUDEPATH += $$system($$PYTHON python-includepath.py) -- LIBS += $$system($$PYTHON -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"") -+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR) -+ LIBS += -l$$(PYTHON_VERSION) - LIBS += -lm - system(mkdir -p $${SIP_DIR}) -- system($$system($$PYTHON python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip) -+ SIPCMD = $$PYTHON_CMD python-sipcmd.py -+ system($$system($$SIPCMD) -c $${SIP_DIR} src/scripting/qti.sip) - } - - win32 { diff --git a/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp b/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp deleted file mode 100644 index 29dd19d0d93d..000000000000 --- a/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp +++ /dev/null @@ -1,44 +0,0 @@ ---- qtiplot/src/analysis/dialogs/FitDialog.cpp.orig 2011-10-17 10:38:07 UTC -+++ qtiplot/src/analysis/dialogs/FitDialog.cpp -@@ -101,7 +101,7 @@ FitDialog::FitDialog(Graph *g, QWidget* - ApplicationWindow *app = (ApplicationWindow *)parent; - QString pluginsPath = app->fitPluginsPath; - QFileInfo fi(pluginsPath); -- if (pluginsPath.isEmpty() || !fi.isDir() || !fi.isWritable()) -+ if (pluginsPath.isEmpty() || !fi.isDir()) - choosePluginsFolder(); - else - loadPlugins(); -@@ -1019,11 +1019,7 @@ void FitDialog::showFitPage() - int prec = boxPrecision->value(); - for (int i = 0; i<parameters; i++){ - QTableWidgetItem *it = new QTableWidgetItem(paramList[i]); --#ifdef Q_CC_MSVC - it->setFlags(it->flags() & (~Qt::ItemIsEditable)); --#else -- it->setFlags(!Qt::ItemIsEditable); --#endif - it->setBackground(QBrush(Qt::lightGray)); - it->setForeground(Qt::black); - QFont font = it->font(); -@@ -1049,7 +1045,7 @@ void FitDialog::showFitPage() - boxParams->setCellWidget(i, 2, sb); - - it = new QTableWidgetItem(); -- it->setFlags(!Qt::ItemIsEditable); -+ it->setFlags(it->flags() & (~Qt::ItemIsEditable)); - it->setText("--"); - boxParams->setItem(i, 5, it); - } -@@ -1061,11 +1057,7 @@ void FitDialog::showFitPage() - boxParams->showColumn(4); - for (int i = 0; i<boxParams->rowCount(); i++ ){ - QTableWidgetItem *it = new QTableWidgetItem(); --#ifdef Q_CC_MSVC - it->setFlags(it->flags() & (~Qt::ItemIsEditable)); --#else -- it->setFlags(!Qt::ItemIsEditable); --#endif - it->setBackground(QBrush(Qt::lightGray)); - boxParams->setItem(i, 4, it); - diff --git a/math/qtiplot/files/patch-qtiplot__src__plot3D__Cone3D.cpp b/math/qtiplot/files/patch-qtiplot__src__plot3D__Cone3D.cpp deleted file mode 100644 index daaf3f4404a1..000000000000 --- a/math/qtiplot/files/patch-qtiplot__src__plot3D__Cone3D.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- ./qtiplot/src/plot3D/Cone3D.cpp.orig 2010-09-27 07:12:48.000000000 +0000 -+++ ./qtiplot/src/plot3D/Cone3D.cpp 2012-04-16 21:30:38.879058155 +0000 -@@ -31,6 +31,7 @@ - #include "qwt3d_plot.h" - #include <qwt3d_curve.h> - #include "Cone3D.h" -+#include "GL/glu.h" - - using namespace Qwt3D; - diff --git a/math/qtiplot/files/patch-qtiplot__src__scripting__qti.sip b/math/qtiplot/files/patch-qtiplot__src__scripting__qti.sip deleted file mode 100644 index 6c6c275e7f24..000000000000 --- a/math/qtiplot/files/patch-qtiplot__src__scripting__qti.sip +++ /dev/null @@ -1,69 +0,0 @@ ---- qtiplot/src/scripting/qti.sip.orig 2018-05-11 22:48:48 UTC -+++ qtiplot/src/scripting/qti.sip -@@ -370,7 +370,7 @@ public: - if (sipCpp->text(row, col) != "") - sipRes = sipCpp->cell(row, col); - else { -- sipRes = NULL; -+ sipRes = 0; - PyErr_SetString(PyExc_ValueError, "Empty table cell"); - } - } -@@ -3433,57 +3433,6 @@ public: - double pValue(); - }; - --class Anova : StatisticTest --{ --%TypeHeaderCode --#include <Anova.h> --%End --public: -- Anova(ApplicationWindow * /TransferThis/, bool twoWay = false, double level = 0.05); -- Anova(bool twoWay = false, double level = 0.05) /NoDerived/; --%MethodCode -- SIPQTI_APP(new sipAnova(app, a0, a1)) --%End -- -- bool run(); -- bool addSample(const QString& colName, int aLevel = 1, int bLevel = 1); -- void setAnovaTwoWayModel(int); -- -- virtual QString logInfo(); -- double fStat(); -- double statistic(); -- double pValue(); -- //! Sum of squares -- double ssm(); -- double sse(); -- double sst(); -- //! Mean square value -- double mse(); -- //! F statistic for factor A -- double fStatA(); -- //! F statistic for factor B -- double fStatB(); -- //! F statistic for the interaction -- double fStatAB(); -- //! P value for factor A -- double pValueA(); -- //! P value for factor B -- double pValueB(); -- //! P value for the interaction -- double pValueAB(); -- //! Sum of squares for factor A -- double ssa(); -- //! Sum of squares for factor B -- double ssb(); -- //! Sum of squares for the interaction -- double ssab(); -- //! Mean square value for factor A -- double msa(); -- //! Mean square value for factor B -- double msb(); -- //! Mean square value for the interaction -- double msab(); --}; - - // used for output redirection - class PythonScripting diff --git a/math/qtiplot/files/patch-qtiplot__src__scripting__scripting.pri b/math/qtiplot/files/patch-qtiplot__src__scripting__scripting.pri deleted file mode 100644 index a73948349446..000000000000 --- a/math/qtiplot/files/patch-qtiplot__src__scripting__scripting.pri +++ /dev/null @@ -1,10 +0,0 @@ ---- ./qtiplot/src/scripting/scripting.pri.orig 2010-11-16 13:42:07.000000000 +0300 -+++ ./qtiplot/src/scripting/scripting.pri 2011-03-19 00:09:38.182155936 +0300 -@@ -115,7 +115,6 @@ - $${SIP_DIR}/sipqtitTest.cpp \ - $${SIP_DIR}/sipqtiShapiroWilkTest.cpp \ - $${SIP_DIR}/sipqtiChiSquareTest.cpp \ -- $${SIP_DIR}/sipqtiAnova.cpp \ - - exists(../../$${SIP_DIR}/sipqtiQList.cpp) { - # SIP < 4.9 diff --git a/math/qtiplot/files/patch-qtiplot_qtiplotrc.py b/math/qtiplot/files/patch-qtiplot_qtiplotrc.py deleted file mode 100644 index 4caaedb8283e..000000000000 --- a/math/qtiplot/files/patch-qtiplot_qtiplotrc.py +++ /dev/null @@ -1,14 +0,0 @@ ---- qtiplot/qtiplotrc.py.orig 2011-07-06 06:37:50 UTC -+++ qtiplot/qtiplotrc.py -@@ -37,7 +37,10 @@ def import_to_global(modname, attrs=None - """ - import sys - import os -- sys.path.append(os.path.dirname(__file__)) -+ try: -+ sys.path.append(os.path.dirname(__file__)) -+ except: -+ pass - mod = __import__(modname) - for submod in modname.split(".")[1:]: - mod = getattr(mod, submod) diff --git a/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp b/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp deleted file mode 100644 index c58a884e850b..000000000000 --- a/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp +++ /dev/null @@ -1,25 +0,0 @@ ---- 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_core_ConfigDialog.cpp b/math/qtiplot/files/patch-qtiplot_src_core_ConfigDialog.cpp deleted file mode 100644 index 737207ebfeab..000000000000 --- a/math/qtiplot/files/patch-qtiplot_src_core_ConfigDialog.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- qtiplot/src/core/ConfigDialog.cpp.orig 2011-10-25 09:50:22 UTC -+++ qtiplot/src/core/ConfigDialog.cpp -@@ -1390,7 +1390,7 @@ void ConfigDialog::setColorsList(const Q - colorsList->setRowCount(colors); - for (int i = 0; i < colors; i++){ - QTableWidgetItem *it = new QTableWidgetItem(); -- it->setFlags(!Qt::ItemIsEditable); -+ it->setFlags(it->flags() & (~Qt::ItemIsEditable)); - it->setBackground(QBrush(colList[i])); - colorsList->setItem(i, 0, it); - diff --git a/math/qtiplot/files/patch-qtiplot_src_lib_src_ColorMapEditor.cpp b/math/qtiplot/files/patch-qtiplot_src_lib_src_ColorMapEditor.cpp deleted file mode 100644 index 857a3d421cf4..000000000000 --- a/math/qtiplot/files/patch-qtiplot_src_lib_src_ColorMapEditor.cpp +++ /dev/null @@ -1,26 +0,0 @@ ---- qtiplot/src/lib/src/ColorMapEditor.cpp.orig 2011-07-02 07:23:52 UTC -+++ qtiplot/src/lib/src/ColorMapEditor.cpp -@@ -155,11 +155,7 @@ void ColorMapEditor::setColorMap(const L - QColor c = color_map.color(i); - - QTableWidgetItem *it = new QTableWidgetItem(c.name()); -- #ifdef Q_CC_MSVC - it->setFlags(it->flags() & (~Qt::ItemIsEditable)); -- #else -- it->setFlags(!Qt::ItemIsEditable); -- #endif - it->setBackground(QBrush(c)); - it->setForeground(QBrush(c)); - table->setItem(i, 1, it); -@@ -246,11 +242,7 @@ void ColorMapEditor::insertLevel() - table->setCellWidget(row, 0, sb); - - QTableWidgetItem *it = new QTableWidgetItem(c.name()); --#ifdef Q_CC_MSVC - it->setFlags(it->flags() & (~Qt::ItemIsEditable)); --#else -- it->setFlags(!Qt::ItemIsEditable); --#endif - it->setBackground(QBrush(c)); - it->setForeground(QBrush(c)); - table->setItem(row, 1, it); diff --git a/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp b/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp deleted file mode 100644 index c35361d0a2e0..000000000000 --- a/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index bf6465f11f27..000000000000 --- a/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp +++ /dev/null @@ -1,27 +0,0 @@ -Description: if you don't initialize the "i" variable, or initialize it to 0.0 - qtiplot won't let you set the column values using muparser. -Author: Scott Howard <showard@debian.org> -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707736 - -Index: qtiplot/qtiplot/src/table/Table.cpp -=================================================================== ---- qtiplot/src/table/Table.cpp.orig 2011-09-13 11:20:29 UTC -+++ qtiplot/src/table/Table.cpp -@@ -564,7 +564,7 @@ bool Table::muParserCalculate(int col, i - QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); - - muParserScript *mup = new muParserScript(scriptEnv, cmd, this, QString("<%1>").arg(colName(col))); -- double *r = mup->defineVariable("i"); -+ double *r = mup->defineVariable("i",startRow + 1.0); - 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!")); diff --git a/math/qtiplot/files/patch-sip-4.15 b/math/qtiplot/files/patch-sip-4.15 deleted file mode 100644 index c68f83fc7916..000000000000 --- a/math/qtiplot/files/patch-sip-4.15 +++ /dev/null @@ -1,45 +0,0 @@ ---- ./qtiplot/src/plot2D/ImageWidget.h.orig 2010-10-17 07:04:05.000000000 +0000 -+++ ./qtiplot/src/plot2D/ImageWidget.h 2013-10-23 18:00:01.810504452 +0000 -@@ -67,10 +67,10 @@ - void setWindowName(const QString& name){d_window_name = name;}; - - static QPixmap windowPixmap(ApplicationWindow *mw, const QString& name, const QSize& size); -+ void paintEvent(QPaintEvent *e); - - private: - void draw(QPainter *painter, const QRect& r); -- void paintEvent(QPaintEvent *e); - QPixmap d_pix; - //! The file from which the image was loaded. - QString d_file_name; ---- ./qtiplot/src/analysis/FFT.cpp.orig 2011-07-06 11:51:08.000000000 +0000 -+++ ./qtiplot/src/analysis/FFT.cpp 2013-10-23 23:07:45.674925476 +0000 -@@ -353,7 +353,7 @@ - ml->arrangeLayers(false, false); - } - --bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to) -+bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to, bool unused) - { - d_init_err = true; - ---- ./qtiplot/src/analysis/FFT.h.orig 2011-07-05 22:05:03.000000000 +0000 -+++ ./qtiplot/src/analysis/FFT.h 2013-10-23 23:11:34.277924367 +0000 -@@ -52,6 +52,8 @@ - Matrix *realOutputMatrix(){return d_re_out_matrix;} - Matrix *imaginaryOutputMatrix(){return d_im_out_matrix;} - -+ bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1, bool unused = false); -+ - private: - void init(); - void output(); -@@ -60,8 +62,6 @@ - void fftTable(); - void fftMatrix(); - -- bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1); -- - double d_sampling; - //! Flag telling if an inverse FFT must be performed. - bool d_inverse; diff --git a/math/qtiplot/files/patch-sip-4.19.6 b/math/qtiplot/files/patch-sip-4.19.6 deleted file mode 100644 index 412cf9b76578..000000000000 --- a/math/qtiplot/files/patch-sip-4.19.6 +++ /dev/null @@ -1,17 +0,0 @@ -Obtained from: https://bugs.gentoo.org/641514#c2 ---- qtiplot/src/scripting/qti.sip.orig 2018-01-02 11:37:07 UTC -+++ qtiplot/src/scripting/qti.sip -@@ -3243,11 +3243,11 @@ class FFT : Filter (public) - %MethodCode - SIPQTI_APP(new sipFFT(app, a0, *a1, a2, a3)) - %End -- FFT(QwtPlotCurve *&) /NoDerived/; -+ FFT(QwtPlotCurve *) /NoDerived/; - %MethodCode - SIPQTI_APP(new sipFFT(app, a0)) - %End -- FFT(QwtPlotCurve *&, double, double) /NoDerived/; -+ FFT(QwtPlotCurve *, double, double) /NoDerived/; - %MethodCode - SIPQTI_APP(new sipFFT(app, a0, a1, a2)) - %End |