X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiImage.cpp;h=e7defe7ec585933bd5d3cb5dcd6e5230c5ecb97d;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=75c78a6ee8335b71db7728e7935a009e57a27dec;hpb=7c392af6eab5e06a4836146859cbd9f2c3764420;p=lyx.git diff --git a/src/frontends/qt4/GuiImage.cpp b/src/frontends/qt4/GuiImage.cpp index 75c78a6ee8..e7defe7ec5 100644 --- a/src/frontends/qt4/GuiImage.cpp +++ b/src/frontends/qt4/GuiImage.cpp @@ -23,7 +23,6 @@ #include "support/lstrings.h" // ascii_lowercase #include -#include #include using namespace std; @@ -32,78 +31,21 @@ using namespace lyx::support; namespace lyx { namespace graphics { -/// Access to this class is through this static method. -Image * GuiImage::newImage() +/// Implement factory method defined in GraphicsImage.h +Image * newImage() { return new GuiImage; } -/// Return the list of loadable formats. -Image::FormatList GuiImage::loadableFormats() -{ - static FormatList fmts; - - if (!fmts.empty()) - return fmts; - - // The formats recognised by LyX - Formats::const_iterator begin = formats.begin(); - Formats::const_iterator end = formats.end(); - - //LYXERR(Debug::GRAPHICS, - // "D:/msys/home/yns/src/lyx-devel/lib/images/banner.png mis of format: " - // << fromqstr(Pic.pictureFormat("D:/msys/.../banner.png"))) - //if (Pic.pictureFormat("D:/msys/.../banner.png")) - // LYXERR(Debug::GRAPHICS, "pictureFormat not returned NULL\n" - // << "Supported formats are: " << Pic.inputFormats()); - - QList qt_formats = QImageReader::supportedImageFormats(); - - LYXERR(Debug::GRAPHICS, - "\nThe image loader can load the following directly:\n"); - - if (qt_formats.empty()) - LYXERR(Debug::GRAPHICS, "\nQt4 Problem: No Format available!"); - - for (QList::const_iterator it = qt_formats.begin(); it != qt_formats.end(); ++it) { - - LYXERR(Debug::GRAPHICS, (const char *) *it << ", "); - - string ext = ascii_lowercase((const char *) *it); - - // special case - if (ext == "jpeg") - ext = "jpg"; - - for (Formats::const_iterator fit = begin; fit != end; ++fit) - if (fit->extension() == ext) { - fmts.push_back(fit->name()); - break; - } - } - - if (lyxerr.debugging()) { - LYXERR(Debug::GRAPHICS, "Of these, LyX recognises the following formats:"); - - FormatList::const_iterator fbegin = fmts.begin(); - FormatList::const_iterator fend = fmts.end(); - for (FormatList::const_iterator fit = fbegin; fit != fend; ++fit) { - if (fit != fbegin) - LYXERR(Debug::GRAPHICS, ", "); - LYXERR(Debug::GRAPHICS, *fit); - } - LYXERR(Debug::GRAPHICS, '\n'); - } - - return fmts; -} +GuiImage::GuiImage() : is_transformed_(false) +{} GuiImage::GuiImage(GuiImage const & other) : Image(other), original_(other.original_), - transformed_(other.transformed_), - transformed_pixmap_(other.transformed_pixmap_) + transformed_(other.transformed_), is_transformed_(other.is_transformed_), + fname_(other.fname_) {} @@ -113,141 +55,132 @@ Image * GuiImage::clone() const } +QImage const & GuiImage::image() const +{ + return is_transformed_ ? transformed_ : original_; +} + + unsigned int GuiImage::width() const { - return transformed_.width(); + return is_transformed_ ? transformed_.width() : original_.width(); } unsigned int GuiImage::height() const { - return transformed_.height(); + return is_transformed_ ? transformed_.height() : original_.height(); } -void GuiImage::load(FileName const & filename) +bool GuiImage::load(FileName const & filename) { if (!original_.isNull()) { LYXERR(Debug::GRAPHICS, "Image is loaded already!"); - finishedLoading(false); - return; - } - - if (!original_.load(toqstr(filename.absFilename()))) { - LYXERR(Debug::GRAPHICS, "Unable to open image"); - finishedLoading(false); - return; + return false; } - transformed_ = original_; - finishedLoading(true); + fname_ = toqstr(filename.absFilename()); + return load(); } -// This code is taken from KImageEffect::toGray -static QImage & toGray(QImage & img) +bool GuiImage::load() { - if (img.width() == 0 || img.height() == 0) - return img; - - int const pixels = img.depth() > 8 ? - img.width() * img.height() : img.numColors(); - - unsigned int *data = img.depth() > 8 ? - reinterpret_cast(img.bits()) : - reinterpret_cast(&img.colorTable()[0]); - - for(int i = 0; i < pixels; ++i){ - int const val = qGray(data[i]); - data[i] = qRgba(val, val, val, qAlpha(data[i])); + if (!original_.load(fname_)) { + LYXERR(Debug::GRAPHICS, "Unable to open image"); + return false; } - return img; + return true; } bool GuiImage::setPixmap(Params const & params) { - if (original_.isNull() || params.display == NoDisplay) + if (!params.display) return false; - switch (params.display) { - case GrayscaleDisplay: { - toGray(transformed_); - break; - } - - case MonochromeDisplay: { - transformed_.convertToFormat(transformed_.format(), Qt::MonoOnly); - break; + if (original_.isNull()) { + if (!load()) + return false; } + + is_transformed_ = clip(params); + is_transformed_ |= rotate(params); + is_transformed_ |= scale(params); - default: - break; - } + // Clear the pixmap to save some memory. + if (is_transformed_) + original_ = QImage(); + else + transformed_ = QImage(); - transformed_pixmap_ = QPixmap::fromImage(transformed_); return true; } -void GuiImage::clip(Params const & params) +bool GuiImage::clip(Params const & params) { - if (transformed_.isNull()) - return; - if (params.bb.empty()) // No clipping is necessary. - return; + return false; int const new_width = params.bb.xr - params.bb.xl; int const new_height = params.bb.yt - params.bb.yb; + QImage const & image = is_transformed_ ? transformed_ : original_; + // No need to check if the width, height are > 0 because the // Bounding Box would be empty() in this case. - if (new_width > original_.width() || new_height > original_.height()) { + if (new_width > image.width() || new_height > image.height()) { // Bounds are invalid. - return; + return false; } - if (new_width == original_.width() && new_height == original_.height()) - return; + if (new_width == image.width() && new_height == image.height()) + return false; int const xoffset_l = params.bb.xl; - int const yoffset_t = (original_.height() > int(params.bb.yt) ? - original_.height() - params.bb.yt : 0); + int const yoffset_t = (image.height() > int(params.bb.yt)) + ? image.height() - params.bb.yt : 0; - transformed_ = original_.copy(xoffset_l, yoffset_t, - new_width, new_height); + transformed_ = image.copy(xoffset_l, yoffset_t, new_width, new_height); + return true; } -void GuiImage::rotate(Params const & params) +bool GuiImage::rotate(Params const & params) { - if (transformed_.isNull()) - return; - if (!params.angle) - return; + return false; + QImage const & image = is_transformed_ ? transformed_ : original_; QMatrix m; - m.rotate(-params.angle); - - transformed_ = transformed_.transformed(m); + m.rotate(- params.angle); + transformed_ = image.transformed(m); + return true; } -void GuiImage::scale(Params const & params) +bool GuiImage::scale(Params const & params) { - if (transformed_.isNull()) - return; + QImage const & image = is_transformed_ ? transformed_ : original_; - Dimension dim = scaledDimension(params); + if (params.scale == 100) + return false; + + qreal scale = qreal(params.scale) / 100.0; - if (dim.width() == width() && dim.height() == height()) - return; +#if (QT_VERSION >= 0x040500) && (QT_VERSION <= 0x040502) + // Due to a bug in Qt, LyX will crash for certain + // scaling factors and sizes of the image. + // see bug #5957: http://www.lyx.org/trac/ticket/5957 + scale += 0.0001; +#endif QMatrix m; - m.scale(double(dim.width()) / width(), double(dim.height()) / height()); - transformed_ = transformed_.transformed(m); + m.scale(scale, scale); + transformed_ = image.transformed(m); + return true; } } // namespace graphics