add <string> and other small fixes to make

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

diff --git a/src/graphics/GraphicsParams.C b/src/graphics/GraphicsParams.C
index e2782973d7f8d7c3727663dcac79703fc4f48b8d..f9317fed70dfaffb9a38dbe67b6f0f8ec3cc5fe1 100644 (file)
--- a/src/graphics/GraphicsParams.C
+++ b/src/graphics/GraphicsParams.C
@@ -1,139 +1,59 @@
-/*
+/**
  * \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 "GraphicsParams.h"
-#include "insets/insetgraphicsParams.h"
-#include "lyxrc.h"
-#include "debug.h"
-#include "support/filetools.h"
-#include "support/lstrings.h"
-#include "support/LAssert.h"
-
-namespace grfx {
-
-GParams::GParams(InsetGraphicsParams const & iparams, string const & filepath)
-       : width(0),
-         height(0),
-         scale(0),
+
+#include "lyxlength.h"
+
+#include "support/std_sstream.h"
+
+
+using std::string;
+using std::abs;
+
+
+namespace lyx {
+namespace graphics {
+
+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 tmp = readBB_from_PSFile(filename);
-               lyxerr[Debug::GRAPHICS] << "BB_from_File: " << tmp << std::endl;
-               if (!tmp.empty()) {
-                       int const bb_orig_xl = strToInt(token(tmp, ' ', 0));
-                       int const bb_orig_yb = strToInt(token(tmp, ' ', 1));
-
-                       bb.xl -= bb_orig_xl;
-                       bb.xr -= bb_orig_xl;
-                       bb.yb -= bb_orig_yb;
-                       bb.yt -= bb_orig_yb;
-               }
-
-               bb.xl = std::max(0, bb.xl);
-               bb.xr = std::max(0, bb.xr);
-               bb.yb = std::max(0, bb.yb);
-               bb.yt = std::max(0, bb.yt);
-
-               // 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);
 }
 
 
+std::ostream & operator<<(std::ostream & os, BoundingBox const & bb)
+{
+       os << bb.xl << ' ' << bb.yb << ' ' << bb.xr << ' ' << bb.yt;
+       return os;
+}
+
+
 BoundingBox::BoundingBox()
        : xl(0), yb(0), xr(0), yt(0)
 {}
@@ -151,10 +71,10 @@ BoundingBox::BoundingBox(string const & bb)
 
        // inBP returns the length in Postscript points.
        // Note further that there are 72 Postscript pixels per inch.
-       int const xl_tmp = LyXLength(a).inBP();
-       int const yb_tmp = LyXLength(b).inBP();
-       int const xr_tmp = LyXLength(c).inBP();
-       int const yt_tmp = LyXLength(d).inBP();
+       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;
@@ -186,4 +106,5 @@ bool operator!=(BoundingBox const & a, BoundingBox const & b)
        return !(a == b);
 }
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx