X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsParams.h;h=15baf2aa3ca27af34e6b4cb1e39c013aa55dd159;hb=3aa7e91a827fa15b3e0906b975c4755a2dcdb76d;hp=d8a02610d6077023f40ad3708417d93f302a0801;hpb=607ad8d3a778a23013f5c5a9382e9af3cb64350d;p=lyx.git

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index d8a02610d6..15baf2aa3c 100644
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -1,15 +1,13 @@
 // -*- C++ -*-
 /**
  *  \file GraphicsParams.h
- *  Copyright 2002 the LyX Team
  *  Read the file COPYING
  *
- *  \author Angus Leeming <a.leeming@ic.ac.uk>
+ *  \author Angus Leeming 
  *
- *  Used internally by the GraphicsCache. 
- *  Only a subset of InsetGraphicsParams is needed for display purposes.
- *  The GraphicsParams c-tor also interrogates lyxrc to ascertain whether
- *  to display or not.
+ * Full author contact details available in file CREDITS
+ *
+ *  Used internally by the grfx::Image.
  */
 
 #ifndef GRAPHICSPARAMS_H
@@ -19,10 +17,9 @@
 #pragma interface
 #endif
 
+#include "GraphicsTypes.h"
 #include "LString.h"
-#include "lyxlength.h"
 
-class InsetGraphicsParams;
 
 namespace grfx {
 
@@ -37,61 +34,41 @@ struct BoundingBox {
 
 	/// 0 0 0 0 is empty!
 	bool empty() const;
-	///
-	int xl;
-	int yb;
-	int xr;
-	int yt;
+
+	unsigned int xl;
+	unsigned int yb;
+	unsigned int xr;
+	unsigned int yt;
 };
 
-///
 bool operator==(BoundingBox const &, BoundingBox const &);
-///
 bool operator!=(BoundingBox const &, BoundingBox const &);
 
-struct GParams 
+struct Params
 {
-	/// 
-	GParams(InsetGraphicsParams const &);
-
-	/// How is the image to be displayed on the LyX screen?
-	enum DisplayType {
-		///
-		COLOR,
-		///
-		GRAYSCALE,
-		///
-		MONOCHROME,
-		/// We aren't going to display it at all!
-		NONE
-	};
+	Params();
 
-	///
 	DisplayType display;
+	unsigned int scale;
 
 	/// The image filename.
 	string filename;
 
-	///
+	/** Note that the BoundingBox is always relative to the BoundingBox
+	 *  as stored in the EPS file.
+	 *  Ie, bb.xl and bb.yb == 0 if that corner is not moved.
+	 */
 	BoundingBox bb;
 
 	/** The size of the view inside lyx in pixels or the scaling of the
 	 *  image.
 	 */
-	unsigned int width;
-	///
-	unsigned int height;
-	/// 
-	unsigned int scale;
-
 	/// Rotation angle.
-	int angle;
+	float angle;
 };
 
-///
-bool operator==(GParams const &, GParams const &);
-///
-bool operator!=(GParams const &, GParams const &);
+bool operator==(Params const &, Params const &);
+bool operator!=(Params const &, Params const &);
 
 } // namespace grfx