anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-06 00:10:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move a couple of private member functions into namespace anon.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7952 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-10-22 11:12:31 +00:00
parent f5d9beafd3
commit cf536b5db7
3 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insets/ChangeLog
View File

@ -1,3 +1,8 @@
2003-10-22 Angus Leeming <leeming@lyx.org>
* render_graphic.[Ch] (statusMessage, readyToDisplay): move out of the
class and into an anonymous namespace.
2003-10-22 Angus Leeming <leeming@lyx.org>
* insetcommand.h: remove the display method.

53
src/insets/render_graphic.C
View File

@ -25,6 +25,7 @@
#include "support/filetools.h"
namespace graphics = lyx::graphics;
using lyx::support::AbsolutePath;
using lyx::support::OnlyFilename;
@ -51,7 +52,7 @@ RenderBase * RenderGraphic::clone() const
}
void RenderGraphic::update(lyx::graphics::Params const & params)
void RenderGraphic::update(graphics::Params const & params)
{
params_ = params;
@ -78,47 +79,51 @@ boost::signals::connection RenderGraphic::connect(slot_type const & slot) const
}
string const RenderGraphic::statusMessage() const
namespace {
string const statusMessage(graphics::ImageStatus status)
{
switch (loader_.status()) {
case lyx::graphics::WaitingToLoad:
switch (status) {
case graphics::WaitingToLoad:
return _("Not shown.");
case lyx::graphics::Loading:
case graphics::Loading:
return _("Loading...");
case lyx::graphics::Converting:
case graphics::Converting:
return _("Converting to loadable format...");
case lyx::graphics::Loaded:
case graphics::Loaded:
return _("Loaded into memory. Must now generate pixmap.");
case lyx::graphics::ScalingEtc:
case graphics::ScalingEtc:
return _("Scaling etc...");
case lyx::graphics::Ready:
case graphics::Ready:
return _("Ready to display");
case lyx::graphics::ErrorNoFile:
case graphics::ErrorNoFile:
return _("No file found!");
case lyx::graphics::ErrorConverting:
case graphics::ErrorConverting:
return _("Error converting to loadable format");
case lyx::graphics::ErrorLoading:
case graphics::ErrorLoading:
return _("Error loading file into memory");
case lyx::graphics::ErrorGeneratingPixmap:
case graphics::ErrorGeneratingPixmap:
return _("Error generating the pixmap");
case lyx::graphics::ErrorUnknown:
case graphics::ErrorUnknown:
return _("No image");
}
return string();
}
bool RenderGraphic::readyToDisplay() const
bool readyToDisplay(graphics::Loader const & loader)
{
if (!loader_.image() || loader_.status() != lyx::graphics::Ready)
if (!loader.image() || loader.status() != graphics::Ready)
return false;
return loader_.image()->isDrawable();
return loader.image()->isDrawable();
}
} // namespace anon
void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
{
bool image_ready = readyToDisplay();
bool image_ready = readyToDisplay(loader_);
dim.asc = image_ready ? loader_.image()->getHeight() : 50;
dim.des = 0;
@ -138,7 +143,7 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
font_width = font_metrics::width(justname, msgFont);
}
string const msg = statusMessage();
string const msg = statusMessage(loader_.status());
if (!msg.empty()) {
msgFont.setSize(LyXFont::SIZE_TINY);
font_width = std::max(font_width,
@ -154,18 +159,18 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
{
if (params_.display != lyx::graphics::NoDisplay &&
loader_.status() == lyx::graphics::WaitingToLoad)
if (params_.display != graphics::NoDisplay &&
loader_.status() == graphics::WaitingToLoad)
loader_.startLoading();
if (params_.display != lyx::graphics::NoDisplay &&
if (params_.display != graphics::NoDisplay &&
!loader_.monitoring())
loader_.startMonitoring();
// This will draw the graphics. If the graphics has not been loaded yet,
// we draw just a rectangle.
if (readyToDisplay()) {
if (readyToDisplay(loader_)) {
pi.pain.image(x + InsetOld::TEXT_TO_INSET_OFFSET,
y - dim_.asc,
dim_.wid - 2 * InsetOld::TEXT_TO_INSET_OFFSET,
@ -192,7 +197,7 @@ void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
}
// Print the message.
string const msg = statusMessage();
string const msg = statusMessage(loader_.status());
if (!msg.empty()) {
msgFont.setSize(LyXFont::SIZE_TINY);
pi.pain.text(x + InsetOld::TEXT_TO_INSET_OFFSET + 6,

6
src/insets/render_graphic.h
View File

@ -48,12 +48,6 @@ private:
/// Not implemented.
RenderGraphic & operator=(RenderGraphic const &);
/// The message to display instead of the graphic itself.
std::string const statusMessage() const;
/// Is the image ready to draw, or should we display a message instead?
bool readyToDisplay() const;
/// The stored data.
lyx::graphics::Loader loader_;
lyx::graphics::Params params_;