From cf536b5db7c9f31425dae3ef339be6aa74fc03ce Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 22 Oct 2003 11:12:31 +0000 Subject: [PATCH] Move a couple of private member functions into namespace anon. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7952 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 5 +++ src/insets/render_graphic.C | 75 ++++++++++++++++++++----------------- src/insets/render_graphic.h | 6 --- 3 files changed, 45 insertions(+), 41 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index aa729f2711..85b0fe096e 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2003-10-22 Angus Leeming + + * render_graphic.[Ch] (statusMessage, readyToDisplay): move out of the + class and into an anonymous namespace. + 2003-10-22 Angus Leeming * insetcommand.h: remove the display method. diff --git a/src/insets/render_graphic.C b/src/insets/render_graphic.C index 52186bc9f4..376b142a86 100644 --- a/src/insets/render_graphic.C +++ b/src/insets/render_graphic.C @@ -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: - return _("Not shown."); - case lyx::graphics::Loading: - return _("Loading..."); - case lyx::graphics::Converting: - return _("Converting to loadable format..."); - case lyx::graphics::Loaded: - return _("Loaded into memory. Must now generate pixmap."); - case lyx::graphics::ScalingEtc: - return _("Scaling etc..."); - case lyx::graphics::Ready: - return _("Ready to display"); - case lyx::graphics::ErrorNoFile: - return _("No file found!"); - case lyx::graphics::ErrorConverting: - return _("Error converting to loadable format"); - case lyx::graphics::ErrorLoading: - return _("Error loading file into memory"); - case lyx::graphics::ErrorGeneratingPixmap: - return _("Error generating the pixmap"); - case lyx::graphics::ErrorUnknown: - return _("No image"); + switch (status) { + case graphics::WaitingToLoad: + return _("Not shown."); + case graphics::Loading: + return _("Loading..."); + case graphics::Converting: + return _("Converting to loadable format..."); + case graphics::Loaded: + return _("Loaded into memory. Must now generate pixmap."); + case graphics::ScalingEtc: + return _("Scaling etc..."); + case graphics::Ready: + return _("Ready to display"); + case graphics::ErrorNoFile: + return _("No file found!"); + case graphics::ErrorConverting: + return _("Error converting to loadable format"); + case graphics::ErrorLoading: + return _("Error loading file into memory"); + case graphics::ErrorGeneratingPixmap: + return _("Error generating the pixmap"); + 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, diff --git a/src/insets/render_graphic.h b/src/insets/render_graphic.h index a8c61a6e8f..447e104eb2 100644 --- a/src/insets/render_graphic.h +++ b/src/insets/render_graphic.h @@ -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_; -- 2.39.2