Clean up InsetGraphics::Cache and rename as GraphicsInset.

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 868f6d623e4451da847a42eb7e44196443fc1dac..0ea045452f3cfcdac71dea21a9229ae9b096af17 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -13,15 +13,15 @@
 #ifndef INSET_GRAPHICS_H
 #define INSET_GRAPHICS_H
 
+#include "inset.h"
+#include "insetgraphicsParams.h"
 
-
-#include "insets/inset.h"
-#include "insets/insetgraphicsParams.h"
-
-#include <boost/signals/trackable.hpp>
 #include <boost/scoped_ptr.hpp>
+#include <boost/signals/trackable.hpp>
+
 
 class Dialogs;
+class GraphicInset;
 class LaTeXFeatures;
 
 ///
@@ -30,24 +30,15 @@ public:
        ///
        InsetGraphics();
        ///
-       InsetGraphics(InsetGraphics const &, string const & filepath,
-                     bool same_id = false);
+       InsetGraphics(InsetGraphics const &);
        ///
        ~InsetGraphics();
        ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
        ///
-       int ascent(BufferView *, LyXFont const &) const;
-       ///
-       int descent(BufferView *, LyXFont const &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
-       int width(BufferView *, LyXFont const &) const;
-       ///
-       void draw(BufferView *, LyXFont const &, int, float &) const;
-       ///
-       void edit(BufferView *, int, int, mouse_button::state);
-       ///
-       void edit(BufferView * bv, bool front = true);
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
        EDITABLE editable() const;
        ///
@@ -60,7 +51,7 @@ public:
         fragile commands by adding a #\protect# before.
         */
        int latex(Buffer const *, std::ostream &,
-                 bool fragile, bool free_spc) const;
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
@@ -77,41 +68,34 @@ public:
        Inset::Code lyxCode() const { return Inset::GRAPHICS_CODE; }
 
        ///
-       virtual Inset * clone(Buffer const &, bool same_id = false) const;
+       virtual Inset * clone() const;
 
        /** Set the inset parameters, used by the GUIndependent dialog.
            Return true of new params are different from what was so far.
        */
-       bool setParams(InsetGraphicsParams const & params,
-                      string const & filepath);
+       bool setParams(InsetGraphicsParams const & params);
 
        /// Get the inset parameters, used by the GUIndependent dialog.
        InsetGraphicsParams const & params() const;
 
 private:
-       /// Returns the cached BufferView.
-       BufferView * view() const;
-
        ///
        friend class InsetGraphicsMailer;
 
-       /// Is the image ready to draw, or should we display a message instead?
-       bool imageIsDrawable() const;
-
-       /** This method is connected to cache_->statusChanged, so we are
-           informed when the image has been loaded.
+       /** This method is connected to the graphics loader, so we are
+        *  informed when the image has been loaded.
         */
        void statusChanged();
 
        /// Read the inset native format
-       void readInsetGraphics(LyXLex & lex);
+       void readInsetGraphics(LyXLex & lex, string const & bufpath);
 
        /// Get the status message, depends on the image loading status.
        string const statusMessage() const;
        /// Create the options for the latex command.
        string const createLatexOptions() const;
        /// Convert the file if needed, and return the location of the file.
-       string const prepareFile(Buffer const * buf) const;
+       string const prepareFile(Buffer const * buf, LatexRunParams const &) const;
 
        ///
        InsetGraphicsParams params_;
@@ -119,11 +103,8 @@ private:
        /// holds the entity name that defines the graphics location (SGML).
        string const graphic_label;
 
-       /// The cached variables
-       class Cache;
-       friend class Cache;
-       /// The pointer never changes although *cache_'s contents may.
-       boost::scoped_ptr<Cache> const cache_;
+       /// The thing that actually draws the image on LyX's screen.
+       boost::scoped_ptr<GraphicInset> const graphic_;
 };