mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve labeling for partial pressure graphs

Browse source 
This backs off a little on what was added in commit c1102a38f3 ("More
gradient on the partial pressure graph.") - the numbers simply got too
busy. I also slightly changed the positioning of the numbers to be a
little more "natural looking".

Fixes #323

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-12-04 13:27:34 -08:00
parent 66716b5297
commit 5fc50b2aab
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
qt-ui/profilegraphics.cpp
View file

@ -540,16 +540,16 @@ void ProfileGraphicsView::plot_pp_text()
{ {
double pp, dpp, m; double pp, dpp, m;
int hpos; int hpos;
static text_render_options_t tro = {PP_TEXT_SIZE, PP_LINES, LEFT, MIDDLE}; static text_render_options_t tro = {PP_TEXT_SIZE, PP_LINES, LEFT, -0.75};
QGraphicsRectItem *pressureMarkers = new QGraphicsRectItem(); QGraphicsRectItem *pressureMarkers = new QGraphicsRectItem();
setup_pp_limits(&gc); setup_pp_limits(&gc);
pp = floor(gc.pi.maxpp * 10.0) / 10.0 + 0.2; pp = floor(gc.pi.maxpp * 10.0) / 10.0 + 0.2;
dpp = pp > 4 ? 0.5 : 0.2; dpp = pp > 4 ? 0.5 : 0.25;
hpos = gc.pi.entry[gc.pi.nr - 1].sec; hpos = gc.pi.entry[gc.pi.nr - 1].sec;
QColor c = getColor(PP_LINES); QColor c = getColor(PP_LINES);
bool alt = false; bool alt = true;
for (m = 0.0; m <= pp; m += dpp) { for (m = 0.0; m <= pp; m += dpp) {
QGraphicsLineItem *item = new QGraphicsLineItem(SCALEGC(0, m), SCALEGC(hpos, m)); QGraphicsLineItem *item = new QGraphicsLineItem(SCALEGC(0, m), SCALEGC(hpos, m));
QPen pen(defaultPen); QPen pen(defaultPen);
@ -562,9 +562,8 @@ void ProfileGraphicsView::plot_pp_text()
scene()->addItem(item); scene()->addItem(item);
qreal textPos = hpos; qreal textPos = hpos;
if (alt) if (alt)
textPos += 30; plot_text(&tro, QPointF(textPos, m), QString::number(m), pressureMarkers);
alt = !alt; alt = !alt;
plot_text(&tro, QPointF(textPos, m), QString::number(m), pressureMarkers);
} }
scene()->addItem(pressureMarkers); scene()->addItem(pressureMarkers);
pressureMarkers->setPos(pressureMarkers->pos().x() + 10, 0); pressureMarkers->setPos(pressureMarkers->pos().x() + 10, 0);