X-Git-Url: http://git.maemo.org/git/?p=mardrone;a=blobdiff_plain;f=mardrone%2Fgauges%2Fgaugearc.cpp;h=969a996a0ad792b55bc27a2ddea8f6901f4afa07;hp=3886d17e45a9bd2f16dbbba55e6e03bffe14c861;hb=5338a11daffd03a49ef70b077b37ddc1414063a5;hpb=04dd9eeea7b747c1cee4882673a7e1c17519fe1a;ds=sidebyside diff --git a/mardrone/gauges/gaugearc.cpp b/mardrone/gauges/gaugearc.cpp index 3886d17..969a996 100644 --- a/mardrone/gauges/gaugearc.cpp +++ b/mardrone/gauges/gaugearc.cpp @@ -32,7 +32,7 @@ void GaugeArc::paintArcScale(QPainter *painter,int width,int height) int xo=(width/2); int yo=(height/2); int arcsize=xo-5; - painter->setTransform(QTransform().scale(m_scale,m_scale)); + painter->setTransform(QTransform().translate(scenePos().x()+width/2,scenePos().y()+height/2).scale(m_scale,m_scale)); QTransform savematrix= painter->transform (); QPen pen(m_color); pen.setWidth(m_lineWidth); @@ -49,7 +49,7 @@ void GaugeArc::paintArcScale(QPainter *painter,int width,int height) QFontMetrics fm(m_font); QPolygon needle; - painter->setTransform(QTransform().translate(xo+scenePos().x()/m_scale, yo+scenePos().y()/m_scale),true); + //painter->setTransform(QTransform().translate(xo+scenePos().x()/m_scale, yo+scenePos().y()/m_scale),true); painter->setBrush(backBrush); painter->setPen(nopen); painter->drawChord(QRect(-xo,-xo,2*xo,2*xo),0,360*16); @@ -64,7 +64,6 @@ void GaugeArc::paintArcScale(QPainter *painter,int width,int height) int labelWidth=fm.width(label); int labelHeight=fm.height(); painter->setTransform(savematrix); - painter->setTransform(QTransform().translate(xo+scenePos().x()/m_scale, yo+scenePos().y()/m_scale),true); painter->drawArc(-arcsize,-arcsize,2*arcsize,2*arcsize,(int(m_lowPosition+270)%360)*-16,(int(m_highPosition+270)%360)*-16); QPoint labelP=QPoint(0,-xo+15); labelP=rotT.map(labelP); @@ -77,7 +76,7 @@ void GaugeArc::paintArcScale(QPainter *painter,int width,int height) // qDebug() << alpha << labelP << labelPd << labelPo << labelWidth << labelHeight; painter->drawText(labelPd,label); painter->drawLine(lineInP,lineOutP); - alpha+=m_tickSpacing; + alpha+=m_tickSpacing?m_tickSpacing:10; val+=m_tickIncrement; } needle+=QPoint(-5,0);