Commit e678d76a authored by Giacomo Strangolino's avatar Giacomo Strangolino
Browse files

changed QwtSymbol: filled ellipse rect and tri first, then star diamond and cross: issue 7 point 4

parent 90a73c7b
...@@ -19,8 +19,10 @@ ...@@ -19,8 +19,10 @@
I0MMonPlot::I0MMonPlot(QWidget *parent, CumbiaPool *cup, const CuControlsFactoryPool &fpoo) I0MMonPlot::I0MMonPlot(QWidget *parent, CumbiaPool *cup, const CuControlsFactoryPool &fpoo)
: QuPlotBase(parent), : QuPlotBase(parent),
m_symstyles (QList<QwtSymbol::Style> () << QwtSymbol::XCross << QwtSymbol::Cross m_symstyles (QList<QwtSymbol::Style> () << QwtSymbol::Ellipse
<< QwtSymbol::Rect << QwtSymbol::Triangle << QwtSymbol::Star1 << QwtSymbol::Diamond << QwtSymbol::Ellipse) { << QwtSymbol::Rect << QwtSymbol::Triangle <<
QwtSymbol::Star1 << QwtSymbol::Diamond <<
QwtSymbol::Cross<< QwtSymbol::XCross) {
m_ctrl_fpool = fpoo; m_ctrl_fpool = fpoo;
m_cu_poo = cup; m_cu_poo = cup;
m_time_mode = m_empty = true; m_time_mode = m_empty = true;
...@@ -66,6 +68,9 @@ void I0MMonPlot::setSources(const QString &x, const QString &y, const QMap<int, ...@@ -66,6 +68,9 @@ void I0MMonPlot::setSources(const QString &x, const QString &y, const QMap<int,
if(!crv) { if(!crv) {
crv = new QuPlotCurve(cuna); crv = new QuPlotCurve(cuna);
addCurve(cuna, crv); addCurve(cuna, crv);
QPen p = crv->pen();
p.setWidthF(2.5);
crv->setPen(p);
} }
m_curvesymap[cuna] = m_symstyles[m_curvesymap.size() % m_symstyles.size()]; m_curvesymap[cuna] = m_symstyles[m_curvesymap.size() % m_symstyles.size()];
} }
...@@ -231,8 +236,10 @@ void I0MMonPlot::m_curves_style() { ...@@ -231,8 +236,10 @@ void I0MMonPlot::m_curves_style() {
#if CUMBIA_QTCONTROLS_VERSION > 0x010202 #if CUMBIA_QTCONTROLS_VERSION > 0x010202
c->setMaxDataSizeForSymbol(0); // disable first points symbol c->setMaxDataSizeForSymbol(0); // disable first points symbol
#endif #endif
if(!c->symbol() || c->symbol()->style() != m_curvesymap[cn]) if(!c->symbol() || c->symbol()->style() != m_curvesymap[cn]) {
c->setSymbol(new QwtSymbol(m_curvesymap[cn], c->brush(), c->pen(), QSize(6, 6))); QBrush bru(c->pen().color()); // fill symbol
c->setSymbol(new QwtSymbol(m_curvesymap[cn], bru, c->pen(), QSize(10, 10)));
}
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment