diff --git a/i0mapmon.pro b/i0mapmon.pro index 95c62790aca14911d6775ee6a0dcd6bf04a9515b..2ad1bd0c74919c283a1b24431d7327a7fecfcfab 100644 --- a/i0mapmon.pro +++ b/i0mapmon.pro @@ -5,7 +5,7 @@ include($${CUMBIA_ROOT}/include/quapps/quapps.pri) CONFIG += debug -# DEFINES -= QT_NO_DEBUG_OUTPUT +DEFINES -= QT_NO_DEBUG_OUTPUT # RESOURCES += diff --git a/src/i0mmonplot.cpp b/src/i0mmonplot.cpp index bdb0d96b5f0c25eb6c8608c14b8d0a75eab5cbe2..bc4eecc84e73e41688ca83a0d71e2df05fc8f271 100644 --- a/src/i0mmonplot.cpp +++ b/src/i0mmonplot.cpp @@ -75,6 +75,7 @@ bool I0MMonPlot::yAutoScale() const { } void I0MMonPlot::setSources(const QString &x, const QString &y, const QMap<int, double> lambdamap, int nsamples) { + qDebug() << __PRETTY_FUNCTION__ << lambdamap; m_multiread_plu_i->unsetSources(); foreach(const QString& cn, m_curvesymap.keys()) removeCurve(cn); @@ -84,21 +85,20 @@ void I0MMonPlot::setSources(const QString &x, const QString &y, const QMap<int, m_lambdas = lambdamap; m_time_mode = (x == "time"); m_reset_scales(); - int la = 1, cc = 0;; foreach(double l, lambdamap.values()) { QString cuna = QString("lambda %1").arg(l); QuPlotCurve *crv = curve(cuna); + const int lambdai = lambdamap.key(l) + 1; // from 1 if(!crv) { crv = new QuPlotCurve(cuna); addCurve(cuna, crv); QPen p = crv->pen(); - p.setColor(m_colormap[cc % m_colormap.size()]); + p.setColor(m_colormap[(lambdai - 1) % m_colormap.size()]); // colormap lambdai - 1, from 0 p.setWidthF(2.5); crv->setPen(p); - crv->setTitle(QString("λ %1").arg(la++)); - cc++; + crv->setTitle(QString("λ %1").arg(lambdai)); } - m_curvesymap[cuna] = m_symstyles[m_curvesymap.size() % m_symstyles.size()]; + m_curvesymap[cuna] = m_symstyles[(lambdai-1) % m_symstyles.size()]; } qDebug() << __PRETTY_FUNCTION__ << "settings sources: x " << x << " y " << y << "time mode" << m_time_mode; if(m_time_mode) { @@ -114,6 +114,9 @@ void I0MMonPlot::setSources(const QString &x, const QString &y, const QMap<int, } } updateLegend(); + printf("I0MMonPlot::setSources curvesSize %d\n", curves().size()); + foreach(QwtPlotCurve *c, curves()) + printf("- %s\n", qstoc(c->title().text())); } void I0MMonPlot::setYBounds(double ymi, double yma) {