mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
c2a7382b10
With all the recent changes, some of the previous assumptions about the scale of items seem to be no longer appropriate. Now that we are showing the icons in the profile again on device it's quite obvious that they were way too big - clearly we don't need the special scaling anymore. Also implement a suggestion from Berthold to get slightly smaller fonts and finer structures in the profile on mobile devices. This scaling of the DPR seems to work well in my tests. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
76 lines
3.1 KiB
C++
76 lines
3.1 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#include "divepixmapcache.h"
|
|
#include "core/metrics.h"
|
|
#include "core/qthelper.h" // for renderSVGIconWidth
|
|
#include "core/color.h"
|
|
|
|
#include <cmath>
|
|
|
|
DivePixmaps::~DivePixmaps()
|
|
{
|
|
}
|
|
|
|
static QPixmap createPixmap(const char *name, int size)
|
|
{
|
|
return QPixmap(QString(name)).scaled(size, size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
|
}
|
|
|
|
DivePixmaps::DivePixmaps(int dpr) : dpr(dpr)
|
|
{
|
|
extern int verbose;
|
|
double dprf = dpr / 100.0;
|
|
const IconMetrics &metrics = defaultIconMetrics();
|
|
int sz_bigger = metrics.sz_med + metrics.sz_small; // ex 40px
|
|
sz_bigger = lrint(sz_bigger * dprf);
|
|
int sz_pix = sz_bigger / 2; // ex 20px
|
|
if (verbose)
|
|
qDebug("%s DPR: %f metrics: %d %d sz_bigger: %d", __FUNCTION__, dprf, metrics.sz_med, metrics.sz_small, sz_bigger);
|
|
|
|
warning = createPixmap(":status-warning-icon", sz_pix);
|
|
info = createPixmap(":status-info-icon", sz_pix);
|
|
violation = createPixmap(":status-violation-icon", sz_pix);
|
|
bailout = createPixmap(":bailout-icon", sz_pix);
|
|
onCCRLoop = createPixmap(":onCCRLoop-icon", sz_pix);
|
|
bookmark = QPixmap::fromImage(renderSVGIconWidth(":dive-bookmark-icon", sz_pix));
|
|
gaschangeTrimixICD = createPixmap(":gaschange-trimix-ICD-icon", sz_bigger);
|
|
gaschangeTrimix = createPixmap(":gaschange-trimix-icon", sz_bigger);
|
|
gaschangeAirICD = createPixmap(":gaschange-air-ICD-icon", sz_bigger);
|
|
gaschangeAir = createPixmap(":gaschange-air-icon", sz_bigger);
|
|
gaschangeOxygenICD = createPixmap(":gaschange-oxygen-ICD-icon", sz_bigger);
|
|
gaschangeOxygen = createPixmap(":gaschange-oxygen-icon", sz_bigger);
|
|
gaschangeEANICD = createPixmap(":gaschange-ean-ICD-icon", sz_bigger);
|
|
gaschangeEAN = createPixmap(":gaschange-ean-icon", sz_bigger);
|
|
|
|
// The transparen pixmap is a very obscure feature to enable tooltips without showing a pixmap.
|
|
// See code in diveeventitem.cpp. This should probably be replaced by a different mechanism.
|
|
QPixmap transparentPixmap(lrint(4 * dprf), lrint(20 * dprf));
|
|
transparentPixmap.fill(makeColor(1.0, 1.0, 1.0, 0.01));
|
|
}
|
|
|
|
static std::vector<std::shared_ptr<const DivePixmaps>> cache;
|
|
|
|
// Return a std::shared_ptr<> for reference counting.
|
|
// Note that the idiomatic way would be to store std::weak_ptr<>s.
|
|
// That would mean that the pixmaps are destroyed when the last user uses
|
|
// them. We want to keep them around at least until the next caller!
|
|
// Therefore we also std::shared_ptr<>s.
|
|
std::shared_ptr<const DivePixmaps> getDivePixmaps(double dprIn)
|
|
{
|
|
using ptr = std::shared_ptr<const DivePixmaps>;
|
|
ptr res;
|
|
int dpr = lrint(dprIn * 100.0); // Caching on a percent basis should be fine.
|
|
auto it = std::find_if(cache.begin(), cache.end(), [dpr](const ptr &p) { return p->dpr == dpr; });
|
|
if (it == cache.end()) {
|
|
res = std::make_shared<DivePixmaps>(dpr);
|
|
cache.push_back(res);
|
|
} else {
|
|
res = *it;
|
|
}
|
|
|
|
// Remove unused items with C++'s wonderful erase/remove idiom.
|
|
// If the use_count is one, then the cache has the only reference, so remove the object.
|
|
cache.erase(std::remove_if(cache.begin(), cache.end(),
|
|
[](const ptr &p) { return p.use_count() <= 1; }), cache.end());
|
|
|
|
return res;
|
|
}
|