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

Make font label scale a per axis property

Browse source 
This way the partial pressure graph can have smaller pressure labels than
all the other labels on the profile.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-02-15 11:15:57 -08:00
parent 980737221d
commit 6be62c1d90
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,8 @@ static QPen gridPen(){
return pen; return pen;
} }
void DiveCartesianAxis::setup(double minimum, double maximum, double interval, DiveCartesianAxis::Orientation o, qreal tick_size, const QPointF& pos) void DiveCartesianAxis::setup(double minimum, double maximum, double interval, double labelFontScale,
DiveCartesianAxis::Orientation o, qreal tick_size, const QPointF& pos)
{ {
setMinimum(minimum); setMinimum(minimum);
setMaximum(maximum); setMaximum(maximum);
@ -28,6 +29,7 @@ void DiveCartesianAxis::setup(double minimum, double maximum, double interval, D
setOrientation(o); setOrientation(o);
setTickSize(tick_size); setTickSize(tick_size);
setPos(pos); setPos(pos);
setFontLabelScale(labelFontScale);
} }
double DiveCartesianAxis::tickInterval() const double DiveCartesianAxis::tickInterval() const
@ -40,6 +42,11 @@ double DiveCartesianAxis::tickSize() const
return tick_size; return tick_size;
} }
void DiveCartesianAxis::setFontLabelScale(qreal scale)
{
labelScale = scale;
}
void DiveCartesianAxis::setMaximum(double maximum) void DiveCartesianAxis::setMaximum(double maximum)
{ {
if (IS_FP_SAME(max, maximum)) if (IS_FP_SAME(max, maximum))
@ -67,6 +74,7 @@ DiveCartesianAxis::DiveCartesianAxis() : QObject(),
min(0), min(0),
max(0), max(0),
interval(1), interval(1),
labelScale(1.0),
tick_size(0), tick_size(0),
textVisibility(true) textVisibility(true)
{ {
@ -164,7 +172,7 @@ void DiveCartesianAxis::updateTicks()
label->setText(textForValue(currValue)); label->setText(textForValue(currValue));
label->setBrush(QBrush(textColor)); label->setBrush(QBrush(textColor));
label->setBrush(colorForValue(currValue)); label->setBrush(colorForValue(currValue));
label->setScale(0.8); label->setScale(fontLabelScale());
labels.push_back(label); labels.push_back(label);
if (orientation == RightToLeft || orientation == LeftToRight) { if (orientation == RightToLeft || orientation == LeftToRight) {
label->setAlignment(Qt::AlignBottom | Qt::AlignHCenter); label->setAlignment(Qt::AlignBottom | Qt::AlignHCenter);
@ -262,6 +270,11 @@ double DiveCartesianAxis::minimum() const
return min; return min;
} }
double DiveCartesianAxis::fontLabelScale() const
{
return labelScale;
}
void DiveCartesianAxis::setColor(const QColor& color) void DiveCartesianAxis::setColor(const QColor& color)
{ {
QPen defaultPen(color); QPen defaultPen(color);

5
qt-ui/profile/divecartesianaxis.h
View file

@ -19,16 +19,18 @@ public:
enum Orientation{TopToBottom, BottomToTop, LeftToRight, RightToLeft}; enum Orientation{TopToBottom, BottomToTop, LeftToRight, RightToLeft};
DiveCartesianAxis(); DiveCartesianAxis();
virtual ~DiveCartesianAxis(); virtual ~DiveCartesianAxis();
void setup(double minimum, double maximum, double interval, Orientation o, qreal tickSize, const QPointF& pos); void setup(double minimum, double maximum, double interval, double labelFontScale, Orientation o, qreal tickSize, const QPointF& pos);
void setMinimum(double minimum); void setMinimum(double minimum);
void setMaximum(double maximum); void setMaximum(double maximum);
void setTickInterval(double interval); void setTickInterval(double interval);
void setOrientation(Orientation orientation); void setOrientation(Orientation orientation);
void setTickSize(qreal size); void setTickSize(qreal size);
void setFontLabelScale(qreal scale);
double minimum() const; double minimum() const;
double maximum() const; double maximum() const;
double tickInterval() const; double tickInterval() const;
double tickSize() const; double tickSize() const;
double fontLabelScale() const;
qreal valueAt(const QPointF& p) const; qreal valueAt(const QPointF& p) const;
qreal percentAt(const QPointF& p); qreal percentAt(const QPointF& p);
qreal posAtValue(qreal value); qreal posAtValue(qreal value);
@ -54,6 +56,7 @@ protected:
double tick_size; double tick_size;
QColor textColor; QColor textColor;
bool textVisibility; bool textVisibility;
double labelScale;
}; };
class DepthAxis : public DiveCartesianAxis { class DepthAxis : public DiveCartesianAxis {

1
qt-ui/profile/profilewidget2.cpp
View file

@ -132,6 +132,7 @@ void ProfileWidget2::setupItemOnScene()
gasYAxis->setTickSize(1); gasYAxis->setTickSize(1);
gasYAxis->setMinimum(0); gasYAxis->setMinimum(0);
gasYAxis->setModel(dataModel); gasYAxis->setModel(dataModel);
gasYAxis->setFontLabelScale(0.7);
temperatureAxis->setOrientation(DiveCartesianAxis::BottomToTop); temperatureAxis->setOrientation(DiveCartesianAxis::BottomToTop);
temperatureAxis->setTickSize(2); temperatureAxis->setTickSize(2);