ws changes only

[lyx.git] / src / insets / insetgraphics.h

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index d09edf59c60a67c796dd333f4b05dbedca409151..2ac1afc35b75fe2fe44f4cfa5b2631b61d867cef 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -18,10 +18,11 @@
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
+#include <boost/weak_ptr.hpp>
 
 
 class Dialogs;
-class GraphicRenderer;
+class RenderGraphic;
 class LaTeXFeatures;
 
 ///
@@ -38,8 +39,6 @@ public:
        ///
        void metrics(MetricsInfo &, Dimension &) const;
        ///
-       void draw(PainterInfo & pi, int x, int y) const;
-       ///
        EDITABLE editable() const;
        ///
        void write(Buffer const &, std::ostream &) const;
@@ -77,34 +76,42 @@ public:
 
        /// Get the inset parameters, used by the GUIndependent dialog.
        InsetGraphicsParams const & params() const;
+       ///
+       void draw(PainterInfo & pi, int x, int y) const;
 
 private:
        ///
        friend class InsetGraphicsMailer;
 
+       void cache(BufferView *) const;
+       BufferView * view() const;
+
        /** This method is connected to the graphics loader, so we are
         *  informed when the image has been loaded.
         */
-       void statusChanged();
+       void statusChanged() const;
 
        /// Read the inset native format
-       void readInsetGraphics(LyXLex & lex, string const & bufpath);
+       void readInsetGraphics(LyXLex & lex, std::string const & bufpath);
 
        /// Get the status message, depends on the image loading status.
-       string const statusMessage() const;
+       std::string const statusMessage() const;
        /// Create the options for the latex command.
-       string const createLatexOptions() const;
+       std::string const createLatexOptions() const;
        /// Convert the file if needed, and return the location of the file.
-       string const prepareFile(Buffer const & buf, LatexRunParams const &) const;
+       std::string const prepareFile(Buffer const & buf, LatexRunParams const &) const;
 
        ///
        InsetGraphicsParams params_;
 
        /// holds the entity name that defines the graphics location (SGML).
-       string const graphic_label;
+       std::string const graphic_label;
 
        /// The thing that actually draws the image on LyX's screen.
-       boost::scoped_ptr<GraphicRenderer> const graphic_;
+       boost::scoped_ptr<RenderGraphic> const graphic_;
+
+       /// Cached
+       mutable boost::weak_ptr<BufferView> view_;
 };
 
 
@@ -117,19 +124,19 @@ public:
        ///
        virtual InsetBase & inset() const { return inset_; }
        ///
-       virtual string const & name() const { return name_; }
+       virtual std::string const & name() const { return name_; }
        ///
-       virtual string const inset2string(Buffer const &) const;
+       virtual std::string const inset2string(Buffer const &) const;
        ///
-       static void string2params(string const & data,
+       static void string2params(std::string const & data,
                                  Buffer const & buffer,
                                  InsetGraphicsParams &);
        ///
-       static string const params2string(InsetGraphicsParams const &,
+       static std::string const params2string(InsetGraphicsParams const &,
                                          Buffer const &);
 private:
        ///
-       static string const name_;
+       static std::string const name_;
        ///
        InsetGraphics & inset_;
 };