-/*
+/**
* \file GraphicsParams.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <cstdlib>
#include "GraphicsParams.h"
-#include "insets/insetgraphicsParams.h"
-#include "lyxrc.h"
-#include "support/filetools.h"
-#include "support/lstrings.h"
-#include "support/LAssert.h"
+#include "Lsstream.h"
+#include "lyxlength.h"
+
+using std::abs;
namespace grfx {
-GParams::GParams(InsetGraphicsParams const & iparams, string const & filepath)
- : width(0),
- height(0),
- scale(0),
+Params::Params()
+ : display(ColorDisplay),
+ scale(100),
angle(0)
-{
- filename = iparams.filename;
- if (!filepath.empty()) {
- filename = MakeAbsPath(filename, filepath);
- }
-
- if (iparams.clip) {
- bb = iparams.bb;
-
- // Get the original Bounding Box from the file
- string const bb_orig_str = readBB_from_PSFile(filename);
- if (!bb_orig_str.empty()) {
- BoundingBox bb_orig;
- bb_orig.xl = strToInt(token(bb_orig_str, ' ', 0));
- bb_orig.yb = strToInt(token(bb_orig_str, ' ', 1));
- bb_orig.xr = strToInt(token(bb_orig_str, ' ', 2));
- bb_orig.yt = strToInt(token(bb_orig_str, ' ', 3));
-
- bb.xl -= bb_orig.xl;
- bb.xr -= bb_orig.xl;
- bb.yb -= bb_orig.yb;
- bb.yt -= bb_orig.yb;
- }
-
- // Paranoia check.
- int const width = bb.xr - bb.xl;
- int const height = bb.yt - bb.yb;
-
- if (width < 0 || height < 0) {
- bb.xl = 0;
- bb.xr = 0;
- bb.yb = 0;
- bb.yt = 0;
- }
- }
-
- if (iparams.rotate)
- angle = int(iparams.rotateAngle);
-
- if (iparams.display == InsetGraphicsParams::DEFAULT) {
-
- if (lyxrc.display_graphics == "mono")
- display = MONOCHROME;
- else if (lyxrc.display_graphics == "gray")
- display = GRAYSCALE;
- else if (lyxrc.display_graphics == "color")
- display = COLOR;
- else
- display = NONE;
-
- } else if (iparams.display == InsetGraphicsParams::NONE) {
- display = NONE;
-
- } else if (iparams.display == InsetGraphicsParams::MONOCHROME) {
- display = MONOCHROME;
-
- } else if (iparams.display == InsetGraphicsParams::GRAYSCALE) {
- display = GRAYSCALE;
-
- } else if (iparams.display == InsetGraphicsParams::COLOR) {
- display = COLOR;
- }
-
- // Override the above if we're not using a gui
- if (!lyxrc.use_gui) {
- display = NONE;
- }
-
- if (iparams.lyxsize_type == InsetGraphicsParams::SCALE) {
- scale = iparams.lyxscale;
-
- } else if (iparams.lyxsize_type == InsetGraphicsParams::WH) {
- if (!iparams.lyxwidth.zero())
- width = iparams.lyxwidth.inPixels(1, 1);
- if (!iparams.lyxheight.zero())
- height = iparams.lyxheight.inPixels(1, 1);
-
- // inPixels returns a value scaled by lyxrc.zoom.
- // We want, therefore, to undo this.
- double const scaling_factor = 100.0 / double(lyxrc.zoom);
- width = uint(scaling_factor * width);
- height = uint(scaling_factor * height);
- }
-}
+{}
-bool operator==(GParams const & a, GParams const & b)
+bool operator==(Params const & a, Params const & b)
{
return (a.filename == b.filename &&
- a.display == b.display &&
- a.bb == b.bb &&
- a.width == b.width &&
- a.height == b.height &&
- a.scale == b.scale &&
- a.angle == b.angle);
+ a.display == b.display &&
+ a.bb == b.bb &&
+ a.scale == b.scale &&
+ a.angle == b.angle);
}
-bool operator!=(GParams const & a, GParams const & b)
+bool operator!=(Params const & a, Params const & b)
{
return !(a == b);
}
string a, b, c, d;
is >> a >> b >> c >> d;
- // Don't need to check that the strings are valid LyXLength's
- // because this is done in the LyXLength c-tor.
- LyXLength const length_xl(a);
- LyXLength const length_yb(b);
- LyXLength const length_xr(c);
- LyXLength const length_yt(d);
-
- // inPixels returns the length in inches, scaled by
- // lyxrc.dpi and lyxrc.zoom.
- // We want, therefore, to undo all this lyxrc nonsense because we
- // want the bounding box in Postscript pixels.
+ // inBP returns the length in Postscript points.
// Note further that there are 72 Postscript pixels per inch.
- double const scaling_factor = 7200.0 / (lyxrc.dpi * lyxrc.zoom);
- int const xl_tmp = int(scaling_factor * length_xl.inPixels(1, 1));
- int const yb_tmp = int(scaling_factor * length_yb.inPixels(1, 1));
- int const xr_tmp = int(scaling_factor * length_xr.inPixels(1, 1));
- int const yt_tmp = int(scaling_factor * length_yt.inPixels(1, 1));
+ unsigned int const xl_tmp = abs(LyXLength(a).inBP());
+ unsigned int const yb_tmp = abs(LyXLength(b).inBP());
+ unsigned int const xr_tmp = abs(LyXLength(c).inBP());
+ unsigned int const yt_tmp = abs(LyXLength(d).inBP());
if (xr_tmp <= xl_tmp || yt_tmp <= yb_tmp)
return;