Rename WriteStream to TeXMathStream.

[lyx.git] / src / graphics / GraphicsParams.h

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index 678566e2bdc387bd679746df286ed992cf7c7bc3..e05bb67c5a4c4e12f7a97959b14bfcc1a2e8ae70 100644 (file)
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -14,7 +14,8 @@
 #ifndef GRAPHICSPARAMS_H
 #define GRAPHICSPARAMS_H
 
-#include "GraphicsTypes.h"
+#include "support/FileName.h"
+#include "support/Length.h"
 
 #include <string>
 #include <iosfwd>
@@ -26,7 +27,8 @@ namespace graphics {
 /** Parse a string of the form "200pt 500pt 300mm 5in" into a
  *  usable bounding box.
  */
-struct BoundingBox {
+class BoundingBox {
+public:
        ///
        BoundingBox();
        ///
@@ -35,27 +37,30 @@ struct BoundingBox {
        /// 0 0 0 0 is empty!
        bool empty() const;
 
-       unsigned int xl;
-       unsigned int yb;
-       unsigned int xr;
-       unsigned int yt;
+       Length xl;
+       Length yb;
+       Length xr;
+       Length yt;
 };
 
 bool operator==(BoundingBox const &, BoundingBox const &);
 bool operator!=(BoundingBox const &, BoundingBox const &);
 
+/// output bounding box in LyX file format
 std::ostream & operator<<(std::ostream &, BoundingBox const &);
 
 
-struct Params
+class Params
 {
+public:
        Params();
 
-       DisplayType display;
+       bool display;
        unsigned int scale;
+       double pixel_ratio;
 
        /// The image filename.
-       std::string filename;
+       support::FileName filename;
 
        /** Note that the BoundingBox is always relative to the BoundingBox
         *  as stored in the EPS file.
@@ -67,7 +72,7 @@ struct Params
         *  image.
         */
        /// Rotation angle.
-       float angle;
+       double angle;
 };
 
 bool operator==(Params const &, Params const &);