mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 05:53:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Temperature Text

Browse source 
This fixes temperature text replacing the old code
with the new DiveTextItem.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-01-19 17:38:22 -02:00 • committed by Dirk Hohndel
parent 9d2344d01b
commit 592ee31326
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
qt-ui/profile/diveprofileitem.cpp
View file

@ -120,6 +120,8 @@ void DiveTemperatureItem::modelDataChanged()
if (!hAxis || !vAxis || !dataModel || hDataColumn == -1 || vDataColumn == -1) if (!hAxis || !vAxis || !dataModel || hDataColumn == -1 || vDataColumn == -1)
return; return;
qDeleteAll(texts);
texts.clear();
// Ignore empty values. things do not look good with '0' as temperature in kelvin... // Ignore empty values. things do not look good with '0' as temperature in kelvin...
QPolygonF poly; QPolygonF poly;
int last = -300, last_printed_temp = 0, sec = 0; int last = -300, last_printed_temp = 0, sec = 0;
@ -159,9 +161,15 @@ void DiveTemperatureItem::createTextItem(int sec, int mkelvin)
{ {
double deg; double deg;
const char *unit; const char *unit;
static text_render_options_t tro = {TEMP_TEXT_SIZE, TEMP_TEXT, LEFT, TOP}; static text_render_options_t tro = {TEMP_TEXT_SIZE, TEMP_TEXT};
deg = get_temp_units(mkelvin, &unit); deg = get_temp_units(mkelvin, &unit);
plotText(&tro, QPointF(hAxis->posAtValue(sec), vAxis->posAtValue(mkelvin)), QString("%1%2").arg(deg, 0, 'f', 1).arg(unit), this); //"%.2g%s"
DiveTextItem *text = new DiveTextItem(this);
text->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
text->setBrush(getColor(TEMP_TEXT));
text->setPos(QPointF(hAxis->posAtValue(sec), vAxis->posAtValue(mkelvin)));
text->setText(QString("%1%2").arg(deg, 0, 'f', 1).arg(unit));
// text->setSize(TEMP_TEXT_SIZE); //TODO: TEXT SIZE!
} }
void DiveTemperatureItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) void DiveTemperatureItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
@ -217,8 +225,3 @@ void DiveGasPressureItem::paint(QPainter* painter, const QStyleOptionGraphicsIte
} }
} }
} }
QGraphicsItemGroup *plotText(text_render_options_t* tro, const QPointF& pos, const QString& text, QGraphicsItem *parent)
{
}

1
qt-ui/profile/diveprofileitem.h
View file

@ -60,6 +60,7 @@ public:
virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0); virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
private: private:
void createTextItem(int seconds, int mkelvin); void createTextItem(int seconds, int mkelvin);
QList<DiveTextItem*> texts;
}; };
class DiveGasPressureItem : public AbstractProfilePolygonItem{ class DiveGasPressureItem : public AbstractProfilePolygonItem{