fix typo that put too many include paths for most people

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index ac380bffc46564d9f8b3fb5dd26c4139161a7f67..78f6a73fa74391a65a6bca8a73768c654f251e60 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *      
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 the LyX Team.
  *
@@ -17,20 +17,16 @@
 
 #ifdef __GNUG__
 #pragma interface
-#endif 
+#endif
 
+#include "graphics/GraphicsTypes.h"
 #include "insets/inset.h"
 #include "insets/insetgraphicsParams.h"
-#include "graphics/GraphicsCacheItem.h"
-#include <boost/smart_ptr.hpp>
-
-#include "LaTeXFeatures.h"
-
 // We need a signal here to hide an active dialog when we are deleted.
 #include "sigc++/signal_system.h"
 
 class Dialogs;
-class LyXImage;
+class LaTeXFeatures;
 
 ///
 class InsetGraphics : public Inset, public SigC::Object {
@@ -38,7 +34,8 @@ public:
        ///
        InsetGraphics();
        ///
-       InsetGraphics(InsetGraphics const &, bool same_id = false);
+       InsetGraphics(InsetGraphics const &, string const & filepath,
+                     bool same_id = false);
        ///
        ~InsetGraphics();
        ///
@@ -48,8 +45,6 @@ public:
        ///
        int width(BufferView *, LyXFont const &) const;
        ///
-       bool display() const { return true; }
-       ///
        void draw(BufferView *, LyXFont const &, int, float &, bool) const;
        ///
        void edit(BufferView *, int, int, unsigned int);
@@ -67,7 +62,7 @@ public:
         fragile commands by adding a #\protect# before.
         */
        int latex(Buffer const *, std::ostream &,
-                 bool fragile, bool free_spc) const;
+                 bool fragile, bool free_spc) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
@@ -89,10 +84,11 @@ public:
        /** 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);
+       bool setParams(InsetGraphicsParams const & params,
+                      string const & filepath);
 
        /// Get the inset parameters, used by the GUIndependent dialog.
-       InsetGraphicsParams getParams() const;
+       InsetGraphicsParams const & params() const;
 
        /** This signal is connected by our dialog and called when the inset
            is deleted.
@@ -100,27 +96,39 @@ public:
        SigC::Signal0<void> hideDialog;
 
 private:
+       /// Set the cached variables
+       void setCache() const;
+       /// Is the image ready to draw, or should we display a message instead?
+       bool drawImage() const;
+
        /// Read the inset native format
-       void readInsetGraphics(Buffer const * buf, LyXLex & lex);
+       void readInsetGraphics(LyXLex & lex);
        /// Read the FigInset file format
-       void readFigInset(Buffer const * buf, LyXLex & lex);
-       
+       void readFigInset(LyXLex & lex);
+
        /// Update the inset after parameter change.
-       void updateInset() const;
+       void updateInset(string const & filepath) const;
        /// 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;
-       /// The graphics cache handle.
-       mutable boost::shared_ptr<GraphicsCacheItem> cacheHandle;
-       /// is the pixmap initialized?
-       mutable bool imageLoaded;
-       /// the parameters
-       InsetGraphicsParams params;
+
+       ///
+       InsetGraphicsParams params_;
+
        /// holds the entity name that defines the graphics location (SGML).
        string const graphic_label;
+
+       /// The cached variables
+       mutable grfx::ImageStatus cached_status_;
+       ///
+       mutable grfx::ImagePtr cached_image_;
+       ///
+       mutable bool cache_filled_;
+       ///
+       mutable int old_asc;
 };
 
-#endif 
+#endif