liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding SVG support for icons with automatic cache handling

Browse Source 
See issue #3547 and #4803
This commit is contained in:
Hombre
2018-12-13 00:04:30 +01:00
parent 7ab3893b2b
commit 81407cd663
20 changed files with 196 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
rtgui/rtscalable.cc
View File

@@ -18,10 +18,18 @@
*/
#include "rtscalable.h"
#include "../rtengine/icons.h"
#include <glib/gstdio.h>
#include <regex>
#include <glibmm.h>
#include <iostream>
#include <librsvg/rsvg.h>
#include "options.h"
double RTScalable::dpi = 0.;
int RTScalable::scale = 0;
extern Glib::ustring argv0;
extern Options options;
extern float fontScale;
extern unsigned char scale;
Gtk::TextDirection RTScalable::direction = Gtk::TextDirection::TEXT_DIR_NONE;
@@ -36,11 +44,16 @@ void RTScalable::setDPInScale (const double newDPI, const int newScale)
if (scale == 2 && newDPI < 192) {
dpi *= 2;
}
printf("RTScalable::setDPInScale / New scale = %d & new DPI = %.3f (%.3f asked) -> Reloading all RTScalable\n", scale, dpi, newDPI);
//printf("RTScalable::setDPInScale / New scale = %d & new DPI = %.3f (%.3f asked) -> Reloading all RTScalable\n", scale, dpi, newDPI);
}
}
double RTScalable::getDPI ()
{
return dpi;
}
double RTScalable::getTweakedDPI ()
{
return dpi * fontScale;
}
@@ -57,27 +70,114 @@ Gtk::TextDirection RTScalable::getDirection()
void RTScalable::init(Gtk::Window *window)
{
printf("RTScalable::init\n");
setDPInScale(window->get_screen()->get_resolution(), ::scale);
direction = window->get_direction();
}
void RTScalable::resizeImage(Cairo::RefPtr<Cairo::ImageSurface> &surf, double factor)
/*
* This function try to find the svg file converted to png in a cache and return
* the Cairo::ImageSurface. If it can't find it, it will generate it.
*
* If the provided filename doesn't end with ".svg" (and then we're assuming it's a png file),
* it will try to load that file directly from the source images folder. Scaling is disabled
* for anything else than svg files.
*
* This function will always return a usable value, but it might be a garbage image
* if something went wrong.
*/
Cairo::RefPtr<Cairo::ImageSurface> RTScalable::loadImage(const Glib::ustring &fname, double dpi)
{
if (options.fontFamily != "default") {
factor *= options.fontSize / 9;
}
int newWidth = int((double)surf->get_width() * factor);
int newHeight = int((double)surf->get_height() * factor);
printf("Resizing from %dx%d to %dx%d (factor: %.5f)\n", surf->get_width(), surf->get_height(), newWidth, newHeight, factor);
Cairo::RefPtr<Cairo::ImageSurface> surf2 = Cairo::ImageSurface::create(surf->get_format(), newWidth, newHeight);
Cairo::RefPtr<Cairo::Context> c = Cairo::Context::create(surf2);
c->scale (factor, factor);
c->set_source(surf, 0., 0.);
//Cairo::RefPtr<Cairo::SurfacePattern> p = Cairo::SurfacePattern::create(surf);
//p->set_filter (Cairo::FILTER_BILINEAR);
c->paint ();
surf2->flush();
// Magic color : #2a7fff
// Dark theme color : #CCCCCC
// Light theme color : #252525 -- not used
surf = surf2;
Glib::ustring imagesFolder = Glib::build_filename (argv0, "images");
Glib::ustring imagesCacheFolder = Glib::build_filename (options.cacheBaseDir, "svg2png");
// -------------------- Looking for the cached PNG file first --------------------
Glib::ustring imagesCacheFolderDPI = Glib::build_filename (imagesCacheFolder, Glib::ustring::compose("%1", (int)dpi));
auto path = Glib::build_filename(imagesCacheFolderDPI, fname);
if (Glib::file_test(path.c_str(), Glib::FILE_TEST_EXISTS)) {
return Cairo::ImageSurface::create_from_png(path);
} else {
// -------------------- Looking for the PNG file in install directory --------------------
path = Glib::build_filename(imagesFolder, fname);
if (Glib::file_test(path.c_str(), Glib::FILE_TEST_EXISTS)) {
return Cairo::ImageSurface::create_from_png(path);
}
}
// Last chance: looking for the svg file and creating the cached image file
// -------------------- Creating the cache folder for PNGs --------------------
if (!Glib::file_test(imagesCacheFolderDPI.c_str(), Glib::FILE_TEST_EXISTS)) {
auto error = g_mkdir_with_parents (imagesCacheFolderDPI.c_str(), 0777);
if (error != 0) {
std::cerr << "ERROR: Can't create \"" << imagesCacheFolderDPI << "\" cache folder: " << g_strerror(error) << std::endl;
Cairo::RefPtr<Cairo::ImageSurface> surf = Cairo::ImageSurface::create(Cairo::FORMAT_RGB24, 10, 10);
return surf;
}
}
// -------------------- Loading the SVG file --------------------
std::string svgFile;
Glib::ustring iconNameSVG;
if (fname.find(".png") != Glib::ustring::npos) {
iconNameSVG = fname.substr(0, fname.length() - 3) + Glib::ustring("svg");
}
try {
path = Glib::build_filename (imagesFolder, iconNameSVG);
//printf("Trying to get content of %s\n", path.c_str());
svgFile = Glib::file_get_contents(Glib::build_filename (imagesFolder, iconNameSVG));
}
catch (Glib::FileError &err) {
std::cerr << "ERROR: " << err.what() << std::endl;
Cairo::RefPtr<Cairo::ImageSurface> surf = Cairo::ImageSurface::create(Cairo::FORMAT_RGB24, 10, 10);
return surf;
}
// -------------------- Updating the the magic color --------------------
std::string updatedSVG = std::regex_replace(svgFile, std::regex("#2a7fff"), "#CCCCCC");
// -------------------- Creating the rsvg handle --------------------
GError **error = nullptr;
RsvgHandle *handle = rsvg_handle_new_from_data((unsigned const char*)updatedSVG.c_str(), updatedSVG.length(), error);
if (handle == nullptr) {
std::cerr << "ERROR: Can't use the provided data for \"" << fname << "\" to create a RsvgHandle:" << std::endl
<< Glib::ustring((*error)->message) << std::endl;
Cairo::RefPtr<Cairo::ImageSurface> surf = Cairo::ImageSurface::create(Cairo::FORMAT_RGB24, 10, 10);
return surf;
}
// -------------------- Drawing the image to a Cairo::ImageSurface --------------------
RsvgDimensionData dim;
rsvg_handle_get_dimensions(handle, &dim);
double r = dpi / 92.;
Cairo::RefPtr<Cairo::ImageSurface> surf = Cairo::ImageSurface::create(Cairo::FORMAT_ARGB32, (int)(dim.width * r + 0.499), (int)(dim.height * r + 0.499));
Cairo::RefPtr<Cairo::Context> c = Cairo::Context::create(surf);
c->set_source_rgba (0., 0., 0., 0.);
c->set_operator (Cairo::OPERATOR_CLEAR);
c->paint ();
c->set_operator (Cairo::OPERATOR_OVER);
c->scale(r, r);
rsvg_handle_render_cairo(handle, c->cobj());
rsvg_handle_free(handle);
// -------------------- Saving the image in cache --------------------
surf->write_to_png(Glib::build_filename(imagesCacheFolderDPI, fname));
// -------------------- Finished! Pfeeew ! --------------------
return surf;
}