2001-12-28 Lars Gullik Bj�nnes <larsbj@birdstep.com>

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

diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h
index f6bce4aeef8e9c9efa366289923c1e3ad3916522..601df89b0a740839133208d0701a4e5ace6725d0 100644 (file)
--- a/src/insets/insetgraphicsParams.h
+++ b/src/insets/insetgraphicsParams.h
@@ -4,7 +4,7 @@
  * 
  *          LyX, The Document Processor
  *          Copyright 1995 Matthias Ettrich.
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  *          This file Copyright 2000 Baruch Even
  * ================================================= */
@@ -44,9 +44,6 @@ struct InsetGraphicsParams
        /// How to display the image
        DisplayType display;
 
-       /// Is the figure inlined? (not in a paragraph of its own).
-       bool inlineFigure;
-
        /// Do we have a subcaption?
        bool subcaption;
 
@@ -71,38 +68,40 @@ struct InsetGraphicsParams
            REFERENCE_POINT = LEFTBASELINE
        };
 
-       /// The resize of the image, is it the default size, in cm, inch or
-       /// percentage of the page/column width/height
+       /** The resize of the image, is it the default size, in cm, inch or
+           percentage of the page/column width/height */
        enum Resize {
            DEFAULT_SIZE,
            CM,
            INCH,
            PERCENT_PAGE,
-           PERCENT_COLUMN
+           PERCENT_COLUMN,
+               SCALE
        };
 
 
        /// Keep the ratio between height and width when resizing.
        bool keepAspectRatio;
 
-       // What width resize to do?
+       /// What width resize to do?
        Resize widthResize;
-       // Value of width resize
+       /// Value of width resize
        float widthSize;
-       // What height resize to do?
+       /// What height resize to do?
        Resize heightResize;
-       // Value of height resize
+       /// Value of height resize
        float heightSize;
 
-       // Origin point of rotation
+       /// Origin point of rotation
        Origin rotateOrigin;
-       // Rotation angle.
-       int rotateAngle;
-
+       /// Rotation angle.
+       float rotateAngle;
+       ///
        InsetGraphicsParams();
-
+       ///
        InsetGraphicsParams(InsetGraphicsParams const &);
-       InsetGraphicsParams const & operator=(InsetGraphicsParams const &);
+       ///
+       InsetGraphicsParams & operator=(InsetGraphicsParams const &);
 
        /// Save the parameters in the LyX format stream.
        void Write(Buffer const * buf, ostream & os) const;
@@ -121,6 +120,9 @@ private:
        void copy(InsetGraphicsParams const & params);
 };
 
-bool operator==(InsetGraphicsParams const&, InsetGraphicsParams const &);
+///
+bool operator==(InsetGraphicsParams const &, InsetGraphicsParams const &);
+///
+bool operator!=(InsetGraphicsParams const &, InsetGraphicsParams const &);
 
 #endif