-/*
+/**
* \file GraphicsLoader.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * \author Angus Leeming <leeming@lyx.org>
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "GraphicsLoader.h"
+
#include "GraphicsCache.h"
#include "GraphicsCacheItem.h"
#include "GraphicsImage.h"
#include "GraphicsParams.h"
-#include "GraphicsSupport.h"
+#include "LoaderQueue.h"
-#include "frontends/Timeout.h"
+#include "frontends/LyXView.h"
#include <boost/bind.hpp>
#include <boost/signals/trackable.hpp>
struct Loader::Impl : boost::signals::trackable {
///
- Impl(Loader &, Params const &);
+ Impl(Params const &);
///
~Impl();
///
void createPixmap();
///
- void startLoading(Inset const &, BufferView const &);
+ void startLoading();
/// The loading status of the image.
ImageStatus status_;
Cache::ItemPtr cached_item_;
/// We modify a local copy of the image once it is loaded.
Image::ImagePtr image_;
+ /// This signal is emitted when the image loading status changes.
+ boost::signal0<void> signal_;
private:
///
void statusChanged();
///
void checkedLoading();
-
+
///
Params params_;
- ///
- Loader & parent_;
- ///
- Timeout timer;
- // Multiple Insets can share the same image
- typedef std::list<Inset const *> InsetList;
- ///
- InsetList insets;
- ///
- BufferView const * view;
};
Loader::Loader()
- : pimpl_(new Impl(*this, Params()))
+ : pimpl_(new Impl(Params()))
{}
Loader::Loader(string const & file, DisplayType type)
- : pimpl_(new Impl(*this, Params()))
+ : pimpl_(new Impl(Params()))
{
reset(file, type);
}
Loader::Loader(string const & file, Params const & params)
- : pimpl_(new Impl(*this, params))
+ : pimpl_(new Impl(params))
{
reset(file, params);
}
{}
-void Loader::reset(string const & file, DisplayType type)
+void Loader::reset(string const & file, DisplayType type) const
{
Params params;
params.display = type;
}
-void Loader::reset(string const & file, Params const & params)
+void Loader::reset(string const & file, Params const & params) const
{
pimpl_->resetParams(params);
pimpl_->resetFile(file);
}
-void Loader::reset(Params const & params)
+void Loader::reset(Params const & params) const
{
pimpl_->resetParams(params);
pimpl_->createPixmap();
}
-void Loader::startLoading()
+void Loader::startLoading() const
{
if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_.get())
return;
- pimpl_->cached_item_->startLoading();
+ pimpl_->startLoading();
}
-void Loader::startLoading(Inset const & inset, BufferView const & bv)
+void Loader::startMonitoring() const
{
- if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_.get())
+ if (!pimpl_->cached_item_.get())
return;
- pimpl_->startLoading(inset, bv);
+
+ pimpl_->cached_item_->startMonitoring();
+}
+
+
+bool Loader::monitoring() const
+{
+ if (!pimpl_->cached_item_.get())
+ return false;
+
+ return pimpl_->cached_item_->monitoring();
+}
+
+
+unsigned long Loader::checksum() const
+{
+ if (!pimpl_->cached_item_.get())
+ return 0;
+
+ return pimpl_->cached_item_->checksum();
}
}
+boost::signals::connection Loader::connect(slot_type const & slot) const
+{
+ return pimpl_->signal_.connect(slot);
+}
+
+
Image const * Loader::image() const
{
return pimpl_->image_.get();
}
-Loader::Impl::Impl(Loader & parent, Params const & params)
- : status_(WaitingToLoad), params_(params), parent_(parent),
- timer(2000, Timeout::ONETIME), view(0)
+Loader::Impl::Impl(Params const & params)
+ : status_(WaitingToLoad), params_(params)
{
- timer.timeout.connect(boost::bind(&Impl::checkedLoading, this));
}
if (file == old_file)
return;
+ // If monitoring() the current file, should continue to monitor the
+ // new file.
+ bool continue_monitoring = false;
+
if (!old_file.empty()) {
+ continue_monitoring = cached_item_->monitoring();
cached_item_.reset();
Cache::get().remove(old_file);
}
status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad;
image_.reset();
-
+
if (cached_item_.get() || file.empty())
return;
cached_item_ = gc.item(file);
status_ = cached_item_->status();
- cached_item_->statusChanged.connect(
- boost::bind(&Impl::statusChanged, this));
+ if (continue_monitoring && !cached_item_->monitoring())
+ cached_item_->startMonitoring();
+
+ cached_item_->connect(boost::bind(&Impl::statusChanged, this));
}
{
status_ = cached_item_.get() ? cached_item_->status() : WaitingToLoad;
createPixmap();
- parent_.statusChanged();
+ signal_();
}
void Loader::Impl::createPixmap()
{
- if (!cached_item_.get() || image_.get() ||
+ if (!cached_item_.get() ||
params_.display == NoDisplay || status_ != Loaded)
return;
}
-void Loader::Impl::startLoading(Inset const & inset, BufferView const & bv)
+void Loader::Impl::startLoading()
{
- if (status_ != WaitingToLoad || timer.running())
+ if (status_ != WaitingToLoad)
return;
- InsetList::const_iterator it = insets.begin();
- InsetList::const_iterator end = insets.end();
- it = std::find(it, end, &inset);
- if (it == end)
- insets.push_back(&inset);
- view = &bv;
-
- timer.start();
-}
-
-
-namespace {
-
-struct FindVisibleInset {
-
- FindVisibleInset(std::list<VisibleParagraph> const & vps) : vps_(vps) {}
-
- bool operator()(Inset const * inset_ptr)
- {
- if (!inset_ptr)
- return false;
- return isInsetVisible(*inset_ptr, vps_);
- }
-
-private:
- std::list<VisibleParagraph> const & vps_;
-};
-
-} // namespace anon
-
-
-void Loader::Impl::checkedLoading()
-{
- if (insets.empty() || !view)
- return;
-
- std::list<VisibleParagraph> const vps = getVisibleParagraphs(*view);
-
- InsetList::const_iterator it = insets.begin();
- InsetList::const_iterator end = insets.end();
-
- it = std::find_if(it, end, FindVisibleInset(vps));
-
- // One of the insets is visible, so start loading the image.
- if (it != end)
- cached_item_->startLoading();
+ LoaderQueue::get().touch(cached_item_);
}