X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Frender_preview.C;h=e6882fb32ff8c2271487a3edcef47cf75e658923;hb=5603df4a5b7e511b31026c9a4f8f55b2b10fde57;hp=4fd2d80c181227550fda5d42acc7421850552a8e;hpb=1c4ae33f9a115c8c878b4099f4f518bb58c3fa32;p=lyx.git diff --git a/src/insets/render_preview.C b/src/insets/render_preview.C index 4fd2d80c18..e6882fb32f 100644 --- a/src/insets/render_preview.C +++ b/src/insets/render_preview.C @@ -10,12 +10,18 @@ #include -#include "render_preview.h" +#include "insets/render_preview.h" +#include "insets/inset.h" +#include "BufferView.h" #include "dimension.h" +#include "gettext.h" #include "LColor.h" +#include "lyx_main.h" +#include "lyxrc.h" #include "metricsinfo.h" +#include "frontends/font_metrics.h" #include "frontends/Painter.h" #include "graphics/PreviewImage.h" @@ -27,46 +33,104 @@ #include using std::string; +using std::auto_ptr; namespace graphics = lyx::graphics; namespace support = lyx::support; -bool RenderPreview::activated() +LyXRC_PreviewStatus RenderPreview::status() { - return graphics::Previews::activated(); + return graphics::Previews::status(); } -RenderPreview::RenderPreview() - : pimage_(0) +RenderPreview::RenderPreview(InsetBase const * inset) + : parent_(inset) {} -RenderPreview::RenderPreview(RenderPreview const & other) +RenderPreview::RenderPreview(RenderPreview const & other, + InsetBase const * inset) : RenderBase(other), boost::signals::trackable(), snippet_(other.snippet_), - pimage_(0) + parent_(inset) {} -RenderBase * RenderPreview::clone() const +auto_ptr RenderPreview::clone(InsetBase const * inset) const { - return new RenderPreview(*this); + return auto_ptr(new RenderPreview(*this, inset)); } -void RenderPreview::metrics(MetricsInfo &, Dimension & dim) const +namespace { + +graphics::PreviewLoader & getPreviewLoader(Buffer const & buffer) +{ + graphics::Previews const & previews = graphics::Previews::get(); + return previews.loader(buffer); +} + + +string const statusMessage(BufferView const * bv, string const & snippet) { - if (previewReady()) { - dim.asc = pimage_->ascent(); - dim.des = pimage_->descent(); - dim.wid = pimage_->width(); + BOOST_ASSERT(bv && bv->buffer()); + + Buffer const & buffer = *bv->buffer(); + graphics::PreviewLoader const & loader = getPreviewLoader(buffer); + graphics::PreviewLoader::Status const status = loader.status(snippet); + + string message; + switch (status) { + case graphics::PreviewLoader::InQueue: + case graphics::PreviewLoader::Processing: + message = _("Preview loading"); + break; + case graphics::PreviewLoader::Ready: + message = _("Preview ready"); + break; + case graphics::PreviewLoader::NotFound: + message = _("Preview failed"); + break; + } + + return message; +} + +} // namespace anon + + +graphics::PreviewImage const * +RenderPreview::getPreviewImage(Buffer const & buffer) const +{ + graphics::PreviewLoader const & loader = getPreviewLoader(buffer); + return loader.preview(snippet_); +} + + +void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const +{ + BOOST_ASSERT(mi.base.bv && mi.base.bv->buffer()); + + graphics::PreviewImage const * const pimage = + getPreviewImage(*mi.base.bv->buffer()); + + if (pimage) { + dim.asc = pimage->ascent(); + dim.des = pimage->descent(); + dim.wid = pimage->width(); } else { - dim.asc = 20; - dim.des = 20; - dim.wid = 20; + dim.asc = 50; + dim.des = 0; + + LyXFont font(mi.base.font); + font.setFamily(LyXFont::SANS_FAMILY); + font.setSize(LyXFont::SIZE_FOOTNOTE); + dim.wid = 15 + + font_metrics::width(statusMessage(mi.base.bv, snippet_), + font); } dim_ = dim; @@ -75,48 +139,68 @@ void RenderPreview::metrics(MetricsInfo &, Dimension & dim) const void RenderPreview::draw(PainterInfo & pi, int x, int y) const { - if (!previewReady()) - pi.pain.rectangle(x, y - dim_.asc, dim_.wid, dim_.height(), - LColor::foreground); - else + BOOST_ASSERT(pi.base.bv && pi.base.bv->buffer()); + + graphics::PreviewImage const * const pimage = + getPreviewImage(*pi.base.bv->buffer()); + graphics::Image const * const image = pimage ? pimage->image() : 0; + + if (image) { pi.pain.image(x, y - dim_.asc, dim_.wid, dim_.height(), - *(pimage_->image())); + *image); + + } else { + int const offset = InsetOld::TEXT_TO_INSET_OFFSET; + + pi.pain.rectangle(x + offset, + y - dim_.asc, + dim_.wid - 2 * offset, + dim_.asc + dim_.des, + LColor::foreground); + + LyXFont font(pi.base.font); + font.setFamily(LyXFont::SANS_FAMILY); + font.setSize(LyXFont::SIZE_FOOTNOTE); + + pi.pain.text(x + offset + 6, + y - font_metrics::maxAscent(font) - 4, + statusMessage(pi.base.bv, snippet_), font); + } } -boost::signals::connection RenderPreview::connect(slot_type const & slot) +void RenderPreview::startLoading(Buffer const & buffer) const { - return preview_ready_signal_.connect(slot); + if (status() == LyXRC::PREVIEW_OFF || snippet_.empty()) + return; + + graphics::PreviewLoader const & loader = getPreviewLoader(buffer); + loader.startLoading(); } -void RenderPreview::generatePreview(string const & latex_snippet, - Buffer const & buffer) +void RenderPreview::addPreview(string const & latex_snippet, + Buffer const & buffer) { - if (!activated()) + if (status() == LyXRC::PREVIEW_OFF) return; - graphics::Previews & previews = graphics::Previews::get(); - graphics::PreviewLoader & loader = previews.loader(buffer); + graphics::PreviewLoader & loader = getPreviewLoader(buffer); addPreview(latex_snippet, loader); - if (!snippet_.empty()) - loader.startLoading(); } void RenderPreview::addPreview(string const & latex_snippet, - graphics::PreviewLoader & ploader) + graphics::PreviewLoader & ploader) { - if (!activated()) + if (status() == LyXRC::PREVIEW_OFF) return; snippet_ = support::trim(latex_snippet); - pimage_ = 0; if (snippet_.empty()) return; - pimage_ = ploader.preview(snippet_); - if (pimage_) + if (ploader.preview(snippet_)) return; // If this is the first time of calling, connect to the @@ -136,35 +220,37 @@ void RenderPreview::removePreview(Buffer const & buffer) if (snippet_.empty()) return; - graphics::Previews & previews = graphics::Previews::get(); - graphics::PreviewLoader & loader = previews.loader(buffer); + graphics::PreviewLoader & loader = getPreviewLoader(buffer); loader.remove(snippet_); snippet_.erase(); - pimage_ = 0; } -bool RenderPreview::previewReady() const +void RenderPreview::imageReady(graphics::PreviewImage const & pimage) { - return pimage_ ? pimage_->image() : false; + // Check the current snippet is the same as that previewed. + if (snippet_ == pimage.snippet()) + LyX::cref().updateInset(parent_); } -void RenderPreview::imageReady(graphics::PreviewImage const & pimage) -{ - // Check the current snippet is the same as that previewed. - if (snippet_ != pimage.snippet()) - return; +RenderMonitoredPreview::RenderMonitoredPreview(InsetBase const * inset) + : RenderPreview(inset), + monitor_(std::string(), 2000) +{} + - pimage_ = &pimage; - preview_ready_signal_(); +void RenderMonitoredPreview::setAbsFile(string const & file) +{ + monitor_.reset(file); } -void RenderMonitoredPreview::startMonitoring(string const & file) +void RenderMonitoredPreview::draw(PainterInfo & pi, int x, int y) const { - monitor_.reset(file); - monitor_.start(); + RenderPreview::draw(pi, x, y); + if (!monitoring()) + startMonitoring(); }