Changeset 11ccadb in subsurface


Ignore:
Timestamp:
Feb 5, 2017, 11:59:47 AM (6 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
12c33a0
Parents:
11dcae4
git-author:
Joakim Bygdell <j.bygdell@…> (02/04/17 01:46:02)
git-committer:
Dirk Hohndel <dirk@…> (02/05/17 11:59:47)
Message:

MOBILE: Reposition objects in the profile

Add the tankbar to the profile and change the relative positions of the depth
and temperature curves to minimize overlap.

Signed-off-by: Joakim Bygdell <j.bygdell@…>

Location:
profile-widget
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • profile-widget/profilewidget2.cpp

    r2516ae7e r11ccadb  
    225225        scene()->addItem(diveComputerText);
    226226        scene()->addItem(reportedCeiling);
     227        scene()->addItem(tankItem);
    227228#ifndef SUBSURFACE_MOBILE
    228229        scene()->addItem(toolTipItem);
     
    242243        scene()->addItem(rulerItem->sourceNode());
    243244        scene()->addItem(rulerItem->destNode());
    244         scene()->addItem(tankItem);
    245245        scene()->addItem(mouseFollowerHorizontal);
    246246        scene()->addItem(mouseFollowerVertical);
     
    421421        itemPos.depth.intermediate.setP1(QPointF(0, 0));
    422422        itemPos.depth.intermediate.setP2(QPointF(0, 65));
     423#ifdef SUBSURFACE_MOBILE
     424        itemPos.depth.expanded.setP2(QPointF(0, 65));
     425#endif
    423426
    424427        // Time Axis Config
     
    426429        itemPos.time.pos.on.setY(95);
    427430#ifdef SUBSURFACE_MOBILE
    428         itemPos.time.pos.on.setY(89);
     431        itemPos.time.pos.on.setY(89.5);
    429432#endif
    430433        itemPos.time.pos.off.setX(3);
     
    462465        itemPos.temperature.pos.on.setX(3);
    463466        itemPos.temperature.pos.on.setY(60);
    464 #ifdef SUBSURFACE_MOBILE
    465         itemPos.temperature.pos.on.setY(50);
    466 #endif
    467467        itemPos.temperatureAll.pos.on.setY(51);
    468468        itemPos.temperature.pos.off.setX(-10);
     
    474474        itemPos.temperature.intermediate.setP1(QPointF(0, 2));
    475475        itemPos.temperature.intermediate.setP2(QPointF(0, 12));
     476#ifdef SUBSURFACE_MOBILE
     477        itemPos.temperature.pos.on.setY(51);
     478        itemPos.temperatureAll.pos.on.setY(47);
     479        itemPos.temperature.expanded.setP1(QPointF(0, 20));
     480        itemPos.temperature.expanded.setP2(QPointF(0, 33));
     481        itemPos.temperature.intermediate.setP1(QPointF(0, 2));
     482        itemPos.temperature.intermediate.setP2(QPointF(0, 12));
     483#endif
    476484
    477485        // Heartbeat axis config
     
    498506        itemPos.tankBar.on.setX(0);
    499507        itemPos.tankBar.on.setY(91.95);
     508#ifdef SUBSURFACE_MOBILE
     509        itemPos.tankBar.on.setY(86.4);
     510#endif
    500511}
    501512
  • profile-widget/tankitem.cpp

    rdd2791f r11ccadb  
    7575        label->setPos(x + 1, 0);
    7676        label->setAlignment(Qt::AlignBottom | Qt::AlignRight);
     77#ifdef SUBSURFACE_MOBILE
     78        label->setPos(x + 1, -2.5);
     79#endif
    7780        label->setZValue(101);
    7881}
Note: See TracChangeset for help on using the changeset viewer.