#include "GraphicsImage.h"
#include "GraphicsParams.h"
#include "GraphicsCache.h"
-#include "support/debug.h"
+#include "support/debug.h"
#include "support/Timeout.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
-#include <set>
#include <queue>
+#include <memory>
+#include <set>
using namespace std;
+using namespace lyx::support;
namespace lyx {
namespace graphics {
-using support::FileName;
/////////////////////////////////////////////////////////////////////
//
/// This class is a singleton class... use LoaderQueue::get() instead
LoaderQueue();
/// The in-progress loading queue (elements are unique here).
- std::list<Cache::ItemPtr> cache_queue_;
+ list<Cache::ItemPtr> cache_queue_;
/// Used to make the insertion of new elements faster.
- std::set<Cache::ItemPtr> cache_set_;
+ set<Cache::ItemPtr> cache_set_;
/// Newly touched elements go here. loadNext moves them to cache_queue_
- std::queue<Cache::ItemPtr> bucket_;
+ queue<Cache::ItemPtr> bucket_;
///
Timeout timer;
///
};
-//static int s_numimages_ = 5;
-//static int s_millisecs_ = 500;
-static int s_numimages_ = 10;
-static int s_millisecs_ = 500;
+//static int const s_numimages_ = 5;
+static int const s_numimages_ = 10;
+static int const s_millisecs_ = 500;
+
+// FIXME THREAD
LoaderQueue & LoaderQueue::get()
{
static LoaderQueue singleton;
LYXERR(Debug::GRAPHICS, "LoaderQueue: "
<< cache_queue_.size() << " items in the queue");
int counter = s_numimages_;
- while (cache_queue_.size() && counter--) {
+ while (!cache_queue_.empty() && counter--) {
Cache::ItemPtr ptr = cache_queue_.front();
cache_set_.erase(ptr);
cache_queue_.pop_front();
if (ptr->status() == WaitingToLoad)
ptr->startLoading();
}
- if (cache_queue_.size()) {
+ if (!cache_queue_.empty())
startLoader();
- } else {
+ else
stopLoader();
- }
}
LoaderQueue::LoaderQueue() : timer(s_millisecs_, Timeout::ONETIME),
running_(false)
{
- timer.timeout.connect(boost::bind(&LoaderQueue::loadNext, this));
+ timer.timeout.connect(bind(&LoaderQueue::loadNext, this));
}
list<Cache::ItemPtr>::iterator
end = cache_queue_.end();
- it = std::find(it, end, item);
+ it = find(it, end, item);
if (it != end)
cache_queue_.erase(it);
}
//
/////////////////////////////////////////////////////////////////////
-typedef boost::shared_ptr<Image> ImagePtr;
+typedef std::shared_ptr<Image> ImagePtr;
-class Loader::Impl : public boost::signals::trackable {
+class Loader::Impl : public boost::signals2::trackable {
public:
///
Impl();
/// We modify a local copy of the image once it is loaded.
ImagePtr image_;
/// This signal is emitted when the image loading status changes.
- boost::signal<void()> signal_;
+ boost::signals2::signal<void()> signal_;
/// The connection of the signal StatusChanged
- boost::signals::connection sc_;
+ boost::signals2::connection sc_;
+
+ double displayPixelRatio() const
+ {
+ return params_.pixel_ratio;
+ }
+ void setDisplayPixelRatio(double scale)
+ {
+ params_.pixel_ratio = scale;
+ }
private:
///
{}
-Loader::Loader(FileName const & file, DisplayType type)
+Loader::Loader(FileName const & file, bool display)
: pimpl_(new Impl)
{
- reset(file, type);
+ reset(file, display);
}
}
-void Loader::reset(FileName const & file, DisplayType type) const
+void Loader::reset(FileName const & file, bool display) const
{
Params params;
- params.display = type;
+ params.display = display;
pimpl_->resetParams(params);
pimpl_->resetFile(file);
void Loader::startLoading() const
{
- if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_.get())
+ if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_)
return;
pimpl_->startLoading();
}
+void Loader::reload() const
+{
+ pimpl_->cached_item_->startLoading();
+}
+
+
void Loader::startMonitoring() const
{
- if (!pimpl_->cached_item_.get())
+ if (!pimpl_->cached_item_)
return;
pimpl_->cached_item_->startMonitoring();
bool Loader::monitoring() const
{
- if (!pimpl_->cached_item_.get())
+ if (!pimpl_->cached_item_)
return false;
return pimpl_->cached_item_->monitoring();
unsigned long Loader::checksum() const
{
- if (!pimpl_->cached_item_.get())
+ if (!pimpl_->cached_item_)
return 0;
return pimpl_->cached_item_->checksum();
FileName const & Loader::filename() const
{
static FileName const empty;
- return pimpl_->cached_item_.get() ?
+ return pimpl_->cached_item_ ?
pimpl_->cached_item_->filename() : empty;
}
}
-boost::signals::connection Loader::connect(slot_type const & slot) const
+double Loader::displayPixelRatio() const
+{
+ return pimpl_->displayPixelRatio();
+}
+
+
+void Loader::setDisplayPixelRatio(double scale)
+{
+ pimpl_->setDisplayPixelRatio(scale);
+}
+
+
+boost::signals2::connection Loader::connect(slot_type const & slot) const
{
return pimpl_->signal_.connect(slot);
}
void Loader::Impl::resetFile(FileName const & file)
{
- FileName const old_file = cached_item_.get() ?
+ FileName const old_file = cached_item_ ?
cached_item_->filename() : FileName();
if (file == old_file)
// signal needs to be disconnected.
sc_.disconnect();
cached_item_.reset();
- Cache::get().remove(old_file);
+ if (status_ != Converting) {
+ Cache::get().remove(old_file);
+ } else {
+ //TODO remove cache item when it is not busy any more, see #7163
+ }
}
- status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad;
+ status_ = cached_item_ ? cached_item_->status() : WaitingToLoad;
image_.reset();
- if (cached_item_.get() || file.empty())
+ if (cached_item_ || file.empty())
return;
Cache & gc = Cache::get();
if (continue_monitoring && !cached_item_->monitoring())
cached_item_->startMonitoring();
- sc_ = cached_item_->connect(boost::bind(&Impl::statusChanged, this));
+ sc_ = cached_item_->connect(bind(&Impl::statusChanged, this));
}
return;
params_ = params;
- status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad;
+ status_ = cached_item_ ? cached_item_->status() : WaitingToLoad;
image_.reset();
}
void Loader::Impl::statusChanged()
{
- status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad;
+ status_ = cached_item_ ? cached_item_->status() : WaitingToLoad;
createPixmap();
signal_();
}
void Loader::Impl::createPixmap()
{
- if (!cached_item_.get() ||
- params_.display == NoDisplay || status_ != Loaded)
+ if (!params_.display || status_ != Loaded)
+ return;
+
+ if (!cached_item_) {
+ LYXERR(Debug::GRAPHICS, "pixmap not cached yet");
return;
+ }
+
+ if (!cached_item_->image()) {
+ // There must have been a problem reading the file.
+ LYXERR(Debug::GRAPHICS, "Graphics file not loaded.");
+ return;
+ }
image_.reset(cached_item_->image()->clone());
- // These do nothing if there's nothing to do
- image_->clip(params_);
- image_->rotate(params_);
- image_->scale(params_);
+ if (params_.pixel_ratio == 1.0) {
+ string filename = cached_item_->filename().absFileName();
+ size_t idx = filename.find_last_of('.');
+ if (idx != string::npos && idx > 3) {
+ if (filename.substr(idx - 3, 3) == "@2x") {
+ params_.pixel_ratio = 2.0;
+ }
+ }
+ }
bool const success = image_->setPixmap(params_);
if (status_ != WaitingToLoad)
return;
+ if (cached_item_->tryDisplayFormat()) {
+ status_ = Loaded;
+ createPixmap();
+ return;
+ }
+
LoaderQueue::get().touch(cached_item_);
}
projects / lyx.git / blobdiff